sinek/src gtkxine.c,1.8,1.9 prefs.c,1.25,1.26 sinek.c,1.9,1.10 utility.c,1.38,1.39

[email protected] Sat, 18 Jan 2003 22:18:25 -0800
Newsgroups gmane.comp.video.sinek.cvs
Message-ID <[email protected]>
Update of /cvsroot/sinek/sinek/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12285/src

Modified Files:
	gtkxine.c prefs.c sinek.c utility.c 
Log Message:
beat this fucker into compiling


Index: gtkxine.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/gtkxine.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtkxine.c	19 Jan 2003 05:58:04 -0000	1.8
+++ gtkxine.c	19 Jan 2003 06:18:23 -0000	1.9
@@ -1007,6 +1007,16 @@
 	return 1;
 }
 
+char **gtk_xine_get_autoplay_input_plugin_ids (GtkXine *xine)
+{
+	return xine_get_autoplay_input_plugin_ids (xine->xine);
+}
+
+char **gtk_xine_get_autoplay_mrls (GtkXine *xine, const char *id, int *count)
+{
+	return xine_get_autoplay_mrls (xine->xine, id, count);
+}
+
 #ifdef GTK_XINE_TEST
 
 #define RCFILE "/home/dilinger/.xine/config"

Index: prefs.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/prefs.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- prefs.c	17 Jan 2003 08:45:49 -0000	1.25
+++ prefs.c	19 Jan 2003 06:18:23 -0000	1.26
@@ -266,7 +266,7 @@
 					val = (void *) gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(citem->widget));
 					break;
 				case XINE_CONFIG_TYPE_RANGE:
-					val = ((GtkAdjustment *)citem->widget)->value;
+					val = (int) GTK_ADJUSTMENT(citem->widget)->value; /* This drops precision, but gcc doesn't like casting from double->void* */
 					break;
 				default:
 					break;

Index: sinek.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/sinek.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sinek.c	15 Jan 2003 08:08:59 -0000	1.9
+++ sinek.c	19 Jan 2003 06:18:23 -0000	1.10
@@ -51,6 +51,7 @@
 	return GTK_WIDGET(xine);
 }
 
+#if 0
 void sinek_video_event(sinek_type *s, void *event)
 {
 	XEvent *ev = (XEvent *)event;
@@ -100,4 +101,6 @@
 	}
 	if(ev->type == MyShmEvent)
 		xine_gui_send_vo_data(sinek.stream, XINE_GUI_SEND_COMPLETION_EVENT, (void *) ev);
+
 }
+#endif

Index: utility.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/utility.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- utility.c	19 Jan 2003 05:36:39 -0000	1.38
+++ utility.c	19 Jan 2003 06:18:23 -0000	1.39
@@ -307,7 +307,7 @@
 	{
 		gtk_widget_add_events(w->win, GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK);
 	}
-	video_lift(w->win);
+	gtk_widget_show(w->win);
 }
 
 
@@ -383,7 +383,8 @@
 	for(item = g_list_first(windows); item; item = g_list_next(item))
 	{
 		win = ((struct window *)item->data)->win;
-		if(GTK_WIDGET_REALIZED(win)) video_lift(win);
+		if(GTK_WIDGET_REALIZED(win))
+			gtk_widget_show(win);
 	}
 }
 




-------------------------------------------------------
This SF.NET email is sponsored by: Thawte.com - A 128-bit supercerts will
allow you to extend the highest allowed 128 bit encryption to all your 
clients even if they use browsers that are limited to 40 bit encryption. 
Get a guide here:http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0030en