Author: duncan
Date: Sat Mar 8 16:36:35 2008
New Revision: 10491
Log:
Small cosmetic changes
Modified:
branches/rel-1/freevo/src/event.py
branches/rel-1/freevo/src/helpers/encodingserver.py
branches/rel-1/freevo/src/util/misc.py
Modified: branches/rel-1/freevo/src/event.py
==============================================================================
--- branches/rel-1/freevo/src/event.py (original)
+++ branches/rel-1/freevo/src/event.py Sat Mar 8 16:36:35 2008
@@ -254,8 +254,7 @@
INPUT_9 = Event('INPUT_9', arg=9)
INPUT_0 = Event('INPUT_0', arg=0)
-INPUT_ALL_NUMBERS = (INPUT_0, INPUT_1, INPUT_2, INPUT_3, INPUT_4, INPUT_5,
- INPUT_6, INPUT_7, INPUT_8, INPUT_9, INPUT_0 )
+INPUT_ALL_NUMBERS = (INPUT_0, INPUT_1, INPUT_2, INPUT_3, INPUT_4, INPUT_5,
INPUT_6, INPUT_7, INPUT_8, INPUT_9)
# Call the function specified in event.arg
@@ -532,7 +531,6 @@
key.K_SPACE : 'SELECT',
key.K_RETURN : 'SELECT',
key.K_F2 : 'POWER',
- key.K_F3 : 'MUTE',
key.K_KP_MINUS : 'VOL-',
key.K_n : 'VOL-',
key.K_KP_PLUS : 'VOL+',
@@ -563,6 +561,7 @@
key.K_s : 'STOP',
key.K_F6 : 'REC',
key.K_PERIOD : 'EJECT',
+ key.K_F3 : 'EJECT',
key.K_l : 'SUBTITLE',
key.K_a : 'LANG',
key.K_RIGHTBRACKET: 'NEXT',
Modified: branches/rel-1/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1/freevo/src/helpers/encodingserver.py Sat Mar 8 16:36:35 2008
@@ -105,7 +105,7 @@
#wait for the analyzing to end
while not self.jobs[idnr].finishedanalyze:
time.sleep(0.1)
- if self.jobs[idnr].finishedanalyze == True and self.jobs[idnr].failed
== True:
+ if self.jobs[idnr].finishedanalyze and self.jobs[idnr].failed:
_debug_('Analysis failed')
return (False,10)
Modified: branches/rel-1/freevo/src/util/misc.py
==============================================================================
--- branches/rel-1/freevo/src/util/misc.py (original)
+++ branches/rel-1/freevo/src/util/misc.py Sat Mar 8 16:36:35 2008
@@ -417,8 +417,7 @@
(status, schedule) = scheduledRecordings
if not status:
- result = _('Recording server is not available')
- return result
+ return schedule # in this case the schedule is the reason
progs = schedule.getProgramList()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
