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_internal.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_internal.h')
| -rw-r--r-- | src/output_internal.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/output_internal.h b/src/output_internal.h index 873ec8532..eba3aed91 100644 --- a/src/output_internal.h +++ b/src/output_internal.h @@ -110,6 +110,15 @@ struct audio_output { bool pause; /** + * When this flag is set, the output thread will not do any + * playback. It will wait until the flag is cleared. + * + * This is used to synchronize the "clear" operation on the + * shared music pipe during the CANCEL command. + */ + bool allow_play; + + /** * If not NULL, the device has failed, and this timer is used * to estimate how long it should stay disabled (unless * explicitly reopened with "play"). |