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/PlayerControl.cxx
View File

@@ -20,7 +20,7 @@
#include "config.h"
#include "PlayerControl.hxx"
#include "Idle.hxx"
#include "song.h"
#include "Song.hxx"
#include "DecoderControl.hxx"
#include "Main.hxx"
@@ -30,7 +30,7 @@
#include <stdio.h>
static void
pc_enqueue_song_locked(struct player_control *pc, struct song *song);
pc_enqueue_song_locked(struct player_control *pc, Song *song);
player_control::player_control(unsigned _buffer_chunks,
unsigned _buffered_before_play)
@@ -59,7 +59,7 @@ player_control::player_control(unsigned _buffer_chunks,
player_control::~player_control()
{
if (next_song != nullptr)
song_free(next_song);
next_song->Free();
}
static void
@@ -88,7 +88,7 @@ player_command(struct player_control *pc, enum player_command cmd)
}
void
player_control::Play(struct song *song)
player_control::Play(Song *song)
{
assert(song != NULL);
@@ -253,7 +253,7 @@ player_control::GetErrorMessage() const
}
static void
pc_enqueue_song_locked(struct player_control *pc, struct song *song)
pc_enqueue_song_locked(struct player_control *pc, Song *song)
{
assert(song != NULL);
assert(pc->next_song == NULL);
@@ -263,7 +263,7 @@ pc_enqueue_song_locked(struct player_control *pc, struct song *song)
}
void
player_control::EnqueueSong(struct song *song)
player_control::EnqueueSong(Song *song)
{
assert(song != NULL);
@@ -273,14 +273,14 @@ player_control::EnqueueSong(struct song *song)
}
bool
player_control::Seek(struct song *song, float seek_time)
player_control::Seek(Song *song, float seek_time)
{
assert(song != NULL);
Lock();
if (next_song != nullptr)
song_free(next_song);
next_song->Free();
next_song = song;
seek_where = seek_time;