Merged release 0.15.1 from branch 'v0.15.x'

This commit is contained in:
Max Kellermann
2009-07-16 07:37:13 +02:00
11 changed files with 245 additions and 32 deletions
+5 -1
View File
@@ -338,7 +338,11 @@ static gpointer audio_output_task(gpointer arg)
case AO_COMMAND_PAUSE:
ao_pause(ao);
break;
/* don't "break" here: this might cause
ao_play() to be called when command==CLOSE
ends the paused state - "continue" checks
the new command first */
continue;
case AO_COMMAND_CANCEL:
ao->chunk = NULL;