Mercurial > mplayer.hg
changeset 30536:39a4dd7ec420
Move GUI-related extern declarations to a GUI header file.
| author | diego |
|---|---|
| date | Sun, 14 Feb 2010 14:33:16 +0000 |
| parents | 016e5fc1dead |
| children | 7bebe34b6ad2 |
| files | gui/cfg.c gui/interface.c gui/mplayer/gmplayer.h gui/mplayer/gtk/opts.c mplayer.h |
| diffstat | 5 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/cfg.c Sun Feb 14 14:02:09 2010 +0000 +++ b/gui/cfg.c Sun Feb 14 14:33:16 2010 +0000 @@ -37,6 +37,7 @@ #include "cfg.h" #include "app.h" #include "interface.h" +#include "mplayer/gmplayer.h" #include "mplayer/play.h" // --- params
--- a/gui/interface.c Sun Feb 14 14:02:09 2010 +0000 +++ b/gui/interface.c Sun Feb 14 14:33:16 2010 +0000 @@ -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"
--- a/gui/mplayer/gmplayer.h Sun Feb 14 14:02:09 2010 +0000 +++ b/gui/mplayer/gmplayer.h Sun Feb 14 14:33:16 2010 +0000 @@ -29,6 +29,11 @@ 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 );
--- a/gui/mplayer/gtk/opts.c Sun Feb 14 14:02:09 2010 +0000 +++ b/gui/mplayer/gtk/opts.c Sun Feb 14 14:33:16 2010 +0000 @@ -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"
--- a/mplayer.h Sun Feb 14 14:02:09 2010 +0000 +++ b/mplayer.h Sun Feb 14 14:33:16 2010 +0000 @@ -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 int stream_cache_size; extern int autosync; -// libmpcodecs: -extern int fullscreen; -extern int flip; - extern int frame_dropping; extern int auto_quality;