mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 11:41:09 +00:00
Fixed the xid stuff and some cleanups.
Original commit message from CVS: Fixed the xid stuff and some cleanups.
This commit is contained in:
parent
db0325ee37
commit
98f65dadac
1 changed files with 32 additions and 36 deletions
|
@ -6,24 +6,16 @@
|
|||
|
||||
static int launch_argc;
|
||||
static char **launch_argv;
|
||||
int xid = 0;
|
||||
|
||||
GtkWidget *window;
|
||||
GtkWidget *hbox;
|
||||
GtkWidget *gtk_socket;
|
||||
|
||||
|
||||
typedef void (*found_handler) (GstElement *element, GtkArg *arg, void *priv);
|
||||
typedef void (*found_handler) (GstElement *element, gint xid, void *priv);
|
||||
|
||||
void
|
||||
arg_search (GstBin *bin, gchar *argname, found_handler handler, void *priv)
|
||||
{
|
||||
GList *children;
|
||||
GstElement *child;
|
||||
GtkType type;
|
||||
GtkArg *args;
|
||||
guint32 *flags;
|
||||
guint num_args,i;
|
||||
gchar *ccargname;
|
||||
|
||||
ccargname = g_strdup_printf("::%s",argname);
|
||||
|
@ -31,19 +23,28 @@ arg_search (GstBin *bin, gchar *argname, found_handler handler, void *priv)
|
|||
children = gst_bin_get_list(bin);
|
||||
|
||||
while (children) {
|
||||
child = GST_ELEMENT(children->data);
|
||||
children = g_list_next(children);
|
||||
// fprintf(stderr,"have child \"%s\"\n",gst_object_get_path_string(GST_OBJECT(child)));
|
||||
GstElement *child;
|
||||
|
||||
child = GST_ELEMENT (children->data);
|
||||
children = g_list_next (children);
|
||||
|
||||
if (GST_IS_BIN(child)) arg_search(GST_BIN(child),argname,handler,priv);
|
||||
if (GST_IS_BIN (child)) arg_search (GST_BIN (child), argname, handler, priv);
|
||||
else {
|
||||
type = GTK_OBJECT_TYPE(child);
|
||||
GtkType type;
|
||||
|
||||
type = GTK_OBJECT_TYPE (child);
|
||||
|
||||
while (type != GTK_TYPE_INVALID) {
|
||||
GtkArg *args;
|
||||
guint32 *flags;
|
||||
guint num_args,i;
|
||||
|
||||
args = gtk_object_query_args(type,&flags,&num_args);
|
||||
|
||||
for (i=0;i<num_args;i++) {
|
||||
//fprintf(stderr,"arg is \"%s\"\n",args[i].name);
|
||||
if (strstr(args[i].name,ccargname))
|
||||
(handler)(child,&args[i],priv);
|
||||
if (strstr(args[i].name,ccargname)) {
|
||||
(handler)(child, gst_util_get_int_arg (GTK_OBJECT (child), argname) ,priv);
|
||||
}
|
||||
}
|
||||
type = gtk_type_parent(type);
|
||||
}
|
||||
|
@ -53,28 +54,28 @@ arg_search (GstBin *bin, gchar *argname, found_handler handler, void *priv)
|
|||
g_free(ccargname);
|
||||
}
|
||||
|
||||
void handle_have_size(GstElement *element,int width,int height) {
|
||||
fprintf(stderr,"have size from xvideosink: %dx%d\n",width,height);
|
||||
void
|
||||
handle_have_size (GstElement *element,int width,int height)
|
||||
{
|
||||
gtk_widget_set_usize(gtk_socket,width,height);
|
||||
gtk_widget_show_all(window);
|
||||
}
|
||||
|
||||
void xid_handler(GstElement *element, GtkArg *arg, void *priv) {
|
||||
fprintf(stderr,"have xid\n");
|
||||
|
||||
xid = GTK_VALUE_INT(*arg);
|
||||
|
||||
void
|
||||
xid_handler (GstElement *element, gint xid, void *priv)
|
||||
{
|
||||
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||
hbox = gtk_hbox_new(TRUE,10);
|
||||
|
||||
gtk_socket = gtk_socket_new ();
|
||||
gtk_widget_set_usize(gtk_socket,720,480);
|
||||
gtk_widget_show(gtk_socket);
|
||||
gtk_container_add(GTK_CONTAINER(window),hbox);
|
||||
gtk_box_pack_end(GTK_BOX(hbox),gtk_socket,TRUE,TRUE,0);
|
||||
|
||||
gtk_container_add(GTK_CONTAINER(window),gtk_socket);
|
||||
|
||||
gtk_widget_realize(gtk_socket);
|
||||
gtk_socket_steal (GTK_SOCKET (gtk_socket), xid);
|
||||
|
||||
gtk_object_set(GTK_OBJECT(window),"allow_grow",TRUE,NULL);
|
||||
gtk_object_set(GTK_OBJECT(window),"allow_shrink",TRUE,NULL);
|
||||
gtk_widget_show_all(window);
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (element), "have_size",
|
||||
GTK_SIGNAL_FUNC (handle_have_size), element);
|
||||
|
@ -134,13 +135,8 @@ main(int argc, char *argv[])
|
|||
fprintf(stderr,"RUNNING pipeline\n");
|
||||
gst_element_set_state (pipeline, GST_STATE_PLAYING);
|
||||
|
||||
// if (have_window) {
|
||||
gtk_idle_add(idle_func,pipeline);
|
||||
fprintf(stderr,"going into gtk_main()\n");
|
||||
gtk_main();
|
||||
// } else {
|
||||
// while (gst_bin_iterate (GST_BIN (pipeline)));
|
||||
// }
|
||||
gtk_idle_add(idle_func,pipeline);
|
||||
gtk_main();
|
||||
|
||||
gst_element_set_state (pipeline, GST_STATE_NULL);
|
||||
|
||||
|
|
Loading…
Reference in a new issue