diff options
| author | Michal Ratajsky <[email protected]> | 2014-07-20 10:35:28 +0200 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-07-20 10:35:28 +0200 |
| commit | 32049d16801b8c0b53448eba4b41df8765a94f84 (patch) | |
| tree | 6a232dfd4c472aebb79af722cf61855086f56dfb /backends/pulse/pulse-ext-stream.c | |
| parent | c965e0de05231c7da6c11d5cc1a8d97b6d156f1b (diff) | |
| download | libmatemixer-32049d16801b8c0b53448eba4b41df8765a94f84.tar.bz2 libmatemixer-32049d16801b8c0b53448eba4b41df8765a94f84.tar.xz | |
Fix setting ext-stream parent and generalize it in PulseClientStream
Diffstat (limited to 'backends/pulse/pulse-ext-stream.c')
| -rw-r--r-- | backends/pulse/pulse-ext-stream.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/backends/pulse/pulse-ext-stream.c b/backends/pulse/pulse-ext-stream.c index 96164e8..a12a22a 100644 --- a/backends/pulse/pulse-ext-stream.c +++ b/backends/pulse/pulse-ext-stream.c @@ -30,8 +30,6 @@ #include "pulse-client-stream.h" #include "pulse-ext-stream.h" #include "pulse-helpers.h" -#include "pulse-sink.h" -#include "pulse-source.h" #include "pulse-stream.h" static void pulse_ext_stream_class_init (PulseExtStreamClass *klass); @@ -242,7 +240,6 @@ pulse_ext_stream_set_volume (PulseStream *pstream, pa_cvolume *cvolume) static gboolean pulse_ext_stream_set_parent (PulseClientStream *pclient, PulseStream *parent) { - MateMixerStreamFlags flags; PulseStream *pstream; const pa_channel_map *map; const pa_cvolume *cvolume; @@ -251,19 +248,6 @@ pulse_ext_stream_set_parent (PulseClientStream *pclient, PulseStream *parent) g_return_val_if_fail (PULSE_IS_EXT_STREAM (pclient), FALSE); g_return_val_if_fail (PULSE_IS_STREAM (parent), FALSE); - flags = mate_mixer_stream_get_flags (MATE_MIXER_STREAM (pclient)); - - /* Validate the parent stream */ - if (flags & MATE_MIXER_STREAM_INPUT && !PULSE_IS_SOURCE (parent)) { - g_warning ("Could not change stream parent to %s: not a parent input stream", - mate_mixer_stream_get_name (MATE_MIXER_STREAM (parent))); - return FALSE; - } else if (!PULSE_IS_SINK (parent)) { - g_warning ("Could not change stream parent to %s: not a parent output stream", - mate_mixer_stream_get_name (MATE_MIXER_STREAM (parent))); - return FALSE; - } - pstream = PULSE_STREAM (pclient); info.name = mate_mixer_stream_get_name (MATE_MIXER_STREAM (pstream)); |