Author: duncan
Date: Thu Dec 28 22:48:20 2006
New Revision: 8855
Modified:
branches/rel-1-6/freevo/ChangeLog
branches/rel-1-6/freevo/src/video/fxdhandler.py
Log:
[ 1623905 ] FXD with 2 or more files don't show thumbnail
Patch from Gorka Olaizola applied
Modified: branches/rel-1-6/freevo/ChangeLog
==============================================================================
--- branches/rel-1-6/freevo/ChangeLog (original)
+++ branches/rel-1-6/freevo/ChangeLog Thu Dec 28 22:48:20 2006
@@ -17,6 +17,7 @@
* Fixed manual record when month is December (B#1621615)
* Fixed shopping cart for items with two or more subitems (B#1620425)
* Fixed video thumbnails not being shown with subitems (B#1620452)
+ * Fixed video thumbnails not being shown for playlists (B#1623905)
* Fixed webserver 'genre' module generated html (B#1622456)
* Fixed webserver 'manual record' module not allowing day 31 (B#1622662)
* Updated Catalan translation (F#1623286)
Modified: branches/rel-1-6/freevo/src/video/fxdhandler.py
==============================================================================
--- branches/rel-1-6/freevo/src/video/fxdhandler.py (original)
+++ branches/rel-1-6/freevo/src/video/fxdhandler.py Thu Dec 28 22:48:20 2006
@@ -206,8 +206,9 @@
v.name = fxd.getattr(variant, 'name')
item.variants.append(v)
- elif len(video) == 1:
- # only one file, this is directly for the item
+ else:
+ # one or more files, this is directly for the item
+
id, url, item.media_id, item.mplayer_options, player, is_playlist = \
parse_video_child(fxd, video[0], dirname)
if url.startswith('file://') and os.path.isfile(url[7:]):
@@ -230,21 +231,23 @@
# global <video> mplayer_options
if mplayer_options:
item.mplayer_options += mplayer_options
- else:
- # a list of files
- for s in video:
- video_child = parse_video_child(fxd, s, dirname)
- v = VideoItem(video_child[1], parent=item, info=item.info,
parse=False)
- v.files = None
- v.media_id, v.mplayer_options, player, is_playlist =
video_child[2:]
- if video_child[-2]:
- v.force_player = video_child[-2]
- if video_child[-1]:
- item.is_playlist = True
- # global <video> mplayer_options
- if mplayer_options:
- v.mplayer_options += mplayer_options
- item.subitems.append(v)
+
+ # if there is more than one item add them to subitems
+ if len(video) > 1:
+ # a list of files
+ for s in video:
+ video_child = parse_video_child(fxd, s, dirname)
+ v = VideoItem(video_child[1], parent=item, info=item.info,
parse=False)
+ v.files = None
+ v.media_id, v.mplayer_options, player, is_playlist =
video_child[2:]
+ if video_child[-2]:
+ v.force_player = video_child[-2]
+ if video_child[-1]:
+ item.is_playlist = True
+ # global <video> mplayer_options
+ if mplayer_options:
+ v.mplayer_options += mplayer_options
+ item.subitems.append(v)
if not item.files:
item.files = FileInformation()
-------------------------------------------------------------------------
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
