diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-20 17:31:45 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-20 17:31:45 -0700 |
| commit | 77f98f37245f7d8ea2b0182b326420b6d6455cad (patch) | |
| tree | b38c6ec08ce8ab7b80f0f11e1739b7890c4a2b2a /src/directory.h | |
| parent | df1ed6f83043b7290d27b49c3c63fc8bcb796d5c (diff) | |
| parent | 228736ffb9d88a2910d7ae7df71827d12d7bfeb5 (diff) | |
| download | mpd-77f98f37245f7d8ea2b0182b326420b6d6455cad.tar.gz mpd-77f98f37245f7d8ea2b0182b326420b6d6455cad.tar.xz mpd-77f98f37245f7d8ea2b0182b326420b6d6455cad.zip | |
Merge branch 'ew/directory'
* ew/directory:
Don't try to prune unless we're updating
workaround race condition on updates with broken signal blocking
Replace SongList with struct songvec
directory: remove unused updateMp3Directory() function
start using prefixcmp()
Add prefixcmp() (stol^H^H^H^Hborrowed from git)
Diffstat (limited to 'src/directory.h')
| -rw-r--r-- | src/directory.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/directory.h b/src/directory.h index 9553095b3..40c9d6499 100644 --- a/src/directory.h +++ b/src/directory.h @@ -20,13 +20,14 @@ #define DIRECTORY_H #include "song.h" +#include "songvec.h" typedef List DirectoryList; typedef struct _Directory { char *path; DirectoryList *subDirectories; - SongList *songs; + struct songvec songs; struct _Directory *parent; ino_t inode; dev_t device; @@ -55,8 +56,6 @@ int writeDirectoryDB(void); int readDirectoryDB(void); -void updateMp3Directory(void); - Song *getSongFromDB(const char *file); time_t getDbModTime(void); |