From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 26 Jan 2015 13:53:35 +0000 (+0100)
Subject: Merge branch 'dev' into dev-server-TM
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6a001fdef7435133d00f8dab9cb78c5e0219b4e1;p=timeside.git

Merge branch 'dev' into dev-server-TM

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

6a001fdef7435133d00f8dab9cb78c5e0219b4e1
diff --cc timeside/core/analyzer.py
index f0074e2,b3e2ce9..348d3a8
--- a/timeside/core/analyzer.py
+++ b/timeside/core/analyzer.py
@@@ -848,11 -833,7 +833,7 @@@ class FrameValueObject(ValueObject, Fra
              else:
                  chunksize = 1
                  numchunks = nb_frames
 -            
 +
-             #print "nb_frames %d" % nb_frames
-             #print "chunksize %d" % chunksize
-             #print "numchunks %d" % numchunks
- 
              if self.data.ndim <= 1:
                  ychunks = self.data[:chunksize*numchunks].reshape((-1,
                                                                     chunksize))