output/Multiple: move Wait() to struct PlayerControl

Eliminate a dependency from MultipleOutputs on PlayerControl.
This commit is contained in:
Max Kellermann
2016-12-14 12:54:19 +01:00
parent 7c6b0d5c31
commit ece5971027
5 changed files with 32 additions and 29 deletions

View File

@@ -500,7 +500,7 @@ Player::CheckDecoderStartup()
pc.Unlock();
if (output_open &&
!pc.outputs.Wait(pc, 1))
!pc.LockWaitOutputConsumed(1))
/* the output devices havn't finished playing
all chunks yet - wait for that */
return true;
@@ -813,7 +813,7 @@ play_chunk(PlayerControl &pc,
inline bool
Player::PlayNextChunk()
{
if (!pc.outputs.Wait(pc, 64))
if (!pc.LockWaitOutputConsumed(64))
/* the output pipe is still large enough, don't send
another chunk */
return true;