output/Internal: move "client" to struct AudioOutputControl

2017-05-23 00:31:13 +02:00
parent 194f733ca7
commit ebecee3d85
7 changed files with 24 additions and 47 deletions
@@ -38,8 +38,9 @@ static constexpr PeriodClock::Duration REOPEN_AFTER = std::chrono::seconds(10);

 struct notify audio_output_client_notify;

-AudioOutputControl::AudioOutputControl(AudioOutput *_output)
-	:output(_output),
+AudioOutputControl::AudioOutputControl(AudioOutput *_output,
+				       AudioOutputClient &_client)
+	:output(_output), client(_client),
 	 thread(BIND_THIS_METHOD(Task)),
 	 mutex(output->mutex)
 {
@@ -59,12 +60,6 @@ AudioOutputControl::GetName() const noexcept
 	return output->GetName();
 }

-AudioOutputClient &
-AudioOutputControl::GetClient() noexcept
-{
-	return *output->client;
-}
-
 Mixer *
 AudioOutputControl::GetMixer() const noexcept
 {