updating_db in status and some ideas for the TODO that i've already forgotten
git-svn-id: https://svn.musicpd.org/mpd/trunk@669 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
@@ -84,6 +84,7 @@
|
||||
#define COMMAND_STATUS_ERROR "error"
|
||||
#define COMMAND_STATUS_CROSSFADE "xfade"
|
||||
#define COMMAND_STATUS_AUDIO "audio"
|
||||
#define COMMAND_STATUS_UPDATING_DB "updating_db"
|
||||
|
||||
typedef int (* CommandHandlerFunction)(FILE *, unsigned int *, int, char **);
|
||||
|
||||
@@ -193,6 +194,8 @@ int commandStatus(FILE * fp, unsigned int * permission, int argArrayLength,
|
||||
myfprintf(fp,"%s: %u:%i:%i\n",COMMAND_STATUS_AUDIO,getPlayerSampleRate(),getPlayerBits(),getPlayerChannels());
|
||||
}
|
||||
|
||||
if(isUpdatingDB()) myfprintf(fp,"%s: 1\n",COMMAND_STATUS_UPDATING_DB);
|
||||
|
||||
if(getPlayerError()!=PLAYER_ERROR_NOERROR) {
|
||||
myfprintf(fp,"%s: %s\n",COMMAND_STATUS_ERROR,getPlayerErrorStr());
|
||||
}
|
||||
|
@@ -88,6 +88,11 @@ void deleteEmptyDirectoriesInDirectory(Directory * directory);
|
||||
|
||||
int addSubDirectoryToDirectory(Directory * directory, char * shortname, char * name);
|
||||
|
||||
int isUpdatingDB() {
|
||||
if(directory_updatePid>0) return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void directory_sigChldHandler(int pid, int status) {
|
||||
if(directory_updatePid==pid) {
|
||||
if(WIFSIGNALED(status) && WTERMSIG(status)!=SIGTERM) {
|
||||
|
@@ -28,6 +28,8 @@
|
||||
|
||||
extern char directorydb[MAXPATHLEN+1];
|
||||
|
||||
int isUpdatingDB();
|
||||
|
||||
void directory_sigChldHandler(int pid, int status);
|
||||
|
||||
int updateInit(FILE * fp);
|
||||
|
Reference in New Issue
Block a user