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/locate.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/locate.c')
-rw-r--r-- | src/locate.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/locate.c b/src/locate.c index 6101dd95b..96fa4ee58 100644 --- a/src/locate.c +++ b/src/locate.c @@ -121,7 +121,8 @@ void freeLocateTagItem(LocateTagItem * item) free(item); } -static int strstrSearchTag(Song * song, enum tag_type type, char *str) +static int strstrSearchTag(struct mpd_song * song, + enum tag_type type, char *str) { int i; char *duplicate; @@ -131,7 +132,7 @@ static int strstrSearchTag(Song * song, enum tag_type type, char *str) if (type == LOCATE_TAG_FILE_TYPE || type == LOCATE_TAG_ANY_TYPE) { char path_max_tmp[MPD_PATH_MAX]; - string_toupper(get_song_url(path_max_tmp, song)); + string_toupper(song_get_url(song, path_max_tmp)); if (strstr(path_max_tmp, str)) ret = 1; if (ret == 1 || type == LOCATE_TAG_FILE_TYPE) @@ -166,7 +167,8 @@ static int strstrSearchTag(Song * song, enum tag_type type, char *str) return ret; } -int strstrSearchTags(Song * song, int numItems, LocateTagItem * items) +int +strstrSearchTags(struct mpd_song * song, int numItems, LocateTagItem * items) { int i; @@ -180,14 +182,15 @@ int strstrSearchTags(Song * song, int numItems, LocateTagItem * items) return 1; } -static int tagItemFoundAndMatches(Song * song, enum tag_type type, char *str) +static int +tagItemFoundAndMatches(struct mpd_song * song, enum tag_type type, char *str) { int i; int8_t visitedTypes[TAG_NUM_OF_ITEM_TYPES] = { 0 }; if (type == LOCATE_TAG_FILE_TYPE || type == LOCATE_TAG_ANY_TYPE) { char path_max_tmp[MPD_PATH_MAX]; - if (0 == strcmp(str, get_song_url(path_max_tmp, song))) + if (0 == strcmp(str, song_get_url(song, path_max_tmp))) return 1; if (type == LOCATE_TAG_FILE_TYPE) return 0; @@ -220,7 +223,8 @@ static int tagItemFoundAndMatches(Song * song, enum tag_type type, char *str) } -int tagItemsFoundAndMatches(Song * song, int numItems, LocateTagItem * items) +int tagItemsFoundAndMatches(struct mpd_song * song, + int numItems, LocateTagItem * items) { int i; |