[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.20,1.21

[Felix Buenemann]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv14856

Modified Files:
	vo_sdl.c 
Log Message:
Reincluded fastmemcpy.h and added some keybindings for mixer.


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** vo_sdl.c	2001/04/20 10:27:51	1.20
--- vo_sdl.c	2001/04/22 10:45:01	1.21
***************
*** 90,97 ****
  #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)
--- 90,94 ----
***************
*** 387,391 ****
  	struct sdl_priv_s *priv = &sdl_priv;
          unsigned int sdl_format;
! 
  	sdl_format = format;
          switch(format){
--- 384,388 ----
  	struct sdl_priv_s *priv = &sdl_priv;
          unsigned int sdl_format;
! 	
  	sdl_format = format;
          switch(format){
***************
*** 665,678 ****
  				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_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_KP_PLUS: mplayer_put_key('+');break;
                                  case SDLK_MINUS:
!                                 case SDLK_KP_MINUS: mplayer_put_key('-');break;*/
  				default:
  					mplayer_put_key(keypressed);
--- 662,681 ----
  				break;
                                  /*case SDLK_o: mplayer_put_key('o');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_KP_PLUS: mplayer_put_key('+');break;
                                  case SDLK_MINUS:
!                                 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);


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog