[xine-cvs] CVS: gnome-xine/src globals.h,1.11,1.12 main.c,1.93,1.94 noskin_window.c,1.17,1.18 skin_window.c,1.8,1.9 widget_video.c,1.1,1.2

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14428/src

Modified Files:
	globals.h main.c noskin_window.c skin_window.c widget_video.c 
Log Message:
Mark various sections of code EXP_STUFF or !EXP_STUFF.
(I'm not concerned about the skinnable variant ATM.)


Index: globals.h
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/globals.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- globals.h	9 Apr 2004 18:07:52 -0000	1.11
+++ globals.h	25 Oct 2004 20:04:40 -0000	1.12
@@ -24,6 +24,10 @@
 #ifndef HAVE_GLOBALS_H
 #define HAVE_GLOBALS_H
 
+/*
+#define EXP_STUFF
+*/
+
 #include <X11/Xlib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>

Index: main.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/main.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- main.c	25 Oct 2004 19:38:57 -0000	1.93
+++ main.c	25 Oct 2004 20:04:40 -0000	1.94
@@ -61,10 +61,6 @@
 #include "utils.h"
 
 /*
-#define EXP_STUFF 
-*/
-
-/*
  * globals
  */
 

Index: noskin_window.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/noskin_window.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- noskin_window.c	9 Apr 2004 21:41:01 -0000	1.17
+++ noskin_window.c	25 Oct 2004 20:04:40 -0000	1.18
@@ -20,13 +20,16 @@
  * standard, non-skinned main window
  */
 
+#include "globals.h"
+
+#ifndef EXP_STUFF
+
 #include "noskin_window.h"
 
 #include <stdio.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
-#include "globals.h"
 #include "utils.h"
 #include "engine.h"
 #include "key_events.h"
@@ -379,8 +382,6 @@
 			   G_CALLBACK (context_menu_cb), 
 			   GTK_OBJECT (gtk_item_factory_get_widget (item_factory, "/File")));
 #endif
-
-
 }
 
-
+#endif /* !EXP_STUFF */

Index: skin_window.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/skin_window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- skin_window.c	17 Jun 2004 08:37:19 -0000	1.8
+++ skin_window.c	25 Oct 2004 20:04:40 -0000	1.9
@@ -21,6 +21,10 @@
  * cool fully-user-skinned windows, generate from xml/js code
  */
 
+#include "globals.h"
+
+#ifdef EXP_STUFF
+
 #include <config.h>
 
 #include <stdio.h>
@@ -36,7 +40,6 @@
 
 #include "skin_window.h"
 #include "utils.h"
-#include "globals.h"
 #include "xmlparser.h"
 #include "script_engine.h"
 #include "skin.h"
@@ -1509,3 +1512,5 @@
   }
 
 }
+
+#endif /* EXP_STUFF */

Index: widget_video.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/widget_video.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- widget_video.c	17 Jun 2004 08:38:05 -0000	1.1
+++ widget_video.c	25 Oct 2004 20:04:40 -0000	1.2
@@ -10,6 +10,8 @@
 #include "widget_video.h"
 #include "gtkvideo.h"
 
+#ifdef EXP_STUFF
+
 struct video_s {
 
   skin_widget_t  widget;
@@ -102,3 +104,5 @@
   }
   return video;
 }
+
+#endif /* EXP_STUFF */