Author: dmeyer
Date: Fri Jun 22 19:07:35 2007
New Revision: 9725
Modified:
trunk/ui/src/input/eventmap.py
trunk/ui/src/video/player.py
Log:
fix dvd chapter and menu keys
Modified: trunk/ui/src/input/eventmap.py
==============================================================================
--- trunk/ui/src/input/eventmap.py (original)
+++ trunk/ui/src/input/eventmap.py Fri Jun 22 19:07:35 2007
@@ -100,10 +100,13 @@
'MENU' : MENU,
'DISPLAY' : TOGGLE_OSD,
'REC' : STORE_BOOKMARK,
- '0' : VIDEO_MANUAL_SEEK
+ '0' : VIDEO_MANUAL_SEEK,
+ 'MENU' : DVDNAV_MENU,
+ 'NEXT' : NEXT,
+ 'PREV' : PREV
}
-DVD_EVENTS = {
+DVDNAV_EVENTS = {
'PLAY' : PLAY,
'PAUSE' : PAUSE,
'STOP' : STOP,
@@ -115,40 +118,7 @@
'ENTER' : DVDNAV_SELECT,
'SELECT' : DVDNAV_SELECT,
'DISPLAY' : TOGGLE_OSD,
- 'SUBTITLE' : VIDEO_NEXT_SUBTITLE,
- 'REW' : Event(SEEK, -10),
- 'FFWD' : Event(SEEK, 10),
- 'GUIDE' : DVDNAV_TITLEMENU,
'MENU' : DVDNAV_MENU,
- 'LANG' : VIDEO_NEXT_AUDIOLANG,
- 'ANGLE' : VIDEO_NEXT_ANGLE,
- 'CH+' : NEXT,
- 'CH-' : PREV
- }
-
-VCD_EVENTS = {
- 'PLAY' : PLAY,
- 'PAUSE' : PAUSE,
- 'STOP' : STOP,
- 'EXIT' : STOP,
- 'LEFT' : Event(SEEK, -60),
- 'RIGHT' : Event(SEEK, 60),
- 'REW' : Event(SEEK, -10),
- 'FFWD' : Event(SEEK, 10),
- 'MENU' : MENU,
- 'DISPLAY' : TOGGLE_OSD,
- 'LANG' : VIDEO_NEXT_AUDIOLANG,
- 'SUBTITLE' : VIDEO_NEXT_SUBTITLE,
- 'ANGLE' : VIDEO_NEXT_ANGLE,
- '1' : INPUT_1,
- '2' : INPUT_2,
- '3' : INPUT_3,
- '4' : INPUT_4,
- '5' : INPUT_5,
- '6' : INPUT_6,
- '7' : INPUT_7,
- '8' : INPUT_8,
- '9' : INPUT_9
}
AUDIO_EVENTS = {
@@ -250,8 +220,7 @@
'input' : INPUT_EVENTS,
'tv' : TV_EVENTS,
'video' : VIDEO_EVENTS,
- 'dvd' : DVD_EVENTS, # only used by xine
- 'vcd' : VCD_EVENTS, # only used by xine
+ 'dvdnav' : DVDNAV_EVENTS,
'audio' : AUDIO_EVENTS,
'games' : GAMES_EVENTS,
'image' : IMAGE_EVENTS,
Modified: trunk/ui/src/video/player.py
==============================================================================
--- trunk/ui/src/video/player.py (original)
+++ trunk/ui/src/video/player.py Fri Jun 22 19:07:35 2007
@@ -147,7 +147,7 @@
if self.player.is_in_menu() != self.is_in_menu:
self.is_in_menu = not self.is_in_menu
if self.is_in_menu:
- self.set_eventmap('dvd')
+ self.set_eventmap('dvdnav')
else:
self.set_eventmap('video')
# FIXME: if item does not start at position 0 the start time
@@ -215,6 +215,14 @@
self.player.set_property('scale', modes[idx])
return True
+ if event in (NEXT, PREV):
+ self.player.nav_command(str(event).lower())
+ return True
+
+ if event == DVDNAV_MENU:
+ self.player.nav_command('menu1')
+ return True
+
if str(event).startswith('DVDNAV_'):
# dvd navigation commands
self.player.nav_command(str(event)[7:].lower())
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
