aboutsummaryrefslogtreecommitdiffstats
path: root/src/DecoderControl.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-26 14:19:34 +0200
committerMax Kellermann <max@duempel.org>2013-10-26 14:19:34 +0200
commit85ae7e9c9a8e31359834b3b4da3c358b941e8012 (patch)
treecadafa466a385107ba43f4c60664a064c7617550 /src/DecoderControl.cxx
parent2098b94b47a60f6265dd5afb61757e9f6b7f9a6e (diff)
downloadmpd-85ae7e9c9a8e31359834b3b4da3c358b941e8012.tar.gz
mpd-85ae7e9c9a8e31359834b3b4da3c358b941e8012.tar.xz
mpd-85ae7e9c9a8e31359834b3b4da3c358b941e8012.zip
DecoderControl: move code/attributes to new class MixRampInfo
Diffstat (limited to 'src/DecoderControl.cxx')
-rw-r--r--src/DecoderControl.cxx29
1 files changed, 3 insertions, 26 deletions
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
@@ -130,25 +124,8 @@ decoder_control::Quit()
}
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();
}