diff options
| author | Michal Ratajsky <[email protected]> | 2014-08-29 00:01:41 +0200 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-08-29 00:01:41 +0200 |
| commit | 652eb260c2574312664c35acd10893d7a6460426 (patch) | |
| tree | e396e048aabc82c589c020f8f2099c27d38ec93d /backends | |
| parent | e67e02993cb8c1827659e1b3ddd693d347b8cf96 (diff) | |
| download | libmatemixer-652eb260c2574312664c35acd10893d7a6460426.tar.bz2 libmatemixer-652eb260c2574312664c35acd10893d7a6460426.tar.xz | |
Include backend flags in backend info and add a flag indicating stored controls support
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/alsa/alsa-backend.c | 10 | ||||
| -rw-r--r-- | backends/null/null-backend.c | 10 | ||||
| -rw-r--r-- | backends/oss/oss-backend.c | 10 | ||||
| -rw-r--r-- | backends/pulse/pulse-backend.c | 18 |
4 files changed, 27 insertions, 21 deletions
diff --git a/backends/alsa/alsa-backend.c b/backends/alsa/alsa-backend.c index 2493d45..0b7895e 100644 --- a/backends/alsa/alsa-backend.c +++ b/backends/alsa/alsa-backend.c @@ -28,6 +28,7 @@ #define BACKEND_NAME "ALSA" #define BACKEND_PRIORITY 20 +#define BACKEND_FLAGS MATE_MIXER_BACKEND_NO_FLAGS #define ALSA_DEVICE_GET_ID(d) \ (g_object_get_data (G_OBJECT (d), "__matemixer_alsa_device_id")) @@ -97,10 +98,11 @@ backend_module_init (GTypeModule *module) { alsa_backend_register_type (module); - info.name = BACKEND_NAME; - info.priority = BACKEND_PRIORITY; - info.g_type = ALSA_TYPE_BACKEND; - info.backend_type = MATE_MIXER_BACKEND_ALSA; + info.name = BACKEND_NAME; + info.priority = BACKEND_PRIORITY; + info.g_type = ALSA_TYPE_BACKEND; + info.backend_flags = BACKEND_FLAGS; + info.backend_type = MATE_MIXER_BACKEND_ALSA; } const MateMixerBackendInfo *backend_module_get_info (void) diff --git a/backends/null/null-backend.c b/backends/null/null-backend.c index ee0ad2e..a061428 100644 --- a/backends/null/null-backend.c +++ b/backends/null/null-backend.c @@ -24,6 +24,7 @@ #define BACKEND_NAME "Null" #define BACKEND_PRIORITY 0 +#define BACKEND_FLAGS MATE_MIXER_BACKEND_NO_FLAGS static void null_backend_class_init (NullBackendClass *klass); static void null_backend_class_finalize (NullBackendClass *klass); @@ -43,10 +44,11 @@ backend_module_init (GTypeModule *module) { null_backend_register_type (module); - info.name = BACKEND_NAME; - info.priority = BACKEND_PRIORITY; - info.g_type = NULL_TYPE_BACKEND; - info.backend_type = MATE_MIXER_BACKEND_NULL; + info.name = BACKEND_NAME; + info.priority = BACKEND_PRIORITY; + info.g_type = NULL_TYPE_BACKEND; + info.backend_flags = BACKEND_FLAGS; + info.backend_type = MATE_MIXER_BACKEND_NULL; } const MateMixerBackendInfo *backend_module_get_info (void) diff --git a/backends/oss/oss-backend.c b/backends/oss/oss-backend.c index bf9a694..78ed69b 100644 --- a/backends/oss/oss-backend.c +++ b/backends/oss/oss-backend.c @@ -33,6 +33,7 @@ #define BACKEND_NAME "OSS" #define BACKEND_PRIORITY 10 +#define BACKEND_FLAGS MATE_MIXER_BACKEND_NO_FLAGS #if !defined(__linux__) && !defined(__NetBSD__) && !defined(__OpenBSD__) /* At least on systems based on FreeBSD we will need to read device names @@ -114,10 +115,11 @@ backend_module_init (GTypeModule *module) { oss_backend_register_type (module); - info.name = BACKEND_NAME; - info.priority = BACKEND_PRIORITY; - info.g_type = OSS_TYPE_BACKEND; - info.backend_type = MATE_MIXER_BACKEND_OSS; + info.name = BACKEND_NAME; + info.priority = BACKEND_PRIORITY; + info.g_type = OSS_TYPE_BACKEND; + info.backend_flags = BACKEND_FLAGS; + info.backend_type = MATE_MIXER_BACKEND_OSS; } const MateMixerBackendInfo *backend_module_get_info (void) diff --git a/backends/pulse/pulse-backend.c b/backends/pulse/pulse-backend.c index 0d9c39c..4c0697a 100644 --- a/backends/pulse/pulse-backend.c +++ b/backends/pulse/pulse-backend.c @@ -38,6 +38,10 @@ #define BACKEND_NAME "PulseAudio" #define BACKEND_PRIORITY 100 +#define BACKEND_FLAGS (MATE_MIXER_BACKEND_HAS_APPLICATION_CONTROLS | \ + MATE_MIXER_BACKEND_HAS_STORED_CONTROLS | \ + MATE_MIXER_BACKEND_CAN_SET_DEFAULT_INPUT_STREAM | \ + MATE_MIXER_BACKEND_CAN_SET_DEFAULT_OUTPUT_STREAM) struct _PulseBackendPrivate { @@ -209,10 +213,11 @@ backend_module_init (GTypeModule *module) { pulse_backend_register_type (module); - info.name = BACKEND_NAME; - info.priority = BACKEND_PRIORITY; - info.g_type = PULSE_TYPE_BACKEND; - info.backend_type = MATE_MIXER_BACKEND_PULSEAUDIO; + info.name = BACKEND_NAME; + info.priority = BACKEND_PRIORITY; + info.g_type = PULSE_TYPE_BACKEND; + info.backend_flags = BACKEND_FLAGS; + info.backend_type = MATE_MIXER_BACKEND_PULSEAUDIO; } const MateMixerBackendInfo *backend_module_get_info (void) @@ -432,11 +437,6 @@ pulse_backend_open (MateMixerBackend *backend) return FALSE; } - _mate_mixer_backend_set_flags (backend, - MATE_MIXER_BACKEND_HAS_APPLICATION_CONTROLS | - MATE_MIXER_BACKEND_CAN_SET_DEFAULT_INPUT_STREAM | - MATE_MIXER_BACKEND_CAN_SET_DEFAULT_OUTPUT_STREAM); - pulse->priv->connection = connection; return TRUE; } |