oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist: pass const pointers to search functions

Browse Source 
The LocateTagItem objects are not modified.
This commit is contained in:
Max Kellermann
2009-01-23 16:22:43 +01:00
parent 3a86a6ca16
commit 4c77a4c494
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/playlist.c
View File

@@ -1297,16 +1297,16 @@ enum playlist_result loadPlaylist(const char *utf8file)
return PLAYLIST_RESULT_SUCCESS; return PLAYLIST_RESULT_SUCCESS;
} }
void searchForSongsInPlaylist(struct client *client, void
unsigned numItems, LocateTagItem * items) searchForSongsInPlaylist(struct client *client,
unsigned numItems, const LocateTagItem *items)
{ {
unsigned i; unsigned i;
char **originalNeedles = g_malloc(numItems * sizeof(char *)); LocateTagItem *new_items =
g_memdup(items, sizeof(LocateTagItem) * numItems);
for (i = 0; i < numItems; i++) { for (i = 0; i < numItems; i++)
originalNeedles[i] = items[i].needle; new_items[i].needle = g_utf8_casefold(new_items[i].needle, -1);
items[i].needle = g_utf8_casefold(originalNeedles[i], -1);
}
for (i = 0; i < queue_length(&playlist.queue); i++) { for (i = 0; i < queue_length(&playlist.queue); i++) {
const struct song *song = queue_get(&playlist.queue, i); const struct song *song = queue_get(&playlist.queue, i);
@@ -1315,16 +1315,12 @@ void searchForSongsInPlaylist(struct client *client,
printPlaylistSongInfo(client, i); printPlaylistSongInfo(client, i);
} }
for (i = 0; i < numItems; i++) { freeLocateTagItemArray(numItems, new_items);
g_free(items[i].needle);
items[i].needle = originalNeedles[i];
}
free(originalNeedles);
} }
void findSongsInPlaylist(struct client *client, void
unsigned numItems, LocateTagItem * items) findSongsInPlaylist(struct client *client,
unsigned numItems, const LocateTagItem *items)
{ {
for (unsigned i = 0; i < queue_length(&playlist.queue); i++) { for (unsigned i = 0; i < queue_length(&playlist.queue); i++) {
const struct song *song = queue_get(&playlist.queue, i); const struct song *song = queue_get(&playlist.queue, i);

10
src/playlist.h
View File

@@ -176,11 +176,13 @@ int playlistChangesPosId(struct client *client, uint32_t version);
int PlaylistInfo(struct client *client, const char *utf8file, int detail); int PlaylistInfo(struct client *client, const char *utf8file, int detail);
void searchForSongsInPlaylist(struct client *client, void
unsigned numItems, LocateTagItem * items); searchForSongsInPlaylist(struct client *client,
unsigned numItems, const LocateTagItem *items);
void findSongsInPlaylist(struct client *client, void
unsigned numItems, LocateTagItem * items); findSongsInPlaylist(struct client *client,
unsigned numItems, const LocateTagItem *items);
int is_valid_playlist_name(const char *utf8path); int is_valid_playlist_name(const char *utf8path);