diff options
author | Max Kellermann <max@duempel.org> | 2008-09-19 14:10:37 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2008-09-19 14:10:37 +0200 |
commit | b93a0bab1cfb0479c24963f649ae0de33b885289 (patch) | |
tree | d6f942d775da9c24a61fd981521c5aeaf43a84dd /src/filelist.c | |
parent | 4364a0bc8620e95f2fb63949f1f6f63aa233a649 (diff) | |
download | mpd-b93a0bab1cfb0479c24963f649ae0de33b885289.tar.gz mpd-b93a0bab1cfb0479c24963f649ae0de33b885289.tar.xz mpd-b93a0bab1cfb0479c24963f649ae0de33b885289.zip |
mpdclient: moved code to filelist.c
Move everything which is solely filelist related to filelist.c and
filelist.h. Fix the indentation of that file, and provide the struct
name "filelist". Don't clear data in mpdclient_filelist_free() before
calling g_free(). Constify the "song" parameter to
mpdclient_filelist_find_song().
Diffstat (limited to 'src/filelist.c')
-rw-r--r-- | src/filelist.c | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/src/filelist.c b/src/filelist.c new file mode 100644 index 000000000..6f938ea30 --- /dev/null +++ b/src/filelist.c @@ -0,0 +1,69 @@ +/* + * (c) 2004 by Kalle Wallin <kaw@linux.se> + * (c) 2008 Max Kellermann <max@duempel.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "filelist.h" +#include "libmpdclient.h" + +#include <string.h> + +void +mpdclient_filelist_free(struct filelist *filelist) +{ + GList *list = g_list_first(filelist->list); + + if (list == NULL) + return; + + while (list != NULL) { + filelist_entry_t *entry = list->data; + + if (entry->entity) + mpd_freeInfoEntity(entry->entity); + + g_free(entry); + list = list->next; + } + + g_list_free(filelist->list); + g_free(filelist->path); + g_free(filelist); +} + +struct filelist_entry * +mpdclient_filelist_find_song(struct filelist *fl, + const struct mpd_song *song) +{ + GList *list = g_list_first(fl->list); + + while (list && song) { + filelist_entry_t *entry = list->data; + mpd_InfoEntity *entity = entry->entity; + + if (entity && entity->type == MPD_INFO_ENTITY_TYPE_SONG) { + struct mpd_song *song2 = entity->info.song; + + if (strcmp(song->file, song2->file) == 0) + return entry; + } + + list = list->next; + } + + return NULL; +} |