comparison Gui/interface.c @ 17144:0e1471d9da74

Unify include paths, -I.. is in CFLAGS.
author diego
date Thu, 08 Dec 2005 22:12:57 +0000
parents e2e231134056
children 9a5a62f480e6
comparison
equal deleted inserted replaced
17143:6e44a1e05769 17144:0e1471d9da74
13 #include "mplayer/gtk/eq.h" 13 #include "mplayer/gtk/eq.h"
14 #include "mplayer/widgets.h" 14 #include "mplayer/widgets.h"
15 #include "mplayer/mplayer.h" 15 #include "mplayer/mplayer.h"
16 #include "mplayer/play.h" 16 #include "mplayer/play.h"
17 17
18 #include "../mplayer.h" 18 #include "mplayer.h"
19 #include "app.h" 19 #include "app.h"
20 #include "cfg.h" 20 #include "cfg.h"
21 #include "../help_mp.h" 21 #include "help_mp.h"
22 #include "../subreader.h" 22 #include "subreader.h"
23 #include "../libvo/x11_common.h" 23 #include "libvo/x11_common.h"
24 #include "../libvo/video_out.h" 24 #include "libvo/video_out.h"
25 #include "../libvo/font_load.h" 25 #include "libvo/font_load.h"
26 #include "../libvo/sub.h" 26 #include "libvo/sub.h"
27 #include "../input/input.h" 27 #include "input/input.h"
28 #include "../libao2/audio_out.h" 28 #include "libao2/audio_out.h"
29 #include "../mixer.h" 29 #include "mixer.h"
30 #include "../libaf/af.h" 30 #include "libaf/af.h"
31 #include "../libaf/equalizer.h" 31 #include "libaf/equalizer.h"
32 32
33 extern af_cfg_t af_cfg; 33 extern af_cfg_t af_cfg;
34 34
35 #ifdef USE_ICONV 35 #ifdef USE_ICONV
36 #include <iconv.h> 36 #include <iconv.h>
37 #endif 37 #endif
38 38
39 #include "../libmpdemux/stream.h" 39 #include "libmpdemux/stream.h"
40 #include "../libmpdemux/demuxer.h" 40 #include "libmpdemux/demuxer.h"
41 #include "../libmpdemux/stheader.h" 41 #include "libmpdemux/stheader.h"
42 #include "../libmpcodecs/dec_video.h" 42 #include "libmpcodecs/dec_video.h"
43 43
44 #include "../m_config.h" 44 #include "m_config.h"
45 #include "../m_option.h" 45 #include "m_option.h"
46 46
47 extern mixer_t mixer; // mixer from mplayer.c 47 extern mixer_t mixer; // mixer from mplayer.c
48 48
49 guiInterface_t guiIntfStruct; 49 guiInterface_t guiIntfStruct;
50 int guiWinID=-1; 50 int guiWinID=-1;
1193 return NULL; 1193 return NULL;
1194 } 1194 }
1195 1195
1196 #define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1)) 1196 #define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
1197 1197
1198 #include "../playtree.h" 1198 #include "playtree.h"
1199 1199
1200 //This function adds/inserts one file into the gui playlist 1200 //This function adds/inserts one file into the gui playlist
1201 1201
1202 int import_file_into_gui(char* temp, int insert) 1202 int import_file_into_gui(char* temp, int insert)
1203 { 1203 {