From 56c76128b0144a5c61e77d2a7aec07a337cfb66d Mon Sep 17 00:00:00 2001 From: Michal Ratajsky Date: Fri, 18 Jul 2014 15:41:59 +0200 Subject: PulseAudio fixes and API updates --- libmatemixer/matemixer-enums.h | 139 +++++++++++++++++++++++++++++++++++------ 1 file changed, 120 insertions(+), 19 deletions(-) (limited to 'libmatemixer/matemixer-enums.h') diff --git a/libmatemixer/matemixer-enums.h b/libmatemixer/matemixer-enums.h index 4753aaf..a6326ce 100644 --- a/libmatemixer/matemixer-enums.h +++ b/libmatemixer/matemixer-enums.h @@ -23,8 +23,16 @@ * https://bugzilla.gnome.org/show_bug.cgi?id=621942 */ +/** + * MateMixerState: + * @MATE_MIXER_STATE_IDLE: + * @MATE_MIXER_STATE_CONNECTING: + * @MATE_MIXER_STATE_READY: + * @MATE_MIXER_STATE_FAILED: + * @MATE_MIXER_STATE_UNKNOWN: + */ typedef enum { - MATE_MIXER_STATE_IDLE = 0, + MATE_MIXER_STATE_IDLE, MATE_MIXER_STATE_CONNECTING, MATE_MIXER_STATE_READY, MATE_MIXER_STATE_FAILED, @@ -46,11 +54,18 @@ typedef enum { * "real" backends fail to initialize. */ typedef enum { - MATE_MIXER_BACKEND_UNKNOWN = 0, + MATE_MIXER_BACKEND_UNKNOWN, MATE_MIXER_BACKEND_PULSEAUDIO, MATE_MIXER_BACKEND_NULL } MateMixerBackendType; +/** + * 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, @@ -58,33 +73,119 @@ typedef enum { /*< flags >*/ 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_MUTE: + * @MATE_MIXER_STREAM_HAS_VOLUME: + * @MATE_MIXER_STREAM_HAS_DECIBEL_VOLUME: + * @MATE_MIXER_STREAM_HAS_FLAT_VOLUME: + * @MATE_MIXER_STREAM_HAS_MONITOR: + * @MATE_MIXER_STREAM_CAN_SET_VOLUME: + * @MATE_MIXER_STREAM_CAN_BALANCE: + * @MATE_MIXER_STREAM_CAN_FADE: + * @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_APPLICATION = 1 << 3, - MATE_MIXER_STREAM_EVENT = 1 << 4, - MATE_MIXER_STREAM_HAS_MUTE = 1 << 5, - MATE_MIXER_STREAM_HAS_VOLUME = 1 << 6, - MATE_MIXER_STREAM_HAS_DECIBEL_VOLUME = 1 << 7, - MATE_MIXER_STREAM_HAS_FLAT_VOLUME = 1 << 8, - MATE_MIXER_STREAM_HAS_MONITOR = 1 << 9, - MATE_MIXER_STREAM_CAN_BALANCE = 1 << 10, - MATE_MIXER_STREAM_CAN_FADE = 1 << 11, - MATE_MIXER_STREAM_CAN_SET_VOLUME = 1 << 12, - MATE_MIXER_STREAM_CAN_SUSPEND = 1 << 13 + MATE_MIXER_STREAM_HAS_MUTE = 1 << 3, + MATE_MIXER_STREAM_HAS_VOLUME = 1 << 4, + MATE_MIXER_STREAM_HAS_DECIBEL_VOLUME = 1 << 5, + MATE_MIXER_STREAM_HAS_FLAT_VOLUME = 1 << 6, + MATE_MIXER_STREAM_HAS_MONITOR = 1 << 7, + MATE_MIXER_STREAM_CAN_SET_VOLUME = 1 << 8, + MATE_MIXER_STREAM_CAN_BALANCE = 1 << 9, + MATE_MIXER_STREAM_CAN_FADE = 1 << 10, + MATE_MIXER_STREAM_CAN_SUSPEND = 1 << 11 } MateMixerStreamFlags; +/** + * MateMixerStreamState: + * @MATE_MIXER_STREAM_STATE_UNKNOWN: + * @MATE_MIXER_STREAM_STATE_RUNNING: + * @MATE_MIXER_STREAM_STATE_IDLE: + * @MATE_MIXER_STREAM_STATE_SUSPENDED: + */ typedef enum { - MATE_MIXER_STREAM_UNKNOWN_STATE, - MATE_MIXER_STREAM_RUNNING, - MATE_MIXER_STREAM_IDLE, - MATE_MIXER_STREAM_SUSPENDED + MATE_MIXER_STREAM_STATE_UNKNOWN, + MATE_MIXER_STREAM_STATE_RUNNING, + MATE_MIXER_STREAM_STATE_IDLE, + MATE_MIXER_STREAM_STATE_SUSPENDED } MateMixerStreamState; +/** + * MateMixerClientStreamFlags: + * @MATE_MIXER_CLIENT_STREAM_NO_FLAGS: + * @MATE_MIXER_CLIENT_STREAM_APPLICATION: + * @MATE_MIXER_CLIENT_STREAM_CACHED: + */ +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; + +/** + * 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; + +/** + * MateMixerChannelPosition: + * @MATE_MIXER_CHANNEL_UNKNOWN: + * @MATE_MIXER_CHANNEL_MONO: + * @MATE_MIXER_CHANNEL_FRONT_LEFT: + * @MATE_MIXER_CHANNEL_FRONT_RIGHT: + * @MATE_MIXER_CHANNEL_FRONT_CENTER: + * @MATE_MIXER_CHANNEL_LFE: + * @MATE_MIXER_CHANNEL_BACK_LEFT: + * @MATE_MIXER_CHANNEL_BACK_RIGHT: + * @MATE_MIXER_CHANNEL_BACK_CENTER: + * @MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER: + * @MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER: + * @MATE_MIXER_CHANNEL_SIDE_LEFT: + * @MATE_MIXER_CHANNEL_SIDE_RIGHT: + * @MATE_MIXER_CHANNEL_TOP_FRONT_LEFT: + * @MATE_MIXER_CHANNEL_TOP_FRONT_RIGHT: + * @MATE_MIXER_CHANNEL_TOP_FRONT_CENTER: + * @MATE_MIXER_CHANNEL_TOP_CENTER: + * @MATE_MIXER_CHANNEL_TOP_BACK_LEFT: + * @MATE_MIXER_CHANNEL_TOP_BACK_RIGHT: + * @MATE_MIXER_CHANNEL_TOP_BACK_CENTER: + */ typedef enum { - MATE_MIXER_CHANNEL_UNKNOWN_POSITION, + MATE_MIXER_CHANNEL_UNKNOWN, MATE_MIXER_CHANNEL_MONO, MATE_MIXER_CHANNEL_FRONT_LEFT, MATE_MIXER_CHANNEL_FRONT_RIGHT, @@ -92,9 +193,9 @@ typedef enum { MATE_MIXER_CHANNEL_LFE, MATE_MIXER_CHANNEL_BACK_LEFT, MATE_MIXER_CHANNEL_BACK_RIGHT, + MATE_MIXER_CHANNEL_BACK_CENTER, MATE_MIXER_CHANNEL_FRONT_LEFT_CENTER, MATE_MIXER_CHANNEL_FRONT_RIGHT_CENTER, - MATE_MIXER_CHANNEL_BACK_CENTER, MATE_MIXER_CHANNEL_SIDE_LEFT, MATE_MIXER_CHANNEL_SIDE_RIGHT, MATE_MIXER_CHANNEL_TOP_FRONT_LEFT, -- cgit v1.2.1