diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-10-11 23:39:50 -0700 |
| commit | 0df62a2c3cb7af88347d40a17cc336b5d1740f62 (patch) | |
| tree | 25040833144c3e24f6b4702d9b745cd068b5371a /src/sig_handlers.c | |
| parent | 3456e2de5bf90207d8149a842bb12c3f9bdd218f (diff) | |
| parent | 6e2b0ca9edaed200f250ef487701ad161aa4a168 (diff) | |
| download | mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.gz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.tar.xz mpd-0df62a2c3cb7af88347d40a17cc336b5d1740f62.zip | |
Merge branch 'mk/directory'
* mk/directory: (59 commits)
directory: don't use identical struct and variable names
update: replaced update_return with global "modified" flag
update: make the variable "progress" static
update: don't print debug message when song was not modified
update: fix memory leak in directory_update_init()
update: make the job id unsigned
update: job ID must be positive
update: check progress!=IDLE in reap_update_task()
update: fixed stack corruption due to pthread_join() call
updated: always call removeDeletedFromDirectory()
update: eliminated addSubDirectoryToDirectory()
update: make the "song" variable more local
update: do the recursive directory check only once
update: copy stat to new directory
update: avoid duplicate stat() calls
update: rewrote updatePath() using updateInDirectory()
update: don't export updateDirectory()
update: pass const pointer to addSubDirectoryToDirectory()
update: never pass root path to updatePath()
update: merged addDirectoryPathToDB() into addParentPathToDB()
...
Conflicts:
src/song.c
Diffstat (limited to 'src/sig_handlers.c')
| -rw-r--r-- | src/sig_handlers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sig_handlers.c b/src/sig_handlers.c index e4ac21f22..5a4ebe57d 100644 --- a/src/sig_handlers.c +++ b/src/sig_handlers.c @@ -19,7 +19,8 @@ #include "sig_handlers.h" #include "playlist.h" -#include "directory.h" +#include "database.h" +#include "update.h" #include "command.h" #include "signal_check.h" #include "log.h" @@ -35,7 +36,7 @@ int handlePendingSignals(void) DEBUG("got SIGHUP, rereading DB\n"); signal_clear(SIGHUP); if (!isUpdatingDB()) { - readDirectoryDB(); + db_load(); playlistVersionChange(); } if (cycle_log_files() < 0) |