From 34fb4a4877d0ee6a316189ff49e0dbf21be55b40 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Tue, 27 May 2014 15:07:00 +0200 Subject: [PATCH] Fixes documentation after 04abf2e22c2ca06a --- doc/source/tutorial/AnalyzerResult.rst | 2 +- doc/source/tutorial/frames_stack.rst | 4 ++-- doc/source/tutorial/quick_start.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/tutorial/AnalyzerResult.rst b/doc/source/tutorial/AnalyzerResult.rst index 083c059..8f4d65c 100644 --- 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 cf0f7ff..c89d49c 100644 --- 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 f750933..ae74997 100644 --- 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={})} -- 2.39.5