deepblue/samplebrain
1
0
Fork 0
mirror of https://gitlab.com/then-try-this/samplebrain.git synced 2025-06-08 05:47:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

v0.9 crash fix attempts

Browse Source
This commit is contained in:
foam 2015-08-07 17:18:16 +01:00
parent 9d041ca2b8
commit d4b937f0f0
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samplebrain/qt/generated/ui_samplebrain.h
View File

@ -1043,7 +1043,7 @@ public:
void retranslateUi(QMainWindow *MainWindow) void retranslateUi(QMainWindow *MainWindow)
{ {
MainWindow->setWindowTitle(QApplication::translate("MainWindow", "samplebrain 0.8", 0, QApplication::UnicodeUTF8)); MainWindow->setWindowTitle(QApplication::translate("MainWindow", "samplebrain 0.9", 0, QApplication::UnicodeUTF8));
label_19->setText(QApplication::translate("MainWindow", "brain tweaks", 0, QApplication::UnicodeUTF8)); label_19->setText(QApplication::translate("MainWindow", "brain tweaks", 0, QApplication::UnicodeUTF8));
label_6->setText(QApplication::translate("MainWindow", "fft / mfcc", 0, QApplication::UnicodeUTF8)); label_6->setText(QApplication::translate("MainWindow", "fft / mfcc", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP

2
samplebrain/src/aquila/filter/MelFilter.dep
View File

@ -1,2 +1,2 @@
MelFilter.o: src/aquila/filter/MelFilter.cpp \ MelFilter.o: src/aquila/filter/MelFilter.cpp \
src/aquila/filter/MelFilter.h src/aquila/filter/../global.h src/aquila/filter/MelFilter.h src/aquila/filter/../global.h

4
samplebrain/src/aquila/filter/MelFilterBank.dep
View File

@ -1,3 +1,3 @@
MelFilterBank.o: src/aquila/filter/MelFilterBank.cpp \ MelFilterBank.o: src/aquila/filter/MelFilterBank.cpp \
src/aquila/filter/MelFilterBank.h src/aquila/filter/../global.h \ src/aquila/filter/MelFilterBank.h src/aquila/filter/../global.h \
src/aquila/filter/MelFilter.h src/aquila/filter/MelFilter.h

2
samplebrain/src/aquila/transform/Dct.dep
View File

@ -1,2 +1,2 @@
Dct.o: src/aquila/transform/Dct.cpp src/aquila/transform/Dct.h \ Dct.o: src/aquila/transform/Dct.cpp src/aquila/transform/Dct.h \
src/aquila/transform/../global.h src/aquila/transform/../global.h

5
samplebrain/src/brain.cpp
View File

@ -203,6 +203,7 @@ void brain::build_synapses_fixed(search_params &params) {
++outer_index; ++outer_index;
} }
status::update("Done: %d synapses grown for %d blocks",num_synapses*brain_size,brain_size);
} }
@ -223,7 +224,7 @@ u32 brain::search_synapses(const block &target, search_params &params) {
if (current.get_synapse_const().size()<params.m_num_synapses) { if (current.get_synapse_const().size()<params.m_num_synapses) {
params.m_num_synapses = current.get_synapse_const().size()-1; params.m_num_synapses = current.get_synapse_const().size()-1;
} }
assert(current.get_synapse_const().size()>params.m_num_synapses); // assert(current.get_synapse_const().size()>params.m_num_synapses);
u32 synapse_count=0; u32 synapse_count=0;
// use m_num_synapses to restrict search // use m_num_synapses to restrict search
@ -231,7 +232,7 @@ u32 brain::search_synapses(const block &target, search_params &params) {
vector<u32>::const_iterator i=current.get_synapse_const().begin(); vector<u32>::const_iterator i=current.get_synapse_const().begin();
while (i!=current.get_synapse_const().end() && while (i!=current.get_synapse_const().end() &&
synapse_count<params.m_num_synapses) { synapse_count<params.m_num_synapses) {
assert(*i<m_blocks.size()); //assert(*i<m_blocks.size());
const block &other = get_block(*i); const block &other = get_block(*i);
double diff = target.compare(other,params); double diff = target.compare(other,params);

2
samplebrain/src/fft.cpp
View File

@ -15,6 +15,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <fft.h> #include <fft.h>
#include <string.h>
#include <iostream> #include <iostream>
@ -30,6 +31,7 @@ FFT::FFT(u32 length, u32 bins) :
m_spectrum(new fftw_complex[length]), m_spectrum(new fftw_complex[length]),
m_bin(new float[bins]) m_bin(new float[bins])
{ {
memset(m_spectrum,0,sizeof(fftw_complex)*length);
m_plan = fftw_plan_dft_r2c_1d(m_length, m_in, m_spectrum, FFTW_ESTIMATE); m_plan = fftw_plan_dft_r2c_1d(m_length, m_in, m_spectrum, FFTW_ESTIMATE);
} }