diff options
| author | Michal Ratajsky <[email protected]> | 2016-01-04 21:50:08 +0100 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2016-01-05 11:18:38 +0100 |
| commit | c03e76c83ed49335390cdb9e3a8e63df4d73e0c5 (patch) | |
| tree | de057f689b582f23f63d348530c0d27a0c9518cb /backends/pulse/pulse-source-control.c | |
| parent | 299e1a26e5eb5d6625feba2a9db017f43d9d853c (diff) | |
| download | libmatemixer-c03e76c83ed49335390cdb9e3a8e63df4d73e0c5.tar.bz2 libmatemixer-c03e76c83ed49335390cdb9e3a8e63df4d73e0c5.tar.xz | |
pulse: Use own PulseAudio connection in stream controls
Diffstat (limited to 'backends/pulse/pulse-source-control.c')
| -rw-r--r-- | backends/pulse/pulse-source-control.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/backends/pulse/pulse-source-control.c b/backends/pulse/pulse-source-control.c index 3ed1573..1cff6b5 100644 --- a/backends/pulse/pulse-source-control.c +++ b/backends/pulse/pulse-source-control.c @@ -56,8 +56,9 @@ pulse_source_control_init (PulseSourceControl *control) } PulseSourceControl * -pulse_source_control_new (PulseSource *source, - const pa_source_info *info) +pulse_source_control_new (PulseConnection *connection, + const pa_source_info *info, + PulseSource *parent) { PulseSourceControl *control; MateMixerStreamControlFlags flags = MATE_MIXER_STREAM_CONTROL_MUTE_READABLE | @@ -67,8 +68,9 @@ pulse_source_control_new (PulseSource *source, MATE_MIXER_STREAM_CONTROL_HAS_MONITOR; MateMixerStreamControlRole role; - g_return_val_if_fail (PULSE_IS_SOURCE (source), NULL); + g_return_val_if_fail (PULSE_IS_CONNECTION (connection), NULL); g_return_val_if_fail (info != NULL, NULL); + g_return_val_if_fail (PULSE_IS_SOURCE (parent), NULL); if (info->active_port != NULL) role = MATE_MIXER_STREAM_CONTROL_ROLE_PORT; @@ -84,7 +86,8 @@ pulse_source_control_new (PulseSource *source, "label", info->description, "flags", flags, "role", role, - "stream", source, + "stream", parent, + "connection", connection, NULL); pulse_source_control_update (control, info); @@ -118,7 +121,7 @@ pulse_source_control_set_mute (PulseStreamControl *psc, gboolean mute) { g_return_val_if_fail (PULSE_IS_SOURCE_CONTROL (psc), FALSE); - return pulse_connection_set_source_mute (PULSE_STREAM_CONTROL_GET_CONNECTION (psc), + return pulse_connection_set_source_mute (pulse_stream_control_get_connection (psc), PULSE_STREAM_CONTROL_GET_STREAM_INDEX (psc), mute); } @@ -129,7 +132,7 @@ pulse_source_control_set_volume (PulseStreamControl *psc, pa_cvolume *cvolume) g_return_val_if_fail (PULSE_IS_SOURCE_CONTROL (psc), FALSE); g_return_val_if_fail (cvolume != NULL, FALSE); - return pulse_connection_set_source_volume (PULSE_STREAM_CONTROL_GET_CONNECTION (psc), + return pulse_connection_set_source_volume (pulse_stream_control_get_connection (psc), PULSE_STREAM_CONTROL_GET_STREAM_INDEX (psc), cvolume); } @@ -148,7 +151,7 @@ pulse_source_control_create_monitor (PulseStreamControl *psc) return NULL; } - return pulse_connection_create_monitor (PULSE_STREAM_CONTROL_GET_CONNECTION (psc), + return pulse_connection_create_monitor (pulse_stream_control_get_connection (psc), index, PA_INVALID_INDEX); } |