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 | |
| 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')
| -rw-r--r-- | backends/oss/oss-backend.c | 23 | ||||
| -rw-r--r-- | backends/oss/oss-device.c | 15 | ||||
| -rw-r--r-- | backends/oss/oss-stream.c | 12 |
3 files changed, 16 insertions, 34 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); } diff --git a/backends/oss/oss-device.c b/backends/oss/oss-device.c index 70f46e6..8398aed 100644 --- a/backends/oss/oss-device.c +++ b/backends/oss/oss-device.c @@ -362,29 +362,23 @@ oss_device_close (OssDevice *device) /* Make each stream remove its controls and switch */ if (device->priv->input != NULL) { - const gchar *name = - mate_mixer_stream_get_name (MATE_MIXER_STREAM (device->priv->input)); - oss_stream_remove_all (device->priv->input); free_stream_list (device); g_signal_emit_by_name (G_OBJECT (device), "stream-removed", - name); + MATE_MIXER_STREAM (device->priv->input)); g_clear_object (&device->priv->input); } if (device->priv->output != NULL) { - const gchar *name = - mate_mixer_stream_get_name (MATE_MIXER_STREAM (device->priv->output)); - oss_stream_remove_all (device->priv->output); free_stream_list (device); g_signal_emit_by_name (G_OBJECT (device), "stream-removed", - name); + MATE_MIXER_STREAM (device->priv->output)); g_clear_object (&device->priv->output); } @@ -596,16 +590,13 @@ read_mixer_devices (OssDevice *device) continue; if (oss_stream_has_controls (stream) == FALSE) { - const gchar *name = - mate_mixer_stream_get_name (MATE_MIXER_STREAM (stream)); - free_stream_list (device); /* Pretend the stream has just been created now that we are adding * the first control */ g_signal_emit_by_name (G_OBJECT (device), "stream-added", - name); + MATE_MIXER_STREAM (stream)); } g_debug ("Adding device %s control %s", diff --git a/backends/oss/oss-stream.c b/backends/oss/oss-stream.c index f094537..7727dad 100644 --- a/backends/oss/oss-stream.c +++ b/backends/oss/oss-stream.c @@ -112,19 +112,15 @@ oss_stream_new (const gchar *name, void oss_stream_add_control (OssStream *stream, OssStreamControl *control) { - const gchar *name; - g_return_if_fail (OSS_IS_STREAM (stream)); g_return_if_fail (OSS_IS_STREAM_CONTROL (control)); - name = mate_mixer_stream_control_get_name (MATE_MIXER_STREAM_CONTROL (control)); - stream->priv->controls = g_list_append (stream->priv->controls, g_object_ref (control)); g_signal_emit_by_name (G_OBJECT (stream), "control-added", - name); + MATE_MIXER_STREAM_CONTROL (control)); } void @@ -223,7 +219,7 @@ oss_stream_set_switch_data (OssStream *stream, gint fd, GList *options) stream->priv->switches = g_list_prepend (NULL, g_object_ref (stream->priv->swtch)); g_signal_emit_by_name (G_OBJECT (stream), "switch-added", - OSS_STREAM_SWITCH_NAME); + MATE_MIXER_STREAM_SWITCH (stream->priv->swtch)); } void @@ -243,7 +239,7 @@ oss_stream_remove_all (OssStream *stream) stream->priv->controls = g_list_delete_link (stream->priv->controls, list); g_signal_emit_by_name (G_OBJECT (stream), "control-removed", - mate_mixer_stream_control_get_name (control)); + control); g_object_unref (control); list = next; @@ -260,7 +256,7 @@ oss_stream_remove_all (OssStream *stream) g_signal_emit_by_name (G_OBJECT (stream), "switch-removed", - OSS_STREAM_SWITCH_NAME); + MATE_MIXER_STREAM_SWITCH (stream->priv->swtch)); g_clear_object (&stream->priv->swtch); } |