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

added more soundfile formats to the loading dialog and new error report when it can't load

Browse Source
This commit is contained in:
Dave Griffiths 2022-10-14 20:30:12 +01:00
parent b5fd6dd3e0
commit e1c8e0ea67
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/MainWindow.cpp
View File

@ -31,7 +31,8 @@ MainWindow::MainWindow(const string &port, const string &audio_port, const strin
m_last_file("."), m_last_file("."),
m_feedback(port), m_feedback(port),
m_audio_port(audio_port), m_audio_port(audio_port),
m_process_port(process_port) m_process_port(process_port),
m_format_string("Microsoft WAV (*.wav);;SGI/Apple AIFF (*.aiff);;SGI/Apple AIFC (*.aifc);;Sun/DEC/NeXT AU (*.au);;Sun/DEC/NeXT SND (*.snd);;Fasttracker 2 XI (*.xi);;All files (*.*)")
{ {
m_sound_item_enable_mapper = new QSignalMapper(this); m_sound_item_enable_mapper = new QSignalMapper(this);
m_sound_item_delete_mapper = new QSignalMapper(this); m_sound_item_delete_mapper = new QSignalMapper(this);

40
app/MainWindow.h
View File

@ -206,11 +206,10 @@ private slots:
void run_slot() {} void run_slot() {}
void load_target() { void load_target() {
m_last_file=QFileDialog::getOpenFileName( m_last_file=QFileDialog::getOpenFileName(this,
this, QString("Select an audio file"),
QString("Select an wav file"),
m_last_file, m_last_file,
QString("Sounds (*.wav)")); m_format_string);
send_process_osc("/load_target","s",m_last_file.toStdString().c_str()); send_process_osc("/load_target","s",m_last_file.toStdString().c_str());
} }
@ -222,26 +221,25 @@ private slots:
void fft_spectrum_size(int) {} void fft_spectrum_size(int) {}
void generate() { send_process_osc("/generate_brain",""); } void generate() { send_process_osc("/generate_brain",""); }
void load_sound() { void load_sound() {
m_last_file=QFileDialog::getOpenFileName( m_last_file=QFileDialog::getOpenFileName(this,
this,
QString("Select a wav file"), QString("Select a wav file"),
m_last_file, m_last_file,
QString("Sounds (*.wav)")); m_format_string);
send_process_osc("/load_sample","s",m_last_file.toStdString().c_str()); if (m_last_file!="") {
send_process_osc("/load_sample","s",m_last_file.toStdString().c_str());
sound_items::sound_item &si = m_sound_items.add(m_Ui.brain_contents, m_last_file.toStdString(),true); sound_items::sound_item &si = m_sound_items.add(m_Ui.brain_contents, m_last_file.toStdString(),true);
QObject::connect(si.m_enable, SIGNAL(clicked()), m_sound_item_enable_mapper, SLOT(map()));
QObject::connect(si.m_enable, SIGNAL(clicked()), m_sound_item_enable_mapper, SLOT(map())); m_sound_item_enable_mapper->setMapping(si.m_enable, si.m_id);
m_sound_item_enable_mapper->setMapping(si.m_enable, si.m_id); QObject::connect(si.m_del, SIGNAL(clicked()), m_sound_item_delete_mapper, SLOT(map()));
QObject::connect(si.m_del, SIGNAL(clicked()), m_sound_item_delete_mapper, SLOT(map())); m_sound_item_delete_mapper->setMapping(si.m_del, si.m_id);
m_sound_item_delete_mapper->setMapping(si.m_del, si.m_id); }
} }
void load_sounds() { void load_sounds() {
m_last_file=QFileDialog::getExistingDirectory(this, m_last_file=QFileDialog::getExistingDirectory(this,
QString("Select a directory"), QString("Select a directory of wav files"),
m_last_file); m_last_file);
@ -319,7 +317,7 @@ private slots:
this, this,
QString("Select a wav file"), QString("Select a wav file"),
m_last_file, m_last_file,
QString("Sounds (*.wav)")); QString("Sounds (*.wav);;All files (*.*)"));
m_save_wav = m_last_file.toStdString(); m_save_wav = m_last_file.toStdString();
// chop off .wav // chop off .wav
size_t pos = m_save_wav.find_last_of("."); size_t pos = m_save_wav.find_last_of(".");
@ -345,7 +343,7 @@ private slots:
this, this,
QString("Select a brain file"), QString("Select a brain file"),
m_last_file, m_last_file,
QString("Brains (*.brain)")); QString("Brains (*.brain);;All files (*.*)"));
send_process_osc("/load_brain","s",m_last_file.toStdString().c_str()); send_process_osc("/load_brain","s",m_last_file.toStdString().c_str());
} }
@ -354,7 +352,7 @@ private slots:
this, this,
QString("Select a brain file"), QString("Select a brain file"),
m_last_file, m_last_file,
QString("Brains (*.brain)")); QString("Brains (*.brain);;All files (*.*)"));
send_process_osc("/save_brain","s",m_last_file.toStdString().c_str()); send_process_osc("/save_brain","s",m_last_file.toStdString().c_str());
} }
@ -364,7 +362,7 @@ private slots:
this, this,
QString("Select a session file"), QString("Select a session file"),
m_last_file, m_last_file,
QString("Sessions *.samplebrain (*.samplebrain)")); QString("Sessions *.samplebrain (*.samplebrain);;All files (*.*)"));
send_process_osc("/load_session","s",m_last_file.toStdString().c_str()); send_process_osc("/load_session","s",m_last_file.toStdString().c_str());
init_from_session(m_last_file.toStdString()); init_from_session(m_last_file.toStdString());
@ -455,5 +453,5 @@ private:
string m_audio_port; string m_audio_port;
string m_process_port; string m_process_port;
QString m_format_string;
}; };

2
brain/src/brain.cpp
View File

@ -69,6 +69,8 @@ void brain::load_sound(std::string filename, stereo_mode mode) {
delete[] temp; delete[] temp;
m_samples.push_back(sound(filename,s)); m_samples.push_back(sound(filename,s));
status::update("loaded %s",filename.c_str()); status::update("loaded %s",filename.c_str());
} else {
status::update("problem loading %s",filename.c_str());
} }
} }