Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4495/src
Modified Files:
event.py osd.py
Log Message:
move osd keybindings into the config file
Index: event.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/event.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** event.py 1 Sep 2003 16:40:53 -0000 1.19
--- event.py 10 Sep 2003 19:05:05 -0000 1.20
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.20 2003/09/10 19:05:05 dischi
+ # move osd keybindings into the config file
+ #
# Revision 1.19 2003/09/01 16:40:53 dischi
# add PLAY_START
***************
*** 423,426 ****
--- 426,479 ----
'VOL-' : MIXER_VOLDOWN,
'MUTE' : MIXER_MUTE
+ }
+
+
+
+ from pygame.locals import *
+
+ DEFAULT_KEYMAP = {
+ K_F1 : 'SLEEP',
+ K_HOME : 'MENU',
+ K_g : 'GUIDE',
+ K_ESCAPE : 'EXIT',
+ K_UP : 'UP',
+ K_DOWN : 'DOWN',
+ K_LEFT : 'LEFT',
+ K_RIGHT : 'RIGHT',
+ K_SPACE : 'SELECT',
+ K_RETURN : 'SELECT',
+ K_F2 : 'POWER',
+ K_F3 : 'MUTE',
+ K_KP_MINUS : 'VOL-',
+ K_n : 'VOL-',
+ K_KP_PLUS : 'VOL+',
+ K_m : 'VOL+',
+ K_c : 'CH+',
+ K_v : 'CH-',
+ K_1 : '1',
+ K_2 : '2',
+ K_3 : '3',
+ K_4 : '4',
+ K_5 : '5',
+ K_6 : '6',
+ K_7 : '7',
+ K_8 : '8',
+ K_9 : '9',
+ K_0 : '0',
+ K_d : 'DISPLAY',
+ K_e : 'ENTER',
+ K_UNDERSCORE : 'PREV_CH',
+ K_o : 'PIP_ONOFF',
+ K_w : 'PIP_SWAP',
+ K_i : 'PIP_MOVE',
+ K_F4 : 'TV_VCR',
+ K_r : 'REW',
+ K_p : 'PLAY',
+ K_f : 'FFWD',
+ K_u : 'PAUSE',
+ K_s : 'STOP',
+ K_F6 : 'REC',
+ K_PERIOD : 'EJECT',
+ K_l : 'SUBTITLE'
}
Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** osd.py 7 Sep 2003 11:19:16 -0000 1.87
--- osd.py 10 Sep 2003 19:05:05 -0000 1.88
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.88 2003/09/10 19:05:05 dischi
+ # move osd keybindings into the config file
+ #
# Revision 1.87 2003/09/07 11:19:16 dischi
# add name and ptsize to OSDFont
***************
*** 181,230 ****
- cmds_sdl = {
- K_F1 : 'SLEEP',
- K_HOME : 'MENU',
- K_g : 'GUIDE',
- K_ESCAPE : 'EXIT',
- K_UP : 'UP',
- K_DOWN : 'DOWN',
- K_LEFT : 'LEFT',
- K_RIGHT : 'RIGHT',
- K_SPACE : 'SELECT',
- K_RETURN : 'SELECT',
- K_F2 : 'POWER',
- K_F3 : 'MUTE',
- K_KP_MINUS : 'VOL-',
- K_n : 'VOL-',
- K_KP_PLUS : 'VOL+',
- K_m : 'VOL+',
- K_c : 'CH+',
- K_v : 'CH-',
- K_1 : '1',
- K_2 : '2',
- K_3 : '3',
- K_4 : '4',
- K_5 : '5',
- K_6 : '6',
- K_7 : '7',
- K_8 : '8',
- K_9 : '9',
- K_0 : '0',
- K_d : 'DISPLAY',
- K_e : 'ENTER',
- K_UNDERSCORE : 'PREV_CH',
- K_o : 'PIP_ONOFF',
- K_w : 'PIP_SWAP',
- K_i : 'PIP_MOVE',
- K_F4 : 'TV_VCR',
- K_r : 'REW',
- K_p : 'PLAY',
- K_f : 'FFWD',
- K_u : 'PAUSE',
- K_s : 'STOP',
- K_F6 : 'REC',
- K_PERIOD : 'EJECT',
- K_l : 'SUBTITLE'
- }
-
# Module variable that contains an initialized OSD() object
_singleton = None
--- 184,187 ----
***************
*** 502,510 ****
'/tmp/freevo_ss%s.bmp' % self._screenshotnum)
self._screenshotnum += 1
! elif event.key in cmds_sdl.keys():
# Turn off the helpscreen if it was on
if self._help:
self._helpscreen()
! return cmds_sdl[event.key]
--- 459,467 ----
'/tmp/freevo_ss%s.bmp' % self._screenshotnum)
self._screenshotnum += 1
! elif event.key in config.KEYMAP.keys():
# Turn off the helpscreen if it was on
if self._help:
self._helpscreen()
! return config.KEYMAP[event.key]
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
