Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv31734
Modified Files:
fxdhandler.py videoitem.py
Log Message:
support for type=url and <playlist> and <player>
Index: fxdhandler.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/fxdhandler.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fxdhandler.py 30 Nov 2003 14:41:10 -0000 1.3
--- fxdhandler.py 6 Dec 2003 16:25:45 -0000 1.4
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2003/12/06 16:25:45 dischi
+ # support for type=url and <playlist> and <player>
+ #
# Revision 1.3 2003/11/30 14:41:10 dischi
# use new Mimetype plugin interface
***************
*** 71,74 ****
--- 74,82 ----
media_id = fxd.getattr(node, 'media_id')
options = fxd.getattr(node, 'mplayer_options')
+ player = fxd.childcontent(node, 'player')
+ playlist = False
+
+ if fxd.get_children(node, 'playlist'):
+ playlist = True
duplicates = fxd.getattr(None, 'duplicate_check', [])
***************
*** 86,90 ****
duplicates.remove(filename)
! return id, filename, mode, media_id, options
--- 94,98 ----
duplicates.remove(filename)
! return id, filename, mode, media_id, options, player, playlist
***************
*** 106,110 ****
video = fxd.get_children(video[0], 'file') + \
fxd.get_children(video[0], 'vcd') + \
! fxd.get_children(video[0], 'dvd')
variants = fxd.get_children(node, 'variants')
--- 114,119 ----
video = fxd.get_children(video[0], 'file') + \
fxd.get_children(video[0], 'vcd') + \
! fxd.get_children(video[0], 'dvd') + \
! fxd.get_children(video[0], 'url')
variants = fxd.get_children(node, 'variants')
***************
*** 168,172 ****
# only one file, this is directly for the item
id, item.filename, item.mode, item.media_id, \
! item.mplayer_options = parse_video_child(fxd, video[0], item, dirname)
# global <video> mplayer_options
if mplayer_options:
--- 177,186 ----
# only one file, this is directly for the item
id, item.filename, item.mode, item.media_id, \
! item.mplayer_options, player, is_playlist = \
! parse_video_child(fxd, video[0], item, dirname)
! if player:
! item.force_player = player
! if is_playlist:
! item.is_playlist = True
# global <video> mplayer_options
if mplayer_options:
***************
*** 179,182 ****
--- 193,200 ----
v = VideoItem(info[1], parent=item, parse=False)
v.mode, v.media_id, v.mplayer_options = info[2:]
+ if info[-2]:
+ v.force_player = info[-2]
+ if info[-1]:
+ item.is_playlist = True
# global <video> mplayer_options
if mplayer_options:
Index: videoitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** videoitem.py 28 Nov 2003 20:08:58 -0000 1.99
--- videoitem.py 6 Dec 2003 16:25:45 -0000 1.100
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.100 2003/12/06 16:25:45 dischi
+ # support for type=url and <playlist> and <player>
+ #
# Revision 1.99 2003/11/28 20:08:58 dischi
# renamed some config variables
***************
*** 302,305 ****
--- 305,311 ----
self.mime_type = self.mode
+ if self.mode == 'url':
+ self.network_play = 1
+
self.possible_player = []
for p in plugin.getbyname(plugin.VIDEO_PLAYER, True):
***************
*** 307,312 ****
if config.VIDEO_PREFERED_PLAYER == p.name:
rating += 1
self.possible_player.append((rating, p))
!
self.possible_player.sort(lambda l, o: -cmp(l[0], o[0]))
--- 313,320 ----
if config.VIDEO_PREFERED_PLAYER == p.name:
rating += 1
+ if hasattr(self, 'force_player') and p.name == self.force_player:
+ rating += 100
self.possible_player.append((rating, p))
!
self.possible_player.sort(lambda l, o: -cmp(l[0], o[0]))
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
