oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

[CLEANUP] Remove unused function

Browse Source 
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
This commit is contained in:
Avuton Olrich 2006-07-14 20:34:46 +00:00
parent e4b0fcf8e0
commit b4945959ab
3 changed files with 26 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/directory.c
View File

@ -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();

30
src/player.c
View File

@ -102,29 +102,17 @@ 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();
else if(pc->stop) pc->stop = 0; else if(pc->stop) pc->stop = 0;
@ -173,16 +161,6 @@ int playerPlay(FILE * fp, Song * song) {
if(playerStop(fp)<0) return -1; if(playerStop(fp)<0) return -1;
/*{
struct stat st;
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; if(song->tag) pc->fileTime = song->tag->time;
else pc->fileTime = 0; else pc->fileTime = 0;
@ -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);

6
src/player.h
View File

@ -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();
void playerKill(); void playerKill();
void playerProcessMessages();
int getPlayerTotalTime(); int getPlayerTotalTime();
int getPlayerElapsedTime(); int getPlayerElapsedTime();
@ -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();