[MPlayer-cvslog] CVS: main/libvo vo_dfbmga.c, 1.29, 1.30 vo_directfb2.c, 1.20, 1.21 vo_directx.c, 1.56, 1.57 vo_quartz.c, 1.56, 1.57 vo_sdl.c, 1.122, 1.123 vo_winvidix.c, 1.10, 1.11 w32_common.c, 1.15, 1.16 x11_common.c, 1.197, 1.198
Alban Bedel CVS
syncmail at mplayerhq.hu
Wed Nov 2 22:50:58 CET 2005
CVS change done by Alban Bedel CVS
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv3818/libvo
Modified Files:
vo_dfbmga.c vo_directfb2.c vo_directx.c vo_quartz.c vo_sdl.c
vo_winvidix.c w32_common.c x11_common.c
Log Message:
libvo input cleanup: remove the dependency on libinput,
remove most of the crappy mappings (like O->o or ESC->q).
Index: vo_dfbmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vo_dfbmga.c 26 Oct 2005 07:41:41 -0000 1.29
+++ vo_dfbmga.c 2 Nov 2005 21:50:55 -0000 1.30
@@ -1439,7 +1439,7 @@
if (event.type == DIET_KEYPRESS) {
switch (event.key_symbol) {
case DIKS_ESCAPE:
- mplayer_put_key( 'q' );
+ mplayer_put_key( KEY_ESC );
break;
case DIKS_PAGE_UP:
mplayer_put_key( KEY_PAGE_UP );
@@ -1473,33 +1473,43 @@
break;
case DIKS_POWER:
- mplayer_put_key( 'q' );
+ mplayer_put_key( KEY_POWER );
break;
case DIKS_MENU:
- mplayer_put_key( 'o' );
+ mplayer_put_key( KEY_MENU );
break;
case DIKS_PLAY:
+ mplayer_put_key( KEY_PLAY );
+ break;
case DIKS_STOP:
+ mplayer_put_key( KEY_STOP );
+ break;
case DIKS_PAUSE:
+ mplayer_put_key( KEY_PAUSE );
+ break;
case DIKS_PLAYPAUSE:
- mplayer_put_key( ' ' );
+ mplayer_put_key( KEY_PLAYPAUSE );
break;
case DIKS_FORWARD:
+ mplayer_put_key( KEY_FORWARD );
+ break;
case DIKS_NEXT:
- mplayer_put_key( KEY_PAGE_UP );
+ mplayer_put_key( KEY_NEXT );
break;
case DIKS_REWIND:
+ mplayer_put_key( KEY_REWIND );
+ break;
case DIKS_PREVIOUS:
- mplayer_put_key( KEY_PAGE_DOWN );
+ mplayer_put_key( KEY_PREVIOUS );
break;
case DIKS_VOLUME_UP:
- mplayer_put_key( '0' );
+ mplayer_put_key( KEY_VOLUME_UP );
break;
case DIKS_VOLUME_DOWN:
- mplayer_put_key( '9' );
+ mplayer_put_key( KEY_VOLUME_DOWN );
break;
case DIKS_MUTE:
- mplayer_put_key( 'm' );
+ mplayer_put_key( KEY_MUTE );
break;
default:
Index: vo_directfb2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_directfb2.c 5 Aug 2005 01:24:36 -0000 1.20
+++ vo_directfb2.c 2 Nov 2005 21:50:55 -0000 1.21
@@ -909,7 +909,7 @@
if (event.type == DIET_KEYPRESS) {
switch (event.key_symbol) {
case DIKS_ESCAPE:
- mplayer_put_key('q');
+ mplayer_put_key(KEY_ESC);
break;
case DIKS_PAGE_UP: mplayer_put_key(KEY_PAGE_UP);break;
case DIKS_PAGE_DOWN: mplayer_put_key(KEY_PAGE_DOWN);break;
Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- vo_directx.c 16 Sep 2005 12:09:24 -0000 1.56
+++ vo_directx.c 2 Nov 2005 21:50:55 -0000 1.57
@@ -889,7 +889,7 @@
}
case WM_CLOSE:
{
- mp_input_queue_cmd(mp_input_parse_cmd("quit"));
+ mplayer_put_key(KEY_CLOSE_WIN);
return 0;
}
case WM_WINDOWPOSCHANGED:
Index: vo_quartz.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- vo_quartz.c 21 Aug 2005 01:20:31 -0000 1.56
+++ vo_quartz.c 2 Nov 2005 21:50:55 -0000 1.57
@@ -378,7 +378,7 @@
switch ( theHICommand.commandID )
{
case kHICommandQuit:
- mplayer_put_key(KEY_ESC);
+ mplayer_put_key(KEY_CLOSE_WIN);
break;
case kHalfScreenCmd:
@@ -476,7 +476,7 @@
{
case kEventWindowClosed:
theWindow = NULL;
- mplayer_put_key(KEY_ESC);
+ mplayer_put_key(KEY_CLOSE_WIN);
break;
//resize window
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- vo_sdl.c 5 Aug 2005 01:24:36 -0000 1.122
+++ vo_sdl.c 2 Nov 2005 21:50:55 -0000 1.123
@@ -1320,7 +1320,7 @@
}
break;
- case SDL_QUIT: mplayer_put_key('q');break;
+ case SDL_QUIT: mplayer_put_key(KEY_CLOSE_WIN);break;
}
}
}
Index: vo_winvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_winvidix.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_winvidix.c 21 Aug 2005 01:20:31 -0000 1.10
+++ vo_winvidix.c 2 Nov 2005 21:50:55 -0000 1.11
@@ -65,7 +65,7 @@
PostQuitMessage(0);
return 0;
case WM_CLOSE:
- mp_input_queue_cmd(mp_input_parse_cmd("quit"));
+ mplayer_put_key(KEY_CLOSE_WIN);
break;
case WM_WINDOWPOSCHANGED:
{
Index: w32_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/w32_common.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- w32_common.c 22 Aug 2005 09:05:18 -0000 1.15
+++ w32_common.c 2 Nov 2005 21:50:55 -0000 1.16
@@ -25,7 +25,7 @@
static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
switch (message) {
case WM_CLOSE:
- mp_input_queue_cmd(mp_input_parse_cmd("quit"));
+ mplayer_put_key(KEY_CLOSE_WIN);
break;
case WM_SYSCOMMAND:
switch (wParam) {
Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- x11_common.c 18 Oct 2005 11:11:25 -0000 1.197
+++ x11_common.c 2 Nov 2005 21:50:55 -0000 1.198
@@ -548,16 +548,16 @@
switch (keysym)
{
case XF86XK_AudioPause:
- mplayer_put_key(KEY_XF86_PAUSE);
+ mplayer_put_key(KEY_PAUSE);
break;
case XF86XK_AudioStop:
- mplayer_put_key(KEY_XF86_STOP);
+ mplayer_put_key(KEY_STOP);
break;
case XF86XK_AudioPrev:
- mplayer_put_key(KEY_XF86_PREV);
+ mplayer_put_key(KEY_PREV);
break;
case XF86XK_AudioNext:
- mplayer_put_key(KEY_XF86_NEXT);
+ mplayer_put_key(KEY_NEXT);
break;
default:
break;
@@ -587,6 +587,9 @@
case wsEscape:
mplayer_put_key(KEY_ESC);
break;
+ case wsTab:
+ mplayer_put_key(KEY_TAB);
+ break;
case wsEnter:
mplayer_put_key(KEY_ENTER);
break;
@@ -647,14 +650,6 @@
case wsF12:
mplayer_put_key(KEY_F + 12);
break;
- case wsq:
- case wsQ:
- mplayer_put_key('q');
- break;
- case wsp:
- case wsP:
- mplayer_put_key('p');
- break;
case wsMinus:
case wsGrayMinus:
mplayer_put_key('-');
@@ -728,15 +723,6 @@
case wsGrayEnter:
mplayer_put_key(KEY_KPENTER);
break;
- case wsm:
- case wsM:
- mplayer_put_key('m');
- break;
- case wso:
- case wsO:
- mplayer_put_key('o');
- break;
-
case wsGrave:
mplayer_put_key('`');
break;
More information about the MPlayer-cvslog
mailing list