From 8135d7dbf86043fb5f4e960ef4d976e4908631f3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 16 Sep 2008 19:11:39 +0200 Subject: libmpdclient: moved code to song.c Move everything which manipulates the mpd_Song struct to song.c. Thousands of lines of too much for libmpdclient.c! --- src/libmpdclient.c | 67 ------------------------------------------------------ 1 file changed, 67 deletions(-) (limited to 'src/libmpdclient.c') diff --git a/src/libmpdclient.c b/src/libmpdclient.c index 248d8ea2f..ae4bd9c24 100644 --- a/src/libmpdclient.c +++ b/src/libmpdclient.c @@ -911,73 +911,6 @@ void mpd_freeStats(mpd_Stats * stats) { free(stats); } -static void mpd_initSong(mpd_Song * song) { - song->file = NULL; - song->artist = NULL; - song->album = NULL; - song->track = NULL; - song->title = NULL; - song->name = NULL; - song->date = NULL; - /* added by Qball */ - song->genre = NULL; - song->composer = NULL; - song->disc = NULL; - song->comment = NULL; - - song->time = MPD_SONG_NO_TIME; - song->pos = MPD_SONG_NO_NUM; - song->id = MPD_SONG_NO_ID; -} - -static void mpd_finishSong(mpd_Song * song) { - if(song->file) str_pool_put(song->file); - if(song->artist) str_pool_put(song->artist); - if(song->album) str_pool_put(song->album); - if(song->title) str_pool_put(song->title); - if(song->track) str_pool_put(song->track); - if(song->name) str_pool_put(song->name); - if(song->date) str_pool_put(song->date); - if(song->genre) str_pool_put(song->genre); - if(song->composer) str_pool_put(song->composer); - if(song->disc) str_pool_put(song->disc); - if(song->comment) str_pool_put(song->comment); -} - -mpd_Song * mpd_newSong(void) { - mpd_Song * ret = malloc(sizeof(mpd_Song)); - - mpd_initSong(ret); - - return ret; -} - -void mpd_freeSong(mpd_Song * song) { - mpd_finishSong(song); - free(song); -} - -mpd_Song * mpd_songDup(const mpd_Song * song) { - mpd_Song * ret = mpd_newSong(); - - if(song->file) ret->file = str_pool_dup(song->file); - if(song->artist) ret->artist = str_pool_dup(song->artist); - if(song->album) ret->album = str_pool_dup(song->album); - if(song->title) ret->title = str_pool_dup(song->title); - if(song->track) ret->track = str_pool_dup(song->track); - if(song->name) ret->name = str_pool_dup(song->name); - if(song->date) ret->date = str_pool_dup(song->date); - if(song->genre) ret->genre= str_pool_dup(song->genre); - if(song->composer) ret->composer= str_pool_dup(song->composer); - if(song->disc) ret->disc = str_pool_dup(song->disc); - if(song->comment) ret->comment = str_pool_dup(song->comment); - ret->time = song->time; - ret->pos = song->pos; - ret->id = song->id; - - return ret; -} - static void mpd_initDirectory(mpd_Directory * directory) { directory->path = NULL; } -- cgit v1.2.3