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/songvec.h | |
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 '')
-rw-r--r-- | src/songvec.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/songvec.h b/src/songvec.h index dbe6be508..633cf8d66 100644 --- a/src/songvec.h +++ b/src/songvec.h @@ -5,20 +5,21 @@ #include "os_compat.h" struct songvec { - Song **base; + struct mpd_song **base; size_t nr; }; void songvec_sort(struct songvec *sv); -Song *songvec_find(struct songvec *sv, const char *url); +struct mpd_song *songvec_find(const struct songvec *sv, const char *url); -int songvec_delete(struct songvec *sv, const Song *del); +int songvec_delete(struct songvec *sv, const struct mpd_song *del); -void songvec_add(struct songvec *sv, Song *add); +void songvec_add(struct songvec *sv, struct mpd_song *add); void songvec_destroy(struct songvec *sv); -int songvec_for_each(struct songvec *sv, int (*fn)(Song *, void *), void *arg); +int songvec_for_each(const struct songvec *sv, + int (*fn)(struct mpd_song *, void *), void *arg); #endif /* SONGVEC_H */ |