diff options
author | Michal Ratajsky <[email protected]> | 2014-08-12 04:56:55 +0200 |
---|---|---|
committer | Michal Ratajsky <[email protected]> | 2014-08-12 04:56:55 +0200 |
commit | 6c6d4239ddc807e922df3874654f99eea291aadb (patch) | |
tree | 558f48fc965476344a946d93088680db3b5bac41 /libmatemixer/matemixer-enums.h | |
parent | 8436ec1641eee8868128755f6d1475230cea25e6 (diff) | |
download | libmatemixer-6c6d4239ddc807e922df3874654f99eea291aadb.tar.bz2 libmatemixer-6c6d4239ddc807e922df3874654f99eea291aadb.tar.xz |
Add ALSA, improve OSS and remove OSS4
Diffstat (limited to 'libmatemixer/matemixer-enums.h')
-rw-r--r-- | libmatemixer/matemixer-enums.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/libmatemixer/matemixer-enums.h b/libmatemixer/matemixer-enums.h index b99f4c5..8a88b1c 100644 --- a/libmatemixer/matemixer-enums.h +++ b/libmatemixer/matemixer-enums.h @@ -47,8 +47,8 @@ typedef enum { * PulseAudio sound system backend. It has the highest priority and * will be the first one to try unless you select a specific backend * to connect to. + * @MATE_MIXER_BACKEND_ALSA: * @MATE_MIXER_BACKEND_OSS: - * @MATE_MIXER_BACKEND_OSS4: * @MATE_MIXER_BACKEND_NULL: * Fallback backend which never fails to initialize, but provides no * functionality. This backend has the lowest priority and will be used @@ -58,11 +58,17 @@ typedef enum { typedef enum { MATE_MIXER_BACKEND_UNKNOWN, MATE_MIXER_BACKEND_PULSEAUDIO, + MATE_MIXER_BACKEND_ALSA, MATE_MIXER_BACKEND_OSS, - MATE_MIXER_BACKEND_OSS4, MATE_MIXER_BACKEND_NULL } MateMixerBackendType; +typedef enum { /*< flags >*/ + MATE_MIXER_BACKEND_NO_FLAGS = 0, + MATE_MIXER_BACKEND_CAN_SET_DEFAULT_INPUT_STREAM, + MATE_MIXER_BACKEND_CAN_SET_DEFAULT_OUTPUT_STREAM +} MateMixerBackendFlags; + /** * MateMixerPortFlags: * @MATE_MIXER_PORT_NO_FLAGS: @@ -116,7 +122,7 @@ typedef enum { * @MATE_MIXER_STREAM_CONTROL_NO_FLAGS: * @MATE_MIXER_STREAM_CONTROL_HAS_MUTE: * @MATE_MIXER_STREAM_CONTROL_HAS_VOLUME: - * @MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL_VOLUME: + * @MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL: * @MATE_MIXER_STREAM_CONTROL_HAS_FLAT_VOLUME: * @MATE_MIXER_STREAM_CONTROL_CAN_SET_VOLUME: * @MATE_MIXER_STREAM_CONTROL_CAN_BALANCE: @@ -126,22 +132,23 @@ typedef enum { MATE_MIXER_STREAM_CONTROL_NO_FLAGS = 0, MATE_MIXER_STREAM_CONTROL_HAS_MUTE = 1 << 0, MATE_MIXER_STREAM_CONTROL_HAS_VOLUME = 1 << 1, - MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL_VOLUME = 1 << 2, + MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL = 1 << 2, MATE_MIXER_STREAM_CONTROL_HAS_FLAT_VOLUME = 1 << 3, - MATE_MIXER_STREAM_CONTROL_CAN_SET_VOLUME = 1 << 4, - MATE_MIXER_STREAM_CONTROL_CAN_BALANCE = 1 << 5, - MATE_MIXER_STREAM_CONTROL_CAN_FADE = 1 << 6 + MATE_MIXER_STREAM_CONTROL_CAN_SET_MUTE = 1 << 4, + MATE_MIXER_STREAM_CONTROL_CAN_SET_VOLUME = 1 << 5, + MATE_MIXER_STREAM_CONTROL_CAN_BALANCE = 1 << 6, + MATE_MIXER_STREAM_CONTROL_CAN_FADE = 1 << 7 } MateMixerStreamControlFlags; typedef enum { MATE_MIXER_STREAM_CONTROL_ROLE_UNKNOWN, MATE_MIXER_STREAM_CONTROL_ROLE_MASTER, + MATE_MIXER_STREAM_CONTROL_ROLE_PORT, MATE_MIXER_STREAM_CONTROL_ROLE_PCM, MATE_MIXER_STREAM_CONTROL_ROLE_BASS, MATE_MIXER_STREAM_CONTROL_ROLE_TREBLE, MATE_MIXER_STREAM_CONTROL_ROLE_CD, MATE_MIXER_STREAM_CONTROL_ROLE_SPEAKER, - MATE_MIXER_STREAM_CONTROL_ROLE_PORT } MateMixerStreamControlRole; /** @@ -210,7 +217,7 @@ typedef enum { * @MATE_MIXER_CHANNEL_TOP_BACK_CENTER: */ typedef enum { - MATE_MIXER_CHANNEL_UNKNOWN, + MATE_MIXER_CHANNEL_UNKNOWN = 0, MATE_MIXER_CHANNEL_MONO, MATE_MIXER_CHANNEL_FRONT_LEFT, MATE_MIXER_CHANNEL_FRONT_RIGHT, @@ -229,7 +236,8 @@ typedef enum { MATE_MIXER_CHANNEL_TOP_CENTER, MATE_MIXER_CHANNEL_TOP_BACK_LEFT, MATE_MIXER_CHANNEL_TOP_BACK_RIGHT, - MATE_MIXER_CHANNEL_TOP_BACK_CENTER + MATE_MIXER_CHANNEL_TOP_BACK_CENTER, + MATE_MIXER_CHANNEL_MAX } MateMixerChannelPosition; #endif /* MATEMIXER_ENUMS_H */ |