From: yomguy <yomguy@parisson.com>
Date: Wed, 19 Sep 2012 18:48:14 +0000 (+0200)
Subject: Merge branch 'dev' into gst
X-Git-Tag: 0.3.4-noleekmp3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2043796dd1c69e2c604ff3987d1881250ef59c06;p=timeside.git

Merge branch 'dev' into gst

Conflicts:
	tests/testdecoding.py
---

2043796dd1c69e2c604ff3987d1881250ef59c06
diff --cc tests/testdecoding.py
index 0205197,99e3e11..a038f1f
--- a/tests/testdecoding.py
+++ b/tests/testdecoding.py
@@@ -7,8 -9,8 +7,8 @@@ class TestDecoding(TestCase)
      "Test the low level streaming features"
  
      def setUp(self):
 -        pass
 +        self.samplerate, self.channels, self.blocksize = None, None, None
-    
+ 
      def testWav(self):
          "Test wav decoding"
          self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")