From 85ae7e9c9a8e31359834b3b4da3c358b941e8012 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 26 Oct 2013 14:19:34 +0200 Subject: DecoderControl: move code/attributes to new class MixRampInfo --- src/DecoderControl.cxx | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'src/DecoderControl.cxx') diff --git a/src/DecoderControl.cxx b/src/DecoderControl.cxx index cbe93361e..e3b5f8977 100644 --- a/src/DecoderControl.cxx +++ b/src/DecoderControl.cxx @@ -30,9 +30,7 @@ decoder_control::decoder_control() :state(DecoderState::STOP), command(DecoderCommand::NONE), song(nullptr), - replay_gain_db(0), replay_gain_prev_db(0), - mixramp_start(nullptr), mixramp_end(nullptr), - mixramp_prev_end(nullptr) {} + replay_gain_db(0), replay_gain_prev_db(0) {} decoder_control::~decoder_control() { @@ -40,10 +38,6 @@ decoder_control::~decoder_control() if (song != nullptr) song->Free(); - - g_free(mixramp_start); - g_free(mixramp_end); - g_free(mixramp_prev_end); } bool @@ -129,26 +123,9 @@ decoder_control::Quit() thread.Join(); } -void -decoder_control::MixRampStart(char *_mixramp_start) -{ - g_free(mixramp_start); - mixramp_start = _mixramp_start; -} - -void -decoder_control::MixRampEnd(char *_mixramp_end) -{ - g_free(mixramp_end); - mixramp_end = _mixramp_end; -} - void decoder_control::CycleMixRamp() { - g_free(mixramp_start); - mixramp_start = nullptr; - g_free(mixramp_prev_end); - mixramp_prev_end = mixramp_end; - mixramp_end = nullptr; + previous_mix_ramp = std::move(mix_ramp); + mix_ramp.Clear(); } -- cgit v1.2.3