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

X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10662 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-08-18 14:05:30 +00:00
parent 06f1a02f00
commit 4eb73ff345
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mplayer.c
View File

@ -150,7 +150,9 @@ static int cfg_include(m_option_t *conf, char *filename){
// XScreensaver
//**************************************************************************//
#ifdef HAVE_X11
void xscreensaver_heartbeat(float time);
#endif
//**************************************************************************//
//**************************************************************************//
@ -449,14 +451,10 @@ static void uninit_player(unsigned int mask){
current_module=NULL;
}
#ifdef X11_FULLSCREEN
extern void vo_uninit( void );
#endif
static void exit_player_with_rc(char* how, int rc){
uninit_player(INITED_ALL);
#ifdef X11_FULLSCREEN
#ifdef HAVE_X11
#ifdef HAVE_NEW_GUI
if ( !use_gui )
#endif
@ -1518,7 +1516,7 @@ if(sh_video){
sh_video->frametime=1.0f/sh_video->fps;
}
vo_fps = sh_video->fps;
#ifdef X11_FULLSCREEN
#ifdef HAVE_X11
vo_mouse_timer_const=(int)sh_video->fps;
#endif