the only thing required to make this work was to make sure that xvideosink is not a toplevel window. The only other r...

Original commit message from CVS:
the only thing required to make this work was to make sure that xvideosink is not a toplevel window. The only other real change is to get the xid from the signal callback instead of from the xvideosink prop.
This commit is contained in:
Steve Baker 2002-11-22 03:41:49 +00:00
parent 8557496cae
commit f3aee44fa9
2 changed files with 12 additions and 22 deletions

View file

@ -10,6 +10,7 @@ GstElement *filter;
GdkWindow *wind; GdkWindow *wind;
GstElement *pipeline; GstElement *pipeline;
#if 0
static int static int
configure(GtkWidget * widget, GdkEventConfigure * evt, gpointer data) configure(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
{ {
@ -28,18 +29,11 @@ map_event(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
printf("map\n"); printf("map\n");
return FALSE; return FALSE;
} }
#endif
int xid; static int have_xid(GstElement * xv, gint xid, gpointer data)
static int have_xid(GstElement * xv, gpointer data)
{ {
GValue value = { 0 };
// int xid;
printf("have_xid\n"); printf("have_xid\n");
g_value_init(&value, G_TYPE_INT);
g_object_get_property(G_OBJECT(xvideosink), "xid", &value);
xid = g_value_get_int(&value);
wind = gdk_window_foreign_new(xid); wind = gdk_window_foreign_new(xid);
printf("gdk_window_reparent() wind=%p window=%p xid=%d\n",wind,window->window,xid); printf("gdk_window_reparent() wind=%p window=%p xid=%d\n",wind,window->window,xid);
@ -58,12 +52,12 @@ int main(int argc, char *argv[])
window = gtk_window_new(GTK_WINDOW_TOPLEVEL); window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window), 640, 480); gtk_window_set_default_size(GTK_WINDOW(window), 640, 480);
#if 0
gtk_signal_connect(GTK_OBJECT(window), "configure_event", gtk_signal_connect(GTK_OBJECT(window), "configure_event",
GTK_SIGNAL_FUNC(configure), NULL); GTK_SIGNAL_FUNC(configure), NULL);
gtk_signal_connect(GTK_OBJECT(window), "map", gtk_signal_connect(GTK_OBJECT(window), "map",
GTK_SIGNAL_FUNC(map_event), NULL); GTK_SIGNAL_FUNC(map_event), NULL);
#endif
gtk_widget_show_all(window); gtk_widget_show_all(window);
pipeline = gst_element_factory_make("pipeline", NULL); pipeline = gst_element_factory_make("pipeline", NULL);
@ -78,6 +72,7 @@ int main(int argc, char *argv[])
#endif #endif
xvideosink = gst_element_factory_make("xvideosink", NULL); xvideosink = gst_element_factory_make("xvideosink", NULL);
g_object_set(xvideosink, "toplevel", FALSE, NULL);
g_signal_connect(xvideosink, "have_xid", (GCallback) (have_xid), g_signal_connect(xvideosink, "have_xid", (GCallback) (have_xid),
NULL); NULL);

View file

@ -10,6 +10,7 @@ GstElement *filter;
GdkWindow *wind; GdkWindow *wind;
GstElement *pipeline; GstElement *pipeline;
#if 0
static int static int
configure(GtkWidget * widget, GdkEventConfigure * evt, gpointer data) configure(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
{ {
@ -28,18 +29,11 @@ map_event(GtkWidget * widget, GdkEventConfigure * evt, gpointer data)
printf("map\n"); printf("map\n");
return FALSE; return FALSE;
} }
#endif
int xid; static int have_xid(GstElement * xv, gint xid, gpointer data)
static int have_xid(GstElement * xv, gpointer data)
{ {
GValue value = { 0 };
// int xid;
printf("have_xid\n"); printf("have_xid\n");
g_value_init(&value, G_TYPE_INT);
g_object_get_property(G_OBJECT(xvideosink), "xid", &value);
xid = g_value_get_int(&value);
wind = gdk_window_foreign_new(xid); wind = gdk_window_foreign_new(xid);
printf("gdk_window_reparent() wind=%p window=%p xid=%d\n",wind,window->window,xid); printf("gdk_window_reparent() wind=%p window=%p xid=%d\n",wind,window->window,xid);
@ -58,12 +52,12 @@ int main(int argc, char *argv[])
window = gtk_window_new(GTK_WINDOW_TOPLEVEL); window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window), 640, 480); gtk_window_set_default_size(GTK_WINDOW(window), 640, 480);
#if 0
gtk_signal_connect(GTK_OBJECT(window), "configure_event", gtk_signal_connect(GTK_OBJECT(window), "configure_event",
GTK_SIGNAL_FUNC(configure), NULL); GTK_SIGNAL_FUNC(configure), NULL);
gtk_signal_connect(GTK_OBJECT(window), "map", gtk_signal_connect(GTK_OBJECT(window), "map",
GTK_SIGNAL_FUNC(map_event), NULL); GTK_SIGNAL_FUNC(map_event), NULL);
#endif
gtk_widget_show_all(window); gtk_widget_show_all(window);
pipeline = gst_element_factory_make("pipeline", NULL); pipeline = gst_element_factory_make("pipeline", NULL);
@ -78,6 +72,7 @@ int main(int argc, char *argv[])
#endif #endif
xvideosink = gst_element_factory_make("xvideosink", NULL); xvideosink = gst_element_factory_make("xvideosink", NULL);
g_object_set(xvideosink, "toplevel", FALSE, NULL);
g_signal_connect(xvideosink, "have_xid", (GCallback) (have_xid), g_signal_connect(xvideosink, "have_xid", (GCallback) (have_xid),
NULL); NULL);