diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
| commit | 6a3008d7ff787164124a43911145f7305c66aa7e (patch) | |
| tree | 54090ac05037c9ba4c7536747462469744bb2531 /src/output_control.h | |
| parent | 140162191388063e41e33b53d4533e07529df870 (diff) | |
| parent | 2556449b361c00d9c66cf85beb64d7c6458763ed (diff) | |
| download | mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.gz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.xz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.zip | |
Merge branch 'v0.16.x'
Conflicts:
configure.ac
src/output_control.c
Diffstat (limited to 'src/output_control.h')
| -rw-r--r-- | src/output_control.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/output_control.h b/src/output_control.h index 8711a6566..f58a113e6 100644 --- a/src/output_control.h +++ b/src/output_control.h @@ -72,8 +72,19 @@ void audio_output_pause(struct audio_output *ao); void audio_output_drain_async(struct audio_output *ao); +/** + * Clear the "allow_play" flag and send the "CANCEL" command + * asynchronously. To finish the operation, the caller has to call + * audio_output_allow_play(). + */ void audio_output_cancel(struct audio_output *ao); +/** + * Set the "allow_play" and signal the thread. + */ +void +audio_output_allow_play(struct audio_output *ao); + void audio_output_close(struct audio_output *ao); /** |