RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-19 05:15:12 +00:00
Code Issues Releases Wiki Activity

Remove some of the worst "headers include headers which include

Browse Source 
completely unrelated headers" mess.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21386 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-29 14:08:24 +00:00
parent 4373e71a95
commit f9b2e78d79
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gui/interface.h
View File

@ -4,7 +4,6 @@
#include "../config.h" #include "../config.h"
#include "mplayer/play.h" #include "mplayer/play.h"
#include "mplayer.h"
#include "libvo/font_load.h" #include "libvo/font_load.h"
#include "cfg.h" #include "cfg.h"
@ -142,6 +141,8 @@ extern guiInterface_t guiIntfStruct;
#define guiFilenames 4 #define guiFilenames 4
#define guiALL 0xffffffff #define guiALL 0xffffffff
extern int use_gui;
extern char *get_path(const char *filename); extern char *get_path(const char *filename);
extern void guiInit( void ); extern void guiInit( void );

1
Gui/mplayer/gtk/fs.c
View File

@ -7,6 +7,7 @@
#include <unistd.h> #include <unistd.h>
#include "../gmplayer.h" #include "../gmplayer.h"
#include "../../mplayer.h"
#include "mplayer/pixmaps/up.xpm" #include "mplayer/pixmaps/up.xpm"
#include "mplayer/pixmaps/dir.xpm" #include "mplayer/pixmaps/dir.xpm"

1
Gui/mplayer/gtk/opts.c
View File

@ -12,6 +12,7 @@
#include "../../mixer.h" #include "../../mixer.h"
#include "../../libao2/audio_out.h" #include "../../libao2/audio_out.h"
#include "../../libvo/video_out.h" #include "../../libvo/video_out.h"
#include "../../mplayer.h"
#include "../app.h" #include "../app.h"
#include "../cfg.h" #include "../cfg.h"

3
libvo/sub.h
View File

@ -59,6 +59,9 @@ static inline void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,in
#include "subreader.h" #include "subreader.h"
extern sub_data* subdata; //currently used subtitles
extern subtitle* vo_sub;
extern unsigned char* vo_osd_text; extern unsigned char* vo_osd_text;
extern int vo_osd_progbar_type; extern int vo_osd_progbar_type;

2
mencoder.c
View File

@ -199,7 +199,7 @@ int sub_auto = 0;
int subcc_enabled=0; int subcc_enabled=0;
int suboverlap_enabled = 1; int suboverlap_enabled = 1;
static sub_data* subdata=NULL; sub_data* subdata=NULL;
float sub_last_pts = -303; float sub_last_pts = -303;
int auto_expand=1; int auto_expand=1;

6
mplayer.h
View File

@ -2,10 +2,6 @@
#ifndef __MPLAYER_MAIN #ifndef __MPLAYER_MAIN
#define __MPLAYER_MAIN #define __MPLAYER_MAIN
#include "libvo/sub.h"
#include "subreader.h"
extern int use_gui;
extern char* current_module; extern char* current_module;
extern char * dvd_device; extern char * dvd_device;
@ -34,8 +30,6 @@ extern int sub_auto;
extern int sub_pos; extern int sub_pos;
extern int sub_unicode; extern int sub_unicode;
extern char * sub_cp; extern char * sub_cp;
extern sub_data* subdata; //currently used subtitles
extern subtitle* vo_sub;
extern int suboverlap_enabled; extern int suboverlap_enabled;
extern char * filename; extern char * filename;