Author: duncan Date: Tue Oct 24 07:47:16 2006 New Revision: 8461 Modified: branches/rel-1/freevo/RELEASE_NOTES branches/rel-1/freevo/src/config.py branches/rel-1/freevo/src/tv/plugins/mplayer.py branches/rel-1/freevo/src/tv/v4l2.py
Log: Merged changes from rel-1-6 Modified: branches/rel-1/freevo/RELEASE_NOTES ============================================================================== --- branches/rel-1/freevo/RELEASE_NOTES (original) +++ branches/rel-1/freevo/RELEASE_NOTES Tue Oct 24 07:47:16 2006 @@ -5,16 +5,35 @@ The ChangeLog has a tracker reference for a discussion about the changes. -*Important* +IMPORTANT +--------- + The recordable setting has been from from VIDEO_GROUPS Delete this setting from your local_conf.py +This change can be mostly automated by running: +freevo convert_config + To use multi-tuner support the VIDEO_GROUPS needs setting up correctly see http://freevo.sourceforge.net/cgi-bin/doc/MultiTunerConfig elementtree, include in Python-2.5+, is now a prerequisite for freevo, if can be downloaded from http://effbot.org/zone/elementtree.htm +Known Problems +-------------- + +If a directory is name with a media extension it will be treated as a +media file, e.g. music.mp3 or record.avi. + +If webradio is activated it will appear twice in the music menu. + +If a mp3 file is incorrectly named the header search will scan the whole +file, e.g. something.mp3 which is really a wave file. + +Sometime the headlines plug-in crashed when it receives incorrect data +from the rss feed. + Release Notes for 1.5.3 ----------------------- Modified: branches/rel-1/freevo/src/config.py ============================================================================== --- branches/rel-1/freevo/src/config.py (original) +++ branches/rel-1/freevo/src/config.py Tue Oct 24 07:47:16 2006 @@ -136,7 +136,7 @@ can be left as default, 'normal', or set to 'ivtv' or 'dvb'. """ - def __init__(self, vdev='/dev/video', adev='/dev/dsp', input_type='tuner', + def __init__(self, vdev='/dev/video', adev=None, input_type='tuner', input_num=0, tuner_norm='NTSC', tuner_chanlist='us-cable', tuner_type='internal', tuner_chan=None, record_group=None, desc='Freevo default VideoGroup', 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 Tue Oct 24 07:47:16 2006 @@ -122,7 +122,19 @@ tvcmd = '' args += ('"dvb://%s" %s' % (tuner_channel, config.MPLAYER_ARGS['dvb']),) - else: + elif vg.group_type == 'tvalsa': + freq_khz = self.fc.chanSet(tuner_channel, True, app='mplayer') + tuner_freq = '%1.3f' % (freq_khz / 1000.0) + + tvcmd = ('tv:// -tv driver=%s:%s:freq=%s:%s:%s:' + '%s:width=%s:height=%s:%s %s' % + (config.TV_DRIVER, vg.adev, tuner_freq, device, input, norm, + w, h, outfmt, config.TV_OPTS)) + + if config.MPLAYER_ARGS.has_key('tv'): + args += (config.MPLAYER_ARGS['tv'],) + + else: # group_type == 'normal' freq_khz = self.fc.chanSet(tuner_channel, True, app='mplayer') tuner_freq = '%1.3f' % (freq_khz / 1000.0) @@ -134,7 +146,6 @@ if config.MPLAYER_ARGS.has_key('tv'): args += (config.MPLAYER_ARGS['tv'],) - elif mode == 'vcr': tvcmd = ('tv:// -tv driver=%s:%s:%s:' '%s:width=%s:height=%s:%s %s' % Modified: branches/rel-1/freevo/src/tv/v4l2.py ============================================================================== --- branches/rel-1/freevo/src/tv/v4l2.py (original) +++ branches/rel-1/freevo/src/tv/v4l2.py Tue Oct 24 07:47:16 2006 @@ -288,7 +288,7 @@ def gettuner(self,index): val = struct.pack( TUNER_ST, index, "", 0,0,0,0,0,0,0,0) r = fcntl.ioctl(self.device, i32(GET_TUNER_NO), val) - if DEBUG >= 3: print "getfmt: val=%r, r=%r, res=%r" % (val, r, struct.unpack(FMT_ST,r)) + if DEBUG >= 3: print "gettuner: val=%r, r=%r, res=%r" % (val, r, struct.unpack(TUNER_ST,r)) return struct.unpack( TUNER_ST, r ) @@ -387,13 +387,13 @@ if __name__ == '__main__': + DEBUG = 4 viddev=Videodev('/dev/video0') print viddev.getdriver() print viddev.getversion() #print viddev.querycap() inp = viddev.getinput() viddev.setinput(inp) - ''' print viddev.querycap() fmt = viddev.getstd() print fmt @@ -438,4 +438,5 @@ print viddev.getfreq() print viddev.getfreq2() ''' + ''' viddev.close() ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Freevo-cvslog mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
