Mercurial > mplayer.hg
changeset 575:3fde7340afd5
Reincluded fastmemcpy.h and added some keybindings for mixer.
| author | atmosfear |
|---|---|
| date | Sun, 22 Apr 2001 10:45:01 +0000 |
| parents | cd093f24709f |
| children | 5cbbf47cae1e |
| files | libvo/vo_sdl.c |
| diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_sdl.c Sun Apr 22 09:50:27 2001 +0000 +++ b/libvo/vo_sdl.c Sun Apr 22 10:45:01 2001 +0000 @@ -89,10 +89,7 @@ #include "video_out.h" #include "video_out_internal.h" -/* FIXME: MPlayer crashes in fastmemcpy.h when SDL_NOXV is defined! */ -#ifndef SDL_NOXV #include "fastmemcpy.h" -#endif LIBVO_EXTERN(sdl) @@ -386,7 +383,7 @@ { struct sdl_priv_s *priv = &sdl_priv; unsigned int sdl_format; - + sdl_format = format; switch(format){ case IMGFMT_YV12: @@ -664,16 +661,22 @@ mplayer_put_key('q'); break; /*case SDLK_o: mplayer_put_key('o');break; - case SDLK_p: mplayer_put_key('p');break; - case SDLK_SPACE: mplayer_put_key(' ');break;*/ + case SDLK_SPACE: mplayer_put_key(' ');break; + case SDLK_p: mplayer_put_key('p');break;*/ 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_PLUS: + case SDLK_PLUS: case SDLK_KP_PLUS: mplayer_put_key('+');break; case SDLK_MINUS: - case SDLK_KP_MINUS: mplayer_put_key('-');break;*/ + case SDLK_KP_MINUS: mplayer_put_key('-');break; + case SDLK_ASTERISK: + case SDLK_KP_MULTIPLY: + case SDLK_w: mplayer_put_key('*');break; + case SDLK_SLASH: + case SDLK_KP_DIVIDE: + case SDLK_s: mplayer_put_key('/');break; default: mplayer_put_key(keypressed); }