Author: dmeyer
Date: Sun Feb 12 10:42:52 2006
New Revision: 1172
Modified:
trunk/metadata/AUTHORS
trunk/metadata/TODO
trunk/metadata/bin/mminfo
trunk/metadata/src/__init__.py
trunk/metadata/src/audio/ac3info.py
trunk/metadata/src/audio/eyed3info.py
trunk/metadata/src/audio/flacinfo.py
trunk/metadata/src/audio/id3.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/discinfo.py
trunk/metadata/src/disc/dvdinfo.py
trunk/metadata/src/disc/ifomodule.c
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/IPTC.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/table.py
trunk/metadata/src/video/asfinfo.py
trunk/metadata/src/video/fourcc.py
trunk/metadata/src/video/mkvinfo.py
trunk/metadata/src/video/movinfo.py
trunk/metadata/src/video/movlanguages.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:
update header
Modified: trunk/metadata/AUTHORS
==============================================================================
--- trunk/metadata/AUTHORS (original)
+++ trunk/metadata/AUTHORS Sun Feb 12 10:42:52 2006
@@ -12,7 +12,8 @@
Aubin Paul <[EMAIL PROTECTED]>
Lars Eggert (FreeBSD support)
-
+Richard Mottershead <[EMAIL PROTECTED]>
+Games support
This module is based on mmpython created by Thomas Schueppel and
maintained by Thomas Schueppel and Dirk Meyer before it was renamed to
Modified: trunk/metadata/TODO
==============================================================================
--- trunk/metadata/TODO (original)
+++ trunk/metadata/TODO Sun Feb 12 10:42:52 2006
@@ -6,8 +6,10 @@
Create a REAME
-Every file needs a header and inline docs. Also correct the header to
-point to the correct AUTHORS file.
+Update inline docs
+
+Move external submodules like eyeD3 and the discID code to an extra
+dir lib to serperate our code from external modules we just copy.
Create doc in the Wiki and dump it into the doc subdir
Modified: trunk/metadata/bin/mminfo
==============================================================================
--- trunk/metadata/bin/mminfo (original)
+++ trunk/metadata/bin/mminfo Sun Feb 12 10:42:52 2006
@@ -12,7 +12,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/__init__.py
==============================================================================
--- trunk/metadata/src/__init__.py (original)
+++ trunk/metadata/src/__init__.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/audio/ac3info.py
==============================================================================
--- trunk/metadata/src/audio/ac3info.py (original)
+++ trunk/metadata/src/audio/ac3info.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/audio/eyed3info.py
==============================================================================
--- trunk/metadata/src/audio/eyed3info.py (original)
+++ trunk/metadata/src/audio/eyed3info.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@
if not re.compile(r'0*\xFF\xFA\xB0\x04$').search(s):
# that's it, it is no mp3 at all
raise mediainfo.KaaMetadataParseError()
-
+
try:
if id3 and id3.tag:
log.debug(id3.tag.frames)
Modified: trunk/metadata/src/audio/flacinfo.py
==============================================================================
--- trunk/metadata/src/audio/flacinfo.py (original)
+++ trunk/metadata/src/audio/flacinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -117,4 +117,4 @@
factory.register( 'application/flac', ('flac',), mediainfo.TYPE_MUSIC,
- FlacInfo )
+ FlacInfo )
Modified: trunk/metadata/src/audio/id3.py
==============================================================================
--- trunk/metadata/src/audio/id3.py (original)
+++ trunk/metadata/src/audio/id3.py Sun Feb 12 10:42:52 2006
@@ -1,3 +1,34 @@
+# -*- coding: iso-8859-1 -*-
+# -----------------------------------------------------------------------------
+# id3.py - id3 listings
+# -----------------------------------------------------------------------------
+# $Id$
+#
+# -----------------------------------------------------------------------------
+# kaa-Metadata - Media Metadata for Python
+# Copyright (C) 2003-2005 Thomas Schueppel, Dirk Meyer
+#
+# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
+# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
+#
+# Please see the file AUTHORS for a complete list of authors.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# -----------------------------------------------------------------------------
+
GENRE_LIST = {
0 : 'Blues',
1 : 'Classic Rock',
@@ -80,10 +111,10 @@
78 : 'Rock & Roll',
79 : 'Hard Rock',
-
+
# The following genres are Winamp extensions
-
+
80 : 'Folk',
81 : 'Folk-Rock',
82 : 'National Folk',
Modified: trunk/metadata/src/audio/m4ainfo.py
==============================================================================
--- trunk/metadata/src/audio/m4ainfo.py (original)
+++ trunk/metadata/src/audio/m4ainfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Aubin Paul <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# Based on a sample implementation posted to daap-dev mailing list by
# Bob Ippolito <[EMAIL PROTECTED]>
@@ -103,6 +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',), mediainfo.TYPE_MUSIC, Mpeg4)
Modified: trunk/metadata/src/audio/ogginfo.py
==============================================================================
--- trunk/metadata/src/audio/ogginfo.py (original)
+++ trunk/metadata/src/audio/ogginfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -138,5 +138,4 @@
return (granule_position / self.samplerate)
-factory.register( 'application/ogg', ('ogg',), mediainfo.TYPE_MUSIC,
- OggInfo )
+factory.register( 'application/ogg', ('ogg',), mediainfo.TYPE_MUSIC, OggInfo)
Modified: trunk/metadata/src/audio/pcminfo.py
==============================================================================
--- trunk/metadata/src/audio/pcminfo.py (original)
+++ trunk/metadata/src/audio/pcminfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@
# doesn't look right
raise mediainfo.KaaMetadataParseError()
self.mime = "audio/%s" % self.type
-
+
def _what(self,f):
"""Recognize sound headers"""
h = f.read(512)
@@ -60,4 +60,4 @@
factory.register( 'application/pcm', ('wav','aif','voc','au'),
- mediainfo.TYPE_AUDIO, PCMInfo )
+ mediainfo.TYPE_AUDIO, PCMInfo )
Modified: trunk/metadata/src/audio/webradioinfo.py
==============================================================================
--- trunk/metadata/src/audio/webradioinfo.py (original)
+++ trunk/metadata/src/audio/webradioinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@
raise mediainfo.KaaMetadataParseError()
# Open an URL Connection
- fi = urllib.urlopen(url)
+ fi = urllib.urlopen(url)
# grab the statusline
self.statusline = fi.readline()
@@ -64,7 +64,7 @@
except ValueError:
# assume it is okay since so many servers are badly configured
statuslist = ["ICY", "200"]
-
+
if statuslist[1] != "200":
if fi:
fi.close()
@@ -75,7 +75,7 @@
# grab any headers for a max of 10 lines
linecnt = 0
tab = {}
- lines = fi.readlines(512)
+ lines = fi.readlines(512)
for linecnt in range(0,11):
icyline = lines[linecnt]
icyline = icyline.rstrip('\r\n')
@@ -84,20 +84,19 @@
cidx = icyline.find(':')
if cidx != -1:
# break on short line (ie. really should be a blank line)
- # strip leading and trailing whitespace
+ # strip leading and trailing whitespace
tab[icyline[:cidx].strip()] = icyline[cidx+2:].strip()
if fi:
fi.close()
self.appendtable('ICY', tab)
self.tag_map = { ('ICY', 'en') : ICY_tags }
- # Copy Metadata from tables into the main set of attributes
+ # Copy Metadata from tables into the main set of attributes
for k in self.tag_map.keys():
map(lambda x:self.setitem(x,self.gettable(k[0],k[1]),
self.tag_map[k][x]),
self.tag_map[k].keys())
- self.bitrate = string.atoi(self.bitrate)*1000
+ self.bitrate = string.atoi(self.bitrate)*1000
factory.register( 'text/plain', mediainfo.EXTENSION_STREAM,
- mediainfo.TYPE_MUSIC, WebRadioInfo )
-
+ mediainfo.TYPE_MUSIC, WebRadioInfo )
Modified: trunk/metadata/src/disc/audioinfo.py
==============================================================================
--- trunk/metadata/src/disc/audioinfo.py (original)
+++ trunk/metadata/src/disc/audioinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@
cdromfd = DiscID.open(device)
disc_id = DiscID.disc_id(cdromfd)
-
+
if kaa.metadata.USE_NETWORK:
try:
(query_stat, query_info) = CDDB.query(disc_id)
Modified: trunk/metadata/src/disc/datainfo.py
==============================================================================
--- trunk/metadata/src/disc/datainfo.py (original)
+++ trunk/metadata/src/disc/datainfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -47,4 +47,4 @@
factory.register( 'cd/unknown', mediainfo.EXTENSION_DEVICE,
- mediainfo.TYPE_NONE, DataDiscInfo )
+ mediainfo.TYPE_NONE, DataDiscInfo )
Modified: trunk/metadata/src/disc/discinfo.py
==============================================================================
--- trunk/metadata/src/disc/discinfo.py (original)
+++ trunk/metadata/src/disc/discinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
#
# -----------------------------------------------------------------------------
-# freevo imports
+# python imports
import os
import re
import time
Modified: trunk/metadata/src/disc/dvdinfo.py
==============================================================================
--- trunk/metadata/src/disc/dvdinfo.py (original)
+++ trunk/metadata/src/disc/dvdinfo.py Sun Feb 12 10:42:52 2006
@@ -13,7 +13,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@
self.mime = 'video/mpeg'
self.video.append(DVDVideo(info[2:8]))
self.length = self.video[0].length
-
+
for pos, a in enumerate(info[-2]):
self.audio.append(DVDAudio(pos, a))
@@ -128,7 +128,7 @@
ti.trackof = len(info)
self.appendtrack(ti)
-
+
def parseDVDdir(self, dirname):
if not (os.path.isdir(dirname+'/VIDEO_TS') or \
os.path.isdir(dirname+'/video_ts') or \
@@ -185,12 +185,10 @@
self._parse(f.name)
-if not factory.gettype('video/dvd', mediainfo.EXTENSION_DEVICE):
- factory.register( 'video/dvd', mediainfo.EXTENSION_DEVICE,
- mediainfo.TYPE_AV, DVDInfo )
-
-if not factory.gettype('video/dvd', mediainfo.EXTENSION_DIRECTORY):
- factory.register('video/dvd', mediainfo.EXTENSION_DIRECTORY,
- mediainfo.TYPE_AV, DVDInfo)
+factory.register( 'video/dvd', mediainfo.EXTENSION_DEVICE,
+ mediainfo.TYPE_AV, DVDInfo )
+
+factory.register('video/dvd', mediainfo.EXTENSION_DIRECTORY,
+ mediainfo.TYPE_AV, DVDInfo)
factory.register('video/dvd', ['iso'], mediainfo.TYPE_AV, DVDInfo)
Modified: trunk/metadata/src/disc/ifomodule.c
==============================================================================
--- trunk/metadata/src/disc/ifomodule.c (original)
+++ trunk/metadata/src/disc/ifomodule.c Sun Feb 12 10:42:52 2006
@@ -1,5 +1,36 @@
-/* based on http://arnfast.net/projects/ifoinfo.php by Jens Arnfast
- and lsdvd by by Chris Phillips
+/* -*- coding: iso-8859-1 -*-
+ * ---------------------------------------------------------------------------
+ * dvdinfo.py - parse dvd title structure
+ * ---------------------------------------------------------------------------
+ * $Id$
+ *
+ * ---------------------------------------------------------------------------
+ * kaa-Metadata - Media Metadata for Python
+ * Copyright (C) 2003-2005 Thomas Schueppel, Dirk Meyer
+ *
+ * First Edition: Dirk Meyer <[EMAIL PROTECTED]>
+ * Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
+ *
+ * based on http://arnfast.net/projects/ifoinfo.php by Jens Arnfast
+ * and lsdvd by by Chris Phillips
+ *
+ * Please see the file AUTHORS for a complete list of authors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+ * CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * ---------------------------------------------------------------------------
*/
#include <Python.h>
@@ -21,12 +52,12 @@
int audiochannels;
int audiofreq;
audio_attr_t *attr;
-
+
if (!vtsfile->vts_pgcit || !vtsfile->vtsi_mat)
return NULL;
-
+
attr = &vtsfile->vtsi_mat->vts_audio_attr[id];
-
+
if ( attr->audio_format == 0
&& attr->multichannel_extension == 0
&& attr->lang_type == 0
@@ -39,7 +70,7 @@
&& attr->unknown1 == 0) {
return NULL;
}
-
+
/* audio format */
switch (attr->audio_format) {
case 0:
@@ -66,19 +97,20 @@
default:
snprintf(audioformat, 10, "N/A");
}
-
+
switch (attr->lang_type) {
case 0:
assert(attr->lang_code == 0 || attr->lang_code == 0xffff);
snprintf(audiolang, 5, "N/A");
break;
case 1:
- snprintf(audiolang, 5, "%c%c", attr->lang_code>>8, attr->lang_code &
0xff);
+ snprintf(audiolang, 5, "%c%c", attr->lang_code>>8,
+ attr->lang_code & 0xff);
break;
default:
snprintf(audiolang, 5, "N/A");
}
-
+
switch(attr->sample_frequency) {
case 0:
audiofreq = 48000;
@@ -89,22 +121,23 @@
default:
audiofreq = -1;
}
-
+
audiochannels = attr->channels + 1;
-
+
//AUDIOTRACK: ID=%i; LANG=%s; FORMAT=%s; CHANNELS=%i; FREQ=%ikHz
- return Py_BuildValue("(ssii)", audiolang, audioformat, audiochannels,
audiofreq);
+ return Py_BuildValue("(ssii)", audiolang, audioformat, audiochannels,
+ audiofreq);
}
static PyObject * ifoinfo_get_subtitle_tracks(ifo_handle_t *vtsfile, int id) {
char language[5];
subp_attr_t *attr;
-
+
if (!vtsfile->vts_pgcit)
return NULL;
-
+
attr = &vtsfile->vtsi_mat->vts_subp_attr[id];
-
+
if ( attr->type == 0
&& attr->lang_code == 0
&& attr->zero1 == 0
@@ -112,19 +145,23 @@
&& attr->lang_extension == 0 ) {
return Py_BuildValue("s", "N/A");
}
-
+
/* language code */
- if (isalpha((int)(attr->lang_code >> 8)) && isalpha((int)(attr->lang_code
& 0xff))) {
- snprintf(language, 5, "%c%c", attr->lang_code >> 8, attr->lang_code &
0xff);
+ if (isalpha((int)(attr->lang_code >> 8)) &&
+ isalpha((int)(attr->lang_code & 0xff))) {
+ snprintf(language, 5, "%c%c", attr->lang_code >> 8,
+ attr->lang_code & 0xff);
} else {
- snprintf(language, 5, "%02x%02x", 0xff & (unsigned)(attr->lang_code >>
8),
+ snprintf(language, 5, "%02x%02x",
+ 0xff & (unsigned)(attr->lang_code >> 8),
0xff & (unsigned)(attr->lang_code & 0xff));
}
-
+
return Py_BuildValue("s", language);
}
-static PyObject *ifoinfo_read_title(dvd_reader_t *dvd, ifo_handle_t *ifofile,
int id) {
+static PyObject *ifoinfo_read_title(dvd_reader_t *dvd, ifo_handle_t *ifofile,
+ int id) {
tt_srpt_t *tt_srpt;
ifo_handle_t *vtsfile;
video_attr_t *video_attr;
@@ -135,10 +172,10 @@
PyObject *subtitles;
PyObject *tmp;
int i;
-
+
tt_srpt = ifofile->tt_srpt;
vtsfile = ifoOpen(dvd, tt_srpt->title[id].title_set_nr);
-
+
if (!vtsfile)
return NULL;
@@ -162,7 +199,7 @@
break;
PyList_Append(audio, tmp);
}
-
+
subtitles = PyList_New(0);
for (i=0; i < vtsfile->vtsi_mat->nr_of_vts_subp_streams; i++) {
tmp = ifoinfo_get_subtitle_tracks(vtsfile, i);
@@ -170,22 +207,23 @@
break;
PyList_Append(subtitles, tmp);
}
-
+
video_attr = &vtsfile->vtsi_mat->vts_video_attr;
- /* chapters, angles, playtime, fps, format, aspect, width, height, audio,
subtitles */
- ret = Py_BuildValue("(iiiiiiiiOO)",
+ /* chapters, angles, playtime, fps, format, aspect, width, height, audio,
+ subtitles */
+ ret = Py_BuildValue("(iiiiiiiiOO)",
tt_srpt->title[id].nr_of_ptts,
- tt_srpt->title[id].nr_of_angles,
+ tt_srpt->title[id].nr_of_angles,
playtime,
- fps,
- video_attr->video_format,
+ fps,
+ video_attr->video_format,
video_attr->display_aspect_ratio,
- video_attr->picture_size,
+ video_attr->picture_size,
video_attr->video_format,
- audio,
+ audio,
subtitles);
ifoClose(vtsfile);
return ret;
@@ -198,17 +236,17 @@
ifo_handle_t *ifofile;
PyObject *ret;
int i;
-
+
if (!PyArg_ParseTuple(args, "s", &dvddevice))
return Py_BuildValue("i", 0);
dvd = DVDOpen(dvddevice);
-
+
if (!dvd) {
Py_INCREF(Py_None);
return Py_None;
}
-
+
ifofile = ifoOpen(dvd, 0);
if (!ifofile) {
DVDClose(dvd);
@@ -217,7 +255,7 @@
}
ret = PyList_New(0);
-
+
for (i=0; i<ifofile->tt_srpt->nr_of_srpts; i++) {
PyObject *title = ifoinfo_read_title(dvd, ifofile, i);
if (!title)
Modified: trunk/metadata/src/disc/vcdinfo.py
==============================================================================
--- trunk/metadata/src/disc/vcdinfo.py (original)
+++ trunk/metadata/src/disc/vcdinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@
self.context = 'video'
self.offset = 0
self.mime = 'video/vcd'
- self.type = 'CD'
+ self.type = 'CD'
self.subtype = 'video'
# parse disc
self.parseDisc(device)
@@ -51,7 +51,7 @@
type = None
if DiscInfo.isDisc(self, device) != 2:
raise mediainfo.KaaMetadataParseError()
-
+
# brute force reading of the device to find out if it is a VCD
f = open(device,'rb')
f.seek(32768, 0)
@@ -97,6 +97,6 @@
lmin, lsec = min, sec
device.close()
-
+
factory.register( 'video/vcd', mediainfo.EXTENSION_DEVICE,
- mediainfo.TYPE_AV, VCDInfo )
+ mediainfo.TYPE_AV, VCDInfo )
Modified: trunk/metadata/src/factory.py
==============================================================================
--- trunk/metadata/src/factory.py (original)
+++ trunk/metadata/src/factory.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -65,15 +65,15 @@
"""
Register a parser to the factory.
"""
- return Factory().register(mimetype,extensions,type,c)
+ return Factory().register(mimetype,extensions,type,c)
def gettype(mimetype, extensions):
"""
Return parser for mimetype / extensions
"""
- return Factory().get(mimetype,extensions)
-
+ return Factory().get(mimetype,extensions)
+
def parse(filename):
"""
@@ -119,7 +119,7 @@
import video.ogminfo
import video.mkvinfo
import misc.xmlinfo
-
+
# import some disc modules (may fail)
try:
import disc.discinfo
@@ -129,20 +129,20 @@
# looks like cdrom.so was not created
if log.level < 30:
log.error(e)
-
+
try:
import disc.dvdinfo
except ImportError, e:
if log.level < 30:
log.error(e)
-
+
# use fallback disc module
try:
import disc.datainfo
except ImportError, e:
if log.level < 30:
log.error(e)
-
+
import audio.eyed3info
import audio.webradioinfo
import audio.flacinfo
@@ -151,8 +151,8 @@
import games.snesinfo
import misc.dirinfo
-
-
+
+
def create_from_file(self, file):
"""
create based on the file stream 'file
Modified: trunk/metadata/src/games/gameboyinfo.py
==============================================================================
--- trunk/metadata/src/games/gameboyinfo.py (original)
+++ trunk/metadata/src/games/gameboyinfo.py Sun Feb 12 10:42:52 2006
@@ -2,6 +2,7 @@
# -----------------------------------------------------------------------------
# gameboyinfo.py - Gameboy ROM parsing
# -----------------------------------------------------------------------------
+# $Id$
#
# -----------------------------------------------------------------------------
# kaa-Metadata - Media Metadata for Python
@@ -10,7 +11,7 @@
# First Edition: Richard Mottershead <[EMAIL PROTECTED]>
# Maintainer: Richard Mottershead <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -42,9 +43,9 @@
# interesting file format info:
# GameBoy Advance http://www.forums.emuita.it/index.php?showtopic=67255
-GBA_LOGOCODE =
'\x24\xff\xae\x51\x69\x9a\xa2\x21\x3d\x84\x82\x0a\x84\xe4\x09\xad\x11\x24\x8b\x98\xc0\x81\x7f\x21\xa3\x52\xbe\x19\x93\x09\xce\x20\x10\x46\x4a\x4a\xf8\x27\x31\xec\x58\xc7\xe8\x33\x82\xe3\xce\xbf\x85\xf4\xdf\x94\xce\x4b\x09\xc1\x94\x56\x8a\xc0\x13\x72\xa7\xfc\x9f\x84\x4d\x73\xa3\xca\x9a\x61\x58\x97\xa3\x27\xfc\x03\x98\x76\x23\x1d\xc7\x61\x03\x04\xae\x56\xbf\x38\x84\x00\x40\xa7\x0e\xfd\xff\x52\xfe\x03\x6f\x95\x30\xf1\x97\xfb\xc0\x85\x60\xd6\x80\x25\xa9\x63\xbe\x03\x01\x4e\x38\xe2\xf9\xa2\x34\xff\xbb\x3e\x03\x44\x78\x00\x90\xcb\x88\x11\x3a\x94\x65\xc0\x7c\x63\x87\xf0\x3c\xaf\xd6\x25\xe4\x8b\x38\x0a\xac\x72\x21\xd4\xf8\x07'
+GBA_LOGOCODE =
'\x24\xff\xae\x51\x69\x9a\xa2\x21\x3d\x84\x82\x0a\x84\xe4\x09\xad\x11\x24\x8b\x98\xc0\x81\x7f\x21\xa3\x52\xbe\x19\x93\x09\xce\x20\x10\x46\x4a\x4a\xf8\x27\x31\xec\x58\xc7\xe8\x33\x82\xe3\xce\xbf\x85\xf4\xdf\x94\xce\x4b\x09\xc1\x94\x56\x8a\xc0\x13\x72\xa7\xfc\x9f\x84\x4d\x73\xa3\xca\x9a\x61\x58\x97\xa3\x27\xfc\x03\x98\x76\x23\x1d\xc7\x61\x03\x04\xae\x56\xbf\x38\x84\x00\x40\xa7\x0e\xfd\xff\x52\xfe\x03\x6f\x95\x30\xf1\x97\xfb\xc0\x85\x60\xd6\x80\x25\xa9\x63\xbe\x03\x01\x4e\x38\xe2\xf9\xa2\x34\xff\xbb\x3e\x03\x44\x78\x00\x90\xcb\x88\x11\x3a\x94\x65\xc0\x7c\x63\x87\xf0\x3c\xaf\xd6\x25\xe4\x8b\x38\x0a\xac\x72\x21\xd4\xf8\x07'
-GB_LOGOCODE =
'\xCE\xED\x66\x66\xCC\x0D\x00\x0B\x03\x73\x00\x83\x00\x0C\x00\x0D\x00\x08\x11\x1F\x88\x89\x00\x0E\xDC\xCC\x6E\xE6\xDD\xDD\xD9\x99\xBB\xBB\x67\x63\x6E\x0E\xEC\xCC\xDD\xDC\x99\x9F\xBB\xB9\x33\x3E'
+GB_LOGOCODE =
'\xCE\xED\x66\x66\xCC\x0D\x00\x0B\x03\x73\x00\x83\x00\x0C\x00\x0D\x00\x08\x11\x1F\x88\x89\x00\x0E\xDC\xCC\x6E\xE6\xDD\xDD\xD9\x99\xBB\xBB\x67\x63\x6E\x0E\xEC\xCC\xDD\xDC\x99\x9F\xBB\xB9\x33\x3E'
class GameboyInfo(mediainfo.MediaInfo):
@@ -94,4 +95,5 @@
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', ),
+ mediainfo.TYPE_MISC, GameboyInfo )
Modified: trunk/metadata/src/games/snesinfo.py
==============================================================================
--- trunk/metadata/src/games/snesinfo.py (original)
+++ trunk/metadata/src/games/snesinfo.py Sun Feb 12 10:42:52 2006
@@ -2,6 +2,7 @@
# -----------------------------------------------------------------------------
# snesinfo.py - Gameboy Advance ROM parsing
# -----------------------------------------------------------------------------
+# $Id$
#
# -----------------------------------------------------------------------------
# kaa-Metadata - Media Metadata for Python
@@ -10,7 +11,7 @@
# First Edition: Richard Mottershead <[EMAIL PROTECTED]>
# Maintainer: Richard Mottershead <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -45,7 +46,8 @@
# interesting file format info:
# http://www.classicgaming.com/epr/super/sneskart.html#embededcartridge
-# Used to detect the internal rome information, as described in 'SNESKART.DOC
v1.3'
+# Used to detect the internal rome information, as described in
+# 'SNESKART.DOC v1.3'
snesromFileOffset = [33216, 32704, 65472, 65984]
#most of the code is imported from the old snesitem.py.
@@ -103,6 +105,7 @@
else:
raise mediainfo.KaaMetadataParseError()
self.title = romName
-
-factory.register( 'games/snes', ('smc', 'sfc', 'fig', ), mediainfo.TYPE_MISC,
SNESInfo )
+
+factory.register( 'games/snes', ('smc', 'sfc', 'fig', ),
+ mediainfo.TYPE_MISC, SNESInfo )
Modified: trunk/metadata/src/image/IPTC.py
==============================================================================
--- trunk/metadata/src/image/IPTC.py (original)
+++ trunk/metadata/src/image/IPTC.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
# http://www.ap.org/apserver/userguide/codes.htm
+# python imports
from struct import unpack
def flatten(list):
Modified: trunk/metadata/src/image/bmpinfo.py
==============================================================================
--- trunk/metadata/src/image/bmpinfo.py (original)
+++ trunk/metadata/src/image/bmpinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/image/core.py
==============================================================================
--- trunk/metadata/src/image/core.py (original)
+++ trunk/metadata/src/image/core.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@
"""
self.parse_bins(filename)
self.parse_dot_comment(filename)
-
+
def parse_bins(self, filename):
"""
Parse bins xml files
Modified: trunk/metadata/src/image/gifinfo.py
==============================================================================
--- trunk/metadata/src/image/gifinfo.py (original)
+++ trunk/metadata/src/image/gifinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -51,7 +51,8 @@
core.ImageInfo.__init__(self)
self.mime = 'image/gif'
- (gifType, self.width, self.height) = struct.unpack('<6sHH',
file.read(10))
+ (gifType, self.width, self.height) = \
+ struct.unpack('<6sHH', file.read(10))
if not gifType.startswith('GIF'):
raise mediainfo.KaaMetadataParseError()
Modified: trunk/metadata/src/image/jpginfo.py
==============================================================================
--- trunk/metadata/src/image/jpginfo.py (original)
+++ trunk/metadata/src/image/jpginfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/image/pnginfo.py
==============================================================================
--- trunk/metadata/src/image/pnginfo.py (original)
+++ trunk/metadata/src/image/pnginfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/image/tiffinfo.py
==============================================================================
--- trunk/metadata/src/image/tiffinfo.py (original)
+++ trunk/metadata/src/image/tiffinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -122,4 +122,4 @@
self.appendtable('IPTC', iptc)
-factory.register( 'image/tiff', ('tif','tiff'), mediainfo.TYPE_IMAGE, TIFFInfo
)
+factory.register( 'image/tiff', ('tif','tiff'), mediainfo.TYPE_IMAGE, TIFFInfo)
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Sun Feb 12 10:42:52 2006
@@ -14,7 +14,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -66,7 +66,8 @@
VIDEOCORE = ['length', 'encoder', 'bitrate', 'samplerate', 'codec',
'samplebits', 'width', 'height', 'fps', 'aspect']
-MUSICCORE = ['trackno', 'trackof', 'album', 'genre','discs', 'image',
'raw_image']
+MUSICCORE = ['trackno', 'trackof', 'album', 'genre','discs', 'image',
+ 'raw_image']
AVCORE = ['length', 'encoder', 'trackno', 'trackof', 'copyright', 'product',
'genre', 'secondary genre', 'subject', 'writer', 'producer',
@@ -116,7 +117,7 @@
self.media = media[:media.find('.')]
self.keys.append('media')
-
+
def __unicode__(self):
keys = copy.copy(self.keys)
@@ -210,7 +211,7 @@
if key not in self:
return default
return self[key]
-
+
def __getitem__(self,key):
"""
Modified: trunk/metadata/src/misc/dirinfo.py
==============================================================================
--- trunk/metadata/src/misc/dirinfo.py (original)
+++ trunk/metadata/src/misc/dirinfo.py Sun Feb 12 10:42:52 2006
@@ -13,7 +13,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,7 +38,8 @@
# kaa imports
from kaa.base.strutils import unicode_to_str
-from kaa.metadata.mediainfo import MediaInfo, MEDIACORE, EXTENSION_DIRECTORY,
TYPE_MISC
+from kaa.metadata.mediainfo import MediaInfo, MEDIACORE, \
+ EXTENSION_DIRECTORY, TYPE_MISC
from kaa.metadata.factory import register
# get logging object
Modified: trunk/metadata/src/misc/xmlinfo.py
==============================================================================
--- trunk/metadata/src/misc/xmlinfo.py (original)
+++ trunk/metadata/src/misc/xmlinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/table.py
==============================================================================
--- trunk/metadata/src/table.py (original)
+++ trunk/metadata/src/table.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
#
# -----------------------------------------------------------------------------
+# python imports
from gettext import GNUTranslations
import os
Modified: trunk/metadata/src/video/asfinfo.py
==============================================================================
--- trunk/metadata/src/video/asfinfo.py (original)
+++ trunk/metadata/src/video/asfinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -372,5 +372,4 @@
-factory.register( 'video/asf', ('asf','wmv','wma'),
- mediainfo.TYPE_AV, AsfInfo )
+factory.register( 'video/asf', ('asf','wmv','wma'), mediainfo.TYPE_AV, AsfInfo)
Modified: trunk/metadata/src/video/fourcc.py
==============================================================================
--- trunk/metadata/src/video/fourcc.py (original)
+++ trunk/metadata/src/video/fourcc.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/video/mkvinfo.py
==============================================================================
--- trunk/metadata/src/video/mkvinfo.py (original)
+++ trunk/metadata/src/video/mkvinfo.py Sun Feb 12 10:42:52 2006
@@ -10,7 +10,7 @@
#
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -237,7 +237,7 @@
except:
scalecode = 1000
try:
- md = seginfotab[MATROSKA_DURATION_ID].get_data()
+ md = seginfotab[MATROSKA_DURATION_ID].get_data()
duration = float(unpack('!f', md)[0])
duration = float(duration / scalecode)
# Express the time in minutes
Modified: trunk/metadata/src/video/movinfo.py
==============================================================================
--- trunk/metadata/src/video/movinfo.py (original)
+++ trunk/metadata/src/video/movinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@
mediainfo.AVInfo.__init__(self)
self.context = 'video'
self.references = []
-
+
self.mime = 'video/quicktime'
self.type = 'Quicktime Video'
h = file.read(8)
@@ -319,14 +319,14 @@
url = url[:url.find('\0')]
elif datatype == 'rmqu':
quality = unpack('>I', atomdata[pos+8:pos+12])[0]
-
+
elif datatype == 'rmdr':
datarate = unpack('>I', atomdata[pos+12:pos+16])[0]
pos += datasize
if url:
self.references.append((url, quality, datarate))
-
+
else:
if not atomtype in ('wide', 'free'):
log.info('unhandled base atom %s' % atomtype)
@@ -340,6 +340,5 @@
return atomsize
-factory.register( 'video/quicktime', ('mov', 'qt'),
- mediainfo.TYPE_AV, MovInfo )
+factory.register( 'video/quicktime', ('mov', 'qt'), mediainfo.TYPE_AV, MovInfo)
Modified: trunk/metadata/src/video/movlanguages.py
==============================================================================
--- trunk/metadata/src/video/movlanguages.py (original)
+++ trunk/metadata/src/video/movlanguages.py Sun Feb 12 10:42:52 2006
@@ -1,3 +1,34 @@
+# -*- coding: iso-8859-1 -*-
+# -----------------------------------------------------------------------------
+# movlanguages.py - language codes for mov container
+# -----------------------------------------------------------------------------
+# $Id$
+#
+# -----------------------------------------------------------------------------
+# kaa-Metadata - Media Metadata for Python
+# Copyright (C) 2003-2005 Thomas Schueppel, Dirk Meyer
+#
+# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
+# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
+#
+# Please see the file AUTHORS for a complete list of authors.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
+# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# -----------------------------------------------------------------------------
+
QTLANGUAGES = {
0 : "en",
1 : "fr",
Modified: trunk/metadata/src/video/mpeginfo.py
==============================================================================
--- trunk/metadata/src/video/mpeginfo.py (original)
+++ trunk/metadata/src/video/mpeginfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -856,4 +856,4 @@
factory.register( 'video/mpeg', ('mpeg','mpg','mp4', 'ts'),
- mediainfo.TYPE_AV, MpegInfo )
+ mediainfo.TYPE_AV, MpegInfo )
Modified: trunk/metadata/src/video/ogminfo.py
==============================================================================
--- trunk/metadata/src/video/ogminfo.py (original)
+++ trunk/metadata/src/video/ogminfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -328,4 +328,4 @@
factory.register( 'application/ogg', ('ogm', 'ogg',),
- mediainfo.TYPE_AV, OgmInfo )
+ mediainfo.TYPE_AV, OgmInfo )
Modified: trunk/metadata/src/video/realinfo.py
==============================================================================
--- trunk/metadata/src/video/realinfo.py (original)
+++ trunk/metadata/src/video/realinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -111,4 +111,4 @@
factory.register( 'video/real', ('rm', 'ra', 'ram'),
- mediainfo.TYPE_AV, RealInfo )
+ mediainfo.TYPE_AV, RealInfo )
Modified: trunk/metadata/src/video/riffinfo.py
==============================================================================
--- trunk/metadata/src/video/riffinfo.py (original)
+++ trunk/metadata/src/video/riffinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Thomas Schueppel <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/metadata/src/video/vcdinfo.py
==============================================================================
--- trunk/metadata/src/video/vcdinfo.py (original)
+++ trunk/metadata/src/video/vcdinfo.py Sun Feb 12 10:42:52 2006
@@ -11,7 +11,7 @@
# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
#
-# Please see the file doc/CREDITS for a complete list of authors.
+# Please see the file AUTHORS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
