# # ChangeLog for python # # Generated by Trac 1.2 # Nov 10, 2024, 11:15:27 PM Sun, 26 Jan 2014 19:20:37 GMT Paul Brossier [3cc3fd8] * python/ext/py-sink.c (modified) * python/ext/py-source.c (modified) python/ext/py-{source,sink}.c: use _close in .close() Fri, 24 Jan 2014 16:22:00 GMT Paul Brossier [52ca8a3] * python/lib/generator.py (modified) * src/aubio.h (modified) * src/io/sink.c (modified) * src/io/sink_wavwrite.c (added) * src/io/sink_wavwrite.h (added) * tests/src/io/test-sink_wavwrite.c (added) * wscript (modified) src/io/sink_wavwrite.c: add native basic wav writer Fri, 24 Jan 2014 01:23:35 GMT Paul Brossier [16dda03] * python/lib/aubio/slicing.py (modified) python/lib/aubio/slicing.py: use close not del, let garbage collector ... Fri, 24 Jan 2014 01:22:28 GMT Paul Brossier [7b56229] * python/ext/py-sink.c (modified) * python/ext/py-source.c (modified) python/ext/py-{sink,source}.c: add close function Fri, 24 Jan 2014 01:17:18 GMT Paul Brossier [f1100a4] * python/ext/aubio-types.h (modified) * python/ext/aubiomodule.c (modified) * python/ext/py-sink.c (added) * python/lib/generator.py (modified) * python/setup.py (modified) ext/py-sink.c: do not generate Sun, 12 Jan 2014 07:40:22 GMT Paul Brossier [94b16e89] * python/scripts/aubiocut (modified) python/scripts/aubiocut: add --cut-until-nsamples and --cut-until- ... Sun, 12 Jan 2014 07:39:19 GMT Paul Brossier [35a44e9] * python/lib/aubio/slicing.py (modified) python/lib/aubio/slicing.py: also add end if adding start at 0 Sun, 12 Jan 2014 07:09:45 GMT Paul Brossier [6fbee46] * python/lib/aubio/slicing.py (modified) python/lib/aubio/slicing.py: fix zero padding in slice names Sun, 12 Jan 2014 06:58:06 GMT Paul Brossier [4320679] * python/lib/aubio/slicing.py (modified) * python/tests/test_slicing.py (modified) lib/aubio/slicing.py: allow any regions, overlaping or not, add more ... Sun, 12 Jan 2014 04:54:42 GMT Paul Brossier [f36ecea] * python/lib/aubio/slicing.py (modified) * python/tests/test_slicing.py (modified) * python/tests/utils.py (modified) python/lib/aubio/slicing.py: use start and end stamps, make sure read ... Sun, 12 Jan 2014 04:00:15 GMT Paul Brossier [d945976] * python/lib/aubio/slicing.py (modified) python/lib/aubio/slicing.py: next_stamp can be 0 Sun, 12 Jan 2014 03:29:36 GMT Paul Brossier [a4ec189] * python/tests/sounds/chocolate_1min.wav (deleted) python/tests/sounds: deleted Sun, 12 Jan 2014 03:28:49 GMT Paul Brossier [6f27719] * python/lib/aubio/slicing.py (modified) * python/tests/test_slicing.py (modified) python/lib/aubio/slicing.py: improve slicing, make tests faster Sun, 12 Jan 2014 02:33:07 GMT Paul Brossier [aee840b] * python/lib/aubio/slicing.py (modified) * python/tests/sounds/chocolate_1min.wav (added) * python/tests/test_slicing.py (modified) * python/tests/utils.py (modified) python/lib/aubio/slicing.py: error checking, add more tests, use ... Sun, 12 Jan 2014 02:32:06 GMT Paul Brossier [8203ae5] * python/lib/aubio/__init__.py (modified) python/lib/aubio/__init__.py: import slicing Sun, 12 Jan 2014 02:09:25 GMT Paul Brossier [bc24e9c] * python/scripts/aubiocut (modified) python/scripts/aubiocut: use slice_source_at_stamps Sun, 12 Jan 2014 01:59:49 GMT Paul Brossier [88432a9] * python/lib/aubio/slicing.py (added) * python/tests/test_slicing.py (added) * python/tests/utils.py (modified) python/lib/aubio/slicing.py: rewrite slicing loop from aubiocut, add ... Sat, 11 Jan 2014 21:45:10 GMT Paul Brossier [3f9e8e5] * python/scripts/aubiocut (modified) python/scripts/aubiocut: add -o, --output directory option Sat, 11 Jan 2014 16:45:18 GMT Paul Brossier [9d1606d] * python/scripts/aubiocut (modified) python/scripts/aubiocut: use stamp, not onset Thu, 09 Jan 2014 13:00:51 GMT Paul Brossier [a69d3a6] * python/lib/generator.py (modified) python/lib/generator.py: skip source_wavread Wed, 25 Dec 2013 03:57:54 GMT Paul Brossier [89e9e71] * python/tests/test_zero_crossing_rate.py (modified) python/tests/test_zero_crossing_rate.py: clean up, chmod +x Wed, 25 Dec 2013 00:12:12 GMT Paul Brossier [634c12f] * python/demos/demo_mfcc.py (modified) python/demos/demo_mfcc.py: remove unused variables Wed, 18 Dec 2013 07:07:27 GMT Paul Brossier [21234ee] * ChangeLog (modified) * doc/web.cfg (modified) * examples/aubionotes.c (modified) * examples/aubioonset.c (modified) * examples/aubiopitch.c (modified) * examples/aubiotrack.c (modified) * examples/jackio.c (modified) * examples/parse_args.h (modified) * examples/utils.c (modified) * examples/wscript_build (modified) * python/demos/demo_bpm_extract.py (modified) * python/demos/demo_mel-energy.py (modified) * python/demos/demo_pitch.py (modified) * python/demos/demo_specdesc.py (modified) * python/ext/aubio-types.h (modified) * python/ext/aubiomodule.c (modified) * python/ext/aubioproxy.c (modified) * python/ext/py-fft.c (modified) * python/ext/py-source.c (added) * python/lib/gen_pyobject.py (modified) * python/lib/generator.py (modified) * python/setup.py (modified) * src/aubio.h (modified) * src/aubio_priv.h (modified) * src/cvec.c (modified) * src/cvec.h (modified) * src/fmat.c (modified) * src/fmat.h (modified) * src/fvec.c (modified) * src/fvec.h (modified) * src/io/audio_unit.c (modified) * src/io/sndfileio.c (deleted) * src/io/sndfileio.h (deleted) * src/io/source.c (modified) * src/io/source.h (modified) * src/io/source_avcodec.c (modified) * src/lvec.c (modified) * src/lvec.h (modified) * src/mathutils.h (modified) * src/musicutils.h (modified) * src/onset/onset.h (modified) * src/onset/peakpicker.h (modified) * src/pitch/pitch.h (modified) * src/pitch/pitchfcomb.h (modified) * src/pitch/pitchmcomb.h (modified) * src/pitch/pitchschmitt.h (modified) * src/pitch/pitchspecacf.h (modified) * src/pitch/pitchyin.h (modified) * src/pitch/pitchyinfft.h (modified) * src/spectral/fft.h (modified) * src/spectral/filterbank.c (modified) * src/spectral/filterbank.h (modified) * src/spectral/filterbank_mel.h (modified) * src/spectral/mfcc.c (modified) * src/spectral/mfcc.h (modified) * src/spectral/phasevoc.h (modified) * src/spectral/specdesc.h (modified) * src/spectral/tss.h (modified) * src/synth/sampler.c (modified) * src/synth/sampler.h (modified) * src/synth/wavetable.c (modified) * src/synth/wavetable.h (modified) * src/tempo/beattracking.h (modified) * src/tempo/tempo.h (modified) * src/temporal/a_weighting.h (modified) * src/temporal/biquad.h (modified) * src/temporal/c_weighting.h (modified) * src/temporal/filter.h (modified) * src/temporal/resampler.h (modified) * src/types.h (modified) * src/utils/hist.h (modified) * src/utils/parameter.h (modified) * src/utils/scale.h (modified) * src/vecutils.c (modified) * src/vecutils.h (modified) * src/wscript_build (modified) * tests/src/io/test-source_multi.c (modified) * tests/src/spectral/test-mfcc.c (modified) * tests/src/spectral/test-phasevoc-jack.c (deleted) * tests/src/spectral/test-phasevoc.c (modified) * tests/src/test-cvec.c (modified) * tests/src/test-fmat.c (modified) * tests/utils_tests.h (modified) * tests/wscript_build (modified) * wscript (modified) Merge branch 'master' of aubio.org:/git/aubio/aubio into develop Wed, 18 Dec 2013 06:50:02 GMT Paul Brossier [c3c6305] * VERSION (modified) * doc/full.cfg (modified) * doc/web.cfg (modified) * python/VERSION (modified) VERSION: bump to 0.4.0 Wed, 18 Dec 2013 05:42:17 GMT Paul Brossier [4f2c28c] * python/demos/demo_mel-energy.py (modified) * python/demos/demo_pitch.py (modified) * python/demos/demo_specdesc.py (modified) python/demos/: minor plot improvements Tue, 10 Dec 2013 22:58:59 GMT Paul Brossier [3194dca1] * python/ext/aubioproxy.c (modified) ext/aubioproxy.c: improve sizes checks, cast to uint_t ... Tue, 10 Dec 2013 22:57:54 GMT Paul Brossier [906c0a2] * python/lib/gen_pyobject.py (modified) lib/gen_pyobject.py: fix size checks Signed-off-by: Paul Brossier ... Tue, 10 Dec 2013 22:57:30 GMT Paul Brossier [18e22f9] * python/ext/py-source.c (modified) ext/py-source.c: fix size checks Signed-off-by: Paul Brossier ... Tue, 10 Dec 2013 22:56:51 GMT Paul Brossier [bf63c61] * python/ext/py-fft.c (modified) ext/py-fft.c: remove doubled check Signed-off-by: Paul Brossier ... Tue, 10 Dec 2013 21:51:58 GMT Paul Brossier [2f9af5d] * python/ext/aubio-types.h (modified) * python/ext/py-source.c (modified) python/ext/aubio-types.h: only source defaults to samplerate = 0 ... Tue, 10 Dec 2013 21:13:49 GMT Paul Brossier [d27634d] * python/ext/aubio-types.h (modified) * python/ext/aubiomodule.c (modified) * python/ext/py-source.c (added) * python/lib/generator.py (modified) * python/setup.py (modified) python/ext/py-source.c: not generated, modified init to get ... Tue, 10 Dec 2013 21:01:32 GMT Paul Brossier [d7019c4] * python/demos/demo_bpm_extract.py (modified) python/demos/demo_bpm_extract.py: make executable Signed-off-by: ... Sun, 08 Dec 2013 19:10:07 GMT Paul Brossier [6d54cbe] * VERSION (modified) * python/VERSION (modified) VERSION: bump to 0.4.1~alpha Signed-off-by: Paul Brossier ... Sun, 08 Dec 2013 18:33:47 GMT Paul Brossier [6d64a46] * VERSION (modified) * python/VERSION (modified) VERSION: bump to 0.4.0~beta1 Sun, 08 Dec 2013 18:00:13 GMT Paul Brossier [969bbb2] * python/tests/test_zero_crossing_rate.py (added) * python/tests/test_zero_crossing_rate.py.old (deleted) python/tests/test_zero_crossing_rate.py: update Sun, 08 Dec 2013 16:49:46 GMT Paul Brossier [6bc52cc] * python.old/aubioinput.py (moved) python/: moved old gst hack to python.old for now Sun, 08 Dec 2013 03:09:55 GMT Paul Brossier [49e40cc] * python/scripts/aubiocut (modified) python/scripts/aubiocut: sync option names with examples/ Sat, 07 Dec 2013 19:35:04 GMT Paul Brossier [258d441] * python/lib/generator.py (modified) * src/aubio.h (modified) src/aubio.h: add pitchspecacf, remove from python/lib/generator Fri, 06 Dec 2013 19:34:58 GMT Paul Brossier [e1cdb89] * python/lib/generator.py (modified) python/lib/generator.py: add source_avcodec to blacklist Tue, 03 Dec 2013 22:17:52 GMT Paul Brossier [2d88f41a] * python/demos/demo_simple_spectral_weighting.py (added) python/demos/demo_simple_spectral_weighting.py: added simple spectral ... Mon, 02 Dec 2013 17:40:05 GMT Paul Brossier [c911b12] * python/demos/demo_bpm_extract.py (added) python/demos/demo_bpm_extract.py: add simple demo to get bpm of ... Mon, 02 Dec 2013 17:21:43 GMT Paul Brossier [d47a5e19] * python/demos/demo_tempo_plot.py (modified) python/demos/demo_tempo_plot.py: update Mon, 02 Dec 2013 17:16:02 GMT Paul Brossier [41121f5] * python/demos/demo_filterbank.py (modified) python/demos/demo_filterbank.py: fix header Mon, 02 Dec 2013 17:14:33 GMT Paul Brossier [c54b2c0] * python/demos/demo_pitch.py (modified) python/demos/demo_pitch.py: add plotting Wed, 20 Nov 2013 01:50:37 GMT Paul Brossier [dedeffc] * python/demos/demo_sink_create_woodblock.py (modified) python/demos/demo_sink_create_woodblock.py: fix wavetable Wed, 20 Nov 2013 01:47:51 GMT Paul Brossier [1e1a2c9] * python/scripts/aubiocut (modified) python/scripts/aubiocut: make -i optional Tue, 19 Nov 2013 22:33:42 GMT Paul Brossier [d75c900] * python/ext/aubiomodule.c (modified) python/ext/aubiomodule.c: add missing generated_types_ready prototype Wed, 13 Nov 2013 14:16:45 GMT Paul Brossier [3cc1491] * python/lib/aubio/midiconv.py (modified) python/lib/aubio/midiconv.py: add freq2note Tue, 05 Nov 2013 12:47:53 GMT Paul Brossier [e97d0b3] * python/lib/gen_pyobject.py (modified) * python/lib/generator.py (modified) python: add wavetable, skip parameter Thu, 17 Oct 2013 12:54:51 GMT Paul Brossier [7fc5ba2] * python/scripts/aubiocut (modified) python/scripts/aubiocut: add -b option Thu, 17 Oct 2013 12:46:47 GMT Paul Brossier [7079887] * python/demos/demo_waveform_plot.py (modified) demos/demo_waveform_plot.py: add downsample parameter Thu, 17 Oct 2013 11:06:03 GMT Paul Brossier [8617843] * python/tests/run_all_tests (modified) python/tests/run_all_tests: ignore more unstable Tue, 15 Oct 2013 22:26:26 GMT Paul Brossier [7609f6d] * python/lib/generator.py (modified) python/lib/generator.py: remove audio_unit Tue, 15 Oct 2013 22:07:46 GMT Paul Brossier [8f86f0e] * python/lib/generator.py (modified) python/lib/generator.py: remove most unstable objects Tue, 15 Oct 2013 21:22:00 GMT Paul Brossier [735a739] * python/demos/demo_filterbank.py (added) python/demos/demo_filterbank.py: added simple filterbank demo Wed, 10 Apr 2013 16:45:59 GMT Paul Brossier [e8bc8e9] * python/tests/eval_pitch (added) python/tests/eval_pitch: add evaluation script against TONAS database Wed, 10 Apr 2013 05:28:51 GMT Paul Brossier [2693655] * python/tests/utils.py (modified) python/tests/utils.py: add array_from_yaml_file Tue, 09 Apr 2013 17:49:36 GMT Paul Brossier [8b884ef] * python/demos/demo_onset.py (modified) * python/demos/demo_onset_plot.py (modified) * src/onset/onset.c (modified) * src/onset/onset.h (modified) src/onset/: rename get_last_onset to get_last Tue, 09 Apr 2013 16:09:46 GMT Paul Brossier [dee4164] * python/scripts/aubiocut (modified) python/scripts/aubiocut: add slicing Mon, 08 Apr 2013 16:51:45 GMT Paul Brossier [0e75589] * python/tests/test_pitch.py (modified) python/tests/test_pitch.py: more tests Fri, 22 Mar 2013 17:37:18 GMT Paul Brossier [229d050] * python/lib/aubio/__init__.py (modified) lib/aubio/__init__.py: add header and docstring Fri, 22 Mar 2013 17:36:32 GMT Paul Brossier [ff74460] * python/ext/aubio-types.h (modified) ext/aubio-types.h: system include Fri, 22 Mar 2013 17:35:26 GMT Paul Brossier [c342c17] * python/demos/demo_miditofreq.py (added) python/demos/demo_miditofreq.py: added simple miditofreq example Fri, 22 Mar 2013 17:33:54 GMT Paul Brossier [86ad546] * python/tests/test_phasevoc.py (modified) python/tests/test_phasevoc.py: split tests Fri, 22 Mar 2013 17:33:35 GMT Paul Brossier [01e7be0] * python/tests/test_source.py (modified) python/tests/test_source.py: really fail wrong hop size test Fri, 22 Mar 2013 17:22:12 GMT Paul Brossier [5e392e3e] * python/lib/gen_pyobject.py (modified) Merge branch 'synth' into develop Fri, 22 Mar 2013 17:21:06 GMT Paul Brossier [016dc3b] * python/lib/gen_pyobject.py (modified) python/lib/gen_pyobject.py: add sampler Fri, 22 Mar 2013 16:56:15 GMT Paul Brossier [6ff6d18] * python/demos/demo_mel-energy.py (modified) * python/demos/demo_mfcc.py (modified) * python/demos/demo_specdesc.py (modified) python/demos/demo_{mel-energy,mfcc,specdesc}.py: use ... Fri, 22 Mar 2013 16:51:10 GMT Paul Brossier [e5afd47] * python/demos/demo_mel-energy.py (added) python/demos/demo_mel-energy.py: added simple mel energy bands demo Fri, 22 Mar 2013 16:47:00 GMT Paul Brossier [d83ac74] * python/demos/demo_mfcc.py (added) python/demos/demo_mfcc.py: added simple mfcc demo Fri, 22 Mar 2013 16:43:59 GMT Paul Brossier [1e90588] * python/demos/demo_waveform_plot.py (modified) python/demos/demo_waveform_plot.py: also set x limits Fri, 22 Mar 2013 16:42:17 GMT Paul Brossier [1eee405] * python/demos/demo_waveform_plot.py (modified) python/demos/demo_waveform_plot.py: plot more samples, add hop_size ... Mon, 18 Mar 2013 16:28:07 GMT Paul Brossier [7125680] * python/lib/gen_pyobject.py (modified) python/lib/gen_pyobject.py: add forgotten source Mon, 18 Mar 2013 16:19:23 GMT Paul Brossier [6a03729] * python/lib/gen_pyobject.py (modified) * src/io/source.h (modified) * src/io/source_apple_audio.h (modified) * src/io/source_sndfile.h (modified) src/io: use hop_size, not block_size Mon, 18 Mar 2013 16:13:26 GMT Paul Brossier [ab7b1b7] * python/lib/gen_pyobject.py (modified) python/lib/gen_pyobject.py: add block_size for source Mon, 18 Mar 2013 15:53:41 GMT Paul Brossier [9615b03] * python/lib/aubio/midiconv.py (modified) python/lib/aubio/midiconv.py: note2midi improve error message Mon, 18 Mar 2013 15:52:43 GMT Paul Brossier [8e9cb57] * python/tests/test_specdesc.py (modified) python/tests/test_specdesc.py: update to latest specdesc.c Mon, 18 Mar 2013 07:05:29 GMT Paul Brossier [3a67894] * python/lib/gen_pyobject.py (modified) python/lib/gen_pyobject.py: fix shortname of methods with multiple _ Fri, 15 Mar 2013 22:49:29 GMT Paul Brossier [7e9e311] * python/demos/demo_onset.py (modified) * python/demos/demo_onset_plot.py (modified) python/demos/demo_onset*: remove di, moved to C Wed, 13 Mar 2013 18:24:02 GMT Paul Brossier [3cde629] * python/demos/demo_tempo_plot.py (modified) python/demos/demo_tempo_plot.py: import first Tue, 12 Mar 2013 03:44:38 GMT Paul Brossier [20b1aed] * python/tests/test_pitch.py (modified) python/tests/test_pitch.py: indent and generate more tests Sun, 10 Mar 2013 16:37:28 GMT Paul Brossier [7d89e61] * python/lib/aubio/midiconv.py (modified) * python/tests/test_midi2note.py (modified) * python/tests/test_note2midi.py (modified) tests/test_{midi2note,note2midi}.py: add header and encoding Sun, 10 Mar 2013 16:14:49 GMT Paul Brossier [9ead7a9] * python/lib/aubio/midiconv.py (modified) * python/tests/test_midi2note.py (added) lib/aubio/midiconv.py: add note2 midi Sun, 10 Mar 2013 16:13:51 GMT Paul Brossier [f552e9e] * python/lib/aubio/midiconv.py (modified) * python/tests/test_note2midi.py (modified) lib/aubio/midiconv.py: improve note2midi Sun, 10 Mar 2013 15:34:45 GMT Paul Brossier [33102ab] * python/lib/aubio/__init__.py (modified) * python/lib/aubio/midiconv.py (added) * python/tests/test_note2midi.py (added) lib/aubio/midiconv.py: add note2midi Sat, 09 Mar 2013 01:27:43 GMT Paul Brossier [5810ed4] * python/tests/test_cvec.py (modified) tests/test_cvec.py: add missing header Sat, 09 Mar 2013 01:27:10 GMT Paul Brossier [93acd9f] * python/lib/generator.py (modified) lib/generator.py: move add_generated_objects and ... Sat, 09 Mar 2013 01:26:24 GMT Paul Brossier [1e7a8f9] * python/demos/demo_sink_create_woodblock.py (modified) demos/demo_sink_create_woodblock.py: table lookup to improve synthesis Sat, 09 Mar 2013 00:20:39 GMT Paul Brossier [daa0d5d] * python/demos/demo_waveform_plot.py (modified) demos/demo_waveform_plot.py: improve Fri, 08 Mar 2013 22:01:55 GMT Paul Brossier [5d5d6b9] * python/demos/demo_onset.py (modified) * python/demos/demo_pitch.py (added) * python/demos/demo_simple_robot_voice.py (modified) * python/demos/demo_specdesc.py (modified) * python/demos/demo_waveform_plot.py (added) python/demos: add demo_pitch.py and demo_waveform_plot.py Fri, 08 Mar 2013 19:38:45 GMT Paul Brossier [2cedc83] * python/demos/demo_onset.py (modified) demos/demo_onset.py: simplify imports Fri, 08 Mar 2013 19:38:17 GMT Paul Brossier [973206a] * python/tests/test_fvec.py (modified) python/tests/test_fvec.py: clarify Fri, 08 Mar 2013 19:36:44 GMT Paul Brossier [0a42239] * python/demos/demo_specdesc.py (moved) * python/tests/test_fft.py (modified) python/tests/test_fft.py: update, indent Fri, 08 Mar 2013 18:37:45 GMT Paul Brossier [9582713] * python/scripts/aubiocut (added) * python/setup.py (modified) python/setup.py: move programs to scripts Fri, 08 Mar 2013 18:13:43 GMT Paul Brossier [459e46f] * python/demos/aubiocut (deleted) * python/demos/demo_beats_and_tempo.py (deleted) * python/demos/demo_onset.py (modified) * python/demos/demo_onset_plot.py (modified) * python/demos/demo_tempo.py (added) * python/demos/demo_tempo_plot.py (added) python/demos/: update and add some demos Fri, 08 Mar 2013 15:12:17 GMT Paul Brossier [e6f7a4a] * python/demos/demo_onset.py (added) * python/demos/demo_onset_plot.py (moved) demos/demo_onset.py: add simple onset example, update demo_onset_plot.py Fri, 08 Mar 2013 14:30:45 GMT Paul Brossier [92c83ccc] * python/MANIFEST.in (modified) * python/README (modified) * python/env_linux (deleted) * python/env_osx (deleted) * python/lib/__init__.py (added) * python/lib/gen_pyobject.py (moved) * python/lib/generator.py (moved) * python/setup.py (modified) python/: move generator.py to lib, improve README, remove env_ files, ... Fri, 08 Mar 2013 12:41:48 GMT Paul Brossier [264247e] * python/demos/demo_slicing.py (modified) demos/demo_slicing.py: slice exactly at region boundary Fri, 08 Mar 2013 02:52:51 GMT Paul Brossier [1ee4033] * python/lib/aubio/__init__.py (moved) * python/setup.py (modified) python/setup.py: move package_dir to lib Fri, 08 Mar 2013 02:52:01 GMT Paul Brossier [9e6695d] * python/ext/aubiomodule.c (modified) * python/ext/py-filter.c (modified) * python/ext/py-filterbank.c (modified) * python/gen_pyobject.py (modified) * python/tests/test_sink.py (modified) python/: use Py_RETURN_NONE, fixing a memory bug triggered after ...