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

output/Thread: move the AudioOutputSource::Open() call to InternalOpen()

Browse Source 
Prepare for moving the AudioOutputSource to class AudioOutputControl.
This commit is contained in:
Max Kellermann 2017-06-08 21:54:10 +02:00
parent 7cb82fe8f3
commit 58683f02ec
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/Internal.hxx
View File

@ -190,7 +190,7 @@ public:
/** /**
* Throws #std::runtime_error on error. * Throws #std::runtime_error on error.
*/ */
void Open(AudioFormat audio_format, const MusicPipe &pipe); void Open(AudioFormat in_audio_format);
void Close(bool drain) noexcept; void Close(bool drain) noexcept;

55
src/output/Thread.cxx
View File

@ -81,31 +81,17 @@ AudioOutput::CloseFilter() noexcept
{ {
if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin)) if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin))
software_mixer_set_filter(*mixer, nullptr); software_mixer_set_filter(*mixer, nullptr);
source.Close();
} }
inline void inline void
AudioOutput::Open(const AudioFormat in_audio_format, const MusicPipe &pipe) AudioOutput::Open(const AudioFormat in_audio_format)
{ {
assert(in_audio_format.IsValid()); assert(in_audio_format.IsValid());
AudioFormat f;
try {
f = source.Open(in_audio_format, pipe,
prepared_replay_gain_filter,
prepared_other_replay_gain_filter,
prepared_filter);
} catch (const std::runtime_error &e) {
std::throw_with_nested(FormatRuntimeError("Failed to open filter for \"%s\" [%s]",
name, plugin.name));
}
if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin)) if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin))
software_mixer_set_filter(*mixer, volume_filter.Get()); software_mixer_set_filter(*mixer, volume_filter.Get());
const auto cf = f.WithMask(config_audio_format); const auto cf = in_audio_format.WithMask(config_audio_format);
if (open && cf != filter_audio_format) { if (open && cf != filter_audio_format) {
/* if the filter's output format changes, the output /* if the filter's output format changes, the output
@ -125,7 +111,7 @@ AudioOutput::Open(const AudioFormat in_audio_format, const MusicPipe &pipe)
} }
open = true; open = true;
} else if (f != out_audio_format) { } else if (in_audio_format != out_audio_format) {
/* reconfigure the final ConvertFilter for its new /* reconfigure the final ConvertFilter for its new
input AudioFormat */ input AudioFormat */
@ -138,12 +124,6 @@ AudioOutput::Open(const AudioFormat in_audio_format, const MusicPipe &pipe)
name, plugin.name)); name, plugin.name));
} }
} }
if (f != in_audio_format || f != out_audio_format)
FormatDebug(output_domain, "converting in=%s -> f=%s -> out=%s",
ToString(in_audio_format).c_str(),
ToString(f).c_str(),
ToString(out_audio_format).c_str());
} }
void void
@ -222,7 +202,7 @@ AudioOutputControl::InternalDisable() noexcept
} }
inline void inline void
AudioOutputControl::InternalOpen(const AudioFormat audio_format, AudioOutputControl::InternalOpen(const AudioFormat in_audio_format,
const MusicPipe &pipe) noexcept const MusicPipe &pipe) noexcept
{ {
/* enable the device (just in case the last enable has failed) */ /* enable the device (just in case the last enable has failed) */
@ -233,13 +213,37 @@ AudioOutputControl::InternalOpen(const AudioFormat audio_format,
fail_timer.Reset(); fail_timer.Reset();
skip_delay = true; skip_delay = true;
AudioFormat f;
try { try {
output->Open(audio_format, pipe); try {
auto &source = output->source;
f = source.Open(in_audio_format, pipe,
output->prepared_replay_gain_filter,
output->prepared_other_replay_gain_filter,
output->prepared_filter);
} catch (const std::runtime_error &e) {
std::throw_with_nested(FormatRuntimeError("Failed to open filter for \"%s\" [%s]",
GetName(), output->plugin.name));
}
try {
output->Open(f);
} catch (...) {
output->source.Close();
throw;
}
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
LogError(e); LogError(e);
fail_timer.Update(); fail_timer.Update();
last_error = std::current_exception(); last_error = std::current_exception();
} }
if (f != in_audio_format || f != output->out_audio_format)
FormatDebug(output_domain, "converting in=%s -> f=%s -> out=%s",
ToString(in_audio_format).c_str(),
ToString(f).c_str(),
ToString(output->out_audio_format).c_str());
} }
inline void inline void
@ -249,6 +253,7 @@ AudioOutputControl::InternalClose(bool drain) noexcept
return; return;
output->Close(drain); output->Close(drain);
output->source.Close();
} }
void void