Author: duncan
Date: Mon Jan 22 21:43:02 2007
New Revision: 9047
Modified:
branches/rel-1/freevo/src/encodingcore.py
branches/rel-1/freevo/src/plugins/idlebar/encoding.py
branches/rel-1/freevo/src/video/plugins/reencode2.py
Log:
Corrected the output filename and the avi container name
Modified: branches/rel-1/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1/freevo/src/encodingcore.py (original)
+++ branches/rel-1/freevo/src/encodingcore.py Mon Jan 22 21:43:02 2007
@@ -120,7 +120,7 @@
self.sourcetype = None
- self.container = "Avi"
+ self.container = "avi"
self.tgtsize = None
self.length = None
Modified: branches/rel-1/freevo/src/plugins/idlebar/encoding.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/idlebar/encoding.py (original)
+++ branches/rel-1/freevo/src/plugins/idlebar/encoding.py Mon Jan 22
21:43:02 2007
@@ -250,7 +250,7 @@
used_width = max(used_width, w)
used_height += h
for text in self.text:
- used_width = max(used_width, font.font.stringsize(text))
+ used_width = max(used_width, font.font.stringsize(text)) -
1
used_height += self.font_h
_debug_('screen_width=%s, screen_height=%s, used_width=%s,
used_height=%s, font_h=%s' % \
Modified: branches/rel-1/freevo/src/video/plugins/reencode2.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/reencode2.py (original)
+++ branches/rel-1/freevo/src/video/plugins/reencode2.py Mon Jan 22
21:43:02 2007
@@ -56,7 +56,7 @@
plugin.ItemPlugin.__init__(self)
self.title = ''
self.source = ''
- self.filename = ''
+ self.output = ''
self.profile = {}
self.profile['container'] = config.REENCODE_CONTAINER
self.profile['resolution'] = config.REENCODE_RESOLUTION
@@ -98,7 +98,7 @@
self.title = item.name
self.source = item.filename
(filename, extn) = os.path.splitext(item.filename)
- self.filename = filename+'.'+self.profile['container']
+ self.output = filename
_debug_('item.__dict__:' % item.__dict__, 3)
return [ (self.encoding_profile_menu, _('Transcode this
program...')) ]
return []
@@ -112,7 +112,7 @@
if attr == 'disp_title':
return '%s' % (self.title)
if attr == 'disp_filename':
- return '%s' % (os.path.split(self.filename)[1])
+ return '%s' %
(os.path.split(self.filename)[1])+'.'+self.profile['container']
elif attr == 'disp_container':
return '%s' % (self.profile['container'])
elif attr == 'disp_resolution':
@@ -274,8 +274,6 @@
_debug_('Unknown Profile "%s"' % (arg), 0)
self.error(_('Unknown Profile')+(' "%s"' % (arg)))
return
- (filename, extn) = os.path.splitext(self.filename)
- self.filename = filename+'.'+self.profile['container']
if menuw:
menuw.back_one_menu(arg='reload')
@@ -283,12 +281,9 @@
def alter_prop(self, arg=(None,None), menuw=None):
_debug_('alter_prop(self, arg=%r, menuw=%r)' % (arg, menuw), 1)
(prop, val) = arg
- _debug_('DJW:val:%s %s' % (type(val), val))
if prop == 'container':
self.profile['container'] = val
- (filename, extn) = os.path.splitext(self.filename)
- self.filename = filename+'.'+self.profile['container']
elif prop == 'resolution':
self.profile['resolution'] = val
elif prop == 'videocodec':
@@ -327,8 +322,7 @@
box = PopupBox(text=_('Please wait, analyzing video...'))
box.show()
- print 'DJW:filename:', self.filename
- (status, resp) = initEncodeJob(self.source, self.filename, self.title)
+ (status, resp) = initEncodeJob(self.source, self.output, self.title)
_debug_('initEncodeJob:status:%s resp:%s' % (status, resp))
box.destroy()
if not status:
-------------------------------------------------------------------------
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
