Author: duncan
Date: Sun Jan 13 11:46:35 2008
New Revision: 10286
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 Sun Jan 13 11:46:35 2008
@@ -26,6 +26,7 @@
* Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated itv plug-in for youtube video feeds (F#1868425)
* Updated menu osd sounds for more sound events (F#1870321)
+ * Updated osd to allow the window position to be specified (F#1869969)
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
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 Sun Jan 13 11:46:35 2008
@@ -459,6 +459,7 @@
CONF = setup_freevo.Struct()
CONF.geometry = '800x600'
CONF.width, CONF.height = 800, 600
+CONF.x, CONF.y = 0, 0
CONF.display = 'x11'
CONF.tv = 'ntsc'
CONF.chanlist = 'us-cable'
@@ -520,7 +521,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 Sun Jan 13 11:46:35 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 Sun Jan 13
11:46:35 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 Sun Jan 13 11:46:35 2008
@@ -29,6 +29,7 @@
* Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated itv plug-in for youtube video feeds (F#1868425)
* Updated menu osd sounds for more sound events (F#1870321)
+ * Updated osd to allow the window position to be specified (F#1869969)
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
Modified: branches/rel-1/freevo/src/config.py
==============================================================================
--- branches/rel-1/freevo/src/config.py (original)
+++ branches/rel-1/freevo/src/config.py Sun Jan 13 11:46:35 2008
@@ -507,6 +507,7 @@
CONF = setup_freevo.Struct()
CONF.geometry = '800x600'
CONF.width, CONF.height = 800, 600
+CONF.x, CONF.y = 0, 0
CONF.display = 'x11'
CONF.tv = 'ntsc'
CONF.chanlist = 'us-cable'
@@ -568,7 +569,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 Sun Jan 13 11:46:35 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 Sun Jan 13 11:46:35 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':
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
