Mercurial > mplayer.hg
changeset 32030:c2d9c19985cb
Move **sub_name extern declaration to mplayer.h, where it belongs.
author | diego |
---|---|
date | Thu, 09 Sep 2010 15:41:43 +0000 |
parents | b81172c6dd5c |
children | d1e3a6f7d48a |
files | gui/interface.c gui/win32/dialogs.c mplayer.h |
diffstat | 3 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Thu Sep 09 15:39:10 2010 +0000 +++ b/gui/interface.c Thu Sep 09 15:41:43 2010 +0000 @@ -398,8 +398,6 @@ #endif } -extern char **sub_name; - void guiLoadSubtitle( char * name ) { if ( guiIntfStruct.Playing == 0 )
--- a/gui/win32/dialogs.c Thu Sep 09 15:39:10 2010 +0000 +++ b/gui/win32/dialogs.c Thu Sep 09 15:41:43 2010 +0000 @@ -27,6 +27,7 @@ #include "gui/interface.h" #include "mp_msg.h" #include "help_mp.h" +#include "mplayer.h" #include "stream/stream.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" @@ -46,8 +47,6 @@ guiInterface_t guiIntfStruct; int addurl = 0; -extern char **sub_name; - void guiLoadSubtitle(char *name) { if (!guiIntfStruct.Playing)
--- a/mplayer.h Thu Sep 09 15:39:10 2010 +0000 +++ b/mplayer.h Thu Sep 09 15:41:43 2010 +0000 @@ -37,7 +37,6 @@ extern float font_factor; extern double force_fps; -//extern char **sub_name; extern int sub_auto; extern char * filename; @@ -47,6 +46,8 @@ extern double start_pts; extern int frame_dropping; +/* for the GUI */ +extern char **sub_name; extern int auto_quality; extern int audio_id;