[xiph-commits] r14684 - trunk/souffleur
jmesquita at svn.xiph.org
jmesquita at svn.xiph.org
Tue Apr 8 18:02:41 PDT 2008
Author: jmesquita
Date: 2008-04-08 18:02:40 -0700 (Tue, 08 Apr 2008)
New Revision: 14684
Removed:
trunk/souffleur/oggStreams.py
trunk/souffleur/streams.py
Log:
These files are not necessary anymore due to changes in MediaInfo.py
Deleted: trunk/souffleur/oggStreams.py
===================================================================
--- trunk/souffleur/oggStreams.py 2008-04-09 00:53:05 UTC (rev 14683)
+++ trunk/souffleur/oggStreams.py 2008-04-09 01:02:40 UTC (rev 14684)
@@ -1,45 +0,0 @@
-__name__="oggStreams - class of streams in OGG files"
-__author__="Maxim Litvinov (aka DarakuTenshi) otaky<at>ukr.net"
-
-import os
-import re
-
-import oggStream
-
-class oggStreams:
- """
- Class for work with OGG.
- """
- def __init__(self, fileName):
- """
- Constructor of oggStreams class.
- @param[IN] fileName - name of OGG file.
- """
- #Run ogminfo util on given file.
- OGMINFO=os.popen("ogminfo -v \"" + fileName + "\"", "r")
- if(OGMINFO==None): return NULL
- STAT=OGMINFO.readlines() #Output data from ogminfo to the list of strings.
- OGMINFO.close()
-
- self.streams={}
- for i in STAT:
- #Stream info
- regSTAT=re.compile("\(ogminfo.c\) [(](\w)(\d)[/](\S+) (\d)[)] (\S+)")
- mathSTAT=regSTAT.match(i)
- if mathSTAT!=None:
- HASH=mathSTAT.group(1)+mathSTAT.group(2)
- self.streams[HASH]=oggStream.oggStream(mathSTAT.group(4), mathSTAT.group(1), fileName)
- #Stream attribute
- regSTAT=re.compile("\(ogminfo.c\) (\S+)[:](\s+)(\S+)[=]([\S\s]+)[\n]")
- mathSTAT=regSTAT.match(i)
- if mathSTAT!=None:
- OGGStream=self.streams[mathSTAT.group(1)]
- OGGStream.addAttr(mathSTAT.group(3), mathSTAT.group(4))
- return
-#==============================================================================
- def getStreams(self):
- """
- This function return a list of streams.
- """
- return self.streams.values()
-#==============================================================================
Deleted: trunk/souffleur/streams.py
===================================================================
--- trunk/souffleur/streams.py 2008-04-09 00:53:05 UTC (rev 14683)
+++ trunk/souffleur/streams.py 2008-04-09 01:02:40 UTC (rev 14684)
@@ -1,73 +0,0 @@
-## \file streams.py
-# Documentation for streams module of Souffleur project.
-# \author Maxim Litvinov (aka DarakuTenshi) <otaky at ukr.net>
-
-## Stream class
-# Class for geting info on stream
-class Stream:
- ## Constructor
- def __init__(self):
- self.MIME=None
- self.Name=None
- self.attrs={}
- self.ID=None
-
- ## Add attribute.
- # Add attribute on the stream.
- # \param attrName - name of the attribute.
- # \param attrValue - value of the attribute.
- def addAttr(self, attrName, attrValue):
- if not attrName or not attrValue:
- return
-
- self.attrs[attrName]=attrValue
-
- ## \var MIME
- # MIME type of the stream.
-
- ## \var Name
- # Stream name in the GStreamer.
-
- ## \var attrs
- # List of the attributes.
-
- ## \var ID
- # ID of the stream in Souffleur current project.
-
-
-## Media class.
-# Class for geting info on media.
-class Media:
- ## Constructor
- def __init__(self):
- self.MIME=None
- self.source=None
- self.sourceURI=None
- self.Streams=[]
- self.lastID=0
-
- ## Add stream.
- # Add stream to the media.
- # \param stream - the stream to add.
- def addStream(self, stream):
- if type(stream)!=type(Stream()):
- return
- if stream.ID <= self.lastID:
- return
- self.Streams.append(stream)
- self.lastID=stream.ID
-
- ## \var MIME
- # MIME type of the media.
-
- ## \var source
- # Source file name of the media.
-
- ## \var sourceURI
- # Source URO of the media.
-
- ## \var Streams
- # List of the stream of media.
-
- ## \var lastID
- # Last used ID number in the media.
More information about the commits
mailing list