Author: duncan
Date: Wed Apr 25 16:59:40 2007
New Revision: 9503
Modified:
branches/rel-1/freevo/src/childapp.py
branches/rel-1/freevo/src/video/__init__.py
Log:
Corrected my favourite spelling error
Added quotes around command
Modified: branches/rel-1/freevo/src/childapp.py
==============================================================================
--- branches/rel-1/freevo/src/childapp.py (original)
+++ branches/rel-1/freevo/src/childapp.py Wed Apr 25 16:59:40 2007
@@ -134,8 +134,8 @@
(self.so.isAlive(), self.se.isAlive()), 1)
time.sleep(0.1)
if not isinstance(start_str, str):
- start_str = str(' ').join(start_str)
- _debug_('ChildApp.__init__(), pid=%s, app=%s, poll=%s' % \
+ start_str = ' '.join(start_str)
+ _debug_('ChildApp.__init__(), pid=%s, app=\"%s\", poll=%s' % \
(self.child.pid, start_str, self.child.poll()), 1)
self.ready = True
Modified: branches/rel-1/freevo/src/video/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/video/__init__.py (original)
+++ branches/rel-1/freevo/src/video/__init__.py Wed Apr 25 16:59:40 2007
@@ -43,8 +43,8 @@
# variables for the hashing function
fxd_database = {}
-discset_informations = {}
-tv_show_informations = {}
+discset_information = {}
+tv_show_information = {}
class PluginInterface(plugin.MimetypePlugin):
@@ -139,7 +139,7 @@
file_id = parent.media.id + \
file[len(os.path.join(parent.media.mountdir,"")):]
try:
- x.mplayer_options = discset_informations[file_id]
+ x.mplayer_options = discset_information[file_id]
except KeyError:
pass
items.append(x)
@@ -156,15 +156,15 @@
def dirinfo(self, diritem):
"""
- set informations for a diritem based on the content, etc.
+ set information for a diritem based on the content, etc.
"""
- global tv_show_informations
+ global tv_show_information
if not diritem.image and config.VIDEO_SHOW_DATA_DIR:
diritem.image = util.getimage(vfs.join(config.VIDEO_SHOW_DATA_DIR,
vfs.basename(diritem.dir).lower()))
- if tv_show_informations.has_key(vfs.basename(diritem.dir).lower()):
- tvinfo = tv_show_informations[vfs.basename(diritem.dir).lower()]
+ if tv_show_information.has_key(vfs.basename(diritem.dir).lower()):
+ tvinfo = tv_show_information[vfs.basename(diritem.dir).lower()]
diritem.info.set_variables(tvinfo[1])
if not diritem.image:
diritem.image = tvinfo[0]
@@ -190,14 +190,14 @@
"""
import fxditem
- global tv_show_informations
- global discset_informations
+ global tv_show_information
+ global discset_information
global fxd_database
fxd_database['id'] = {}
fxd_database['label'] = []
- discset_informations = {}
- tv_show_informations = {}
+ discset_information = {}
+ tv_show_information = {}
rebuild_file = os.path.join(config.FREEVO_CACHEDIR,
'freevo-rebuild-database')
if vfs.exists(rebuild_file):
@@ -231,7 +231,7 @@
for l in info.__fxd_rom_label__:
fxd_database['label'].append((re.compile(l), info))
for fo in info.__fxd_files_options__:
- discset_informations[fo['file-id']] = fo['mplayer-options']
+ discset_information[fo['file-id']] = fo['mplayer-options']
if config.VIDEO_SHOW_DATA_DIR:
files = util.recursefolders(config.VIDEO_SHOW_DATA_DIR,1, '*.fxd',1)
@@ -239,11 +239,11 @@
if info.type != 'video':
continue
k = vfs.splitext(vfs.basename(info.files.fxd_file))[0]
- tv_show_informations[k] = (info.image, info.info,
info.mplayer_options,
+ tv_show_information[k] = (info.image, info.info,
info.mplayer_options,
info.skin_fxd)
if hasattr(info, '__fxd_rom_info__'):
for fo in info.__fxd_files_options__:
- discset_informations[fo['file-id']] = fo['mplayer-options']
+ discset_information[fo['file-id']] = fo['mplayer-options']
_debug_('done',1)
return 1
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
