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

LightSong: new class to be used by DatabasePlugin callbacks

Browse Source 
Detach the Song class completely from the public API, only to be used
by SimpleDatabase and the update thread.
This commit is contained in:
Max Kellermann
2014-01-19 10:51:34 +01:00
parent 738d6f1040
commit f5ae1ce00b
44 changed files with 387 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/SongPrint.cxx
View File

@@ -19,7 +19,7 @@
#include "config.h"
#include "SongPrint.hxx"
#include "Song.hxx"
#include "LightSong.hxx"
#include "DetachedSong.hxx"
#include "Directory.hxx"
#include "TimePrint.hxx"
@@ -28,6 +28,8 @@
#include "Client.hxx"
#include "util/UriUtil.hxx"
#define SONG_FILE "file: "
static void
song_print_uri(Client &client, const char *uri)
{
@@ -40,11 +42,11 @@ song_print_uri(Client &client, const char *uri)
}
void
song_print_uri(Client &client, const Song &song)
song_print_uri(Client &client, const LightSong &song)
{
if (song.parent != nullptr && !song.parent->IsRoot()) {
if (song.directory != nullptr) {
client_printf(client, "%s%s/%s\n", SONG_FILE,
song.parent->GetPath(), song.uri);
song.directory, song.uri);
} else
song_print_uri(client, song.uri);
}
@@ -56,7 +58,7 @@ song_print_uri(Client &client, const DetachedSong &song)
}
void
song_print_info(Client &client, const Song &song)
song_print_info(Client &client, const LightSong &song)
{
song_print_uri(client, song);
@@ -74,7 +76,7 @@ song_print_info(Client &client, const Song &song)
if (song.mtime > 0)
time_print(client, "Last-Modified", song.mtime);
tag_print(client, song.tag);
tag_print(client, *song.tag);
}
void