Skip to content

M
mpd
Commit b4945959 authored by Avuton Olrich's avatar Avuton Olrich
Browse files
Options

[CLEANUP] Remove unused function

Remove unused functions from the header, static where possible Cleanup whitespace->tabs git-svn-id: https://svn.musicpd.org/mpd/trunk@4341 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent e4b0fcf8
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 61 deletions
src/directory.c
View file @ b4945959
...@@ -171,7 +171,6 @@ int updateInit(FILE * fp, List * pathList) { ...@@ -171,7 +171,6 @@ int updateInit(FILE * fp, List * pathList) {
if(directory_updatePid==0) { if(directory_updatePid==0) {
/* child */ /* child */
int dbUpdated = 0; int dbUpdated = 0;
/* clearPlayerPid(); */
unblockSignals(); unblockSignals();
......
src/player.c
View file @ b4945959
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
extern int masterPid; extern int masterPid;
static void resetPlayerMetadata() { static void resetPlayerMetadata() {
PlayerControl * pc = &(getPlayerData()->playerControl); PlayerControl * pc = &(getPlayerData()->playerControl);
if(pc->metadataState == PLAYER_METADATA_STATE_READ) { if(pc->metadataState == PLAYER_METADATA_STATE_READ) {
pc->metadataState = PLAYER_METADATA_STATE_WRITE; pc->metadataState = PLAYER_METADATA_STATE_WRITE;
} }
} }
void resetPlayer() { void resetPlayer() {
...@@ -65,8 +65,8 @@ void resetPlayer() { ...@@ -65,8 +65,8 @@ void resetPlayer() {
getPlayerData()->playerControl.state = PLAYER_STATE_STOP; getPlayerData()->playerControl.state = PLAYER_STATE_STOP;
getPlayerData()->playerControl.queueState = PLAYER_QUEUE_UNLOCKED; getPlayerData()->playerControl.queueState = PLAYER_QUEUE_UNLOCKED;
getPlayerData()->playerControl.seek = 0; getPlayerData()->playerControl.seek = 0;
getPlayerData()->playerControl.metadataState = getPlayerData()->playerControl.metadataState =
PLAYER_METADATA_STATE_WRITE; PLAYER_METADATA_STATE_WRITE;
pid = getPlayerData()->playerControl.decode_pid; pid = getPlayerData()->playerControl.decode_pid;
if(pid>0) kill(pid,SIGTERM); if(pid>0) kill(pid,SIGTERM);
getPlayerData()->playerControl.decode_pid = 0; getPlayerData()->playerControl.decode_pid = 0;
...@@ -102,28 +102,16 @@ int playerInit() { ...@@ -102,28 +102,16 @@ int playerInit() {
return 0; return 0;
} }
int playerInitReal() { static int playerInitReal() {
int player_pid; int player_pid;
blockSignals(); blockSignals();
player_pid = fork(); player_pid = fork();
if(player_pid==0) { if(player_pid==0) {
PlayerControl * pc = &(getPlayerData()->playerControl); PlayerControl * pc = &(getPlayerData()->playerControl);
/* clearUpdatePid(); */
unblockSignals(); unblockSignals();
setSigHandlersForDecoder(); setSigHandlersForDecoder();
/*
closeAllListenSockets();
freeAllInterfaces();
closeMp3Directory();
finishPlaylist();
finishPermissions();
finishCommands();
finishVolume();
*/
while(1) { while(1) {
if(pc->play) decode(); if(pc->play) decode();
...@@ -142,10 +130,10 @@ int playerInitReal() { ...@@ -142,10 +130,10 @@ int playerInitReal() {
pc->queueLockState = PLAYER_QUEUE_UNLOCKED; pc->queueLockState = PLAYER_QUEUE_UNLOCKED;
pc->unlockQueue = 0; pc->unlockQueue = 0;
} }
else if(pc->cycleLogFiles) { else if(pc->cycleLogFiles) {
myfprintfCloseAndOpenLogFile(); myfprintfCloseAndOpenLogFile();
pc->cycleLogFiles = 0; pc->cycleLogFiles = 0;
} }
else my_usleep(10000); else my_usleep(10000);
} }
...@@ -173,22 +161,12 @@ int playerPlay(FILE * fp, Song * song) { ...@@ -173,22 +161,12 @@ int playerPlay(FILE * fp, Song * song) {
if(playerStop(fp)<0) return -1; if(playerStop(fp)<0) return -1;
/*{ if(song->tag) pc->fileTime = song->tag->time;
struct stat st; else pc->fileTime = 0;
if(stat(rmp2amp(utf8ToFsCharset(utf8file)),&st)<0) {
strncpy(pc->erroredFile,pc->file,MAXPATHLEN);
pc->erroredFile[MAXPATHLEN] = '\0';
pc->error = PLAYER_ERROR_FILENOTFOUND;
return 0;
}
}*/
if(song->tag) pc->fileTime = song->tag->time;
else pc->fileTime = 0;
copyMpdTagToMetadataChunk(song->tag, &(pc->fileMetadataChunk)); copyMpdTagToMetadataChunk(song->tag, &(pc->fileMetadataChunk));
strncpy(pc->utf8url, getSongUrl(song), MAXPATHLEN); strncpy(pc->utf8url, getSongUrl(song), MAXPATHLEN);
pc->utf8url[MAXPATHLEN] = '\0'; pc->utf8url[MAXPATHLEN] = '\0';
pc->play = 1; pc->play = 1;
...@@ -336,8 +314,8 @@ int queueSong(Song * song) { ...@@ -336,8 +314,8 @@ int queueSong(Song * song) {
strncpy(pc->utf8url, getSongUrl(song), MAXPATHLEN); strncpy(pc->utf8url, getSongUrl(song), MAXPATHLEN);
pc->utf8url[MAXPATHLEN] = '\0'; pc->utf8url[MAXPATHLEN] = '\0';
if(song->tag) pc->fileTime = song->tag->time; if(song->tag) pc->fileTime = song->tag->time;
else pc->fileTime = 0; else pc->fileTime = 0;
copyMpdTagToMetadataChunk(song->tag, &(pc->fileMetadataChunk)); copyMpdTagToMetadataChunk(song->tag, &(pc->fileMetadataChunk));
...@@ -433,12 +411,6 @@ void setPlayerSoftwareVolume(int volume) { ...@@ -433,12 +411,6 @@ void setPlayerSoftwareVolume(int volume) {
pc->softwareVolume = volume; pc->softwareVolume = volume;
} }
int getPlayerSoftwareVolume() {
PlayerControl * pc = &(getPlayerData()->playerControl);
return pc->softwareVolume;
}
double getPlayerTotalPlayTime() { double getPlayerTotalPlayTime() {
PlayerControl * pc = &(getPlayerData()->playerControl); PlayerControl * pc = &(getPlayerData()->playerControl);
...@@ -473,23 +445,23 @@ void playerCycleLogFiles() { ...@@ -473,23 +445,23 @@ void playerCycleLogFiles() {
/* this actually creates a dupe of the current metadata */ /* this actually creates a dupe of the current metadata */
Song * playerCurrentDecodeSong() { Song * playerCurrentDecodeSong() {
static Song * song = NULL; static Song * song = NULL;
static MetadataChunk * prev = NULL; static MetadataChunk * prev = NULL;
Song * ret = NULL; Song * ret = NULL;
PlayerControl * pc = &(getPlayerData()->playerControl); PlayerControl * pc = &(getPlayerData()->playerControl);
if(pc->metadataState == PLAYER_METADATA_STATE_READ) { if(pc->metadataState == PLAYER_METADATA_STATE_READ) {
DEBUG("playerCurrentDecodeSong: caught new metadata!\n"); DEBUG("playerCurrentDecodeSong: caught new metadata!\n");
if(prev) free(prev); if(prev) free(prev);
prev = malloc(sizeof(MetadataChunk)); prev = malloc(sizeof(MetadataChunk));
memcpy(prev, &(pc->metadataChunk), sizeof(MetadataChunk)); memcpy(prev, &(pc->metadataChunk), sizeof(MetadataChunk));
if(song) freeJustSong(song); if(song) freeJustSong(song);
song = newNullSong(); song = newNullSong();
song->url = strdup(pc->currentUrl); song->url = strdup(pc->currentUrl);
song->tag = metadataChunkToMpdTagDup(prev); song->tag = metadataChunkToMpdTagDup(prev);
ret = song; ret = song;
resetPlayerMetadata(); resetPlayerMetadata();
} }
return ret; return ret;
} }
src/player.h
View file @ b4945959
...@@ -89,8 +89,6 @@ typedef struct _PlayerControl { ...@@ -89,8 +89,6 @@ typedef struct _PlayerControl {
MetadataChunk fileMetadataChunk; MetadataChunk fileMetadataChunk;
} PlayerControl; } PlayerControl;
void clearPlayerPid();
void player_sigChldHandler(int pid, int status); void player_sigChldHandler(int pid, int status);
int playerPlay(FILE * fp, Song * song); int playerPlay(FILE * fp, Song * song);
...@@ -105,8 +103,6 @@ void playerCloseAudio(); ...@@ -105,8 +103,6 @@ void playerCloseAudio();
void playerKill(); void playerKill();
void playerProcessMessages();
int getPlayerTotalTime(); int getPlayerTotalTime();
int getPlayerElapsedTime(); int getPlayerElapsedTime();
...@@ -139,8 +135,6 @@ void setPlayerCrossFade(float crossFadeInSeconds); ...@@ -139,8 +135,6 @@ void setPlayerCrossFade(float crossFadeInSeconds);
float getPlayerCrossFade(); float getPlayerCrossFade();
int getPlayerSoftwareVolume();
void setPlayerSoftwareVolume(int volume); void setPlayerSoftwareVolume(int volume);
double getPlayerTotalPlayTime(); double getPlayerTotalPlayTime();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment