Author: dmeyer
Date: Sat Dec 9 18:10:30 2006
New Revision: 2194
Modified:
trunk/metadata/src/__init__.py
trunk/metadata/src/disc/discinfo.py
trunk/metadata/src/mediainfo.py
Log:
fix self.media and add MEDIA_DISC
Modified: trunk/metadata/src/__init__.py
==============================================================================
--- trunk/metadata/src/__init__.py (original)
+++ trunk/metadata/src/__init__.py Sat Dec 9 18:10:30 2006
@@ -40,7 +40,7 @@
from factory import *
from disc.discinfo import cdrom_disc_id as getid
from mediainfo import MediaInfo, MEDIA_AUDIO, MEDIA_VIDEO, MEDIA_IMAGE, \
- MEDIA_AV, MEDIA_SUBTITLE, MEDIA_CONTAINER, MEDIA_DIRECTORY
+ MEDIA_AV, MEDIA_SUBTITLE, MEDIA_CONTAINER, MEDIA_DIRECTORY, MEDIA_DISC
# use network functions
Modified: trunk/metadata/src/disc/discinfo.py
==============================================================================
--- trunk/metadata/src/disc/discinfo.py (original)
+++ trunk/metadata/src/disc/discinfo.py Sat Dec 9 18:10:30 2006
@@ -211,7 +211,8 @@
class DiscInfo(mediainfo.CollectionInfo):
_keys = mediainfo.CollectionInfo._keys + [ 'mixed', 'label' ]
-
+ media = mediainfo.MEDIA_DISC
+
def isDisc(self, device):
(type, self.id) = cdrom_disc_id(device, handle_mix=1)
if type != 2:
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Sat Dec 9 18:10:30 2006
@@ -52,6 +52,8 @@
MEDIA_SUBTITLE = 'MEDIA_SUBTITLE'
MEDIA_CONTAINER = 'MEDIA_CONTAINER'
MEDIA_DIRECTORY = 'MEDIA_DIRECTORY'
+MEDIA_DISC = 'MEDIA_DISC'
+
MEDIACORE = ['title', 'caption', 'comment', 'size', 'type', 'subtype', 'date',
'keywords', 'country', 'language', 'url', 'media', 'artist',
'mime']
@@ -103,7 +105,8 @@
self._keys = self._keys[:]
self._tables = {}
for key in self._keys:
- setattr(self, key, None)
+ if not key == 'media':
+ setattr(self, key, None)
#
-------------------------------------------------------------------------
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
