Update of /cvsroot/freevo/freevo/src/video/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv31929/src/video/plugins

Modified Files:
        xine.py 
Log Message:
add config.XINE_ARGS_DEF

Index: xine.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/plugins/xine.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** xine.py     7 Dec 2003 08:32:14 -0000       1.29
--- xine.py     7 Dec 2003 08:57:20 -0000       1.30
***************
*** 18,21 ****
--- 18,24 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.30  2003/12/07 08:57:20  dischi
+ # add config.XINE_ARGS_DEF
+ #
  # Revision 1.29  2003/12/07 08:32:14  dischi
  # make keybindings work for files and urls
***************
*** 75,78 ****
--- 78,82 ----
  import signal
  import popen2, re
+ import copy
  
  import config     # Configuration handler. reads config file.
***************
*** 160,173 ****
          self.xine_version = version
  
!         command = config.XINE_COMMAND
!         if self.xine_version > 921:
!             if self.xine_type == 'X':
!                 command = '%s --no-splash' % config.XINE_COMMAND
!             command = '%s --stdctl' % command
!             if rc.PYLIRC:
!                 command = '%s --no-lirc' % command
  
-         self.command = '--prio=%s %s -V %s -A %s' % (config.MPLAYER_NICE, command,
-                                                      config.XINE_VO_DEV, 
config.XINE_AO_DEV)
  
      def rate(self, item):
--- 164,172 ----
          self.xine_version = version
  
!         self.command = [ '--prio=%s' % config.MPLAYER_NICE ] + \
!                        config.XINE_COMMAND.split(' ') + \
!                        [ '--stdctl', '-V', config.XINE_VO_DEV, '-A', 
config.XINE_AO_DEV ] +\
!                        config.XINE_ARGS_DEF.split(' ')
  
  
      def rate(self, item):
***************
*** 199,225 ****
          play a dvd with xine
          """
!         # set keymap
          self.app_mode = item.mode
          if item.mode in ('file', 'url'):
               self.app_mode = 'video'
-         self.item     = item
  
          if plugin.getbyname('MIXER'):
              plugin.getbyname('MIXER').reset()
  
!         command = self.command
  
          if item.deinterlace and (self.xine_type == 'X' or self.xine_version > 922):
!             command = '%s -D' % command
! 
!         if self.xine_version > 922:
!             command = '%s --post=pp:quality=10,expand' % command
!             
!         command = command.split(' ')
  
!         self.max_audio = 0
!         self.current_audio = -1
  
!         self.max_subtitle = 0
          self.current_subtitle = -1
  
--- 198,226 ----
          play a dvd with xine
          """
!         self.item     = item
          self.app_mode = item.mode
          if item.mode in ('file', 'url'):
               self.app_mode = 'video'
  
          if plugin.getbyname('MIXER'):
              plugin.getbyname('MIXER').reset()
  
!         command = copy.copy(self.command)
  
          if item.deinterlace and (self.xine_type == 'X' or self.xine_version > 922):
!             command.append('-D')
  
!         if not rc.PYLIRC and '--no-lirc' in command:
!             command.remove('--no-lirc')
  
!         if self.xine_version < 922:
!             for arg in command:
!                 if arg.startswith('--post'):
!                     command.remove(arg)
!                     break
!                 
!         self.max_audio        = 0
!         self.current_audio    = -1
!         self.max_subtitle     = 0
          self.current_subtitle = -1
  




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to