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

song: convert header to C++

Browse Source
This commit is contained in:
Max Kellermann
2013-07-28 13:25:12 +02:00
parent 43f613d9be
commit ba161ec572
91 changed files with 643 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/QueueSave.cxx
View File

@@ -20,7 +20,7 @@
#include "config.h"
#include "QueueSave.hxx"
#include "Playlist.hxx"
#include "song.h"
#include "Song.hxx"
#include "SongSave.hxx"
#include "DatabasePlugin.hxx"
#include "DatabaseGlue.hxx"
@@ -32,24 +32,24 @@
#define PRIO_LABEL "Prio: "
static void
queue_save_database_song(FILE *fp, int idx, const struct song *song)
queue_save_database_song(FILE *fp, int idx, const Song *song)
{
char *uri = song_get_uri(song);
char *uri = song->GetURI();
fprintf(fp, "%i:%s\n", idx, uri);
g_free(uri);
}
static void
queue_save_full_song(FILE *fp, const struct song *song)
queue_save_full_song(FILE *fp, const Song *song)
{
song_save(fp, song);
}
static void
queue_save_song(FILE *fp, int idx, const struct song *song)
queue_save_song(FILE *fp, int idx, const Song *song)
{
if (song_in_database(song))
if (song->IsInDatabase())
queue_save_database_song(fp, idx, song);
else
queue_save_full_song(fp, song);
@@ -83,7 +83,7 @@ queue_load_song(TextFile &file, const char *line, queue *queue)
}
const Database *db = nullptr;
struct song *song;
Song *song;
if (g_str_has_prefix(line, SONG_BEGIN)) {
const char *uri = line + sizeof(SONG_BEGIN) - 1;
@@ -108,7 +108,7 @@ queue_load_song(TextFile &file, const char *line, queue *queue)
const char *uri = endptr + 1;
if (uri_has_scheme(uri)) {
song = song_remote_new(uri);
song = Song::NewRemote(uri);
} else {
db = GetDatabase(nullptr);
if (db == nullptr)