diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/song_save.c | 23 | ||||
| -rw-r--r-- | src/tag_save.c | 35 | ||||
| -rw-r--r-- | src/tag_save.h | 28 |
4 files changed, 85 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ba7b7c3a3..1a631d1c6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,6 +88,7 @@ mpd_headers = \ tag_pool.h \ tag_id3.h \ tag_print.h \ + tag_save.h \ tagTracker.h \ utf8.h \ utils.h \ @@ -154,6 +155,7 @@ mpd_SOURCES = \ tag_pool.c \ tag_id3.c \ tag_print.c \ + tag_save.c \ tagTracker.c \ utils.c \ volume.c \ diff --git a/src/song_save.c b/src/song_save.c index a7b398041..a875a65fb 100644 --- a/src/song_save.c +++ b/src/song_save.c @@ -17,7 +17,7 @@ */ #include "song_save.h" -#include "song_print.h" +#include "tag_save.h" #include "directory.h" #include "path.h" #include "utils.h" @@ -27,6 +27,24 @@ #define SONG_KEY "key: " #define SONG_MTIME "mtime: " +static void song_save_url(FILE *fp, Song * song) +{ + if (song->parentDir != NULL && song->parentDir->path != NULL) + fprintf(fp, SONG_FILE "%s/%s\n", + getDirectoryPath(song->parentDir), song->url); + else + fprintf(fp, SONG_FILE "%s\n", + song->url); +} + +static void song_save(FILE *fp, Song * song) +{ + song_save_url(fp, song); + + if (song->tag != NULL) + tag_save(fp, song->tag); +} + void writeSongInfoFromList(FILE * fp, SongList * list) { ListNode *tempNode = list->firstNode; @@ -35,8 +53,7 @@ void writeSongInfoFromList(FILE * fp, SongList * list) while (tempNode != NULL) { fprintf(fp, "%s%s\n", SONG_KEY, tempNode->key); - fflush(fp); - printSongInfo(fileno(fp), (Song *) tempNode->data); + song_save(fp, (Song *) tempNode->data); fprintf(fp, "%s%li\n", SONG_MTIME, (long)((Song *) tempNode->data)->mtime); tempNode = tempNode->nextNode; diff --git a/src/tag_save.c b/src/tag_save.c new file mode 100644 index 000000000..dd2bf1ea3 --- /dev/null +++ b/src/tag_save.c @@ -0,0 +1,35 @@ +/* the Music Player Daemon (MPD) + * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) + * This project's homepage is: http://www.musicpd.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 "tag_save.h" +#include "tag.h" +#include "tag_internal.h" +#include "song.h" + +void tag_save(FILE *file, const struct tag *tag) +{ + int i; + + if (tag->time >= 0) + fprintf(file, SONG_TIME "%i\n", tag->time); + + for (i = 0; i < tag->numOfItems; i++) + fprintf(file, "%s: %s\n", + mpdTagItemKeys[tag->items[i]->type], + tag->items[i]->value); +} diff --git a/src/tag_save.h b/src/tag_save.h new file mode 100644 index 000000000..648f5975f --- /dev/null +++ b/src/tag_save.h @@ -0,0 +1,28 @@ +/* the Music Player Daemon (MPD) + * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) + * This project's homepage is: http://www.musicpd.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 + */ + +#ifndef TAG_SAVE_H +#define TAG_SAVE_H + +#include "os_compat.h" + +struct tag; + +void tag_save(FILE *file, const struct tag *tag); + +#endif |