[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
This commit is contained in:
parent
e4b0fcf8e0
commit
b4945959ab
@ -171,7 +171,6 @@ int updateInit(FILE * fp, List * pathList) {
|
||||
if(directory_updatePid==0) {
|
||||
/* child */
|
||||
int dbUpdated = 0;
|
||||
/* clearPlayerPid(); */
|
||||
|
||||
unblockSignals();
|
||||
|
||||
|
30
src/player.c
30
src/player.c
@ -102,29 +102,17 @@ int playerInit() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int playerInitReal() {
|
||||
static int playerInitReal() {
|
||||
int player_pid;
|
||||
blockSignals();
|
||||
player_pid = fork();
|
||||
if(player_pid==0) {
|
||||
PlayerControl * pc = &(getPlayerData()->playerControl);
|
||||
|
||||
/* clearUpdatePid(); */
|
||||
|
||||
unblockSignals();
|
||||
|
||||
setSigHandlersForDecoder();
|
||||
|
||||
/*
|
||||
closeAllListenSockets();
|
||||
freeAllInterfaces();
|
||||
closeMp3Directory();
|
||||
finishPlaylist();
|
||||
finishPermissions();
|
||||
finishCommands();
|
||||
finishVolume();
|
||||
*/
|
||||
|
||||
while(1) {
|
||||
if(pc->play) decode();
|
||||
else if(pc->stop) pc->stop = 0;
|
||||
@ -173,16 +161,6 @@ int playerPlay(FILE * fp, Song * song) {
|
||||
|
||||
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;
|
||||
else pc->fileTime = 0;
|
||||
|
||||
@ -433,12 +411,6 @@ void setPlayerSoftwareVolume(int volume) {
|
||||
pc->softwareVolume = volume;
|
||||
}
|
||||
|
||||
int getPlayerSoftwareVolume() {
|
||||
PlayerControl * pc = &(getPlayerData()->playerControl);
|
||||
|
||||
return pc->softwareVolume;
|
||||
}
|
||||
|
||||
double getPlayerTotalPlayTime() {
|
||||
PlayerControl * pc = &(getPlayerData()->playerControl);
|
||||
|
||||
|
@ -89,8 +89,6 @@ typedef struct _PlayerControl {
|
||||
MetadataChunk fileMetadataChunk;
|
||||
} PlayerControl;
|
||||
|
||||
void clearPlayerPid();
|
||||
|
||||
void player_sigChldHandler(int pid, int status);
|
||||
|
||||
int playerPlay(FILE * fp, Song * song);
|
||||
@ -105,8 +103,6 @@ void playerCloseAudio();
|
||||
|
||||
void playerKill();
|
||||
|
||||
void playerProcessMessages();
|
||||
|
||||
int getPlayerTotalTime();
|
||||
|
||||
int getPlayerElapsedTime();
|
||||
@ -139,8 +135,6 @@ void setPlayerCrossFade(float crossFadeInSeconds);
|
||||
|
||||
float getPlayerCrossFade();
|
||||
|
||||
int getPlayerSoftwareVolume();
|
||||
|
||||
void setPlayerSoftwareVolume(int volume);
|
||||
|
||||
double getPlayerTotalPlayTime();
|
||||
|
Loading…
Reference in New Issue
Block a user