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

output/Thread: move Enable() call out of Open()

Browse Source
This commit is contained in:
Max Kellermann
2017-06-08 09:41:23 +02:00
parent 669d7a6feb
commit 614df96382
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/Thread.cxx
View File

@@ -99,9 +99,6 @@ AudioOutput::Open(AudioFormat audio_format, const MusicPipe &pipe)
{ {
assert(audio_format.IsValid()); assert(audio_format.IsValid());
/* enable the device (just in case the last enable has failed) */
Enable();
AudioFormat f; AudioFormat f;
try { try {
@@ -218,6 +215,9 @@ AudioOutputControl::InternalOpen(const AudioFormat audio_format,
skip_delay = true; skip_delay = true;
try { try {
/* enable the device (just in case the last enable has failed) */
output->Enable();
output->Open(audio_format, pipe); output->Open(audio_format, pipe);
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
LogError(e); LogError(e);