Author: duncan
Date: Sun Oct 28 16:33:25 2007
New Revision: 10044
Log:
Small cosmetic tidy ups
Added RECORDSERVER_SECRET to config
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/animation/base.py
branches/rel-1/freevo/src/video/__init__.py
branches/rel-1/freevo/src/video/videoitem.py
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Sun Oct 28 16:33:25 2007
@@ -339,6 +339,9 @@
XINE_TV_PROGRESSIVE_SEEK_INCREMENT
Added TV_RECORD_YEAR_FORMAT to allow the from of the year in TV fxd files
to be specified
Moved plug-in "upsoon" to "tv.upsoon"
+ ''' ),
+ (5.22,
+ '''Added RECORDSERVER_SECRET
'''),
]
@@ -1000,9 +1003,9 @@
VIDEO_ITEMS = None
#
-# Directory containing images for tv shows. A tv show maches the regular
+# Directory containing images for TV shows. A TV show matches the regular
# expression VIDEO_SHOW_REGEXP, e.g. "Name 3x10 - Title". If an image
-# name.(png|jpg) (lowercase) is in this directory, it will be taken as cover
+# name.(png|jpg) (lower-case) is in this directory, it will be taken as cover
# image
#
VIDEO_SHOW_DATA_DIR = None
@@ -1702,6 +1705,7 @@
RECORDSERVER_IP = 'localhost'
RECORDSERVER_PORT = 18001
+RECORDSERVER_SECRET = 'secret1'
# If the recordserver runs as root, set the uid to the given one
# after startup. The gui must also match one of the users group ids
Modified: branches/rel-1/freevo/src/animation/base.py
==============================================================================
--- branches/rel-1/freevo/src/animation/base.py (original)
+++ branches/rel-1/freevo/src/animation/base.py Sun Oct 28 16:33:25 2007
@@ -160,7 +160,7 @@
"""
Checks if the screen background has been damaged
- @notes: If the rect passed damages our rect, but no actual blit is done
+ @note: If the rect passed damages our rect, but no actual blit is done
on osd.screen, we'll end up with a copy of our animation in our bg.
This is BAD.
"""
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 Sun Oct 28 16:33:25 2007
@@ -89,7 +89,7 @@
for file in all_files:
if parent and parent.type == 'dir' and \
- hasattr(parent,'VIDEO_DIRECTORY_AUTOBUILD_THUMBNAILS') and \
+ hasattr(parent, 'VIDEO_DIRECTORY_AUTOBUILD_THUMBNAILS') and
\
parent.VIDEO_DIRECTORY_AUTOBUILD_THUMBNAILS:
util.videothumb.snapshot(file, update=False, popup=True)
@@ -138,7 +138,7 @@
if parent.media:
file_id = String(parent.media.id) + \
- file[len(os.path.join(parent.media.mountdir,"")):]
+ file[len(os.path.join(parent.media.mountdir, "")):]
try:
x.mplayer_options = discset_information[file_id]
_debug_('x.mplayer_options=%r' % x.mplayer_options)
@@ -215,13 +215,13 @@
print
return 0
- _debug_("Building the xml hash database...",1)
+ _debug_("Building the xml hash database...", 1)
files = []
if not config.VIDEO_ONLY_SCAN_DATADIR:
if len(config.VIDEO_ITEMS) == 2:
- for name,dir in config.VIDEO_ITEMS:
- files += util.recursefolders(dir,1,'*.fxd',1)
+ for name, dir in config.VIDEO_ITEMS:
+ files += util.recursefolders(dir, 1, '*.fxd', 1)
for subdir in ('disc', 'disc-set'):
files += util.recursefolders(vfs.join(config.OVERLAY_DIR, subdir), 1,
'*.fxd', 1)
@@ -236,7 +236,7 @@
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)
+ files = util.recursefolders(config.VIDEO_SHOW_DATA_DIR, 1, '*.fxd', 1)
for info in fxditem.mimetype.parse(None, files, display_type='video'):
if info.type != 'video':
continue
@@ -247,5 +247,5 @@
for fo in info.__fxd_files_options__:
discset_information[fo['file-id']] = fo['mplayer-options']
- _debug_('done',1)
+ _debug_('done', 1)
return 1
Modified: branches/rel-1/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1/freevo/src/video/videoitem.py (original)
+++ branches/rel-1/freevo/src/video/videoitem.py Sun Oct 28 16:33:25 2007
@@ -539,7 +539,7 @@
self.menuw.show()
ConfirmBox(text=(_('No media found for "%s".\n')+
_('Please insert the media.')) % self.url,
- handler=self.play).show()
+ handler=self.play).show()
return
elif self.mode in ('http') and not self.filename and not self.media:
self.player_rating, self.player = self.possible_player[0]
@@ -633,6 +633,7 @@
i.info.mmdata = self.info.mmdata['tracks'][titlenum]
i.info.set_variables(self.info.get_variables())
i.info_type = 'track'
+ i.possible_player = []
i.files = None
i.name = Unicode(_('Play Title %d') % (titlenum+1))
items.append(i)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
