Author: duncan
Date: Fri Sep 22 05:12:03 2006
New Revision: 8215

Modified:
   branches/rel-1-5/freevo/freevo_config.py
   branches/rel-1-5/freevo/src/setup_freevo.py
   branches/rel-1-5/freevo/src/video/plugins/xine.py

Log:
[ 1563026 ] DirectFB, if df_xine is detected, use it for DVDs
Patch by Lucian Muresan applied.


Modified: branches/rel-1-5/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-5/freevo/freevo_config.py    (original)
+++ branches/rel-1-5/freevo/freevo_config.py    Fri Sep 22 05:12:03 2006
@@ -1045,7 +1045,7 @@
 else:
     MPLAYER_VO_DEV       = CONF.display  # e.g.: x11,mga,fbdev, see mplayer 
docs
 
-MPLAYER_VO_DEV_OPTS  = ''               # e.g.: ':some_var=vcal'
+MPLAYER_VO_DEV_OPTS  = ''                # e.g.: ':some_var=vcal'
 
 DVD_LANG_PREF        = 'en,se,no'        # Order of preferred languages on DVD.
 DVD_SUBTITLE_PREF    = ''                # Order of preferred subtitles on DVD.
@@ -1150,6 +1150,10 @@
     XINE_COMMAND = '%s --hide-gui -pq -g -B --geometry %sx%s+0+0 --no-splash' 
% \
                    (CONF.xine, CONF.width, CONF.height)
 
+if CONF.display in ('dfbmga', 'directfb') and CONF.df_xine:
+    XINE_VO_DEV  = ''
+    XINE_COMMAND = CONF.df_xine
+
 XINE_ARGS_DEF = '--no-lirc --post=pp:quality=10;expand'
 
 XINE_AO_DEV = 'oss'                     # alsa or oss

Modified: branches/rel-1-5/freevo/src/setup_freevo.py
==============================================================================
--- branches/rel-1-5/freevo/src/setup_freevo.py (original)
+++ branches/rel-1-5/freevo/src/setup_freevo.py Fri Sep 22 05:12:03 2006
@@ -68,6 +68,7 @@
                      ("tvtime", "tvtime", 0),
                      ("xine", "xine", 0),
                      ("fbxine", "fbxine", 0),
+                     ("df_xine", "df_xine", 0),
                      ("lsdvd", "lsdvd", 0),
                      ("jpegtran", "jpegtran", 0),
                      ("xmame.x11", "xmame", 0),

Modified: branches/rel-1-5/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1-5/freevo/src/video/plugins/xine.py   (original)
+++ branches/rel-1-5/freevo/src/video/plugins/xine.py   Fri Sep 22 05:12:03 2006
@@ -97,6 +97,9 @@
 
         if config.XINE_COMMAND.find('fbxine') >= 0:
             type = 'fb'
+        elif config.XINE_COMMAND.find('df_xine') >= 0:
+            type = 'df'
+            config.XINE_VERSION = 923
         else:
             type = 'X'
 

-------------------------------------------------------------------------
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