From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 10 Oct 2013 08:10:31 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.0~42
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=adad856dfd6ca8bf331b8b7adad143b1650b44cc;p=timeside.git

Merge branch 'dev' of github.com:yomguy/TimeSide into dev

Conflicts:
	timeside/analyzer/core.py
---

adad856dfd6ca8bf331b8b7adad143b1650b44cc
diff --cc timeside/analyzer/core.py
index 722a3d3,1d55914..73e93db
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@@ -874,42 -904,22 +904,22 @@@ class Analyzer(Processor)
          from datetime import datetime
  
          result = AnalyzerResult(dataMode=dataMode, timeMode=timeMode)
+ 
          # Automatically write known metadata
-         result.idMetadata = IdMetadata(
-             date=datetime.now().replace(microsecond=0).isoformat(' '),
-             version=__version__,
-             author='TimeSide')
-         result.audioMetadata = AudioMetadata(uri=self.mediainfo()['uri'],
-                                              start=self.mediainfo()['start'],
-                                              duration=self.mediainfo()['duration'])
- 
-         result.data = AnalyzerData()
- 
-         if dataMode == 'value':
-             pass
-         elif dataMode == 'label':
-             result.labelMetadata = LabelMetadata()
-         else:
-             # raise ArgError('')
-             pass
+         result.idMetadata.date = datetime.now().replace(
+                                                 microsecond=0).isoformat(' ')
 -        result.idMetadata.version = TimeSideVersion
++        result.idMetadata.version = __version__
+         result.idMetadata.author = 'TimeSide'
+ 
+         result.audioMetadata.uri = self.mediainfo()['uri']
+         result.audioMetadata.start = self.mediainfo()['start']
+         result.audioMetadata.duration = self.mediainfo()['duration']
+         result.audioMetadata.IS_SEGMENT = self.mediainfo()['IS_SEGMENT']
  
          if timeMode == 'framewise':
-             result.frameMetadata = FrameMetadata(
-                 samplerate=self.result_samplerate,
-                 blocksize=self.result_blocksize,
-                 stepsize=self.result_stepsize)
-         elif timeMode == 'global':
-             # None : handle by data
-             pass
-         elif timeMode == 'segment':
-             # None : handle by data
-             pass
-         elif timeMode == 'event':
-             # None : handle by data, duration = 0
-             pass
-         else:
-             # raise ArgError('')
-             pass
+             result.frameMetadata.samplerate = self.result_samplerate
+             result.frameMetadata.blocksize = self.result_blocksize
+             result.frameMetadata.stepsize = self.result_stepsize
  
          return result