Author: dmeyer
Date: Thu Dec 7 20:27:18 2006
New Revision: 2178
Modified:
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/mediainfo.py
trunk/metadata/src/video/flvinfo.py
trunk/metadata/src/video/movinfo.py
trunk/metadata/src/video/mpeginfo.py
trunk/metadata/src/video/realinfo.py
trunk/metadata/src/video/vcdinfo.py
Log:
remove unneeded context var
Modified: trunk/metadata/src/disc/audioinfo.py
==============================================================================
--- trunk/metadata/src/disc/audioinfo.py (original)
+++ trunk/metadata/src/disc/audioinfo.py Thu Dec 7 20:27:18 2006
@@ -49,7 +49,6 @@
class AudioDiscInfo(discinfo.DiscInfo):
def __init__(self,device):
discinfo.DiscInfo.__init__(self)
- self.context = 'audio'
self.offset = 0
# check disc
if discinfo.DiscInfo.isDisc(self, device) != 1:
Modified: trunk/metadata/src/disc/datainfo.py
==============================================================================
--- trunk/metadata/src/disc/datainfo.py (original)
+++ trunk/metadata/src/disc/datainfo.py Thu Dec 7 20:27:18 2006
@@ -39,7 +39,6 @@
DiscInfo.__init__(self)
if DiscInfo.isDisc(self, device) != 2:
raise mediainfo.KaaMetadataParseError()
- self.context = 'unknown'
self.offset = 0
self.mime = 'unknown/unknown'
self.type = 'CD'
Modified: trunk/metadata/src/disc/dvdinfo.py
==============================================================================
--- trunk/metadata/src/disc/dvdinfo.py (original)
+++ trunk/metadata/src/disc/dvdinfo.py Thu Dec 7 20:27:18 2006
@@ -100,7 +100,6 @@
def __init__(self, device):
DiscInfo.__init__(self)
- self.context = 'video'
self.offset = 0
if isinstance(device, file):
Modified: trunk/metadata/src/disc/vcdinfo.py
==============================================================================
--- trunk/metadata/src/disc/vcdinfo.py (original)
+++ trunk/metadata/src/disc/vcdinfo.py Thu Dec 7 20:27:18 2006
@@ -38,7 +38,6 @@
class VCDInfo(DiscInfo):
def __init__(self,device):
DiscInfo.__init__(self)
- self.context = 'video'
self.offset = 0
self.mime = 'video/vcd'
self.type = 'CD'
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Thu Dec 7 20:27:18 2006
@@ -362,6 +362,7 @@
all media, that contain more than one stream.
"""
_keys = MediaInfo._keys + AVCORE
+ media = 'a/v container'
def __init__(self):
MediaInfo.__init__(self)
@@ -388,6 +389,7 @@
Collection of Digial Media like CD, DVD, Directory, Playlist
"""
_keys = MediaInfo._keys + [ 'id', 'tracks' ]
+ media = 'container'
def __init__(self):
MediaInfo.__init__(self)
Modified: trunk/metadata/src/video/flvinfo.py
==============================================================================
--- trunk/metadata/src/video/flvinfo.py (original)
+++ trunk/metadata/src/video/flvinfo.py Thu Dec 7 20:27:18 2006
@@ -62,7 +62,6 @@
class FlashInfo(mediainfo.AVInfo):
def __init__(self,file):
mediainfo.AVInfo.__init__(self)
- self.context = 'video'
self.mime = 'video/flv'
self.type = 'Flash Video'
header = struct.unpack('>3sBBII', file.read(13))
Modified: trunk/metadata/src/video/movinfo.py
==============================================================================
--- trunk/metadata/src/video/movinfo.py (original)
+++ trunk/metadata/src/video/movinfo.py Thu Dec 7 20:27:18 2006
@@ -65,7 +65,6 @@
def __init__(self,file):
mediainfo.AVInfo.__init__(self)
- self.context = 'video'
self._references = []
self.mime = 'video/quicktime'
Modified: trunk/metadata/src/video/mpeginfo.py
==============================================================================
--- trunk/metadata/src/video/mpeginfo.py (original)
+++ trunk/metadata/src/video/mpeginfo.py Thu Dec 7 20:27:18 2006
@@ -137,7 +137,6 @@
class MpegInfo(mediainfo.AVInfo):
def __init__(self,file):
mediainfo.AVInfo.__init__(self)
- self.context = 'video'
self.sequence_header_offset = 0
self.mpeg_version = 2
Modified: trunk/metadata/src/video/realinfo.py
==============================================================================
--- trunk/metadata/src/video/realinfo.py (original)
+++ trunk/metadata/src/video/realinfo.py Thu Dec 7 20:27:18 2006
@@ -47,7 +47,6 @@
class RealInfo(mediainfo.AVInfo):
def __init__(self,file):
mediainfo.AVInfo.__init__(self)
- self.context = 'video'
self.mime = 'video/real'
self.type = 'Real Video'
h = file.read(10)
Modified: trunk/metadata/src/video/vcdinfo.py
==============================================================================
--- trunk/metadata/src/video/vcdinfo.py (original)
+++ trunk/metadata/src/video/vcdinfo.py Thu Dec 7 20:27:18 2006
@@ -39,7 +39,6 @@
class VCDInfo(mediainfo.CollectionInfo):
def __init__(self, file):
mediainfo.CollectionInfo.__init__(self)
- self.context = 'video'
self.offset = 0
self.mime = 'video/vcd'
self.type = 'vcd video'
-------------------------------------------------------------------------
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
