Author: duncan
Date: Sun Jan 13 11:37:49 2008
New Revision: 10285
Log:
[ 1870321 ] menu patch
Patch from Alberto González RodrĂguez applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/menu.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/menu.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Sun Jan 13 11:37:49 2008
@@ -25,6 +25,7 @@
* Updated cdbackup plug-in with CD_RIP_FMT to set the encoding format
(F#1857460)
* Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated itv plug-in for youtube video feeds (F#1868425)
+ * Updated menu osd sounds for more sound events (F#1870321)
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
Modified: branches/rel-1-7/freevo/src/menu.py
==============================================================================
--- branches/rel-1-7/freevo/src/menu.py (original)
+++ branches/rel-1-7/freevo/src/menu.py Sun Jan 13 11:37:49 2008
@@ -318,6 +318,13 @@
pass
try:
if menuitem.arg[0] == mediaitem:
+ if config.OSD_SOUNDS:
+ try:
+ key = "menu." + media
+ if config.OSD_SOUNDS[key]:
+ sounds.play_sound(sounds.load_sound(key))
+ except:
+ pass
menuitem.select(menuw=self)
break
except AttributeError: # may have no .arg (no media menu)
@@ -679,6 +686,22 @@
# because we'll break some (or all) plugins behavior.
# Does that sound correct?
#
+ if config.OSD_SOUNDS:
+ if hasattr(menu.selected, 'arg'):
+ try:
+ key = "menu." + menu.selected.arg[0]
+ if config.OSD_SOUNDS[key]:
+ sounds.play_sound(sounds.load_sound(key))
+ except:
+ pass
+ else:
+ try:
+ key = "menu." + menu.selected.__class__.__name__
+ if config.OSD_SOUNDS[key]:
+ sounds.play_sound(sounds.load_sound(key))
+ except:
+ pass
+
if not hasattr(menu, 'is_submenu'):
plugins = plugin.get('item') + plugin.get('item_%s' %
menu.selected.type)
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sun Jan 13 11:37:49 2008
@@ -28,6 +28,7 @@
* Updated cdbackup plug-in with CD_RIP_FMT to set the encoding format
(F#1857460)
* Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated itv plug-in for youtube video feeds (F#1868425)
+ * Updated menu osd sounds for more sound events (F#1870321)
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
Modified: branches/rel-1/freevo/src/menu.py
==============================================================================
--- branches/rel-1/freevo/src/menu.py (original)
+++ branches/rel-1/freevo/src/menu.py Sun Jan 13 11:37:49 2008
@@ -317,6 +317,13 @@
pass
try:
if menuitem.arg[0] == mediaitem:
+ if config.OSD_SOUNDS:
+ try:
+ key = "menu." + media
+ if config.OSD_SOUNDS[key]:
+ sounds.play_sound(sounds.load_sound(key))
+ except:
+ pass
menuitem.select(menuw=self)
break
except AttributeError: # may have no .arg (no media menu)
@@ -678,6 +685,22 @@
# because we'll break some (or all) plugins behavior.
# Does that sound correct?
#
+ if config.OSD_SOUNDS:
+ if hasattr(menu.selected, 'arg'):
+ try:
+ key = "menu." + menu.selected.arg[0]
+ if config.OSD_SOUNDS[key]:
+ sounds.play_sound(sounds.load_sound(key))
+ except:
+ pass
+ else:
+ try:
+ key = "menu." + menu.selected.__class__.__name__
+ if config.OSD_SOUNDS[key]:
+ sounds.play_sound(sounds.load_sound(key))
+ except:
+ pass
+
if not hasattr(menu, 'is_submenu'):
plugins = plugin.get('item') + plugin.get('item_%s' %
menu.selected.type)
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
