From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 24 Oct 2014 13:00:55 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~1^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=956e5fa040c495390f580600ddd42663ebc8994c;p=timeside.git

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

Conflicts:
	README.rst
	doc/source/dive_in.rst
	doc/source/intro.rst
	doc/source/news.rst
	doc/source/tutorial/Streaming.rst
---

956e5fa040c495390f580600ddd42663ebc8994c
diff --cc README.rst
index c485ee6,e684eb5..c1b76ba
--- a/README.rst
+++ b/README.rst
@@@ -87,21 -53,10 +87,21 @@@ New
  0.5.7
  
    * WARNING! some processor ids have changed. Please see the full list below.
 -  * Add a Docker development box
 +  * NEW analyzers: IRIT Monopoly (see Processors)
 +  * NEW graphers: IRIT Start/Session segmentation
 +  * Add extensible buffering thanks to pytables (NEW dependency)
 +  * Add typed parameters in processors and server thanks to traits (NEW dependency)
 +  * Add a graph model to the pipe thanks to networkx (NEW dependency)
 +  * Add test sample generators based on GStreamer
 +  * Add a background image option for rendering analyzers
 +  * Add on-the-fly filtering decorators
 +  * Add a Docker development image and a Dockerfile
    * Add a Vagrant development box
 -  * Add a Debian package installation procedure
 -  * Fix parent and child analyzers both using yaafe (fix #60)
 +  * Update the Debian package installation procedure
 +  * Results are now stored in pipe.results as as dictionnary of AnalyzerResults
 +  * Update various processors
-   * Fix parent and child analyzers both using yaafe (fix #60)
++  * Prevent duplication of processor in the pipe (i.e. processors sharing the same class and parameters). This also fix #60.
 +  * Update of Travis CI scripts https://travis-ci.org/yomguy/TimeSide/
  
  0.5.6
  
@@@ -442,3 -437,3 +442,7 @@@ GNU General Public License for more det
  
  See LICENSE for more details.
  
++Usage
++======
++
++If
diff --cc doc/source/tutorial/Streaming.rst
index bbefa0e,e6f86e6..5ececfe
--- a/doc/source/tutorial/Streaming.rst
+++ b/doc/source/tutorial/Streaming.rst
@@@ -1,9 -1,9 +1,8 @@@
  .. This file is part of TimeSide
     @author: Guillaume Pellerin
  
--=================================
-  Streaming out encoded audio
 - Streaming encoded audio outside
--=================================
++Streaming out encoded audio
++============================
  
  Instead of calling a pipe.run(), the chunks of an encoding processor can also be retrieved and streamed outside the pipe during the process.