summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorHolger Waechtler <devnull@localhost>2002-12-09 12:01:48 +0000
committerHolger Waechtler <devnull@localhost>2002-12-09 12:01:48 +0000
commitbb7af53caa24320a10340061af6b9c3f7f4ceb26 (patch)
tree7d0385262aa0f32be0cdc4b304524b6cbf3980ff /linux/include
parent533bcb3af75d8de922f55b7743f14085dce225d0 (diff)
downloadmediapointer-dvb-s2-bb7af53caa24320a10340061af6b9c3f7f4ceb26.tar.gz
mediapointer-dvb-s2-bb7af53caa24320a10340061af6b9c3f7f4ceb26.tar.bz2
audio status patch by Honza Petrous <hop@unibase.cz>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/dvb/audio.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/linux/include/linux/dvb/audio.h b/linux/include/linux/dvb/audio.h
index d0ce5e27b..a816be111 100644
--- a/linux/include/linux/dvb/audio.h
+++ b/linux/include/linux/dvb/audio.h
@@ -51,6 +51,13 @@ typedef enum {
} audio_channel_select_t;
+typedef struct audio_mixer {
+ unsigned int volume_left;
+ unsigned int volume_right;
+ // what else do we need? bass, pass-through, ...
+} audio_mixer_t;
+
+
typedef struct audio_status {
int AV_sync_state; /* sync audio and video? */
int mute_state; /* audio is muted */
@@ -58,16 +65,10 @@ typedef struct audio_status {
audio_stream_source_t stream_source; /* current stream source */
audio_channel_select_t channel_select; /* currently selected channel */
int bypass_mode; /* pass on audio data to */
+ audio_mixer_t mixer_state; /* current mixer state */
} audio_status_t; /* separate decoder hardware */
-typedef struct audio_mixer {
- unsigned int volume_left;
- unsigned int volume_right;
- // what else do we need? bass, pass-through, ...
-} audio_mixer_t;
-
-
typedef
struct audio_karaoke{ /* if Vocal1 or Vocal2 are non-zero, they get mixed */
int vocal1; /* into left and right t at 70% each */