Author: duncan
Date: Sat Feb 9 16:32:46 2008
New Revision: 10354
Log:
[ 1869969 ] freevo placement support
Patch from Pierre Ossman applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/config.py
branches/rel-1-7/freevo/src/osd.py
branches/rel-1-7/freevo/src/video/plugins/mplayer.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/config.py
branches/rel-1/freevo/src/osd.py
branches/rel-1/freevo/src/video/plugins/mplayer.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Sat Feb 9 16:32:46 2008
@@ -16,6 +16,7 @@
== Release 1.7.7 (2008-??-??) ==
--------------------------------
+ * New placement support when using xrandr (F#1869969)
* Updated playlist to process "#EXTINF" comments in m3u files (F#1890203)
* Updated Russian translation (B#1889826)
* Updated tv guide with scheduled to record and favorite icons (F#1886621)
Modified: branches/rel-1-7/freevo/src/config.py
==============================================================================
--- branches/rel-1-7/freevo/src/config.py (original)
+++ branches/rel-1-7/freevo/src/config.py Sat Feb 9 16:32:46 2008
@@ -458,7 +458,9 @@
#
CONF = setup_freevo.Struct()
CONF.geometry = '800x600'
+CONF.position = '0,0'
CONF.width, CONF.height = 800, 600
+CONF.x, CONF.y = 0, 0
CONF.display = 'x11'
CONF.tv = 'ntsc'
CONF.chanlist = 'us-cable'
@@ -520,7 +522,9 @@
c.close()
w, h = CONF.geometry.split('x')
+ x, y = CONF.position.split(',')
CONF.width, CONF.height = int(w), int(h)
+ CONF.x, CONF.w = int(x), int(y)
break
else:
print
Modified: branches/rel-1-7/freevo/src/osd.py
==============================================================================
--- branches/rel-1-7/freevo/src/osd.py (original)
+++ branches/rel-1-7/freevo/src/osd.py Sat Feb 9 16:32:46 2008
@@ -372,6 +372,9 @@
if config.CONF.display == 'dxr3':
self.depth = 32
+ if config.CONF.x or config.CONF.y:
+ os.putenv('SDL_VIDEO_WINDOW_POS', '%d,%d' % (config.CONF.x,
config.CONF.y))
+
try:
self.screen = pygame.display.set_mode((self.width, self.height),
self.hw, self.depth)
Modified: branches/rel-1-7/freevo/src/video/plugins/mplayer.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/mplayer.py (original)
+++ branches/rel-1-7/freevo/src/video/plugins/mplayer.py Sat Feb 9
16:32:46 2008
@@ -165,6 +165,9 @@
command += config.MPLAYER_ARGS_DEF.split(' ')
command += ['-ao'] + config.MPLAYER_AO_DEV.split(' ')
+ if config.CONF.x or config.CONF.y:
+ command += ['-geometry', '%d:%d' % (config.CONF.x, config.CONF.y)]
+
additional_args = []
if mode == 'dvd':
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sat Feb 9 16:32:46 2008
@@ -19,6 +19,7 @@
== Release 1.7.7 (2008-??-??) ==
--------------------------------
+ * New placement support when using xrandr (F#1869969)
* Updated playlist to process "#EXTINF" comments in m3u files (F#1890203)
* Updated Russian translation (B#1889826)
* Updated tv guide with scheduled to record and favorite icons (F#1886621)
Modified: branches/rel-1/freevo/src/config.py
==============================================================================
--- branches/rel-1/freevo/src/config.py (original)
+++ branches/rel-1/freevo/src/config.py Sat Feb 9 16:32:46 2008
@@ -506,7 +506,9 @@
#
CONF = setup_freevo.Struct()
CONF.geometry = '800x600'
+CONF.position = '0,0'
CONF.width, CONF.height = 800, 600
+CONF.x, CONF.y = 0, 0
CONF.display = 'x11'
CONF.tv = 'ntsc'
CONF.chanlist = 'us-cable'
@@ -568,7 +570,9 @@
c.close()
w, h = CONF.geometry.split('x')
+ x, y = CONF.position.split(',')
CONF.width, CONF.height = int(w), int(h)
+ CONF.x, CONF.w = int(x), int(y)
break
else:
print
Modified: branches/rel-1/freevo/src/osd.py
==============================================================================
--- branches/rel-1/freevo/src/osd.py (original)
+++ branches/rel-1/freevo/src/osd.py Sat Feb 9 16:32:46 2008
@@ -372,6 +372,9 @@
if config.CONF.display == 'dxr3':
self.depth = 32
+ if config.CONF.x or config.CONF.y:
+ os.putenv('SDL_VIDEO_WINDOW_POS', '%d,%d' % (config.CONF.x,
config.CONF.y))
+
try:
self.screen = pygame.display.set_mode((self.width, self.height),
self.hw, self.depth)
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 Sat Feb 9 16:32:46 2008
@@ -165,6 +165,9 @@
command += config.MPLAYER_ARGS_DEF.split(' ')
command += ['-ao'] + config.MPLAYER_AO_DEV.split(' ')
+ if config.CONF.x or config.CONF.y:
+ command += ['-geometry', '%d:%d' % (config.CONF.x, config.CONF.y)]
+
additional_args = []
if mode == 'dvd':
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
