mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-09-02 18:23:56 +00:00
death to all // comments, portability rules they do not
Original commit message from CVS: death to all // comments, portability rules they do not
This commit is contained in:
parent
08e95cee03
commit
a9e670efb2
3 changed files with 13 additions and 13 deletions
|
@ -58,7 +58,7 @@ static GtkTargetEntry target_table[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static GtkObject *parent_class = NULL;
|
static GtkObject *parent_class = NULL;
|
||||||
//static guint gst_media_play_signals[LAST_SIGNAL] = { 0 };
|
/* static guint gst_media_play_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GtkType
|
GtkType
|
||||||
gst_media_play_get_type (void)
|
gst_media_play_get_type (void)
|
||||||
|
@ -376,7 +376,7 @@ on_load_file_selected (GtkWidget *button,
|
||||||
gst_media_play_start_uri (play, file_name);
|
gst_media_play_start_uri (play, file_name);
|
||||||
gdk_threads_enter ();
|
gdk_threads_enter ();
|
||||||
|
|
||||||
//gst_media_play_addto_playlist (play, file_name);
|
/* gst_media_play_addto_playlist (play, file_name); */
|
||||||
|
|
||||||
g_free (data);
|
g_free (data);
|
||||||
}
|
}
|
||||||
|
@ -661,7 +661,7 @@ gst_media_play_frame_displayed (GstPlay *play, GstMediaPlay *mplay)
|
||||||
size = gst_play_get_media_size (play);
|
size = gst_play_get_media_size (play);
|
||||||
current_offset = gst_play_get_media_offset (play);
|
current_offset = gst_play_get_media_offset (play);
|
||||||
|
|
||||||
//g_print ("%lu %lu %lu %lu\n", current_time, total_time, size, current_offset);
|
/* g_print ("%lu %lu %lu %lu\n", current_time, total_time, size, current_offset); */
|
||||||
|
|
||||||
if (current_time != mplay->last_time) {
|
if (current_time != mplay->last_time) {
|
||||||
gdk_threads_enter ();
|
gdk_threads_enter ();
|
||||||
|
|
|
@ -171,7 +171,7 @@ gst_play_init (GstPlay *play)
|
||||||
|
|
||||||
priv->video_show = gst_elementfactory_make ("xvideosink", "show");
|
priv->video_show = gst_elementfactory_make ("xvideosink", "show");
|
||||||
g_return_if_fail (priv->video_show != NULL);
|
g_return_if_fail (priv->video_show != NULL);
|
||||||
//gtk_object_set (GTK_OBJECT (priv->video_element), "xv_enabled", FALSE, NULL);
|
/* gtk_object_set (GTK_OBJECT (priv->video_element), "xv_enabled", FALSE, NULL); */
|
||||||
g_signal_connect (G_OBJECT (priv->video_show), "frame_displayed",
|
g_signal_connect (G_OBJECT (priv->video_show), "frame_displayed",
|
||||||
G_CALLBACK (gst_play_frame_displayed), play);
|
G_CALLBACK (gst_play_frame_displayed), play);
|
||||||
g_signal_connect (G_OBJECT (priv->video_show), "have_size",
|
g_signal_connect (G_OBJECT (priv->video_show), "have_size",
|
||||||
|
@ -329,7 +329,7 @@ gst_play_object_added (GstAutoplug* autoplug, GstObject *object, GstPlay *play)
|
||||||
if (GST_FLAG_IS_SET (object, GST_ELEMENT_NO_SEEK))
|
if (GST_FLAG_IS_SET (object, GST_ELEMENT_NO_SEEK))
|
||||||
play->priv->can_seek = FALSE;
|
play->priv->can_seek = FALSE;
|
||||||
|
|
||||||
// first come first serve here...
|
/* first come first serve here... */
|
||||||
if (!play->priv->offset_element)
|
if (!play->priv->offset_element)
|
||||||
gst_play_object_introspect (object, "offset",
|
gst_play_object_introspect (object, "offset",
|
||||||
&play->priv->offset_element);
|
&play->priv->offset_element);
|
||||||
|
@ -390,7 +390,7 @@ gst_play_have_type (GstElement *sink, GstCaps *caps, GstPlay *play)
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
if (!new_element) {
|
if (!new_element) {
|
||||||
// FIXME, signal a suitable error
|
/* FIXME, signal a suitable error */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -499,7 +499,7 @@ gst_play_realize (GtkWidget *widget)
|
||||||
|
|
||||||
g_return_if_fail (play != NULL);
|
g_return_if_fail (play != NULL);
|
||||||
|
|
||||||
//g_print ("realize\n");
|
/* g_print ("realize\n"); */
|
||||||
|
|
||||||
play->priv->video_widget = gtk_socket_new ();
|
play->priv->video_widget = gtk_socket_new ();
|
||||||
|
|
||||||
|
@ -508,12 +508,12 @@ gst_play_realize (GtkWidget *widget)
|
||||||
if (GTK_WIDGET_CLASS (parent_class)->realize)
|
if (GTK_WIDGET_CLASS (parent_class)->realize)
|
||||||
GTK_WIDGET_CLASS (parent_class)->realize (widget);
|
GTK_WIDGET_CLASS (parent_class)->realize (widget);
|
||||||
|
|
||||||
//gtk_socket_steal (GTK_SOCKET (priv->video_widget),
|
/* gtk_socket_steal (GTK_SOCKET (priv->video_widget), */
|
||||||
// gst_util_get_int_arg (GTK_OBJECT(priv->video_element), "xid"));
|
/* gst_util_get_int_arg (GTK_OBJECT(priv->video_element), "xid")); */
|
||||||
|
|
||||||
//gtk_widget_realize (priv->video_widget);
|
/* gtk_widget_realize (priv->video_widget); */
|
||||||
//gtk_socket_steal (GTK_SOCKET (priv->video_widget),
|
/* gtk_socket_steal (GTK_SOCKET (priv->video_widget), */
|
||||||
// gst_util_get_int_arg (GTK_OBJECT(priv->video_element), "xid"));
|
/* gst_util_get_int_arg (GTK_OBJECT(priv->video_element), "xid")); */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -23,7 +23,7 @@ enum {
|
||||||
};
|
};
|
||||||
|
|
||||||
static GtkDrawingArea *parent_class = NULL;
|
static GtkDrawingArea *parent_class = NULL;
|
||||||
//static guint gst_status_area_signals[LAST_SIGNAL] = { 0 };
|
/* static guint gst_status_area_signals[LAST_SIGNAL] = { 0 }; */
|
||||||
|
|
||||||
GtkType
|
GtkType
|
||||||
gst_status_area_get_type (void)
|
gst_status_area_get_type (void)
|
||||||
|
|
Loading…
Reference in a new issue