diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-07 21:39:47 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-09 09:05:58 +0100 |
| commit | 322b0616322760dc162447563d8f4da7e024ca90 (patch) | |
| tree | 2f87cb3ce061556161797aba9f57ee08de5b9e21 /test/dump_playlist.cxx | |
| parent | 43847f2244a34064af24704aac4cfad4a3c76f7d (diff) | |
| download | mpd-322b0616322760dc162447563d8f4da7e024ca90.tar.gz mpd-322b0616322760dc162447563d8f4da7e024ca90.tar.xz mpd-322b0616322760dc162447563d8f4da7e024ca90.zip | |
DetachedSong: fork of struct Song
From now on, struct Song will be used by the database only, and
DetachedSong will be used by everybody else. DetachedSong is easier
to use, but Song has lower overhead.
Diffstat (limited to 'test/dump_playlist.cxx')
| -rw-r--r-- | test/dump_playlist.cxx | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index 2ac855a84..b0702d3be 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -19,9 +19,8 @@ #include "config.h" #include "TagSave.hxx" -#include "Song.hxx" +#include "DetachedSong.hxx" #include "SongEnumerator.hxx" -#include "Directory.hxx" #include "InputStream.hxx" #include "ConfigGlobal.hxx" #include "DecoderList.hxx" @@ -39,14 +38,10 @@ #include <unistd.h> #include <stdlib.h> -Directory::Directory() {} -Directory::~Directory() {} - int main(int argc, char **argv) { const char *uri; InputStream *is = NULL; - Song *song; if (argc != 3) { fprintf(stderr, "Usage: dump_playlist CONFIG URI\n"); @@ -114,24 +109,27 @@ int main(int argc, char **argv) /* dump the playlist */ + DetachedSong *song; while ((song = playlist->NextSong()) != NULL) { - printf("%s\n", song->uri); + printf("%s\n", song->GetURI()); + + const unsigned start_ms = song->GetStartMS(); + const unsigned end_ms = song->GetEndMS(); - if (song->end_ms > 0) + if (end_ms > 0) printf("range: %u:%02u..%u:%02u\n", - song->start_ms / 60000, - (song->start_ms / 1000) % 60, - song->end_ms / 60000, - (song->end_ms / 1000) % 60); - else if (song->start_ms > 0) + start_ms / 60000, + (start_ms / 1000) % 60, + end_ms / 60000, + (end_ms / 1000) % 60); + else if (start_ms > 0) printf("range: %u:%02u..\n", - song->start_ms / 60000, - (song->start_ms / 1000) % 60); + start_ms / 60000, + (start_ms / 1000) % 60); - if (song->tag != NULL) - tag_save(stdout, *song->tag); + tag_save(stdout, song->GetTag()); - song->Free(); + delete song; } /* deinitialize everything */ |