Author: duncan
Date: Thu May 17 16:39:35 2007
New Revision: 9577
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/event.py
branches/rel-1/freevo/src/tv/channels.py
branches/rel-1/freevo/src/tv/plugins/mplayer.py
Log:
[ 1720667 ] lastchannel zapping
Patch from Henne Vogelsang applied
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Thu May 17 16:39:35 2007
@@ -18,6 +18,7 @@
* Updated Catalan translation (F#1709740)
* Updated mplayer to allow multiple crop points (F#1712397)
+ * Updated mplayer to allow previous channel selection (F#1720667)
* Fixed alsamixer choose mute control (B#1717659)
* Fixed directory listing crash when permission is denied (B#1715447)
* Fixed freevused mute mixer event name has changed (B#1717661)
Modified: branches/rel-1/freevo/src/event.py
==============================================================================
--- branches/rel-1/freevo/src/event.py (original)
+++ branches/rel-1/freevo/src/event.py Thu May 17 16:39:35 2007
@@ -143,6 +143,7 @@
TV_START_RECORDING = Event('TV_START_RECORDING')
TV_CHANNEL_UP = Event('TV_CHANNEL_UP')
TV_CHANNEL_DOWN = Event('TV_CHANNEL_DOWN')
+TV_CHANNEL_LAST = Event('TV_CHANNEL_LAST')
TV_SEND_TVTIME_CMD = Event('TV_SEND_TVTIME_CMD')
#
Modified: branches/rel-1/freevo/src/tv/channels.py
==============================================================================
--- branches/rel-1/freevo/src/tv/channels.py (original)
+++ branches/rel-1/freevo/src/tv/channels.py Thu May 17 16:39:35 2007
@@ -216,6 +216,8 @@
def getChannel(self):
return config.TV_CHANNELS[self.chan_index][2]
+ def getChannelNum(self):
+ return (self.chan_index) % len(config.TV_CHANNELS)
def getManChannelNum(self, channel=0):
return (channel-1) % len(config.TV_CHANNELS)
Modified: branches/rel-1/freevo/src/tv/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/mplayer.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/mplayer.py Thu May 17 16:39:35 2007
@@ -232,6 +232,15 @@
if os.path.exists('/tmp/freevo.wid'): os.unlink('/tmp/freevo.wid')
+ lastchanfile = os.path.join(config.FREEVO_CACHEDIR, 'lastchan')
+ lcfp = open(lastchanfile, "w")
+ lastchan = self.fc.getChannel()
+ lastchannum = self.fc.getChannelNum()
+ lcfp.write(str(lastchan))
+ lcfp.write('\n')
+ lcfp.write(str(lastchannum))
+ lcfp.write('\n')
+ lcfp.close()
def eventhandler(self, event, menuw=None):
s_event = '%s' % event
@@ -246,7 +255,7 @@
if DEBUG: print '%s: sending pause to mplayer' % (time.time())
return TRUE
- elif event in [ em.TV_CHANNEL_UP, em.TV_CHANNEL_DOWN] or
s_event.startswith('INPUT_'):
+ elif event in [ em.TV_CHANNEL_UP, em.TV_CHANNEL_DOWN,
em.TV_CHANNEL_LAST ] or s_event.startswith('INPUT_'):
chan = None
if event == em.TV_CHANNEL_UP:
nextchan = self.fc.getNextChannel()
@@ -254,6 +263,15 @@
elif event == em.TV_CHANNEL_DOWN:
nextchan = self.fc.getPrevChannel()
nextchannum = self.fc.getPrevChannelNum()
+ elif event == em.TV_CHANNEL_LAST:
+ lastchanfile = os.path.join(config.FREEVO_CACHEDIR, 'lastchan')
+ lcfp = open(lastchanfile, "r")
+ nextchan = lcfp.readline()
+ nextchan = nextchan.strip()
+ nextchannum = lcfp.readline()
+ nextchannum = nextchannum.strip()
+ nextchannum = int(nextchannum)
+ lcfp.close()
else:
chan = int( s_event[6] )
nextchan = self.fc.getManChannel(chan)
-------------------------------------------------------------------------
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
