[MPlayer-cvslog] r30578 - in trunk: gui/cfg.c gui/interface.c gui/mplayer/gmplayer.h gui/mplayer/gtk/opts.c mplayer.h

[diego]

Author: diego
Date: Sun Feb 14 15:33:16 2010
New Revision: 30578

Log:
Move GUI-related extern declarations to a GUI header file.

Modified:
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/mplayer/gmplayer.h
   trunk/gui/mplayer/gtk/opts.c
   trunk/mplayer.h

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Sun Feb 14 15:02:09 2010	(r30577)
+++ trunk/gui/cfg.c	Sun Feb 14 15:33:16 2010	(r30578)
@@ -37,6 +37,7 @@
 #include "cfg.h"
 #include "app.h"
 #include "interface.h"
+#include "mplayer/gmplayer.h"
 #include "mplayer/play.h"
 
 // --- params

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Feb 14 15:02:09 2010	(r30577)
+++ trunk/gui/interface.c	Sun Feb 14 15:33:16 2010	(r30578)
@@ -38,6 +38,7 @@
 #include "help_mp.h"
 #include "get_path.h"
 #include "mp_core.h"
+#include "mplayer.h"
 #include "libvo/x11_common.h"
 #include "libvo/video_out.h"
 #include "libvo/font_load.h"

Modified: trunk/gui/mplayer/gmplayer.h
==============================================================================
--- trunk/gui/mplayer/gmplayer.h	Sun Feb 14 15:02:09 2010	(r30577)
+++ trunk/gui/mplayer/gmplayer.h	Sun Feb 14 15:33:16 2010	(r30578)
@@ -29,6 +29,11 @@ extern int             mainVisible;
 extern int             mplMainAutoPlay;
 extern int             mplMiddleMenu;
 
+extern char          * dvd_device;
+extern char          * cdrom_device;
+extern int             fullscreen;
+extern int             flip;
+
 void mplInit( void * disp );
 
 void mplMainDraw( void );

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Sun Feb 14 15:02:09 2010	(r30577)
+++ trunk/gui/mplayer/gtk/opts.c	Sun Feb 14 15:33:16 2010	(r30578)
@@ -39,6 +39,7 @@
 #include "gui/app.h"
 #include "gui/cfg.h"
 #include "gui/interface.h"
+#include "gui/mplayer/gmplayer.h"
 #include "gui/mplayer/widgets.h"
 #include "opts.h"
 #include "fs.h"

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	Sun Feb 14 15:02:09 2010	(r30577)
+++ trunk/mplayer.h	Sun Feb 14 15:33:16 2010	(r30578)
@@ -21,9 +21,6 @@
 
 extern char* current_module;
 
-extern char * dvd_device;
-extern char * cdrom_device;
-
 extern char ** audio_fm_list;
 extern char ** video_fm_list;
 extern char ** video_driver_list;
@@ -51,10 +48,6 @@ extern char * filename;
 extern int stream_cache_size;
 extern int autosync;
 
-// libmpcodecs:
-extern int fullscreen;
-extern int flip;
-
 extern int frame_dropping;
 
 extern int auto_quality;