Fixes documentation after 04abf2e22c2ca06a

diff --git a/doc/source/tutorial/AnalyzerResult.rst b/doc/source/tutorial/AnalyzerResult.rst
index 083c0592a3b59fa13c5db3fa04fe1fa563d8298d..8f4d65cac97523897af6291497799c685dae673f 100644 (file)
--- a/doc/source/tutorial/AnalyzerResult.rst
+++ b/doc/source/tutorial/AnalyzerResult.rst
@@ -40,7 +40,7 @@ This default result has all the metadata and dataObject attribute
    >>> for key,value in res.items():
    ...     print '%s : %s' % (key, value)
    ...
-   id_metadata : {'description': '', 'author': '', 'uuid': '', 'version': '', 'date': '', 'id': '', 'unit': '', 'name': ''}
+   id_metadata : {'description': '', 'author': '', 'res_uuid': '', 'version': '', 'date': '', 'proc_uuid': '', 'id': '', 'unit': '', 'name': ''}
    data_object : {'value': array([], dtype=float64)}
    audio_metadata : {'sha1': '', 'is_segment': None, 'uri': '', 'channels': None, 'start': 0, 'channelsManagement': '', 'duration': None}
    frame_metadata : {'blocksize': None, 'samplerate': None, 'stepsize': None}

diff --git a/doc/source/tutorial/frames_stack.rst b/doc/source/tutorial/frames_stack.rst
index cf0f7ffad228d840747c15b462ffdfd6e5e08fd0..c89d49c54597ee31c5327db010fc3bb655c14bb1 100644 (file)
--- a/doc/source/tutorial/frames_stack.rst
+++ b/doc/source/tutorial/frames_stack.rst
@@ -63,7 +63,7 @@ And run the pipe:
 
 Assert that the frames passed to the two analyzers are the same, we check that the results of these analyzers are equivalent:
 
->>> np.allclose(pitch_on_file.results['aubio_pitch.pitch'].data,
-...                    pitch_on_stack.results['aubio_pitch.pitch'].data)
+>>> np.allclose(pitch_on_file.results.get_result_by_id('aubio_pitch.pitch').data,
+...                    pitch_on_stack.results.get_result_by_id('aubio_pitch.pitch').data)
 True
 

diff --git a/doc/source/tutorial/quick_start.rst b/doc/source/tutorial/quick_start.rst
index f750933a969e9a565a66a8f3c6f1dc7183abcd02..ae74997e2482045ee130c7d61f69b925a0fba6f6 100644 (file)
--- a/doc/source/tutorial/quick_start.rst
+++ b/doc/source/tutorial/quick_start.rst
@@ -62,4 +62,4 @@ analysis and encoding:
    >>> encoders = get_processor('gst_mp3_enc')('sweep.mp3') | get_processor('gst_flac_enc')('sweep.flac')
    >>> (decoder | levels | encoders).run()
    >>> print levels.results
-   {'level.max': GlobalValueResult(id_metadata=IdMetadata(id='level.max', name='Level Max', unit='dBFS', description='', date='...', version='...', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-6.021])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, sha1='...', channels=2, channelsManagement=''), parameters={}), 'level.rms': GlobalValueResult(id_metadata=IdMetadata(id='level.rms', name='Level RMS', unit='dBFS', description='', date='...', version='...', author='TimeSide', uuid='...'), data_object=DataObject(value=array([-9.856])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, sha1='...', channels=2, channelsManagement=''), parameters={})}
+   {'...': GlobalValueResult(id_metadata=IdMetadata(id='level.max', name='Level Max', unit='dBFS', description='', date='...', version='...', author='TimeSide', proc_uuid='...', res_uuid='...'), data_object=DataObject(value=array([-6.021])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, sha1='...', channels=2, channelsManagement=''), parameters={}), '...': GlobalValueResult(id_metadata=IdMetadata(id='level.rms', name='Level RMS', unit='dBFS', description='', date='...', version='...', author='TimeSide', proc_uuid='...', res_uuid='...'), data_object=DataObject(value=array([-9.856])), audio_metadata=AudioMetadata(uri='file://...sweep.wav', start=0.0, duration=8.0, is_segment=False, sha1='...', channels=2, channelsManagement=''), parameters={})}