1 files changed, 52 insertions, 93 deletions
diff --git a/libmatemixer/matemixer-enums.h b/libmatemixer/matemixer-enums.h
index 8a88b1c..18bbbcf 100644
--- a/libmatemixer/matemixer-enums.h
+++ b/libmatemixer/matemixer-enums.h
@@ -63,59 +63,25 @@ typedef enum {
 MATE_MIXER_BACKEND_NULL
 } MateMixerBackendType;
 
+/**
+ * MateMixerBackendFlags:
+ */
+
 typedef enum { /*< flags >*/
 MATE_MIXER_BACKEND_NO_FLAGS = 0,
+ MATE_MIXER_BACKEND_HAS_APPLICATION_CONTROLS,
 MATE_MIXER_BACKEND_CAN_SET_DEFAULT_INPUT_STREAM,
 MATE_MIXER_BACKEND_CAN_SET_DEFAULT_OUTPUT_STREAM
 } MateMixerBackendFlags;
 
 /**
- * MateMixerPortFlags:
- * @MATE_MIXER_PORT_NO_FLAGS:
- * @MATE_MIXER_PORT_AVAILABLE:
- * @MATE_MIXER_PORT_INPUT:
- * @MATE_MIXER_PORT_OUTPUT:
- */
-typedef enum { /*< flags >*/
- MATE_MIXER_PORT_NO_FLAGS = 0,
- MATE_MIXER_PORT_AVAILABLE = 1 << 0,
- MATE_MIXER_PORT_INPUT = 1 << 1,
- MATE_MIXER_PORT_OUTPUT = 1 << 2
-} MateMixerPortFlags;
-
-/**
- * MateMixerStreamFlags:
- * @MATE_MIXER_STREAM_NO_FLAGS:
- * @MATE_MIXER_STREAM_INPUT:
- * @MATE_MIXER_STREAM_OUTPUT:
- * @MATE_MIXER_STREAM_CLIENT:
- * @MATE_MIXER_STREAM_HAS_MONITOR:
- * @MATE_MIXER_STREAM_CAN_SUSPEND:
- */
-typedef enum { /*< flags >*/
- MATE_MIXER_STREAM_NO_FLAGS = 0,
- MATE_MIXER_STREAM_INPUT = 1 << 0,
- MATE_MIXER_STREAM_OUTPUT = 1 << 1,
- MATE_MIXER_STREAM_CLIENT = 1 << 2,
- MATE_MIXER_STREAM_HAS_MONITOR = 1 << 3,
- MATE_MIXER_STREAM_CAN_SUSPEND = 1 << 4,
- MATE_MIXER_STREAM_PORTS_FIXED = 1 << 5,
- MATE_MIXER_STREAM_PORTS_EXCLUSIVE = 1 << 6,
-} MateMixerStreamFlags;
-
-/**
- * MateMixerStreamState:
- * @MATE_MIXER_STREAM_STATE_UNKNOWN:
- * @MATE_MIXER_STREAM_STATE_RUNNING:
- * @MATE_MIXER_STREAM_STATE_IDLE:
- * @MATE_MIXER_STREAM_STATE_SUSPENDED:
+ * MateMixerDirection:
 */
 typedef enum {
- MATE_MIXER_STREAM_STATE_UNKNOWN,
- MATE_MIXER_STREAM_STATE_RUNNING,
- MATE_MIXER_STREAM_STATE_IDLE,
- MATE_MIXER_STREAM_STATE_SUSPENDED
-} MateMixerStreamState;
+ MATE_MIXER_DIRECTION_UNKNOWN,
+ MATE_MIXER_DIRECTION_INPUT,
+ MATE_MIXER_DIRECTION_OUTPUT,
+} MateMixerDirection;
 
 /**
 * MateMixerStreamControlFlags:
@@ -129,69 +95,62 @@ typedef enum {
 * @MATE_MIXER_STREAM_CONTROL_CAN_FADE:
 */
 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 = 1 << 2,
- MATE_MIXER_STREAM_CONTROL_HAS_FLAT_VOLUME = 1 << 3,
- 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
+ MATE_MIXER_STREAM_CONTROL_NO_FLAGS = 0,
+ MATE_MIXER_STREAM_CONTROL_MUTE_READABLE = 1 << 0,
+ MATE_MIXER_STREAM_CONTROL_MUTE_WRITABLE = 1 << 1,
+ MATE_MIXER_STREAM_CONTROL_VOLUME_READABLE = 1 << 2,
+ MATE_MIXER_STREAM_CONTROL_VOLUME_WRITABLE = 1 << 3,
+ MATE_MIXER_STREAM_CONTROL_CAN_BALANCE = 1 << 4,
+ MATE_MIXER_STREAM_CONTROL_CAN_FADE = 1 << 5,
+ MATE_MIXER_STREAM_CONTROL_MOVABLE = 1 << 6,
+ MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL = 1 << 7,
+ MATE_MIXER_STREAM_CONTROL_HAS_MONITOR = 1 << 8,
+ MATE_MIXER_STREAM_CONTROL_STORED = 1 << 9
 } 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_APPLICATION,
 MATE_MIXER_STREAM_CONTROL_ROLE_PCM,
+ MATE_MIXER_STREAM_CONTROL_ROLE_SPEAKER,
+ MATE_MIXER_STREAM_CONTROL_ROLE_MICROPHONE,
+ MATE_MIXER_STREAM_CONTROL_ROLE_PORT,
+ MATE_MIXER_STREAM_CONTROL_ROLE_BOOST,
 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_VIDEO,
+ MATE_MIXER_STREAM_CONTROL_ROLE_MUSIC
 } MateMixerStreamControlRole;
 
-/**
- * MateMixerClientStreamFlags:
- * @MATE_MIXER_CLIENT_STREAM_NO_FLAGS:
- * @MATE_MIXER_CLIENT_STREAM_APPLICATION:
- * @MATE_MIXER_CLIENT_STREAM_CACHED:
- */
+typedef enum {
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_UNKNOWN,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_VIDEO,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_MUSIC,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_GAME,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_EVENT,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_PHONE,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_ANIMATION,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_PRODUCTION,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_A11Y,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_TEST,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_ABSTRACT,
+ MATE_MIXER_STREAM_CONTROL_MEDIA_ROLE_FILTER
+} MateMixerStreamControlMediaRole;
+
 typedef enum { /*< flags >*/
- MATE_MIXER_CLIENT_STREAM_NO_FLAGS = 0,
- MATE_MIXER_CLIENT_STREAM_APPLICATION = 1 << 0,
- MATE_MIXER_CLIENT_STREAM_CACHED = 1 << 1,
-} MateMixerClientStreamFlags;
+ MATE_MIXER_SWITCH_NO_FLAGS = 0,
+ MATE_MIXER_SWITCH_TOGGLE = 1 << 0,
+ MATE_MIXER_SWITCH_ALLOWS_NO_ACTIVE_OPTION = 1 << 1
+} MateMixerSwitchFlags;
 
-/**
- * MateMixerClientStreamRole:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_NONE:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_VIDEO:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_MUSIC:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_GAME:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_EVENT:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_PHONE:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_ANIMATION:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_PRODUCTION:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_A11Y:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_TEST:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_ABSTRACT:
- * @MATE_MIXER_CLIENT_STREAM_ROLE_FILTER:
- */
 typedef enum {
- MATE_MIXER_CLIENT_STREAM_ROLE_NONE,
- MATE_MIXER_CLIENT_STREAM_ROLE_VIDEO,
- MATE_MIXER_CLIENT_STREAM_ROLE_MUSIC,
- MATE_MIXER_CLIENT_STREAM_ROLE_GAME,
- MATE_MIXER_CLIENT_STREAM_ROLE_EVENT,
- MATE_MIXER_CLIENT_STREAM_ROLE_PHONE,
- MATE_MIXER_CLIENT_STREAM_ROLE_ANIMATION,
- MATE_MIXER_CLIENT_STREAM_ROLE_PRODUCTION,
- MATE_MIXER_CLIENT_STREAM_ROLE_A11Y,
- MATE_MIXER_CLIENT_STREAM_ROLE_TEST,
- MATE_MIXER_CLIENT_STREAM_ROLE_ABSTRACT,
- MATE_MIXER_CLIENT_STREAM_ROLE_FILTER
-} MateMixerClientStreamRole;
+ MATE_MIXER_SWITCH_ROLE_UNKNOWN,
+ MATE_MIXER_SWITCH_ROLE_DEVICE_PROFILE,
+ MATE_MIXER_SWITCH_ROLE_PORT,
+ MATE_MIXER_SWITCH_ROLE_BOOST
+} MateMixerSwitchRole;
 
 /**
 * MateMixerChannelPosition: