Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv10813
Modified Files:
__init__.py fxdhandler.py videoitem.py
Log Message:
reflect self.fxd_file changes
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/__init__.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** __init__.py 9 Jan 2004 21:05:27 -0000 1.22
--- __init__.py 10 Jan 2004 13:22:17 -0000 1.23
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.23 2004/01/10 13:22:17 dischi
+ # reflect self.fxd_file changes
+ #
# Revision 1.22 2004/01/09 21:05:27 dischi
# set directory skin_settings for tv shows
***************
*** 129,134 ****
if not diritem.image:
diritem.image = tvinfo[0]
! if not diritem.skin_settings:
! diritem.skin_settings = tvinfo[3]
--- 132,137 ----
if not diritem.image:
diritem.image = tvinfo[0]
! if not diritem.skin_fxd:
! diritem.skin_fxd = tvinfo[3]
***************
*** 184,190 ****
files = util.recursefolders(config.VIDEO_SHOW_DATA_DIR,1, '*.fxd',1)
for info in fxditem.mimetype.parse(None, files, display_type='video'):
! k = vfs.splitext(vfs.basename(info.fxd_file))[0]
tv_show_informations[k] = (info.image, info.info, info.mplayer_options,
! info.fxd_file)
if hasattr(info, '__fxd_rom_info__'):
for fo in info.__fxd_files_options__:
--- 187,193 ----
files = util.recursefolders(config.VIDEO_SHOW_DATA_DIR,1, '*.fxd',1)
for info in fxditem.mimetype.parse(None, files, display_type='video'):
! k = vfs.splitext(vfs.basename(info.files.fxd_file))[0]
tv_show_informations[k] = (info.image, info.info, info.mplayer_options,
! info.skin_fxd)
if hasattr(info, '__fxd_rom_info__'):
for fo in info.__fxd_files_options__:
Index: fxdhandler.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/fxdhandler.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** fxdhandler.py 4 Jan 2004 11:16:53 -0000 1.11
--- fxdhandler.py 10 Jan 2004 13:22:17 -0000 1.12
***************
*** 10,40 ****
# -----------------------------------------------------------------------
# $Log$
# Revision 1.11 2004/01/04 11:16:53 dischi
# do not override image with nothing
#
- # Revision 1.10 2003/12/30 15:36:01 dischi
- # remove unneeded copy function, small bugfix
- #
- # Revision 1.9 2003/12/29 22:29:25 dischi
- # small bugfix
- #
- # Revision 1.8 2003/12/29 22:08:54 dischi
- # move to new Item attributes
- #
- # Revision 1.7 2003/12/22 13:27:34 dischi
- # patch for better support of fxd files with more discs from Matthieu Weber
- #
- # Revision 1.6 2003/12/09 19:43:01 dischi
- # patch from Matthieu Weber
- #
- # Revision 1.5 2003/12/07 12:28:25 dischi
- # bugfix
- #
- # 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
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 10,19 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2004/01/10 13:22:17 dischi
+ # reflect self.fxd_file changes
+ #
# Revision 1.11 2004/01/04 11:16:53 dischi
# do not override image with nothing
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
***************
*** 113,121 ****
item = VideoItem('', fxd.getattr(None, 'parent', None), parse=False)
! fxd_file = fxd.getattr(None, 'filename', '')
! dirname = os.path.dirname(fxd_file)
image = ''
! item.name = fxd.getattr(node, 'title')
item.image = fxd.childcontent(node, 'cover-img')
if item.image:
--- 92,100 ----
item = VideoItem('', fxd.getattr(None, 'parent', None), parse=False)
! dirname = os.path.dirname(fxd.filename)
image = ''
! title = fxd.getattr(node, 'title')
! item.name = title
item.image = fxd.childcontent(node, 'cover-img')
if item.image:
***************
*** 224,227 ****
--- 203,207 ----
mminfo = item.info
item.set_url(url)
+ item.name = title
for key in mminfo:
item.info[key] = mminfo[key]
***************
*** 253,257 ****
item.files = FileInformation()
item.files.files = files
! item.files.fxd_file = fxd_file
if image:
item.files.image = image
--- 233,238 ----
item.files = FileInformation()
item.files.files = files
!
! item.files.fxd_file = fxd.filename
if image:
item.files.image = image
***************
*** 265,269 ****
pass
! item.fxd_file = fxd_file
fxd.getattr(None, 'items', []).append(item)
--- 246,251 ----
pass
! if fxd.is_skin_fxd:
! item.skin_fxd = fxd.filename
fxd.getattr(None, 'items', []).append(item)
***************
*** 278,283 ****
item = VideoItem('', fxd.getattr(None, 'parent', None), parse=False)
! fxd_file = fxd.getattr(None, 'filename', '')
! dirname = os.path.dirname(fxd_file)
item.name = fxd.getattr(node, 'title')
--- 260,264 ----
item = VideoItem('', fxd.getattr(None, 'parent', None), parse=False)
! dirname = os.path.dirname(fxd.filename)
item.name = fxd.getattr(node, 'title')
***************
*** 323,326 ****
item.mplayer_options = ''
! item.fxd_file = fxd_file
fxd.getattr(None, 'items', []).append(item)
--- 304,311 ----
item.mplayer_options = ''
! if not item.files:
! item.files = FileInformation()
! item.files.fxd_file = fxd.filename
! if fxd.is_skin_fxd:
! item.skin_fxd = fxd.filename
fxd.getattr(None, 'items', []).append(item)
Index: videoitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** videoitem.py 9 Jan 2004 21:05:09 -0000 1.114
--- videoitem.py 10 Jan 2004 13:22:17 -0000 1.115
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.115 2004/01/10 13:22:17 dischi
+ # reflect self.fxd_file changes
+ #
# Revision 1.114 2004/01/09 21:05:09 dischi
# override folder.fxd with tv show version
***************
*** 153,158 ****
if not self.image:
self.image = tvinfo[0]
! if not self.fxd_file or self.fxd_file.endswith('folder.fxd'):
! self.fxd_file = tvinfo[3]
self.mplayer_options = tvinfo[2]
--- 156,160 ----
if not self.image:
self.image = tvinfo[0]
! self.skin_fxd = tvinfo[3]
self.mplayer_options = tvinfo[2]
***************
*** 323,327 ****
if not self.menuw:
self.menuw = menuw
! m = menu.Menu(self.name, self.variants, reload_func=None,
fxd_file=self.fxd_file)
m.item_types = 'video'
self.menuw.pushmenu(m)
--- 325,329 ----
if not self.menuw:
self.menuw = menuw
! m = menu.Menu(self.name, self.variants, reload_func=None,
fxd_file=self.skin_fxd)
m.item_types = 'video'
self.menuw.pushmenu(m)
***************
*** 553,557 ****
items += [i]
! moviemenu = menu.Menu(self.name, items, umount_all = 1,
fxd_file=self.fxd_file)
moviemenu.item_types = 'video'
self.menuw.pushmenu(moviemenu)
--- 555,559 ----
items += [i]
! moviemenu = menu.Menu(self.name, items, umount_all = 1,
fxd_file=self.skin_fxd)
moviemenu.item_types = 'video'
self.menuw.pushmenu(moviemenu)
***************
*** 564,568 ****
if not self.menuw:
self.menuw = menuw
! confmenu = configure.get_menu(self, self.menuw, self.fxd_file)
self.menuw.pushmenu(confmenu)
--- 566,570 ----
if not self.menuw:
self.menuw = menuw
! confmenu = configure.get_menu(self, self.menuw, self.skin_fxd)
self.menuw.pushmenu(confmenu)
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
