Author: dmeyer
Date: Fri Jan 5 18:55:23 2007
New Revision: 2362
Modified:
trunk/popcorn/src/backends/mplayer/player.py
trunk/popcorn/src/config.cxml
trunk/popcorn/src/generic.py
Log:
rename widescreen to fit-method and copy config to property
Modified: trunk/popcorn/src/backends/mplayer/player.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/player.py (original)
+++ trunk/popcorn/src/backends/mplayer/player.py Fri Jan 5 18:55:23 2007
@@ -380,7 +380,7 @@
# This may be needed for some non X based displays
args.add(screenw=size[0], screenh=size[1])
- if not config.widescreen == 'scaled':
+ if not self._properties['fit-method'] == 'scaled':
# Expand to fit the given aspect. In scaled mode we don't
# do that which will result in a scaled image filling
# the whole screen
@@ -389,7 +389,7 @@
# FIXME: this only works if the window has the the aspect
# as the full screen. In all other cases the window is not
# fully used but at least with black bars.
- if config.widescreen == 'zoom':
+ if self._properties['fit-method'] == 'zoom':
# This DOES NOT WORK as it should. The hardware scaler
# will ignore the settings and keep aspect and does
# not crop as default. When using vo x11 and software
Modified: trunk/popcorn/src/config.cxml
==============================================================================
--- trunk/popcorn/src/config.cxml (original)
+++ trunk/popcorn/src/config.cxml Fri Jan 5 18:55:23 2007
@@ -12,20 +12,6 @@
</desc>
</var>
- <var name="widescreen" default="bars">
- <values>
- <value>bars</value>
- <value>zoom</value>
- <value>scale</value>
- </values>
- <desc lang="en">
- How to handle 4:3 content on 16:9 screens. Possible values are
- bars: add black bars on the left and on the right
- zoom: zoom into the video, drop content on top and bottom
- scale: ignore aspect ratio and fill the screen
- </desc>
- </var>
-
<group name="video">
<desc lang="en">video settings</desc>
<var name="driver" default="xv">
@@ -41,6 +27,19 @@
<var name="monitoraspect" default="4:3">
<desc>Aspect ratio of the monitor or tv.</desc>
</var>
+ <var name="fit-method" default="bars">
+ <values>
+ <value>bars</value>
+ <value>zoom</value>
+ <value>scale</value>
+ </values>
+ <desc lang="en">
+ How to handle 4:3 content on 16:9 screens. Possible values are
+ bars: add black bars on the left and on the right
+ zoom: zoom into the video, drop content on top and bottom
+ scale: ignore aspect ratio and fill the screen
+ </desc>
+ </var>
<var name="postprocessing" default="False">
<desc>Activate postprocessing for playback as default.</desc>
</var>
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Fri Jan 5 18:55:23 2007
@@ -108,7 +108,10 @@
# Sets the audio delay relative to the video. A positive
# value causes audio to come later, while a negative value
# plays the audio before.
- 'audio-delay': 0.0
+ 'audio-delay': 0.0,
+
+ # fit method. One of 'bars', 'scale', 'zoom'
+ 'fit-method': config.video.fit_method
}
self.signals = {
-------------------------------------------------------------------------
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
