dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 07:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

API: remove "volume-changed" signal in favor of "notify::volume"

Browse Source 
We do not need both and notify is better here cause it allows binding volume scale value to the volume prop
This commit is contained in:
Rafał Dzięgiel
2021-01-28 13:06:25 +01:00
parent 90697d81a7
commit e731842b08
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/gst/clapper/gstclapper.c
View File

@@ -126,7 +126,6 @@ enum
SIGNAL_WARNING, SIGNAL_WARNING,
SIGNAL_VIDEO_DIMENSIONS_CHANGED, SIGNAL_VIDEO_DIMENSIONS_CHANGED,
SIGNAL_MEDIA_INFO_UPDATED, SIGNAL_MEDIA_INFO_UPDATED,
SIGNAL_VOLUME_CHANGED,
SIGNAL_MUTE_CHANGED, SIGNAL_MUTE_CHANGED,
SIGNAL_SEEK_DONE, SIGNAL_SEEK_DONE,
SIGNAL_LAST SIGNAL_LAST
@@ -166,6 +165,9 @@ struct _GstClapper
gdouble rate; gdouble rate;
/* Prevent unnecessary signals emissions */
gdouble last_volume;
GstClapperState app_state; GstClapperState app_state;
gint buffering; gint buffering;
@@ -381,7 +383,8 @@ gst_clapper_class_init (GstClapperClass * klass)
param_specs[PROP_VOLUME] = param_specs[PROP_VOLUME] =
g_param_spec_double ("volume", "Volume", "Volume", g_param_spec_double ("volume", "Volume", "Volume",
0, 10.0, DEFAULT_VOLUME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); 0, 10.0, DEFAULT_VOLUME, G_PARAM_READWRITE |
G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
param_specs[PROP_MUTE] = param_specs[PROP_MUTE] =
g_param_spec_boolean ("mute", "Mute", "Mute", g_param_spec_boolean ("mute", "Mute", "Mute",
@@ -396,7 +399,8 @@ gst_clapper_class_init (GstClapperClass * klass)
param_specs[PROP_RATE] = param_specs[PROP_RATE] =
g_param_spec_double ("rate", "rate", "Playback rate", g_param_spec_double ("rate", "rate", "Playback rate",
-64.0, 64.0, DEFAULT_RATE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -64.0, 64.0, DEFAULT_RATE, G_PARAM_READWRITE |
G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
param_specs[PROP_VIDEO_MULTIVIEW_MODE] = param_specs[PROP_VIDEO_MULTIVIEW_MODE] =
g_param_spec_enum ("video-multiview-mode", g_param_spec_enum ("video-multiview-mode",
@@ -478,11 +482,6 @@ gst_clapper_class_init (GstClapperClass * klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL,
NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_CLAPPER_MEDIA_INFO); NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_CLAPPER_MEDIA_INFO);
signals[SIGNAL_VOLUME_CHANGED] =
g_signal_new ("volume-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL,
NULL, NULL, G_TYPE_NONE, 0, G_TYPE_INVALID);
signals[SIGNAL_MUTE_CHANGED] = signals[SIGNAL_MUTE_CHANGED] =
g_signal_new ("mute-changed", G_TYPE_FROM_CLASS (klass), g_signal_new ("mute-changed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL,
@@ -2838,24 +2837,26 @@ subtitle_tags_changed_cb (G_GNUC_UNUSED GstElement * playbin, gint stream_index,
} }
static void static void
volume_changed_dispatch (gpointer user_data) volume_notify_dispatch (gpointer user_data)
{ {
GstClapper *clapper = user_data; GstClapper *clapper = user_data;
if (clapper->inhibit_sigs) if (clapper->inhibit_sigs)
return; return;
g_signal_emit (clapper, signals[SIGNAL_VOLUME_CHANGED], 0); g_object_notify_by_pspec (G_OBJECT (clapper), param_specs[PROP_VOLUME]);
} }
static void static void
volume_notify_cb (G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GParamSpec * pspec, volume_notify_cb (G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GParamSpec * pspec,
GstClapper * self) GstClapper * self)
{ {
if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, gdouble volume = gst_clapper_get_volume (self);
signals[SIGNAL_VOLUME_CHANGED], 0, NULL, NULL, NULL) != 0) {
if (self->last_volume != volume) {
self->last_volume = volume;
gst_clapper_signal_dispatcher_dispatch (self->signal_dispatcher, self, gst_clapper_signal_dispatcher_dispatch (self->signal_dispatcher, self,
volume_changed_dispatch, g_object_ref (self), volume_notify_dispatch, g_object_ref (self),
(GDestroyNotify) g_object_unref); (GDestroyNotify) g_object_unref);
} }
} }