diff options
| author | Michal Ratajsky <[email protected]> | 2014-06-23 00:54:20 +0200 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-06-23 00:54:20 +0200 |
| commit | c00c008f789781748706e3f77410cde844602e4a (patch) | |
| tree | df3a895eed814cc9988e7ce2b24ec0427b1c8457 /backends/pulse/pulse-sink-input.c | |
| parent | 18ff80676c9ecce7f875a0bcb8190bd5a1dc1b00 (diff) | |
| download | libmatemixer-c00c008f789781748706e3f77410cde844602e4a.tar.bz2 libmatemixer-c00c008f789781748706e3f77410cde844602e4a.tar.xz | |
Support source output parent, minor fixes
Diffstat (limited to 'backends/pulse/pulse-sink-input.c')
| -rw-r--r-- | backends/pulse/pulse-sink-input.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/backends/pulse/pulse-sink-input.c b/backends/pulse/pulse-sink-input.c index 74734dc..4e9991b 100644 --- a/backends/pulse/pulse-sink-input.c +++ b/backends/pulse/pulse-sink-input.c @@ -175,22 +175,25 @@ pulse_sink_input_update (PulseStream *stream, prop = pa_proplist_gets (info->proplist, PA_PROP_APPLICATION_NAME); if (prop != NULL) - pulse_client_stream_update_app_name (MATE_MIXER_CLIENT_STREAM (stream), prop); + pulse_client_stream_update_app_name (PULSE_CLIENT_STREAM (stream), prop); prop = pa_proplist_gets (info->proplist, PA_PROP_APPLICATION_ID); if (prop != NULL) - pulse_client_stream_update_app_id (MATE_MIXER_CLIENT_STREAM (stream), prop); + pulse_client_stream_update_app_id (PULSE_CLIENT_STREAM (stream), prop); prop = pa_proplist_gets (info->proplist, PA_PROP_APPLICATION_VERSION); if (prop != NULL) - pulse_client_stream_update_app_version (MATE_MIXER_CLIENT_STREAM (stream), prop); + pulse_client_stream_update_app_version (PULSE_CLIENT_STREAM (stream), prop); prop = pa_proplist_gets (info->proplist, PA_PROP_APPLICATION_ICON_NAME); if (prop != NULL) - pulse_client_stream_update_app_icon (MATE_MIXER_CLIENT_STREAM (stream), prop); + pulse_client_stream_update_app_icon (PULSE_CLIENT_STREAM (stream), prop); - pulse_client_stream_update_parent (MATE_MIXER_CLIENT_STREAM (stream), - MATE_MIXER_STREAM (parent)); + if (G_LIKELY (parent != NULL)) + pulse_client_stream_update_parent (PULSE_CLIENT_STREAM (stream), + MATE_MIXER_STREAM (parent)); + else + pulse_client_stream_update_parent (PULSE_CLIENT_STREAM (stream), NULL); // XXX needs to fix monitor if parent changes |