mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 05:28:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

GstGtkGLSink: Ensure widget has a toplevel parent

Browse source 
Checking for a parent is not enough, it must have a toplevel one.
If widget has no toplevel parent then add it in a GtkWindow, that
make it usable from gst-launch-1.0.

https://bugzilla.gnome.org/show_bug.cgi?id=751104
This commit is contained in:
Xavier Claessens 2015-06-17 09:36:57 -04:00 committed by Matthew Waters
parent 9f39a9964a
commit c3f1f2d78b
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/gtk/gstgtkglsink.c
View file

@ -314,6 +314,7 @@ gst_gtk_gl_sink_change_state (GstElement * element, GstStateChange transition)
{ {
GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (element); GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (element);
GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
GtkWidget *toplevel;
GST_DEBUG ("changing state: %s => %s", GST_DEBUG ("changing state: %s => %s",
gst_element_state_get_name (GST_STATE_TRANSITION_CURRENT (transition)), gst_element_state_get_name (GST_STATE_TRANSITION_CURRENT (transition)),
@ -326,10 +327,17 @@ gst_gtk_gl_sink_change_state (GstElement * element, GstStateChange transition)
/* After this point, gtk_sink->widget will always be set */ /* After this point, gtk_sink->widget will always be set */
if (!gtk_widget_get_parent (GTK_WIDGET (gtk_sink->widget))) { toplevel = gtk_widget_get_toplevel (GTK_WIDGET (gtk_sink->widget));
GST_ERROR_OBJECT (gtk_sink, if (!gtk_widget_is_toplevel (toplevel)) {
"gtkglsink widget needs to be parented to work."); GtkWidget *window;
return GST_STATE_CHANGE_FAILURE;
/* User did not add widget its own UI, let's popup a new GtkWindow to
* make gst-launch-1.0 work. */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
gtk_window_set_title (GTK_WINDOW (window), "Gtk+ OpenGL renderer");
gtk_container_add (GTK_CONTAINER (window), toplevel);
gtk_widget_show_all (window);
} }
if (!gtk_gst_gl_widget_init_winsys (gtk_sink->widget)) if (!gtk_gst_gl_widget_init_winsys (gtk_sink->widget))