From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 20 Jan 2014 08:47:18 +0000 (+0100)
Subject: Merge : fixes some minor conflicts
X-Git-Tag: 0.5.3~20^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3b26ae17756f13da341035c0284aa86a85809b8c;p=timeside.git

Merge : fixes some minor conflicts
---

3b26ae17756f13da341035c0284aa86a85809b8c
diff --cc timeside/decoder/live.py
index 539575f,ed333bb..e89e45a
--- a/timeside/decoder/live.py
+++ b/timeside/decoder/live.py
@@@ -62,12 -62,11 +62,13 @@@ class LiveDecoder(Decoder)
  
          >>> import timeside
  
 -        >>> live = timeside.decoder.LiveDecoder(num_buffers=25)
 +        >>> live = timeside.decoder.LiveDecoder(num_buffers=5)
          >>> a = timeside.analyzer.Waveform()
 -        >>> e = timeside.encoder.Mp3Encoder('test_live.mp3', overwrite=True)
 +        >>> e = timeside.encoder.Mp3Encoder('/tmp/test_live.mp3',
 +        ...                                 overwrite=True)
          >>> pipe = (live | a | e)
 -        >>> pipe.run() # doctest: +SKIP    
 +        >>> pipe.run() # doctest: +SKIP
++        >>> pipe.run() # doctest: +SKIP
  
          >>> import matplotlib.pyplot as plt # doctest: +SKIP
          >>> plt.plot(a.results['waveform_analyzer'].time, # doctest: +SKIP