Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv898/src
Modified Files:
event.py
Log Message:
add global events to avoid duplicate code
Index: event.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/event.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** event.py 25 Feb 2004 17:44:13 -0000 1.41
--- event.py 27 Feb 2004 20:13:01 -0000 1.42
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.42 2004/02/27 20:13:01 dischi
+ # add global events to avoid duplicate code
+ #
# Revision 1.41 2004/02/25 17:44:13 dischi
# add special event mapping for tvmenu
***************
*** 34,72 ****
# Anyone want to chime in with an idea on how?
#
- # Revision 1.36 2004/01/15 20:46:02 outlyer
- # Added a "RATING" event... press a number from 0-5 to have the sqlite
- # database keep track of your score. The idea is to be able to build
- # playlists automatically of "top rated" songs. When you press the number,
- # the score is printed on the screen via tiny_osd
- #
- # Revision 1.34 2003/12/14 17:27:19 dischi
- # cleanup
- #
- # Revision 1.33 2003/12/10 19:10:35 dischi
- # AUDIO_PLAY_END is not needed anymore
- #
- # Revision 1.32 2003/12/10 19:01:04 dischi
- # add handler for events who know the needed eventhandler
- #
- # Revision 1.31 2003/11/30 19:41:19 dischi
- # add event to toggle interlacing, it is on no key and only works with xine
- #
- # Revision 1.30 2003/11/09 16:03:09 dischi
- # add step size in VOL+- an arg
- #
- # Revision 1.29 2003/11/09 12:01:25 dischi
- # add subtitle selection and osd info support for xine
- #
- # Revision 1.28 2003/10/23 02:26:52 outlyer
- # Bugfix for missing 'menu' button; it was here before, and it was removed
- # for some reason.
- #
- # Most DVDs have multiple menus, but not all DVDs have a TitleMenu, so under
- # the previous event structure, you could only move to the topmost menu, and
- # only if it was designated as such.
- #
- # This patch allows the old behaviour (from when I first implemented code to
- # support Dischi's Xine patches) which works with more DVDs.
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 37,40 ----
***************
*** 158,163 ****
# local.conf (setting VOL+ step size to 2)
#
! # for k in EVENTS:
! # EVENTS[k]['VOL+'] = Event('MIXER_VOLUP', arg=1)
--- 126,130 ----
# local.conf (setting VOL+ step size to 2)
#
! # EVENTS['global']['VOL+'] = Event('MIXER_VOLUP', arg=1)
***************
*** 231,234 ****
--- 198,203 ----
NEXT = Event('NEXT')
PREV = Event('PREV')
+
+
#
# Audio module
***************
*** 320,327 ****
'ENTER' : MENU_SUBMENU,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'EJECT' : EJECT,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 289,293 ----
'ENTER' : MENU_SUBMENU,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'EJECT' : EJECT
}
***************
*** 337,344 ****
'SELECT' : MENU_SELECT,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'REC' : TV_START_RECORDING,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 303,307 ----
'SELECT' : MENU_SELECT,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'REC' : TV_START_RECORDING
}
***************
*** 362,369 ****
'0' : INPUT_0,
'CH+' : MENU_PAGEUP,
! 'CH-' : MENU_PAGEDOWN,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 325,329 ----
'0' : INPUT_0,
'CH+' : MENU_PAGEUP,
! 'CH-' : MENU_PAGEDOWN
}
***************
*** 381,387 ****
'FFWD' : Event(SEEK, arg=10),
'DISPLAY' : TOGGLE_OSD,
- 'VOL+' : MIXER_VOLUP,
- 'VOL-' : MIXER_VOLDOWN,
- 'MUTE' : MIXER_MUTE,
'0' : INPUT_0,
'1' : INPUT_1,
--- 341,344 ----
***************
*** 412,419 ****
'DISPLAY' : TOGGLE_OSD,
'REC' : STORE_BOOKMARK,
! '0' : VIDEO_MANUAL_SEEK,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 369,373 ----
'DISPLAY' : TOGGLE_OSD,
'REC' : STORE_BOOKMARK,
! '0' : VIDEO_MANUAL_SEEK
}
***************
*** 435,441 ****
'GUIDE' : DVDNAV_TITLEMENU,
'MENU' : DVDNAV_MENU,
- 'VOL+' : MIXER_VOLUP,
- 'VOL-' : MIXER_VOLDOWN,
- 'MUTE' : MIXER_MUTE,
'CH+' : NEXT,
'CH-' : PREV
--- 389,392 ----
***************
*** 462,469 ****
'7' : INPUT_7,
'8' : INPUT_8,
! '9' : INPUT_9,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 413,417 ----
'7' : INPUT_7,
'8' : INPUT_8,
! '9' : INPUT_9
}
***************
*** 481,487 ****
'CH+' : PLAYLIST_PREV,
'CH-' : PLAYLIST_NEXT,
- 'VOL+' : MIXER_VOLUP,
- 'VOL-' : MIXER_VOLDOWN,
- 'MUTE' : MIXER_MUTE,
'1' : INPUT_1,
'2' : INPUT_2,
--- 429,432 ----
***************
*** 517,524 ****
'DOWN' : PLAYLIST_NEXT,
'CH+' : PLAYLIST_PREV,
! 'CH-' : PLAYLIST_NEXT,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 462,466 ----
'DOWN' : PLAYLIST_NEXT,
'CH+' : PLAYLIST_PREV,
! 'CH-' : PLAYLIST_NEXT
}
***************
*** 528,538 ****
'MENU' : MENU,
'DISPLAY' : GAMES_CONFIG,
! 'ENTER' : GAMES_RESET,
'VOL+' : MIXER_VOLUP,
'VOL-' : MIXER_VOLDOWN,
'MUTE' : MIXER_MUTE
}
!
!
import pygame.locals as key
--- 470,482 ----
'MENU' : MENU,
'DISPLAY' : GAMES_CONFIG,
! 'ENTER' : GAMES_RESET
! }
!
! GLOBAL_EVENTS = {
'VOL+' : MIXER_VOLUP,
'VOL-' : MIXER_VOLDOWN,
'MUTE' : MIXER_MUTE
}
!
import pygame.locals as key
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
