Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20068
Modified Files:
mediainfo.py
Log Message:
improved item with track storage
Index: mediainfo.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mediainfo.py 14 Feb 2004 13:05:04 -0000 1.28
--- mediainfo.py 15 Feb 2004 15:30:52 -0000 1.29
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.29 2004/02/15 15:30:52 dischi
+ # improved item with track storage
+ #
# Revision 1.28 2004/02/14 13:05:04 dischi
# do not call skin.get_singleton() anymore
***************
*** 217,224 ****
filename = filename[filename.rfind('/')+1:]
- # print dirname
- # print dirname.__class__
- # print self.current_cachedir
- # print self.current_cachedir.__class__
if dirname != self.current_cachedir:
self.load_cache(dirname)
--- 220,223 ----
***************
*** 281,288 ****
"""
ret = {}
- if hasattr(object, 'tracks'):
- # do not simplifiy dvds on disc/vcds cue/bin
- return object
-
for k in object.keys:
if not k in self.uncachable_keys and getattr(object,k) != None:
--- 280,283 ----
***************
*** 300,309 ****
--- 295,311 ----
for o in getattr(object, k):
ret[k].append(self.simplify(o))
+
if hasattr(object, 'subtitles') and object.subtitles:
# add subtitles for AVCORE
ret['subtitles'] = object.subtitles
+
if hasattr(object, 'mime'):
# mimetype may be good to have :-)
ret['mime'] = object.mime
+
+ # something with tracks (e.g. dvd on disc)
+ if hasattr(object, 'tracks'):
+ ret['tracks'] = object['tracks']
+
return ret
***************
*** 316,320 ****
if info:
info = self.simplify(info)
! info['title:filename'] = Unicode(util.getname(filename))
if info.has_key('video'):
for video in info['video']:
--- 318,327 ----
if info:
info = self.simplify(info)
! name = util.getname(filename)
! if name == name.upper() and info.has_key('type') and \
! info['type'] in ('DVD', 'VCD'):
! name = util.getname(filename.lower())
! info['title:filename'] = name
!
if info.has_key('video'):
for video in info['video']:
***************
*** 323,326 ****
--- 330,343 ----
(info.has_key(variable) and info[variable]):
info[variable] = video[variable]
+
+ if info.has_key('tracks') and info['tracks'] and not
info.has_key('length'):
+ info['length'] = 0
+ for track in info['tracks']:
+ if track.has_key('length'):
+ info['length'] += track['length']
+ if info['tracks'][0].has_key('length') and \
+ info['tracks'][0]['length'] * len(info['tracks']) ==
info['length']:
+ # badly masted dvd
+ info['length'] = info['tracks'][0]['length']
return info
return {}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
