Author: dmeyer
Date: Fri Dec 8 14:57:08 2006
New Revision: 2186
Modified:
trunk/metadata/src/audio/ac3info.py
trunk/metadata/src/audio/adtsinfo.py
trunk/metadata/src/audio/eyed3info.py
trunk/metadata/src/audio/flacinfo.py
trunk/metadata/src/audio/m4ainfo.py
trunk/metadata/src/audio/ogginfo.py
trunk/metadata/src/audio/pcminfo.py
trunk/metadata/src/audio/webradioinfo.py
trunk/metadata/src/disc/audioinfo.py
trunk/metadata/src/disc/datainfo.py
trunk/metadata/src/disc/dvdinfo.py
trunk/metadata/src/disc/vcdinfo.py
trunk/metadata/src/factory.py
trunk/metadata/src/games/gameboyinfo.py
trunk/metadata/src/games/snesinfo.py
trunk/metadata/src/image/bmpinfo.py
trunk/metadata/src/image/core.py
trunk/metadata/src/image/gifinfo.py
trunk/metadata/src/image/jpginfo.py
trunk/metadata/src/image/pnginfo.py
trunk/metadata/src/image/tiffinfo.py
trunk/metadata/src/mediainfo.py
trunk/metadata/src/misc/dirinfo.py
trunk/metadata/src/misc/xmlinfo.py
trunk/metadata/src/video/asfinfo.py
trunk/metadata/src/video/flvinfo.py
trunk/metadata/src/video/mkvinfo.py
trunk/metadata/src/video/movinfo.py
trunk/metadata/src/video/mpeginfo.py
trunk/metadata/src/video/ogminfo.py
trunk/metadata/src/video/realinfo.py
trunk/metadata/src/video/riffinfo.py
trunk/metadata/src/video/vcdinfo.py
Log:
clean up media/type handling
Modified: trunk/metadata/src/audio/ac3info.py
==============================================================================
--- trunk/metadata/src/audio/ac3info.py (original)
+++ trunk/metadata/src/audio/ac3info.py Fri Dec 8 14:57:08 2006
@@ -157,4 +157,5 @@
self.codec = 0x2000 # fourcc code of ac3
self.mime = 'audio/ac3'
-factory.register( 'audio/ac3', ('ac3',), mediainfo.TYPE_MUSIC, AC3Info )
+
+factory.register( 'audio/ac3', ('ac3',), AC3Info )
Modified: trunk/metadata/src/audio/adtsinfo.py
==============================================================================
--- trunk/metadata/src/audio/adtsinfo.py (original)
+++ trunk/metadata/src/audio/adtsinfo.py Fri Dec 8 14:57:08 2006
@@ -77,4 +77,4 @@
self.mime = 'audio/aac'
-factory.register( 'application/adts', ('aac',), mediainfo.TYPE_AUDIO, ADTSInfo
)
+factory.register( 'application/adts', ('aac',), ADTSInfo )
Modified: trunk/metadata/src/audio/eyed3info.py
==============================================================================
--- trunk/metadata/src/audio/eyed3info.py (original)
+++ trunk/metadata/src/audio/eyed3info.py Fri Dec 8 14:57:08 2006
@@ -300,4 +300,4 @@
self._set('mode', _modes[mode])
-factory.register( 'audio/mp3', ('mp3',), mediainfo.TYPE_MUSIC, eyeD3Info )
+factory.register( 'audio/mp3', ('mp3',), eyeD3Info )
Modified: trunk/metadata/src/audio/flacinfo.py
==============================================================================
--- trunk/metadata/src/audio/flacinfo.py (original)
+++ trunk/metadata/src/audio/flacinfo.py Fri Dec 8 14:57:08 2006
@@ -116,5 +116,4 @@
return (len+4,unicode(header[4:4+len], 'utf-8'))
-factory.register( 'application/flac', ('flac',), mediainfo.TYPE_MUSIC,
- FlacInfo )
+factory.register( 'application/flac', ('flac',), FlacInfo )
Modified: trunk/metadata/src/audio/m4ainfo.py
==============================================================================
--- trunk/metadata/src/audio/m4ainfo.py (original)
+++ trunk/metadata/src/audio/m4ainfo.py Fri Dec 8 14:57:08 2006
@@ -103,4 +103,4 @@
return struct.unpack('>I', self.read(4, file))[0]
-factory.register( 'application/m4a', ('m4a',), mediainfo.TYPE_MUSIC, Mpeg4)
+factory.register( 'application/m4a', ('m4a',), Mpeg4)
Modified: trunk/metadata/src/audio/ogginfo.py
==============================================================================
--- trunk/metadata/src/audio/ogginfo.py (original)
+++ trunk/metadata/src/audio/ogginfo.py Fri Dec 8 14:57:08 2006
@@ -138,4 +138,4 @@
return (granule_position / self.samplerate)
-factory.register( 'application/ogg', ('ogg',), mediainfo.TYPE_MUSIC, OggInfo)
+factory.register( 'application/ogg', ('ogg',), OggInfo)
Modified: trunk/metadata/src/audio/pcminfo.py
==============================================================================
--- trunk/metadata/src/audio/pcminfo.py (original)
+++ trunk/metadata/src/audio/pcminfo.py Fri Dec 8 14:57:08 2006
@@ -59,5 +59,4 @@
return None
-factory.register( 'application/pcm', ('wav','aif','voc','au'),
- mediainfo.TYPE_AUDIO, PCMInfo )
+factory.register( 'application/pcm', ('wav','aif','voc','au'), PCMInfo )
Modified: trunk/metadata/src/audio/webradioinfo.py
==============================================================================
--- trunk/metadata/src/audio/webradioinfo.py (original)
+++ trunk/metadata/src/audio/webradioinfo.py Fri Dec 8 14:57:08 2006
@@ -99,5 +99,4 @@
self.bitrate = string.atoi(self.bitrate)*1000
-factory.register( 'text/plain', mediainfo.EXTENSION_STREAM,
- mediainfo.TYPE_MUSIC, WebRadioInfo )
+factory.register( 'text/plain', mediainfo.EXTENSION_STREAM, WebRadioInfo )
Modified: trunk/metadata/src/disc/audioinfo.py
==============================================================================
--- trunk/metadata/src/disc/audioinfo.py (original)
+++ trunk/metadata/src/disc/audioinfo.py Fri Dec 8 14:57:08 2006
@@ -174,5 +174,4 @@
cdromfd.close()
-factory.register( 'audio/cd', mediainfo.EXTENSION_DEVICE,
- mediainfo.TYPE_AUDIO, AudioDiscInfo )
+factory.register( 'audio/cd', mediainfo.EXTENSION_DEVICE, AudioDiscInfo )
Modified: trunk/metadata/src/disc/datainfo.py
==============================================================================
--- trunk/metadata/src/disc/datainfo.py (original)
+++ trunk/metadata/src/disc/datainfo.py Fri Dec 8 14:57:08 2006
@@ -45,5 +45,4 @@
self.subtype = 'data'
-factory.register( 'cd/unknown', mediainfo.EXTENSION_DEVICE,
- mediainfo.TYPE_NONE, DataDiscInfo )
+factory.register( 'cd/unknown', mediainfo.EXTENSION_DEVICE, DataDiscInfo )
Modified: trunk/metadata/src/disc/dvdinfo.py
==============================================================================
--- trunk/metadata/src/disc/dvdinfo.py (original)
+++ trunk/metadata/src/disc/dvdinfo.py Fri Dec 8 14:57:08 2006
@@ -200,10 +200,8 @@
self._parse(f.name)
-factory.register( 'video/dvd', mediainfo.EXTENSION_DEVICE,
- mediainfo.TYPE_AV, DVDInfo )
+factory.register( 'video/dvd', mediainfo.EXTENSION_DEVICE, DVDInfo )
-factory.register('video/dvd', mediainfo.EXTENSION_DIRECTORY,
- mediainfo.TYPE_AV, DVDInfo)
+factory.register('video/dvd', mediainfo.EXTENSION_DIRECTORY, DVDInfo)
-factory.register('video/dvd', ['iso'], mediainfo.TYPE_AV, DVDInfo)
+factory.register('video/dvd', ['iso'], DVDInfo)
Modified: trunk/metadata/src/disc/vcdinfo.py
==============================================================================
--- trunk/metadata/src/disc/vcdinfo.py (original)
+++ trunk/metadata/src/disc/vcdinfo.py Fri Dec 8 14:57:08 2006
@@ -97,5 +97,4 @@
device.close()
-factory.register( 'video/vcd', mediainfo.EXTENSION_DEVICE,
- mediainfo.TYPE_AV, VCDInfo )
+factory.register( 'video/vcd', mediainfo.EXTENSION_DEVICE, VCDInfo )
Modified: trunk/metadata/src/factory.py
==============================================================================
--- trunk/metadata/src/factory.py (original)
+++ trunk/metadata/src/factory.py Fri Dec 8 14:57:08 2006
@@ -52,6 +52,10 @@
# some timing debug
TIME_DEBUG = False
+R_MIMETYPE = 0
+R_EXTENTION = 1
+R_CLASS = 2
+
def Factory():
"""
Create or return global unique factory object.
@@ -65,11 +69,11 @@
return _factory
-def register(mimetype, extensions, type, c):
+def register(mimetype, extensions, c):
"""
Register a parser to the factory.
"""
- return Factory().register(mimetype,extensions,type,c)
+ return Factory().register(mimetype, extensions, c)
def gettype(mimetype, extensions):
@@ -173,7 +177,7 @@
log.debug("trying ext %s" % e[1:])
file.seek(0,0)
try:
- parser = self.extmap[e[1:]][3]
+ parser = self.extmap[e[1:]][R_CLASS]
return parser(file)
except mediainfo.KaaMetadataParseError:
pass
@@ -189,13 +193,13 @@
log.info('No Type found by Extension. Trying all')
for e in self.types:
- if e[3] == parser:
+ if e[R_CLASS] == parser:
# We already tried this parser, don't bother again.
continue
- log.debug('trying %s' % e[0])
+ log.debug('trying %s' % e[R_MIMETYPE])
file.seek(0,0)
try:
- return e[3](file)
+ return e[R_CLASS](file)
except (KeyboardInterrupt, SystemExit):
sys.exit(0)
except:
@@ -226,9 +230,9 @@
# method for this. Perhaps move file.open stuff into __init__
# instead of doing it here...
for e in self.stream_types:
- log.debug('Trying %s' % e[0])
+ log.debug('Trying %s' % e[R_MIMETYPE])
try:
- return e[3](url)
+ return e[R_CLASS](url)
except mediainfo.KaaMetadataParseError:
pass
except (KeyboardInterrupt, SystemExit):
@@ -240,7 +244,7 @@
log.debug("Trying %s" % mime)
if self.mimemap.has_key(mime):
try:
- return self.mimemap[mime][3](file)
+ return self.mimemap[mime][R_CLASS](file)
except mediainfo.KaaMetadataParseError:
pass
except (KeyboardInterrupt, SystemExit):
@@ -277,9 +281,9 @@
are supported.
"""
for e in self.device_types:
- log.debug('Trying %s' % e[0])
+ log.debug('Trying %s' % e[R_MIMETYPE])
try:
- t = e[3](devicename)
+ t = e[R_CLASS](devicename)
t.url = 'file://%s' % os.path.abspath(devicename)
return t
except mediainfo.KaaMetadataParseError:
@@ -294,9 +298,9 @@
Create information from the directory.
"""
for e in self.directory_types:
- log.debug('Trying %s' % e[0])
+ log.debug('Trying %s' % e[R_MIMETYPE])
try:
- return e[3](dirname)
+ return e[R_CLASS](dirname)
except mediainfo.KaaMetadataParseError:
pass
except (KeyboardInterrupt, SystemExit):
@@ -333,12 +337,12 @@
- def register(self,mimetype,extensions,type,c):
+ def register(self, mimetype, extensions, c):
"""
register the parser to kaa.metadata
"""
log.debug('%s registered' % mimetype)
- tuple = (mimetype,extensions,type,c)
+ tuple = (mimetype, extensions, c)
if extensions == mediainfo.EXTENSION_DEVICE:
self.device_types.append(tuple)
@@ -367,7 +371,6 @@
l = self.types
for info in l:
- if info[0] == mimetype and info[1] == extensions:
- return info[3]
-
+ if info[R_MIMETYPE] == mimetype and info[R_EXTENSION] ==
extensions:
+ return info[R_CLASS]
return None
Modified: trunk/metadata/src/games/gameboyinfo.py
==============================================================================
--- trunk/metadata/src/games/gameboyinfo.py (original)
+++ trunk/metadata/src/games/gameboyinfo.py Fri Dec 8 14:57:08 2006
@@ -95,5 +95,4 @@
if file.read(1) != '\x96':
raise mediainfo.KaaMetadataParseError()
-factory.register( 'games/gameboy', ('gba', 'gb', 'gbc', ),
- mediainfo.TYPE_MISC, GameboyInfo )
+factory.register( 'games/gameboy', ('gba', 'gb', 'gbc', ), GameboyInfo )
Modified: trunk/metadata/src/games/snesinfo.py
==============================================================================
--- trunk/metadata/src/games/snesinfo.py (original)
+++ trunk/metadata/src/games/snesinfo.py Fri Dec 8 14:57:08 2006
@@ -98,5 +98,4 @@
self.title = romName.strip()
-factory.register( 'games/snes', ('smc', 'sfc', 'fig', ),
- mediainfo.TYPE_MISC, SNESInfo )
+factory.register( 'games/snes', ('smc', 'sfc', 'fig', ), SNESInfo )
Modified: trunk/metadata/src/image/bmpinfo.py
==============================================================================
--- trunk/metadata/src/image/bmpinfo.py (original)
+++ trunk/metadata/src/image/bmpinfo.py Fri Dec 8 14:57:08 2006
@@ -61,4 +61,4 @@
raise mediainfo.KaaMetadataParseError()
-factory.register( 'image/bmp', ('bmp', ), mediainfo.TYPE_IMAGE, BMPInfo )
+factory.register( 'image/bmp', ('bmp', ), BMPInfo )
Modified: trunk/metadata/src/image/core.py
==============================================================================
--- trunk/metadata/src/image/core.py (original)
+++ trunk/metadata/src/image/core.py Fri Dec 8 14:57:08 2006
@@ -54,7 +54,8 @@
"""
_keys = ATTRIBUTES
-
+ media = mediainfo.MEDIA_IMAGE
+
def _finalize(self):
"""
Add additional information and correct data.
Modified: trunk/metadata/src/image/gifinfo.py
==============================================================================
--- trunk/metadata/src/image/gifinfo.py (original)
+++ trunk/metadata/src/image/gifinfo.py Fri Dec 8 14:57:08 2006
@@ -60,4 +60,4 @@
self.type = gifType.lower()
-factory.register( 'image/gif', ('gif', ), mediainfo.TYPE_IMAGE, GIFInfo )
+factory.register( 'image/gif', ('gif', ), GIFInfo )
Modified: trunk/metadata/src/image/jpginfo.py
==============================================================================
--- trunk/metadata/src/image/jpginfo.py (original)
+++ trunk/metadata/src/image/jpginfo.py Fri Dec 8 14:57:08 2006
@@ -176,4 +176,4 @@
if key.startswith('Thumb:') or key == 'Software':
self._set(key, value)
-factory.register( 'image/jpeg', ('jpg','jpeg'), mediainfo.TYPE_IMAGE, JPGInfo )
+factory.register( 'image/jpeg', ('jpg','jpeg'), JPGInfo )
Modified: trunk/metadata/src/image/pnginfo.py
==============================================================================
--- trunk/metadata/src/image/pnginfo.py (original)
+++ trunk/metadata/src/image/pnginfo.py Fri Dec 8 14:57:08 2006
@@ -128,4 +128,4 @@
self.comment = self.meta[key]
return 1
-factory.register( 'image/png', ('png',), mediainfo.TYPE_IMAGE, PNGInfo )
+factory.register( 'image/png', ('png',), PNGInfo )
Modified: trunk/metadata/src/image/tiffinfo.py
==============================================================================
--- trunk/metadata/src/image/tiffinfo.py (original)
+++ trunk/metadata/src/image/tiffinfo.py Fri Dec 8 14:57:08 2006
@@ -117,4 +117,4 @@
self._appendtable('IPTC', iptc)
-factory.register( 'image/tiff', ('tif','tiff'), mediainfo.TYPE_IMAGE, TIFFInfo)
+factory.register( 'image/tiff', ('tif','tiff'), TIFFInfo)
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Fri Dec 8 14:57:08 2006
@@ -44,15 +44,14 @@
UNPRINTABLE_KEYS = [ 'thumbnail']
-# type definitions
-TYPE_NONE = 0
-TYPE_AUDIO = 1
-TYPE_VIDEO = 2
-TYPE_IMAGE = 4
-TYPE_AV = 5
-TYPE_MUSIC = 6
-TYPE_HYPERTEXT = 8
-TYPE_MISC = 10
+# media type definitions
+MEDIA_AUDIO = 'MEDIA_AUDIO'
+MEDIA_VIDEO = 'MEDIA_VIDEO'
+MEDIA_IMAGE = 'MEDIA_IMAGE'
+MEDIA_AV = 'MEDIA_AV'
+MEDIA_SUBTITLE = 'MEDIA_SUBTITLE'
+MEDIA_CONTAINER = 'MEDIA_CONTAINER'
+MEDIA_DIRECTORY = 'MEDIA_DIRECTORY'
MEDIACORE = ['title', 'caption', 'comment', 'size', 'type', 'subtype', 'date',
'keywords', 'country', 'language', 'url', 'media', 'artist',
'mime']
@@ -289,7 +288,7 @@
Audio Tracks in a Multiplexed Container.
"""
_keys = MediaInfo._keys + AUDIOCORE
- media = 'audio'
+ media = MEDIA_AUDIO
def _finalize(self):
if self.codec is not None:
@@ -301,7 +300,6 @@
Digital Music.
"""
_keys = AudioInfo._keys + MUSICCORE
- media = 'audio'
def _finalize(self):
"""
@@ -324,7 +322,7 @@
Video Tracks in a Multiplexed Container.
"""
_keys = MediaInfo._keys + VIDEOCORE
- media = 'video'
+ media = MEDIA_VIDEO
def _finalize(self):
if self.codec is not None:
@@ -349,7 +347,7 @@
Subtitle Tracks in a Multiplexed Container.
"""
_keys = ['language', 'trackno', 'title']
- media = 'subtitle'
+ media = MEDIA_SUBTITLE
def __init__(self, language=None):
MediaInfo.__init__(self)
@@ -362,7 +360,7 @@
all media, that contain more than one stream.
"""
_keys = MediaInfo._keys + AVCORE
- media = 'a/v container'
+ media = MEDIA_AV
def __init__(self):
MediaInfo.__init__(self)
@@ -389,7 +387,7 @@
Collection of Digial Media like CD, DVD, Directory, Playlist
"""
_keys = MediaInfo._keys + [ 'id', 'tracks' ]
- media = 'container'
+ media = MEDIA_CONTAINER
def __init__(self):
MediaInfo.__init__(self)
Modified: trunk/metadata/src/misc/dirinfo.py
==============================================================================
--- trunk/metadata/src/misc/dirinfo.py (original)
+++ trunk/metadata/src/misc/dirinfo.py Fri Dec 8 14:57:08 2006
@@ -40,7 +40,7 @@
from kaa.strutils import unicode_to_str
from kaa import xml
from kaa.metadata.mediainfo import MediaInfo, MEDIACORE, \
- EXTENSION_DIRECTORY, TYPE_MISC
+ EXTENSION_DIRECTORY, MEDIA_DIRECTORY
from kaa.metadata.factory import register
# get logging object
@@ -51,10 +51,10 @@
"""
Simple parser for reading a .directory file.
"""
+ media = MEDIA_DIRECTORY
+
def __init__(self, directory):
MediaInfo.__init__(self)
-
- self.media = 'directory'
for func in (self.parse_dot_directory, self.parse_bins):
try:
func(directory)
@@ -107,4 +107,4 @@
self._set(key, child.content)
# register to kaa.metadata core
-register('directory', EXTENSION_DIRECTORY, TYPE_MISC, DirInfo)
+register('directory', EXTENSION_DIRECTORY, DirInfo)
Modified: trunk/metadata/src/misc/xmlinfo.py
==============================================================================
--- trunk/metadata/src/misc/xmlinfo.py (original)
+++ trunk/metadata/src/misc/xmlinfo.py Fri Dec 8 14:57:08 2006
@@ -85,5 +85,4 @@
doc.freeDoc()
-factory.register( 'text/xml', ('xml', 'fxd', 'html', 'htm'),
- mediainfo.TYPE_MISC, XMLInfo )
+factory.register( 'text/xml', ('xml', 'fxd', 'html', 'htm'), XMLInfo )
Modified: trunk/metadata/src/video/asfinfo.py
==============================================================================
--- trunk/metadata/src/video/asfinfo.py (original)
+++ trunk/metadata/src/video/asfinfo.py Fri Dec 8 14:57:08 2006
@@ -376,4 +376,4 @@
-factory.register( 'video/asf', ('asf','wmv','wma'), mediainfo.TYPE_AV, AsfInfo)
+factory.register( 'video/asf', ('asf','wmv','wma'), AsfInfo)
Modified: trunk/metadata/src/video/flvinfo.py
==============================================================================
--- trunk/metadata/src/video/flvinfo.py (original)
+++ trunk/metadata/src/video/flvinfo.py Fri Dec 8 14:57:08 2006
@@ -115,4 +115,4 @@
file.seek(4, 1)
-factory.register( 'video/flv', ('flv',), mediainfo.TYPE_AV, FlashInfo )
+factory.register( 'video/flv', ('flv',), FlashInfo )
Modified: trunk/metadata/src/video/mkvinfo.py
==============================================================================
--- trunk/metadata/src/video/mkvinfo.py (original)
+++ trunk/metadata/src/video/mkvinfo.py Fri Dec 8 14:57:08 2006
@@ -265,10 +265,11 @@
"""
This is the main Matroska object
"""
+ media = mediainfo.MEDIA_AUDIO
+
def __init__(self, file):
mediainfo.AVInfo.__init__(self)
self.samplerate = 1
- self.media = 'audio'
self.file = file
# Read enough that we're likely to get the full seekhead (FIXME:
kludge)
@@ -471,7 +472,7 @@
# FIXME: add more video codecs here
track.codec = track.codec[2:]
- self.media = 'video'
+ self.media = mediainfo.MEDIA_AV
self.video.append(track)
return track
@@ -573,4 +574,4 @@
log.debug('Attachment "%s" found' % name)
-factory.register( 'application/mkv', ('mkv', 'mka',), mediainfo.TYPE_AV,
MkvInfo )
+factory.register( 'application/mkv', ('mkv', 'mka',), MkvInfo )
Modified: trunk/metadata/src/video/movinfo.py
==============================================================================
--- trunk/metadata/src/video/movinfo.py (original)
+++ trunk/metadata/src/video/movinfo.py Fri Dec 8 14:57:08 2006
@@ -360,4 +360,4 @@
exts = ('mov', 'qt', 'mp4', 'mp4a', '3gp', '3gp2', 'mk2')
-factory.register( 'video/quicktime', exts, mediainfo.TYPE_AV, MovInfo)
+factory.register( 'video/quicktime', exts, MovInfo)
Modified: trunk/metadata/src/video/mpeginfo.py
==============================================================================
--- trunk/metadata/src/video/mpeginfo.py (original)
+++ trunk/metadata/src/video/mpeginfo.py Fri Dec 8 14:57:08 2006
@@ -854,5 +854,4 @@
log.debug('done scanning file')
-factory.register( 'video/mpeg', ('mpeg','mpg','mp4', 'ts'),
- mediainfo.TYPE_AV, MpegInfo )
+factory.register( 'video/mpeg', ('mpeg','mpg','mp4', 'ts'), MpegInfo )
Modified: trunk/metadata/src/video/ogminfo.py
==============================================================================
--- trunk/metadata/src/video/ogminfo.py (original)
+++ trunk/metadata/src/video/ogminfo.py Fri Dec 8 14:57:08 2006
@@ -321,5 +321,4 @@
-factory.register( 'application/ogg', ('ogm', 'ogg',),
- mediainfo.TYPE_AV, OgmInfo )
+factory.register( 'application/ogg', ('ogm', 'ogg',), OgmInfo )
Modified: trunk/metadata/src/video/realinfo.py
==============================================================================
--- trunk/metadata/src/video/realinfo.py (original)
+++ trunk/metadata/src/video/realinfo.py Fri Dec 8 14:57:08 2006
@@ -109,5 +109,4 @@
self.comment = s[pos+2:pos+comment_len+2]
-factory.register( 'video/real', ('rm', 'ra', 'ram'),
- mediainfo.TYPE_AV, RealInfo )
+factory.register( 'video/real', ('rm', 'ra', 'ram'), RealInfo )
Modified: trunk/metadata/src/video/riffinfo.py
==============================================================================
--- trunk/metadata/src/video/riffinfo.py (original)
+++ trunk/metadata/src/video/riffinfo.py Fri Dec 8 14:57:08 2006
@@ -550,4 +550,4 @@
return False
return True
-factory.register( 'video/avi', ('avi',), mediainfo.TYPE_AV, RiffInfo )
+factory.register( 'video/avi', ('avi',), RiffInfo )
Modified: trunk/metadata/src/video/vcdinfo.py
==============================================================================
--- trunk/metadata/src/video/vcdinfo.py (original)
+++ trunk/metadata/src/video/vcdinfo.py Fri Dec 8 14:57:08 2006
@@ -93,4 +93,4 @@
self.tracks.append(vi)
-factory.register( 'video/vcd', ('cue',), mediainfo.TYPE_AV, VCDInfo )
+factory.register( 'video/vcd', ('cue',), VCDInfo )
-------------------------------------------------------------------------
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
