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

4
test/DumpDatabase.cxx
View File

@@ -22,7 +22,7 @@
#include "DatabasePlugin.hxx"
#include "DatabaseSelection.hxx"
#include "Directory.hxx"
#include "song.h"
#include "Song.hxx"
#include "PlaylistVector.hxx"
#include "conf.h"
#include "tag.h"
@@ -53,7 +53,7 @@ DumpDirectory(const Directory &directory, GError **)
}
static bool
DumpSong(song &song, GError **)
DumpSong(Song &song, GError **)
{
cout << "S " << song.parent->path << "/" << song.uri << endl;
return true;

6
test/FakeSong.cxx
View File

@@ -18,7 +18,7 @@
*/
#include "config.h"
#include "song.h"
#include "Song.hxx"
#include "directory.h"
#include "gcc.h"
@@ -26,8 +26,8 @@
struct directory detached_root;
struct song *
song_dup_detached(gcc_unused const struct song *src)
Song *
song_dup_detached(gcc_unused const Song *src)
{
abort();
}

6
test/dump_playlist.cxx
View File

@@ -19,7 +19,7 @@
#include "config.h"
#include "TagSave.hxx"
#include "song.h"
#include "Song.hxx"
#include "Directory.hxx"
#include "input_stream.h"
#include "conf.h"
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
struct input_stream *is = NULL;
GError *error = NULL;
struct playlist_provider *playlist;
struct song *song;
Song *song;
if (argc != 3) {
g_printerr("Usage: dump_playlist CONFIG URI\n");
@@ -234,7 +234,7 @@ int main(int argc, char **argv)
if (song->tag != NULL)
tag_save(stdout, song->tag);
song_free(song);
song->Free();
}
/* deinitialize everything */

12
test/test_queue_priority.cxx
View File

@@ -1,6 +1,6 @@
#include "config.h"
#include "Queue.hxx"
#include "song.h"
#include "Song.hxx"
#include "Directory.hxx"
#include <glib.h>
@@ -10,14 +10,14 @@ Directory detached_root;
Directory::Directory() {}
Directory::~Directory() {}
struct song *
song_dup_detached(const struct song *src)
Song *
Song::DupDetached() const
{
return const_cast<song *>(src);
return const_cast<Song *>(this);
}
void
song_free(gcc_unused struct song *song)
Song::Free()
{
}
@@ -50,7 +50,7 @@ check_descending_priority(const struct queue *queue,
int
main(gcc_unused int argc, gcc_unused char **argv)
{
static struct song songs[16];
static Song songs[16];
struct queue queue(32);