diff options
| author | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
|---|---|---|
| committer | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
| commit | e4eb667af04304cbe9c0be5997ebea2049178590 (patch) | |
| tree | 5630e70df8199c9f53170c9ef4da1e4dac59e69c /ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data')
3 files changed, 10 insertions, 0 deletions
diff --git a/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/.gitkeep b/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/.gitkeep diff --git a/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/Arial.ttf b/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/Arial.ttf Binary files differnew file mode 100644 index 0000000..ab68fb1 --- /dev/null +++ b/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/Arial.ttf diff --git a/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/settings.xml b/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/settings.xml new file mode 100644 index 0000000..4735189 --- /dev/null +++ b/ofxMaxim/openFrameworksExamples/OSX/OF0.8.4MaximExtractorExample/bin/data/settings.xml @@ -0,0 +1,10 @@ +<group> + <MFCCs__timbre_vocal___13_>1</MFCCs__timbre_vocal___13_> + <FFT_bin_magnitudes__pitch_timbre_volume___512_>1</FFT_bin_magnitudes__pitch_timbre_volume___512_> + <Chromagram__pitch___12_>1</Chromagram__pitch___12_> + <Peak_frequency__pitch___1_>1</Peak_frequency__pitch___1_> + <Spectral_centroid__timbre___1_>1</Spectral_centroid__timbre___1_> + <RMS__volume___1_>1</RMS__volume___1_> +<group/> +<Octave_analyser__pitch___12_>1</Octave_analyser__pitch___12_> +</group> |