Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv11589/plugins
Modified Files:
mplayer.py
Log Message:
patch for better support of fxd files with more discs from Matthieu Weber
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/plugins/mplayer.py,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** mplayer.py 15 Dec 2003 03:45:29 -0000 1.51
--- mplayer.py 22 Dec 2003 13:27:34 -0000 1.52
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.52 2003/12/22 13:27:34 dischi
+ # patch for better support of fxd files with more discs from Matthieu Weber
+ #
# Revision 1.51 2003/12/15 03:45:29 outlyer
# Added onscreen notification of bookmark being added via mplayer's
***************
*** 120,124 ****
elif data[ 0 : 7 ] == "dev-CVS":
config.MPLAYER_VERSION = 9999
! _debug_("MPlayer version set to: %s" % config.MPLAYER_VERSION)
child.wait()
--- 123,129 ----
elif data[ 0 : 7 ] == "dev-CVS":
config.MPLAYER_VERSION = 9999
! else:
! config.MPLAYER_VERSION = None
! _debug_("MPlayer version set to: %s" % config.MPLAYER_VERSION)
child.wait()
***************
*** 185,189 ****
url = item.url + str(i+1)
! _debug_('MPlayer.play(): mode=%s, url=%s' % (mode, url))
if mode == 'file' and not os.path.isfile(url) and not network_play:
--- 190,197 ----
url = item.url + str(i+1)
! try:
! _debug_('MPlayer.play(): mode=%s, url=%s' % (mode, url))
! except UnicodeError:
! _debug_('MPlayer.play(): [non-ASCII data]')
if mode == 'file' and not os.path.isfile(url) and not network_play:
***************
*** 194,203 ****
# Build the MPlayer command
! mpl = '--prio=%s %s %s -slave -ao %s' % (config.MPLAYER_NICE,
! config.MPLAYER_CMD,
! config.MPLAYER_ARGS_DEF,
! config.MPLAYER_AO_DEV)
! additional_args = ''
if mode == 'dvd':
--- 202,210 ----
# Build the MPlayer command
! mpl = [ '--prio=%s' % config.MPLAYER_NICE, config.MPLAYER_CMD ]
! mpl += config.MPLAYER_ARGS_DEF.split(' ')
! mpl += [ '-slave', '-ao', config.MPLAYER_AO_DEV ]
! additional_args = []
if mode == 'dvd':
***************
*** 210,239 ****
print '*** dvd audio broken, try without alang ***'
else:
! additional_args = '-alang %s' % config.DVD_LANG_PREF
if config.DVD_SUBTITLE_PREF:
# Only use if defined since it will always turn on subtitles
# if defined
! additional_args += ' -slang %s' % config.DVD_SUBTITLE_PREF
! additional_args += ' -dvd-device %s' % item.media.devicename
if item.media:
! additional_args += ' -cdrom-device %s ' % item.media.devicename
if item.selected_subtitle == -1:
! additional_args += ' -noautosub'
elif item.selected_subtitle and item.mode == 'file':
! additional_args += ' -vobsubid %s' % item.selected_subtitle
elif item.selected_subtitle:
! additional_args += ' -sid %s' % item.selected_subtitle
if item.selected_audio:
! additional_args += ' -aid %s' % item.selected_audio
if item.deinterlace:
! additional_args += ' -vop pp=fd'
mode = item.mime_type
--- 217,246 ----
print '*** dvd audio broken, try without alang ***'
else:
! additional_args += [ '-alang', config.DVD_LANG_PREF ]
if config.DVD_SUBTITLE_PREF:
# Only use if defined since it will always turn on subtitles
# if defined
! additional_args += [ '-slang', config.DVD_SUBTITLE_PREF ]
! additional_args += [ '-dvd-device', item.media.devicename ]
if item.media:
! additional_args += [ '-cdrom-device', item.media.devicename ]
if item.selected_subtitle == -1:
! additional_args += [ '-noautosub' ]
elif item.selected_subtitle and item.mode == 'file':
! additional_args += [ '-vobsubid', item.selected_subtitle ]
elif item.selected_subtitle:
! additional_args += [ '-sid', item.selected_subtitle ]
if item.selected_audio:
! additional_args += [ '-aid', item.selected_audio ]
if item.deinterlace:
! additional_args += [ '-vop', 'pp=fd' ]
mode = item.mime_type
***************
*** 242,250 ****
# Mplayer command and standard arguments
! mpl += (' -v -vo ' + config.MPLAYER_VO_DEV + config.MPLAYER_VO_DEV_OPTS + \
! ' ' + config.MPLAYER_ARGS[mode])
# make the options a list
! mpl = mpl.split(' ') + additional_args.split(' ')
if hasattr(item, 'is_playlist') and item.is_playlist:
--- 249,258 ----
# Mplayer command and standard arguments
! mpl += [ '-v', '-vo', config.MPLAYER_VO_DEV +
! config.MPLAYER_VO_DEV_OPTS ]
! mpl += config.MPLAYER_ARGS[mode].split(' ')
# make the options a list
! mpl += additional_args
if hasattr(item, 'is_playlist') and item.is_playlist:
***************
*** 255,259 ****
if options:
! mpl += options.split(' ')
# use software scaler?
--- 263,267 ----
if options:
! mpl += options
# use software scaler?
***************
*** 267,272 ****
if config.MPLAYER_SET_AUDIO_DELAY and item.info.has_key('delay') and \
item.info['delay'] > 0:
! mpl += ('-mc', str(int(item.info['delay'])+1), '-delay',
! '-' + str(item.info['delay']))
command = mpl
--- 275,280 ----
if config.MPLAYER_SET_AUDIO_DELAY and item.info.has_key('delay') and \
item.info['delay'] > 0:
! mpl += [ '-mc', str(int(item.info['delay'])+1), '-delay',
! '-' + str(item.info['delay']) ]
command = mpl
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
