Author: duncan
Date: Mon Dec  4 15:34:18 2006
New Revision: 8692

Modified:
   branches/rel-1/freevo/freevo_config.py
   branches/rel-1/freevo/src/video/plugins/mplayer.py

Log:
Fixed some missing configuration variables


Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py      (original)
+++ branches/rel-1/freevo/freevo_config.py      Mon Dec  4 15:34:18 2006
@@ -247,8 +247,9 @@
      Added WEBSERVER_UID and WEBSERVER_GID
      Added optional WEBSERVER_DEBUG, if not defined uses DEBUG
      Added ENCODINGSERVER_UID and ENCODINGSERVER_GID
-     Added RSSSERVER_UID and RSSSERVER_GID
      Added optional ENCODINGSERVER_DEBUG, if not defined uses DEBUG
+     Added RSSSERVER_UID and RSSSERVER_GID
+     Added MPLAYER_VO_DEV_HWACCEL and MPLAYER_VO_DEV_OPTS_HWACCEL
      Added plug-in: Apple trailers in the contrib area
      Added plug-in: reencode and idlebar encode to compress mpeg video
      Added plug-in: XM online
@@ -1300,6 +1301,9 @@
     MPLAYER_VO_DEV = CONF.display  # e.g.: x11,mga,fbdev, see mplayer docs
 
 MPLAYER_VO_DEV_OPTS = ''           # e.g.: ':some_var=vcal'
+# Mainly used for Via EPIA video
+MPLAYER_VO_DEV_HWACCEL = None
+MPLAYER_VO_DEV_OPTS_HWACCEL = None
 
 DVD_LANG_PREF = 'en,se,no'         # Order of preferred languages on DVD.
 DVD_SUBTITLE_PREF = ''             # Order of preferred subtitles on DVD.

Modified: branches/rel-1/freevo/src/video/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/mplayer.py  (original)
+++ branches/rel-1/freevo/src/video/plugins/mplayer.py  Mon Dec  4 15:34:18 2006
@@ -156,8 +156,10 @@
         additional_args = []
 
         if mode == 'dvd':
-            VODEV=config.MPLAYER_VO_DEV_HWACCEL
-            VODEVOPTS=config.MPLAYER_VO_DEV_OPTS_HWACCEL
+            if config.MPLAYER_VO_DEV_HWACCEL:
+                VODEV=config.MPLAYER_VO_DEV_HWACCEL
+                VODEVOPTS=config.MPLAYER_VO_DEV_OPTS_HWACCEL
+
             if config.DVD_LANG_PREF:
                 # There are some bad mastered DVDs out there. E.g. the 
specials on
                 # the German Babylon 5 Season 2 disc claim they have more than 
one

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to