From ba161ec572b98d3bcf9f735ff122133319fe896a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 28 Jul 2013 13:25:12 +0200 Subject: song: convert header to C++ --- src/DecoderControl.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/DecoderControl.cxx') diff --git a/src/DecoderControl.cxx b/src/DecoderControl.cxx index c2331105d..a8f41f564 100644 --- a/src/DecoderControl.cxx +++ b/src/DecoderControl.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "DecoderControl.hxx" #include "MusicPipe.hxx" -#include "song.h" +#include "Song.hxx" #include @@ -41,7 +41,7 @@ decoder_control::~decoder_control() ClearError(); if (song != NULL) - song_free(song); + song->Free(); g_free(mixramp_start); g_free(mixramp_end); @@ -84,7 +84,7 @@ dc_command_async(struct decoder_control *dc, enum decoder_command cmd) } bool -decoder_control::IsCurrentSong(const struct song *_song) const +decoder_control::IsCurrentSong(const Song *_song) const { assert(_song != NULL); @@ -103,7 +103,7 @@ decoder_control::IsCurrentSong(const struct song *_song) const } void -decoder_control::Start(struct song *_song, +decoder_control::Start(Song *_song, unsigned _start_ms, unsigned _end_ms, music_buffer *_buffer, music_pipe *_pipe) { @@ -113,7 +113,7 @@ decoder_control::Start(struct song *_song, assert(music_pipe_empty(_pipe)); if (song != nullptr) - song_free(song); + song->Free(); song = _song; start_ms = _start_ms; -- cgit v1.2.3