X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fconsumer_gtk2.c;h=dc1619e334ede17dc62b42225a76a04f37822f20;hb=bd97dfc6013aaa419c0bfd3093b56885be5c02f3;hp=4da317ca1ad8c2b33762f23ff552889e744ac54b;hpb=c919073e754576f5fd705d912b0f54e7c0f26267;p=melted

diff --git a/src/modules/gtk2/consumer_gtk2.c b/src/modules/gtk2/consumer_gtk2.c
index 4da317c..dc1619e 100644
--- a/src/modules/gtk2/consumer_gtk2.c
+++ b/src/modules/gtk2/consumer_gtk2.c
@@ -3,30 +3,29 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "consumer_gtk2.h"
-
 #include <stdlib.h>
 #include <framework/mlt_consumer.h>
 #include <framework/mlt_factory.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
-mlt_consumer consumer_gtk2_preview_init( GtkWidget *widget )
+mlt_consumer consumer_gtk2_preview_init( mlt_profile profile, GtkWidget *widget )
 {
 	// Create an sdl preview consumer
 	mlt_consumer consumer = NULL;
@@ -41,12 +40,13 @@ mlt_consumer consumer_gtk2_preview_init( GtkWidget *widget )
 	}
 
 	// Create an sdl preview consumer
-	consumer = mlt_factory_consumer( "sdl_preview", NULL );
+	consumer = mlt_factory_consumer( profile, "sdl_preview", NULL );
 
 	// Now assign the lock/unlock callbacks
 	if ( consumer != NULL )
 	{
-		mlt_properties properties = mlt_consumer_properties( consumer );
+		mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
+		mlt_properties_set_int( properties, "app_locked", 1 );
 		mlt_properties_set_data( properties, "app_lock", gdk_threads_enter, 0, NULL, NULL );
 		mlt_properties_set_data( properties, "app_unlock", gdk_threads_leave, 0, NULL, NULL );
 	}