mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback: Add POINTER_TO_ULONG() macro for consistency

Browse source
This commit is contained in:
Sebastian Dröge 2015-09-11 23:28:37 +02:00
parent ab64b00b48
commit 35cb3b0c57
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/playback/gstplaybin2.c
View file

@ -251,6 +251,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_play_bin_debug);
#define GST_IS_PLAY_BIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAY_BIN)) #define GST_IS_PLAY_BIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAY_BIN))
#define ULONG_TO_POINTER(number) ((gpointer) (guintptr) (number)) #define ULONG_TO_POINTER(number) ((gpointer) (guintptr) (number))
#define POINTER_TO_ULONG(number) ((guintptr) (number))
#define VOLUME_MAX_DOUBLE 10.0 #define VOLUME_MAX_DOUBLE 10.0
@ -3562,10 +3563,10 @@ pad_removed_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
GST_SOURCE_GROUP_LOCK (group); GST_SOURCE_GROUP_LOCK (group);
if ((group_id_probe_handler = if ((group_id_probe_handler =
(guintptr) g_object_get_data (G_OBJECT (pad), POINTER_TO_ULONG (g_object_get_data (G_OBJECT (pad),
"playbin.event_probe_id"))) { "playbin.event_probe_id")))) {
gst_pad_remove_probe (pad, group_id_probe_handler); gst_pad_remove_probe (pad, group_id_probe_handler);
g_object_set_data (G_OBJECT (pad), "playbin.event_probe_id", 0); g_object_set_data (G_OBJECT (pad), "playbin.event_probe_id", NULL);
} }
if ((combine = g_object_get_data (G_OBJECT (pad), "playbin.combine"))) { if ((combine = g_object_get_data (G_OBJECT (pad), "playbin.combine"))) {
@ -3591,8 +3592,8 @@ pad_removed_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
gulong notify_tags_handler; gulong notify_tags_handler;
notify_tags_handler = notify_tags_handler =
(guintptr) g_object_get_data (G_OBJECT (peer), POINTER_TO_ULONG (g_object_get_data (G_OBJECT (peer),
"playbin.notify_tags_handler"); "playbin.notify_tags_handler"));
if (notify_tags_handler != 0) if (notify_tags_handler != 0)
g_signal_handler_disconnect (G_OBJECT (peer), notify_tags_handler); g_signal_handler_disconnect (G_OBJECT (peer), notify_tags_handler);
g_object_set_data (G_OBJECT (peer), "playbin.notify_tags_handler", NULL); g_object_set_data (G_OBJECT (peer), "playbin.notify_tags_handler", NULL);