From 617a4fd2d2eff45393c4e243129a4648822d5d86 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 26 Mar 2009 19:43:18 +0100 Subject: mixer: added flag "open" Remember if a mixer object is open or closed. Don't call open() again if it is already open. This guarantees that the mixer plugin is always called in a consistent state, and we will be able to remove lots of checks from the implementations. To support mixers which are automatically opened even if the audio output is still closed (to set the volume before playback starts), this patch also adds the "global" flag to the mixer_plugin struct. Both ALSA and OSS set this flag, while PULSE does not. --- src/mixer_control.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/mixer_control.h') diff --git a/src/mixer_control.h b/src/mixer_control.h index b126d8c81..0f73e8f75 100644 --- a/src/mixer_control.h +++ b/src/mixer_control.h @@ -46,6 +46,13 @@ mixer_open(struct mixer *mixer); void mixer_close(struct mixer *mixer); +/** + * Close the mixer unless the plugin's "global" flag is set. This is + * called when the #audio_output is closed. + */ +void +mixer_auto_close(struct mixer *mixer); + int mixer_get_volume(struct mixer *mixer); -- cgit v1.2.3