diff options
| author | Michal Ratajsky <[email protected]> | 2016-01-07 01:00:27 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-02-21 11:55:59 +0100 |
| commit | 7666c62a307e3cb23994add9f58c8d03478f152f (patch) | |
| tree | ccf74e05c8f3fdc7225a353462da782da0f00349 /backends/oss/oss-backend.c | |
| parent | dd5f0d6489ce7a2b4156b3a6b44da09eb1336611 (diff) | |
| download | libmatemixer-7666c62a307e3cb23994add9f58c8d03478f152f.tar.bz2 libmatemixer-7666c62a307e3cb23994add9f58c8d03478f152f.tar.xz | |
Change added/removed signal argument from name to object
Diffstat (limited to 'backends/oss/oss-backend.c')
| -rw-r--r-- | backends/oss/oss-backend.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/backends/oss/oss-backend.c b/backends/oss/oss-backend.c index 9726570..159107d 100644 --- a/backends/oss/oss-backend.c +++ b/backends/oss/oss-backend.c @@ -96,7 +96,7 @@ static void remove_device_by_list_item (OssBackend *oss, GList *item); static void remove_stream (OssBackend *oss, - const gchar *name); + MateMixerStream *stream); static void select_default_input_stream (OssBackend *oss); static void select_default_output_stream (OssBackend *oss); @@ -502,7 +502,7 @@ add_device (OssBackend *oss, OssDevice *device) g_signal_emit_by_name (G_OBJECT (oss), "device-added", - mate_mixer_device_get_name (MATE_MIXER_DEVICE (device))); + MATE_MIXER_DEVICE (device)); /* Load the device elements after emitting device-added, because the load * function will most likely emit stream-added on the device and backend */ @@ -558,29 +558,24 @@ remove_device_by_list_item (OssBackend *oss, GList *item) oss->priv->default_device = NULL; } - /* The list may have been invalidated by device signals */ - free_stream_list (oss); - g_signal_emit_by_name (G_OBJECT (oss), "device-removed", - mate_mixer_device_get_name (MATE_MIXER_DEVICE (device))); + MATE_MIXER_DEVICE (device)); g_object_unref (device); } static void -remove_stream (OssBackend *oss, const gchar *name) +remove_stream (OssBackend *oss, MateMixerStream *stream) { - MateMixerStream *stream; + MateMixerStream *def; - stream = mate_mixer_backend_get_default_input_stream (MATE_MIXER_BACKEND (oss)); - - if (stream != NULL && strcmp (mate_mixer_stream_get_name (stream), name) == 0) + def = mate_mixer_backend_get_default_input_stream (MATE_MIXER_BACKEND (oss)); + if (def == stream) select_default_input_stream (oss); - stream = mate_mixer_backend_get_default_output_stream (MATE_MIXER_BACKEND (oss)); - - if (stream != NULL && strcmp (mate_mixer_stream_get_name (stream), name) == 0) + def = mate_mixer_backend_get_default_output_stream (MATE_MIXER_BACKEND (oss)); + if (def == stream) select_default_output_stream (oss); } |