oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/recorder: move encoder_finish() call to destructor

Browse Source
This commit is contained in:
Max Kellermann 2015-01-08 16:56:13 +01:00
parent ec41caade4
commit 59ac9d39d5
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/output/plugins/RecorderOutputPlugin.cxx
View File

@ -56,8 +56,14 @@ struct RecorderOutput {
RecorderOutput() RecorderOutput()
:base(recorder_output_plugin), :base(recorder_output_plugin),
encoder(nullptr),
path(AllocatedPath::Null()) {} path(AllocatedPath::Null()) {}
~RecorderOutput() {
if (encoder != nullptr)
encoder_finish(encoder);
}
bool Initialize(const config_param &param, Error &error_r) { bool Initialize(const config_param &param, Error &error_r) {
return base.Configure(param, error_r); return base.Configure(param, error_r);
} }
@ -133,15 +139,6 @@ RecorderOutput::Create(const config_param &param, Error &error)
return recorder; return recorder;
} }
static void
recorder_output_finish(AudioOutput *ao)
{
RecorderOutput *recorder = (RecorderOutput *)ao;
encoder_finish(recorder->encoder);
delete recorder;
}
inline bool inline bool
RecorderOutput::EncoderToFile(Error &error) RecorderOutput::EncoderToFile(Error &error)
{ {
@ -241,7 +238,7 @@ const struct AudioOutputPlugin recorder_output_plugin = {
"recorder", "recorder",
nullptr, nullptr,
&Wrapper::Init, &Wrapper::Init,
recorder_output_finish, &Wrapper::Finish,
nullptr, nullptr,
nullptr, nullptr,
&Wrapper::Open, &Wrapper::Open,