RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-14 02:45:43 +00:00
Code Issues Releases Wiki Activity

Remove code to work around bugs in ancient libSDL versions, the code has been

Browse Source 
accidentally disabled since some time and there were no complaints.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31067 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-04-24 17:15:28 +00:00
parent ccc269a00a
commit d5d3c203d3
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -5396,15 +5396,7 @@ EOF
_ld_tmp="$($_sdlconfig --libs)" _ld_tmp="$($_sdlconfig --libs)"
fi fi
if cc_check $_inc_tmp $_ld_tmp >>"$TMPLOG" 2>&1 ; then if cc_check $_inc_tmp $_ld_tmp >>"$TMPLOG" 2>&1 ; then
_sdlversion=$($_sdlconfig --version | sed 's/[^0-9]//g')
if test "$_sdlversion" -gt 116 ; then
if test "$_sdlversion" -lt 121 ; then
def_sdlbuggy='#define BUGGY_SDL'
else
def_sdlbuggy='#undef BUGGY_SDL'
fi
_sdl=yes _sdl=yes
fi
fi fi
fi fi
fi fi
@ -9096,7 +9088,6 @@ $def_quartz
$def_s3fb $def_s3fb
$def_sdl $def_sdl
$def_sdl_sdl_h $def_sdl_sdl_h
$def_sdlbuggy
$def_svga $def_svga
$def_tdfxfb $def_tdfxfb
$def_tdfxvid $def_tdfxvid

35
libvo/vo_sdl.c
View File

@ -48,8 +48,6 @@
/* define to enable surface locks, this might be needed on SMP machines */ /* define to enable surface locks, this might be needed on SMP machines */
#undef SDL_ENABLE_LOCKS #undef SDL_ENABLE_LOCKS
//#define BUGGY_SDL //defined by configure
/* MONITOR_ASPECT MUST BE FLOAT */ /* MONITOR_ASPECT MUST BE FLOAT */
#define MONITOR_ASPECT 4.0/3.0 #define MONITOR_ASPECT 4.0/3.0
@ -457,13 +455,11 @@ static int sdl_open (void *plugin, void *name)
* We use SDL_KEYUP cause SDL_KEYDOWN seems to cause problems * We use SDL_KEYUP cause SDL_KEYDOWN seems to cause problems
* with keys need to be pressed twice, to be recognized. * with keys need to be pressed twice, to be recognized.
*/ */
#ifndef BUGGY_SDL
SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE); SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE); SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
// SDL_EventState(SDL_QUIT, SDL_IGNORE); // SDL_EventState(SDL_QUIT, SDL_IGNORE);
SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
SDL_EventState(SDL_USEREVENT, SDL_IGNORE); SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
#endif
/* Success! */ /* Success! */
return 0; return 0;
@ -1141,26 +1137,7 @@ static void check_events (void)
break; break;
/* graphics mode selection shortcuts */ /* graphics mode selection shortcuts */
#ifdef BUGGY_SDL
case SDL_KEYDOWN: case SDL_KEYDOWN:
switch(event.key.keysym.sym) {
case SDLK_UP: mplayer_put_key(KEY_UP); break;
case SDLK_DOWN: mplayer_put_key(KEY_DOWN); break;
case SDLK_LEFT: mplayer_put_key(KEY_LEFT); break;
case SDLK_RIGHT: mplayer_put_key(KEY_RIGHT); break;
case SDLK_LESS: mplayer_put_key(shift_key?'>':'<'); break;
case SDLK_GREATER: mplayer_put_key('>'); break;
case SDLK_ASTERISK:
case SDLK_KP_MULTIPLY:
case SDLK_SLASH:
case SDLK_KP_DIVIDE:
default: break;
}
break;
case SDL_KEYUP:
#else
case SDL_KEYDOWN:
#endif
keypressed = event.key.keysym.sym; keypressed = event.key.keysym.sym;
mp_msg(MSGT_VO,MSGL_DBG2, "SDL: Key pressed: '%i'\n", keypressed); mp_msg(MSGT_VO,MSGL_DBG2, "SDL: Key pressed: '%i'\n", keypressed);
@ -1219,17 +1196,6 @@ static void check_events (void)
case SDLK_TAB: mplayer_put_key('\t');break; case SDLK_TAB: mplayer_put_key('\t');break;
case SDLK_PAGEUP: mplayer_put_key(KEY_PAGE_UP);break; case SDLK_PAGEUP: mplayer_put_key(KEY_PAGE_UP);break;
case SDLK_PAGEDOWN: mplayer_put_key(KEY_PAGE_DOWN);break; case SDLK_PAGEDOWN: mplayer_put_key(KEY_PAGE_DOWN);break;
#ifdef BUGGY_SDL
case SDLK_UP:
case SDLK_DOWN:
case SDLK_LEFT:
case SDLK_RIGHT:
case SDLK_ASTERISK:
case SDLK_KP_MULTIPLY:
case SDLK_SLASH:
case SDLK_KP_DIVIDE:
break;
#else
case SDLK_UP: mplayer_put_key(KEY_UP);break; case SDLK_UP: mplayer_put_key(KEY_UP);break;
case SDLK_DOWN: mplayer_put_key(KEY_DOWN);break; case SDLK_DOWN: mplayer_put_key(KEY_DOWN);break;
case SDLK_LEFT: mplayer_put_key(KEY_LEFT);break; case SDLK_LEFT: mplayer_put_key(KEY_LEFT);break;
@ -1240,7 +1206,6 @@ static void check_events (void)
case SDLK_KP_MULTIPLY: mplayer_put_key('*'); break; case SDLK_KP_MULTIPLY: mplayer_put_key('*'); break;
case SDLK_SLASH: case SDLK_SLASH:
case SDLK_KP_DIVIDE: mplayer_put_key('/'); break; case SDLK_KP_DIVIDE: mplayer_put_key('/'); break;
#endif
case SDLK_KP0: mplayer_put_key(KEY_KP0); break; case SDLK_KP0: mplayer_put_key(KEY_KP0); break;
case SDLK_KP1: mplayer_put_key(KEY_KP1); break; case SDLK_KP1: mplayer_put_key(KEY_KP1); break;
case SDLK_KP2: mplayer_put_key(KEY_KP2); break; case SDLK_KP2: mplayer_put_key(KEY_KP2); break;