mirror of
https://gitlab.com/then-try-this/samplebrain.git
synced 2025-05-12 10:37:20 +00:00
Merge branch 'main' into 'upgrade-to-cmake'
# Conflicts: # app/MainWindow.h # app/SettingsDialog.h
This commit is contained in:
commit
bbdcd4b29c
@ -27,9 +27,12 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
MainWindow::MainWindow() :
|
||||
MainWindow::MainWindow(const string &port, const string &audio_port, const string &process_port, QSettings *settings) :
|
||||
m_last_file("."),
|
||||
m_feedback("8890")
|
||||
m_feedback(port),
|
||||
m_audio_port(audio_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);;Free Lossless Audio Codec FLAC (*.flac);;All files (*.*)")
|
||||
{
|
||||
m_sound_item_enable_mapper = new QSignalMapper(this);
|
||||
m_sound_item_delete_mapper = new QSignalMapper(this);
|
||||
@ -49,7 +52,7 @@ MainWindow::MainWindow() :
|
||||
m_Ui.brain_contents->setSpacing(0);
|
||||
m_Ui.brain_contents->setContentsMargins(0,0,0,0);
|
||||
|
||||
m_settings_dialog = new SettingsDialog(this);
|
||||
m_settings_dialog = new SettingsDialog(this,settings);
|
||||
|
||||
// add default local dest
|
||||
// turn on first one
|
||||
@ -59,8 +62,8 @@ MainWindow::MainWindow() :
|
||||
for (int i=0; i<10; i++) {
|
||||
osc_destination d;
|
||||
d.m_id=i;
|
||||
d.m_audio_address = lo_address_new_from_url("osc.udp://localhost:8888");
|
||||
d.m_process_address = lo_address_new_from_url("osc.udp://localhost:8889");
|
||||
d.m_audio_address = lo_address_new_from_url(string("osc.udp://localhost:"+m_audio_port).c_str());
|
||||
d.m_process_address = lo_address_new_from_url(string("osc.udp://localhost:"+m_process_port).c_str());
|
||||
if (i==0) d.m_enabled=true;
|
||||
else d.m_enabled=false;
|
||||
add_gui_address(d,enable_mapper);
|
||||
|
594
app/MainWindow.h
594
app/MainWindow.h
@ -18,7 +18,8 @@
|
||||
#include <QDirIterator>
|
||||
#include <QFileDialog>
|
||||
#include <QLineEdit>
|
||||
#include "../gui/ui_samplebrain.h"
|
||||
#include <QMessageBox>
|
||||
#include "ui_samplebrain.h"
|
||||
#include "SettingsDialog.h"
|
||||
|
||||
#include <iostream>
|
||||
@ -32,13 +33,23 @@
|
||||
using namespace std;
|
||||
using namespace spiralcore;
|
||||
|
||||
class QSettings;
|
||||
|
||||
class MainWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
MainWindow();
|
||||
MainWindow(const string &port, const string &audio_port, const string &process_port, QSettings *settings);
|
||||
|
||||
void message(const string &msg) {
|
||||
QMessageBox::information(this,"problem",msg.c_str(), QMessageBox::Ok);
|
||||
}
|
||||
|
||||
bool ok() {
|
||||
return m_feedback.ok();
|
||||
}
|
||||
|
||||
// all this to work around liblo's use of varargs...
|
||||
void send_audio_osc(const char *name, const char *types) {
|
||||
for (auto dest:m_destinations) {
|
||||
@ -102,344 +113,345 @@ protected:
|
||||
|
||||
private slots:
|
||||
|
||||
void play_slot() { send_audio_osc("/start",""); }
|
||||
void stop_slot() { send_audio_osc("/pause",""); }
|
||||
void play_slot() { send_audio_osc("/start",""); }
|
||||
void stop_slot() { send_audio_osc("/pause",""); }
|
||||
|
||||
void ratio_slot(int s) {
|
||||
send_audio_osc("/ratio","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxRatio->setValue(s/100.0f);
|
||||
}
|
||||
void ratio_slot(double s) {
|
||||
send_audio_osc("/ratio","f",s);
|
||||
m_Ui.sliderRatio->setValue(s*100);
|
||||
}
|
||||
void ratio_slot(int s) {
|
||||
send_audio_osc("/ratio","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxRatio->setValue(s/100.0f);
|
||||
}
|
||||
void ratio_slot(double s) {
|
||||
send_audio_osc("/ratio","f",s);
|
||||
m_Ui.sliderRatio->setValue(s*100);
|
||||
}
|
||||
|
||||
void n_ratio_slot(int s) {
|
||||
send_audio_osc("/n_ratio","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxNRatio->setValue(s/100.0f);
|
||||
}
|
||||
void n_ratio_slot(double s) {
|
||||
send_audio_osc("/n_ratio","f",s);
|
||||
m_Ui.sliderNRatio->setValue(s*100);
|
||||
}
|
||||
void n_ratio_slot(int s) {
|
||||
send_audio_osc("/n_ratio","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxNRatio->setValue(s/100.0f);
|
||||
}
|
||||
void n_ratio_slot(double s) {
|
||||
send_audio_osc("/n_ratio","f",s);
|
||||
m_Ui.sliderNRatio->setValue(s*100);
|
||||
}
|
||||
|
||||
void autotune(int s) {
|
||||
send_audio_osc("/autotune","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxAutotune->setValue(s/100.0f);
|
||||
}
|
||||
void autotune(double s) {
|
||||
send_audio_osc("/autotune","f",s);
|
||||
m_Ui.sliderAutotune->setValue(s*100);
|
||||
}
|
||||
void autotune(int s) {
|
||||
send_audio_osc("/autotune","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxAutotune->setValue(s/100.0f);
|
||||
}
|
||||
void autotune(double s) {
|
||||
send_audio_osc("/autotune","f",s);
|
||||
m_Ui.sliderAutotune->setValue(s*100);
|
||||
}
|
||||
|
||||
void fft1_start_slot(int s) { send_audio_osc("/fft1_start","i",s); }
|
||||
void fft1_end_slot(int s) { send_audio_osc("/fft1_end","i",s); }
|
||||
void fft2_start_slot(int s){} // { m_renderer->get_params()->m_fft2_start=s; }
|
||||
void fft2_end_slot(int s){} // { m_renderer->get_params()->m_fft2_end=s; }
|
||||
void fft1_start_slot(int s) { send_audio_osc("/fft1_start","i",s); }
|
||||
void fft1_end_slot(int s) { send_audio_osc("/fft1_end","i",s); }
|
||||
void fft2_start_slot(int s){} // { m_renderer->get_params()->m_fft2_start=s; }
|
||||
void fft2_end_slot(int s){} // { m_renderer->get_params()->m_fft2_end=s; }
|
||||
|
||||
void n_mix_slot(int s) {
|
||||
send_audio_osc("/n_mix","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxNMix->setValue(s/100.0f);
|
||||
}
|
||||
void n_mix_slot(double s) {
|
||||
send_audio_osc("/n_mix","f",s);
|
||||
m_Ui.sliderNMix->setValue(s*100);
|
||||
}
|
||||
void n_mix_slot(int s) {
|
||||
send_audio_osc("/n_mix","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxNMix->setValue(s/100.0f);
|
||||
}
|
||||
void n_mix_slot(double s) {
|
||||
send_audio_osc("/n_mix","f",s);
|
||||
m_Ui.sliderNMix->setValue(s*100);
|
||||
}
|
||||
|
||||
void novelty_slot(int s) {
|
||||
send_audio_osc("/novelty","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxNovelty->setValue(s/100.0f);
|
||||
}
|
||||
void novelty_slot(double s) {
|
||||
send_audio_osc("/novelty","f",s);
|
||||
m_Ui.sliderNovelty->setValue(s*100);
|
||||
}
|
||||
void novelty_slot(int s) {
|
||||
send_audio_osc("/novelty","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxNovelty->setValue(s/100.0f);
|
||||
}
|
||||
void novelty_slot(double s) {
|
||||
send_audio_osc("/novelty","f",s);
|
||||
m_Ui.sliderNovelty->setValue(s*100);
|
||||
}
|
||||
|
||||
void boredom_slot(int s) {
|
||||
float v=s/100.0f;
|
||||
send_audio_osc("/boredom","f",v);
|
||||
m_Ui.doubleSpinBoxBoredom->setValue(v);
|
||||
}
|
||||
void boredom_slot(double s) {
|
||||
send_audio_osc("/boredom","f",s);
|
||||
m_Ui.sliderBoredom->setValue(s*100);
|
||||
}
|
||||
void synapses(int s) {
|
||||
send_audio_osc("/synapses","i",s);
|
||||
}
|
||||
void target_mix_slot(int s) {
|
||||
send_audio_osc("/target_mix","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxTargetMix->setValue(s/100.0f);
|
||||
}
|
||||
void target_mix_slot(double s) {
|
||||
send_audio_osc("/target_mix","f",s);
|
||||
m_Ui.sliderTargetMix->setValue(s*100);
|
||||
}
|
||||
void search_stretch(int s) {
|
||||
send_audio_osc("/search-stretch","i",s);
|
||||
}
|
||||
void slide_error(int s) {
|
||||
send_audio_osc("/slide-error","i",s);
|
||||
}
|
||||
void stickyness_slot(int s) {
|
||||
send_audio_osc("/stickyness","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxStickyness->setValue(s/100.0f);
|
||||
}
|
||||
void stickyness_slot(double s) {
|
||||
send_audio_osc("/stickyness","f",s);
|
||||
m_Ui.sliderStickyness->setValue(s*100);
|
||||
}
|
||||
void boredom_slot(int s) {
|
||||
float v=s/100.0f;
|
||||
send_audio_osc("/boredom","f",v);
|
||||
m_Ui.doubleSpinBoxBoredom->setValue(v);
|
||||
}
|
||||
void boredom_slot(double s) {
|
||||
send_audio_osc("/boredom","f",s);
|
||||
m_Ui.sliderBoredom->setValue(s*100);
|
||||
}
|
||||
void synapses(int s) {
|
||||
send_audio_osc("/synapses","i",s);
|
||||
}
|
||||
void target_mix_slot(int s) {
|
||||
send_audio_osc("/target_mix","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxTargetMix->setValue(s/100.0f);
|
||||
}
|
||||
void target_mix_slot(double s) {
|
||||
send_audio_osc("/target_mix","f",s);
|
||||
m_Ui.sliderTargetMix->setValue(s*100);
|
||||
}
|
||||
void search_stretch(int s) {
|
||||
send_audio_osc("/search-stretch","i",s);
|
||||
}
|
||||
void slide_error(int s) {
|
||||
send_audio_osc("/slide-error","i",s);
|
||||
}
|
||||
void stickyness_slot(int s) {
|
||||
send_audio_osc("/stickyness","f",s/100.0f);
|
||||
m_Ui.doubleSpinBoxStickyness->setValue(s/100.0f);
|
||||
}
|
||||
void stickyness_slot(double s) {
|
||||
send_audio_osc("/stickyness","f",s);
|
||||
m_Ui.sliderStickyness->setValue(s*100);
|
||||
}
|
||||
|
||||
void volume_slot(int s) { send_audio_osc("/volume","f",s/100.0f); }
|
||||
void algo(int n) { send_audio_osc("/search_algo","i",n); }
|
||||
void volume_slot(int s) { send_audio_osc("/volume","f",s/100.0f); }
|
||||
void algo(int n) { send_audio_osc("/search_algo","i",n); }
|
||||
|
||||
void run_slot() {}
|
||||
void load_target() {
|
||||
m_last_file=QFileDialog::getOpenFileName(
|
||||
this,
|
||||
QString("Select an wav file"),
|
||||
m_last_file,
|
||||
QString("Sounds (*.wav)"));
|
||||
void run_slot() {}
|
||||
void load_target() {
|
||||
m_last_file=QFileDialog::getOpenFileName(this,
|
||||
QString("Select an audio file"),
|
||||
m_last_file,
|
||||
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());
|
||||
}
|
||||
void target_block_size(int s) { send_process_osc("/target_block_size","i",s); }
|
||||
void target_block_overlap(double s) { send_process_osc("/target_overlap","f",s); }
|
||||
void generate_target_blocks() { send_process_osc("/generate_target",""); }
|
||||
void block_size(int s) { send_process_osc("/source_block_size","i",s); }
|
||||
void block_overlap(double s) { send_process_osc("/source_overlap","f",s); }
|
||||
void fft_spectrum_size(int) {}
|
||||
void generate() { send_process_osc("/generate_brain",""); }
|
||||
void load_sound() {
|
||||
m_last_file=QFileDialog::getOpenFileName(this,
|
||||
QString("Select a wav file"),
|
||||
m_last_file,
|
||||
m_format_string);
|
||||
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
}
|
||||
void target_block_size(int s) { send_process_osc("/target_block_size","i",s); }
|
||||
void target_block_overlap(double s) { send_process_osc("/target_overlap","f",s); }
|
||||
void generate_target_blocks() { send_process_osc("/generate_target",""); }
|
||||
void block_size(int s) { send_process_osc("/source_block_size","i",s); }
|
||||
void block_overlap(double s) { send_process_osc("/source_overlap","f",s); }
|
||||
void fft_spectrum_size(int) {}
|
||||
void generate() { send_process_osc("/generate_brain",""); }
|
||||
void load_sound() {
|
||||
m_last_file=QFileDialog::getOpenFileName(
|
||||
this,
|
||||
QString("Select a wav file"),
|
||||
m_last_file,
|
||||
QString("Sounds (*.wav)"));
|
||||
}
|
||||
|
||||
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);
|
||||
void load_sounds() {
|
||||
m_last_file=QFileDialog::getExistingDirectory(this,
|
||||
QString("Select a directory of wav files"),
|
||||
m_last_file);
|
||||
|
||||
|
||||
QDirIterator dirIt(m_last_file,QDirIterator::Subdirectories);
|
||||
while (dirIt.hasNext()) {
|
||||
dirIt.next();
|
||||
if (QFileInfo(dirIt.filePath()).isFile() &&
|
||||
QFileInfo(dirIt.filePath()).suffix() == "wav") {
|
||||
send_process_osc("/load_sample","s",dirIt.filePath().toStdString().c_str());
|
||||
|
||||
sound_items::sound_item &si = m_sound_items.add(m_Ui.brain_contents, dirIt.filePath().toStdString(),true);
|
||||
|
||||
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);
|
||||
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);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void select_all() {
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
si.m_enable->setChecked(true);
|
||||
send_process_osc("/activate_sound","s",si.m_filename.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void load_sounds() {
|
||||
m_last_file=QFileDialog::getExistingDirectory(this,
|
||||
QString("Select a directory"),
|
||||
m_last_file);
|
||||
void select_none() {
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
si.m_enable->setChecked(false);
|
||||
send_process_osc("/deactivate_sound","s",si.m_filename.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
QDirIterator dirIt(m_last_file,QDirIterator::Subdirectories);
|
||||
while (dirIt.hasNext()) {
|
||||
dirIt.next();
|
||||
if (QFileInfo(dirIt.filePath()).isFile() &&
|
||||
QFileInfo(dirIt.filePath()).suffix() == "wav") {
|
||||
send_process_osc("/load_sample","s",dirIt.filePath().toStdString().c_str());
|
||||
|
||||
sound_items::sound_item &si = m_sound_items.add(m_Ui.brain_contents, dirIt.filePath().toStdString(),true);
|
||||
|
||||
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);
|
||||
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);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void select_all() {
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
si.m_enable->setChecked(true);
|
||||
send_process_osc("/activate_sound","s",si.m_filename.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void select_none() {
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
si.m_enable->setChecked(false);
|
||||
send_process_osc("/deactivate_sound","s",si.m_filename.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void sound_enable(int id) {
|
||||
// search for this id...
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
if (si.m_id==id) {
|
||||
if (si.m_enable->isChecked()) {
|
||||
send_process_osc("/activate_sound","s",si.m_filename.c_str());
|
||||
} else {
|
||||
send_process_osc("/deactivate_sound","s",si.m_filename.c_str());
|
||||
}
|
||||
void sound_enable(int id) {
|
||||
// search for this id...
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
if (si.m_id==id) {
|
||||
if (si.m_enable->isChecked()) {
|
||||
send_process_osc("/activate_sound","s",si.m_filename.c_str());
|
||||
} else {
|
||||
send_process_osc("/deactivate_sound","s",si.m_filename.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void delete_sound(int id) {
|
||||
// search for this id...
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
if (si.m_id==id) {
|
||||
send_process_osc("/delete_sample","s",si.m_filename.c_str());
|
||||
m_sound_items.remove(si.m_filename);
|
||||
// iterator is now invalidated...
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
void clear_brain() {
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
void delete_sound(int id) {
|
||||
// search for this id...
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
if (si.m_id==id) {
|
||||
send_process_osc("/delete_sample","s",si.m_filename.c_str());
|
||||
m_sound_items.remove(si.m_filename);
|
||||
// iterator is now invalidated...
|
||||
return;
|
||||
}
|
||||
m_sound_items.clear();
|
||||
}
|
||||
void restart_audio() { send_audio_osc("/restart_audio",""); }
|
||||
|
||||
void brain_shape(int n) { send_process_osc("/window_type","i",n); }
|
||||
void target_shape(int n) { send_process_osc("/target_window_type","i",n); }
|
||||
void mic(bool n) { send_audio_osc("/mic","i",(int)n); }
|
||||
|
||||
void record() {
|
||||
if (m_save_wav=="") {
|
||||
m_last_file=QFileDialog::getSaveFileName(
|
||||
this,
|
||||
QString("Select a wav file"),
|
||||
m_last_file,
|
||||
QString("Sounds (*.wav)"));
|
||||
m_save_wav = m_last_file.toStdString();
|
||||
// chop off .wav
|
||||
size_t pos = m_save_wav.find_last_of(".");
|
||||
if (pos!=string::npos) {
|
||||
m_save_wav = m_save_wav.substr(0,pos);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
char fn[1024];
|
||||
snprintf(fn,1024,"%s-%i",m_save_wav.c_str(),m_record_id);
|
||||
send_audio_osc("/record","s",fn);
|
||||
cerr<<fn<<endl;
|
||||
m_record_id++;
|
||||
}
|
||||
void clear_brain() {
|
||||
for (auto &si:m_sound_items.m_sound_items) {
|
||||
send_process_osc("/delete_sample","s",si.m_filename.c_str());
|
||||
}
|
||||
m_sound_items.clear();
|
||||
}
|
||||
void restart_audio() { send_audio_osc("/restart_audio",""); }
|
||||
|
||||
void stop_record() {
|
||||
send_audio_osc("/stop","");
|
||||
}
|
||||
void brain_shape(int n) { send_process_osc("/window_type","i",n); }
|
||||
void target_shape(int n) { send_process_osc("/target_window_type","i",n); }
|
||||
void mic(bool n) { send_audio_osc("/mic","i",(int)n); }
|
||||
|
||||
void load_brain() {
|
||||
m_last_file=QFileDialog::getOpenFileName(
|
||||
this,
|
||||
QString("Select a brain file"),
|
||||
m_last_file,
|
||||
QString("Brains (*.brain)"));
|
||||
|
||||
send_process_osc("/load_brain","s",m_last_file.toStdString().c_str());
|
||||
}
|
||||
void save_brain() {
|
||||
m_last_file=QFileDialog::getSaveFileName(
|
||||
this,
|
||||
QString("Select a brain file"),
|
||||
m_last_file,
|
||||
QString("Brains (*.brain)"));
|
||||
|
||||
send_process_osc("/save_brain","s",m_last_file.toStdString().c_str());
|
||||
}
|
||||
|
||||
void load_session() {
|
||||
m_last_file=QFileDialog::getOpenFileName(
|
||||
this,
|
||||
QString("Select a session file"),
|
||||
m_last_file,
|
||||
QString("Sessions *.samplebrain (*.samplebrain)"));
|
||||
|
||||
send_process_osc("/load_session","s",m_last_file.toStdString().c_str());
|
||||
init_from_session(m_last_file.toStdString());
|
||||
}
|
||||
|
||||
void save_session() {
|
||||
m_last_file=QFileDialog::getSaveFileName(
|
||||
this,
|
||||
QString("Select a session file"),
|
||||
m_last_file,
|
||||
QString("Sessions *.samplebrain (*.samplebrain)"));
|
||||
|
||||
send_process_osc("/save_session","s",m_last_file.toStdString().c_str());
|
||||
}
|
||||
|
||||
void update_status() {
|
||||
m_feedback.poll(m_Ui.statusbar,&m_sound_items,m_settings_dialog);
|
||||
}
|
||||
|
||||
void stereo_mode(bool s) {
|
||||
send_audio_osc("/stereo","i",s);
|
||||
}
|
||||
|
||||
void net_enable(int id) {
|
||||
osc_destination &d = m_destinations[id];
|
||||
|
||||
if (d.m_enable->isChecked()) {
|
||||
// reconnect
|
||||
string url = d.m_address->text().toUtf8().constData();
|
||||
lo_address_free(d.m_audio_address);
|
||||
lo_address_free(d.m_process_address);
|
||||
d.m_audio_address = lo_address_new_from_url(string(url+":8888").c_str());
|
||||
d.m_process_address = lo_address_new_from_url(string(url+":8889").c_str());
|
||||
// start sending messages here
|
||||
d.m_enabled=true;
|
||||
} else {
|
||||
// stop sending messages here
|
||||
d.m_enabled=false;
|
||||
void record() {
|
||||
if (m_save_wav=="") {
|
||||
m_last_file=QFileDialog::getSaveFileName(
|
||||
this,
|
||||
QString("Select a wav file"),
|
||||
m_last_file,
|
||||
QString("Sounds (*.wav);;All files (*.*)"));
|
||||
m_save_wav = m_last_file.toStdString();
|
||||
// chop off .wav
|
||||
size_t pos = m_save_wav.find_last_of(".");
|
||||
if (pos!=string::npos) {
|
||||
m_save_wav = m_save_wav.substr(0,pos);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
char fn[1024];
|
||||
snprintf(fn,1024,"%s-%i",m_save_wav.c_str(),m_record_id);
|
||||
send_audio_osc("/record","s",fn);
|
||||
cerr<<fn<<endl;
|
||||
m_record_id++;
|
||||
}
|
||||
|
||||
void stop_record() {
|
||||
send_audio_osc("/stop","");
|
||||
}
|
||||
|
||||
void load_brain() {
|
||||
m_last_file=QFileDialog::getOpenFileName(
|
||||
this,
|
||||
QString("Select a brain file"),
|
||||
m_last_file,
|
||||
QString("Brains (*.brain);;All files (*.*)"));
|
||||
|
||||
send_process_osc("/load_brain","s",m_last_file.toStdString().c_str());
|
||||
}
|
||||
void save_brain() {
|
||||
m_last_file=QFileDialog::getSaveFileName(
|
||||
this,
|
||||
QString("Select a brain file"),
|
||||
m_last_file,
|
||||
QString("Brains (*.brain);;All files (*.*)"));
|
||||
|
||||
send_process_osc("/save_brain","s",m_last_file.toStdString().c_str());
|
||||
}
|
||||
|
||||
void load_session() {
|
||||
m_last_file=QFileDialog::getOpenFileName(
|
||||
this,
|
||||
QString("Select a session file"),
|
||||
m_last_file,
|
||||
QString("Sessions *.samplebrain (*.samplebrain);;All files (*.*)"));
|
||||
|
||||
send_process_osc("/load_session","s",m_last_file.toStdString().c_str());
|
||||
init_from_session(m_last_file.toStdString());
|
||||
}
|
||||
|
||||
void save_session() {
|
||||
m_last_file=QFileDialog::getSaveFileName(
|
||||
this,
|
||||
QString("Select a session file"),
|
||||
m_last_file,
|
||||
QString("Sessions *.samplebrain (*.samplebrain)"));
|
||||
|
||||
send_process_osc("/save_session","s",m_last_file.toStdString().c_str());
|
||||
}
|
||||
|
||||
void update_status() {
|
||||
m_feedback.poll(m_Ui.statusbar,&m_sound_items,m_settings_dialog);
|
||||
}
|
||||
|
||||
void stereo_mode(bool s) {
|
||||
send_audio_osc("/stereo","i",s);
|
||||
}
|
||||
|
||||
void net_enable(int id) {
|
||||
osc_destination &d = m_destinations[id];
|
||||
|
||||
if (d.m_enable->isChecked()) {
|
||||
// reconnect
|
||||
string url = d.m_address->text().toUtf8().constData();
|
||||
lo_address_free(d.m_audio_address);
|
||||
lo_address_free(d.m_process_address);
|
||||
d.m_audio_address = lo_address_new_from_url(string(url+":"+m_audio_port).c_str());
|
||||
d.m_process_address = lo_address_new_from_url(string(url+":"+m_process_port).c_str());
|
||||
// start sending messages here
|
||||
d.m_enabled=true;
|
||||
} else {
|
||||
// stop sending messages here
|
||||
d.m_enabled=false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void settings() {
|
||||
m_settings_dialog->show();
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
///////////////////////////////////////////////
|
||||
///////////////////////////////////////////////
|
||||
|
||||
// we want to be able to send out to
|
||||
// multiple addresses over the network
|
||||
// we want to be able to send out to
|
||||
// multiple addresses over the network
|
||||
|
||||
////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////
|
||||
|
||||
|
||||
// we want to be able to send out to
|
||||
// multiple addresses over the network
|
||||
class osc_destination {
|
||||
public:
|
||||
int m_id;
|
||||
lo_address m_audio_address;
|
||||
lo_address m_process_address;
|
||||
// can't find a way to address these via qt
|
||||
QLineEdit *m_address;
|
||||
QCheckBox *m_enable;
|
||||
bool m_enabled;
|
||||
};
|
||||
// we want to be able to send out to
|
||||
// multiple addresses over the network
|
||||
class osc_destination {
|
||||
public:
|
||||
int m_id;
|
||||
lo_address m_audio_address;
|
||||
lo_address m_process_address;
|
||||
// can't find a way to address these via qt
|
||||
QLineEdit *m_address;
|
||||
QCheckBox *m_enable;
|
||||
bool m_enabled;
|
||||
};
|
||||
|
||||
vector<osc_destination> m_destinations;
|
||||
vector<osc_destination> m_destinations;
|
||||
|
||||
|
||||
void init_from_session(const string &filename);
|
||||
void add_gui_address(osc_destination &dest,
|
||||
QSignalMapper* enable_mapper);
|
||||
void init_from_session(const string &filename);
|
||||
void add_gui_address(osc_destination &dest,
|
||||
QSignalMapper* enable_mapper);
|
||||
|
||||
string m_save_wav;
|
||||
QString m_last_file;
|
||||
unsigned int m_record_id;
|
||||
Ui_MainWindow m_Ui;
|
||||
feedback m_feedback;
|
||||
QSignalMapper* m_sound_item_enable_mapper;
|
||||
QSignalMapper* m_sound_item_delete_mapper;
|
||||
sound_items m_sound_items;
|
||||
string m_save_wav;
|
||||
QString m_last_file;
|
||||
unsigned int m_record_id;
|
||||
Ui_MainWindow m_Ui;
|
||||
feedback m_feedback;
|
||||
QSignalMapper* m_sound_item_enable_mapper;
|
||||
QSignalMapper* m_sound_item_delete_mapper;
|
||||
sound_items m_sound_items;
|
||||
|
||||
SettingsDialog *m_settings_dialog;
|
||||
SettingsDialog *m_settings_dialog;
|
||||
audio_thread *m_audio_thread;
|
||||
|
||||
|
||||
string m_audio_port;
|
||||
string m_process_port;
|
||||
QString m_format_string;
|
||||
};
|
||||
|
@ -24,12 +24,16 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
SettingsDialog::SettingsDialog(MainWindow *parent):
|
||||
SettingsDialog::SettingsDialog(MainWindow *parent, QSettings *settings):
|
||||
m_device(""),
|
||||
m_parent(parent),
|
||||
m_buffersize(2048),
|
||||
m_samplerate(44100) {
|
||||
m_samplerate(44100),
|
||||
m_settings(settings) {
|
||||
m_Ui.setupUi(this);
|
||||
m_Ui.guiOSCLineEdit->setText(settings->value("gui_port").toByteArray().constData());
|
||||
m_Ui.processOSCLineEdit->setText(settings->value("process_port").toByteArray().constData());
|
||||
m_Ui.audioOSCLineEdit->setText(settings->value("audio_port").toByteArray().constData());
|
||||
}
|
||||
|
||||
void SettingsDialog::connect() {
|
||||
|
@ -20,7 +20,8 @@
|
||||
#include <QtGui>
|
||||
#include <QDialog>
|
||||
#include <QLineEdit>
|
||||
#include "../gui/ui_settings.h"
|
||||
#include <QSettings>
|
||||
#include "ui_settings.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <lo/lo.h>
|
||||
@ -36,7 +37,7 @@ class SettingsDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
SettingsDialog(MainWindow *parent);
|
||||
SettingsDialog(MainWindow *parent, QSettings *settings);
|
||||
|
||||
Ui_SettingsDialog m_Ui;
|
||||
string m_device;
|
||||
@ -61,15 +62,28 @@ class SettingsDialog : public QDialog
|
||||
void accept() { connect(); hide(); }
|
||||
void reject() { hide(); }
|
||||
void apply() { connect(); }
|
||||
|
||||
|
||||
void gui_port(QString str) {
|
||||
m_settings->setValue("gui_port",str);
|
||||
}
|
||||
|
||||
void process_port(QString str) {
|
||||
m_settings->setValue("process_port",str);
|
||||
}
|
||||
|
||||
void audio_port(QString str) {
|
||||
m_settings->setValue("audio_port",str);
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
void connect();
|
||||
MainWindow *m_parent;
|
||||
void connect();
|
||||
MainWindow *m_parent;
|
||||
|
||||
unsigned int m_buffersize;
|
||||
unsigned int m_samplerate;
|
||||
unsigned int m_buffersize;
|
||||
unsigned int m_samplerate;
|
||||
|
||||
QSettings *m_settings;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -20,26 +20,23 @@
|
||||
using namespace spiralcore;
|
||||
using namespace std;
|
||||
|
||||
audio_thread::audio_thread(process_thread &p) :
|
||||
audio_thread::audio_thread(const string &port, process_thread &p) :
|
||||
m_audio_device(NULL),
|
||||
m_osc("8888"),
|
||||
m_osc(port),
|
||||
m_process_thread(p),
|
||||
m_brain_mutex(p.m_brain_mutex),
|
||||
m_stereo_mode(false),
|
||||
m_mic_mode(false),
|
||||
m_bufsize(2048),
|
||||
m_samplerate(44100),
|
||||
m_device("")
|
||||
{
|
||||
// start_audio();
|
||||
m_device("") {
|
||||
|
||||
pthread_mutex_lock(m_brain_mutex);
|
||||
m_left_renderer = new renderer(p.m_source,p.m_left_target);
|
||||
m_right_renderer = new renderer(p.m_source,p.m_right_target);
|
||||
m_block_stream = new block_stream();
|
||||
pthread_mutex_unlock(m_brain_mutex);
|
||||
m_osc.run();
|
||||
// it this threadsafe?
|
||||
// m_audio_device->report_devices();
|
||||
}
|
||||
|
||||
static bool state = 1;
|
||||
|
@ -26,12 +26,12 @@ namespace spiralcore {
|
||||
|
||||
class audio_thread {
|
||||
public:
|
||||
audio_thread(process_thread &p);
|
||||
audio_thread(const string &port, process_thread &p);
|
||||
~audio_thread();
|
||||
|
||||
void start_audio();
|
||||
void restart_audio(const string device, unsigned int samplerate, unsigned int bufsize);
|
||||
|
||||
bool ok() { return m_osc.ok(); }
|
||||
void process(sample &left_in, sample &right_in, sample &left_out, sample &right_out);
|
||||
|
||||
static void run_audio(void* c, unsigned int frames);
|
||||
|
@ -29,7 +29,8 @@ class feedback {
|
||||
public:
|
||||
feedback(std::string address);
|
||||
void poll(QStatusBar *s, sound_items *sound_items, SettingsDialog *settings);
|
||||
|
||||
bool ok() { return m_osc.ok(); }
|
||||
|
||||
private:
|
||||
|
||||
OSC_server m_osc;
|
||||
|
@ -32,8 +32,8 @@ static void* _process(void *c) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
process_thread::process_thread() :
|
||||
m_osc("8889"),
|
||||
process_thread::process_thread(const string &port) :
|
||||
m_osc(port),
|
||||
m_source_block_size(1000),
|
||||
m_source_overlap(0.75),
|
||||
m_target_block_size(1000),
|
||||
|
@ -25,9 +25,9 @@
|
||||
|
||||
namespace spiralcore {
|
||||
|
||||
class process_thread {
|
||||
public:
|
||||
process_thread();
|
||||
class process_thread {
|
||||
public:
|
||||
process_thread(const string &port);
|
||||
~process_thread();
|
||||
|
||||
pthread_mutex_t* m_brain_mutex;
|
||||
@ -47,10 +47,13 @@ public:
|
||||
void load_session(const std::string &filename);
|
||||
void save_session(const std::string &filename);
|
||||
|
||||
|
||||
bool ok() { return m_osc.ok(); }
|
||||
|
||||
// only for use in mutex
|
||||
brain m_source, m_left_target, m_right_target;
|
||||
|
||||
private:
|
||||
private:
|
||||
OSC_server m_osc;
|
||||
u32 m_source_block_size;
|
||||
float m_source_overlap;
|
||||
@ -64,6 +67,6 @@ private:
|
||||
renderer *m_left_renderer;
|
||||
renderer *m_right_renderer;
|
||||
block_stream *m_block_stream;
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -19,22 +19,54 @@
|
||||
#include <iostream>
|
||||
#include <unistd.h>
|
||||
#include <QtGui>
|
||||
#include <QSettings>
|
||||
|
||||
#include "MainWindow.h"
|
||||
|
||||
#include "process_thread.h"
|
||||
#include "audio_thread.h"
|
||||
#include "status.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main( int argc , char *argv[] ){
|
||||
QApplication app(argc, argv);
|
||||
MainWindow mainWin;
|
||||
mainWin.show();
|
||||
process_thread pt;
|
||||
audio_thread at(pt);
|
||||
pt.register_renderer(at.m_left_renderer, at.m_right_renderer, at.m_block_stream);
|
||||
|
||||
mainWin.set_audio_thread(&at);
|
||||
|
||||
QApplication app(argc, argv);
|
||||
|
||||
QSettings settings("thentrythis", "samplebrain");
|
||||
|
||||
return app.exec();
|
||||
// slight over-use of OSC servers here, but the are packaged nicely for
|
||||
// threadsafe (nonblocking) communication, and it's useful to expose all
|
||||
// moving parts for external control (i.e. the processing and the audio)
|
||||
|
||||
if (!settings.contains("gui_port")) settings.setValue("gui_port", "62345");
|
||||
if (!settings.contains("audio_port")) settings.setValue("audio_port", "62346");
|
||||
if (!settings.contains("process_port")) settings.setValue("process_port", "62347");
|
||||
|
||||
string gui_port = settings.value("gui_port").toByteArray().constData();
|
||||
string audio_port = settings.value("audio_port").toByteArray().constData();
|
||||
string process_port = settings.value("process_port").toByteArray().constData();
|
||||
|
||||
status::set_port(gui_port);
|
||||
|
||||
MainWindow mainWin(gui_port,audio_port,process_port,&settings);
|
||||
mainWin.show();
|
||||
process_thread pt(process_port);
|
||||
audio_thread at(audio_port,pt);
|
||||
|
||||
pt.register_renderer(at.m_left_renderer, at.m_right_renderer, at.m_block_stream);
|
||||
mainWin.set_audio_thread(&at);
|
||||
|
||||
if (!at.ok()) {
|
||||
mainWin.message("problem starting audio thread on port "+audio_port);
|
||||
}
|
||||
if (!pt.ok()) {
|
||||
mainWin.message("problem starting process thread on port "+process_port);
|
||||
}
|
||||
if (!mainWin.ok()) {
|
||||
mainWin.message("problem starting gui thread on port "+gui_port);
|
||||
}
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
|
@ -69,6 +69,8 @@ void brain::load_sound(std::string filename, stereo_mode mode) {
|
||||
delete[] temp;
|
||||
m_samples.push_back(sound(filename,s));
|
||||
status::update("loaded %s",filename.c_str());
|
||||
} else {
|
||||
status::update("problem loading %s",filename.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -31,117 +31,106 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
OSC_server::OSC_server(const string &port) :
|
||||
m_port(port),
|
||||
m_exit(false),
|
||||
m_command_ring_buffer(262144)
|
||||
{
|
||||
//cerr<<"using port: ["<<port<<"]"<<endl;
|
||||
m_server = lo_server_thread_new(port.c_str(), error_handler);
|
||||
m_port(port),
|
||||
m_exit(false),
|
||||
m_command_ring_buffer(262144) {
|
||||
cerr<<"OSC using port: ["<<port<<"]"<<endl;
|
||||
m_server = lo_server_thread_new(port.c_str(), error_handler);
|
||||
if (m_server) {
|
||||
lo_server_thread_add_method(m_server, NULL, NULL, default_handler, this);
|
||||
} else {
|
||||
cerr<<"error opening OSC port"<<endl;
|
||||
}
|
||||
}
|
||||
|
||||
OSC_server::~OSC_server()
|
||||
{
|
||||
m_exit=true;
|
||||
lo_server_thread_stop(m_server);
|
||||
OSC_server::~OSC_server() {
|
||||
m_exit=true;
|
||||
lo_server_thread_stop(m_server);
|
||||
}
|
||||
|
||||
void OSC_server::run()
|
||||
{
|
||||
lo_server_thread_start(m_server);
|
||||
// while (!m_exit) usleep(1000);
|
||||
void OSC_server::run() {
|
||||
if (!m_server) return;
|
||||
lo_server_thread_start(m_server);
|
||||
// while (!m_exit) usleep(1000);
|
||||
}
|
||||
|
||||
void OSC_server::error_handler(int num, const char *msg, const char *path)
|
||||
{
|
||||
//cerr<<"liblo server error "<<num<<" in path "<<path<<": "<<msg<<endl;
|
||||
cerr<<"liblo server error "<<num<<endl;
|
||||
void OSC_server::error_handler(int num, const char *msg, const char *path) {
|
||||
//cerr<<"liblo server error "<<num<<" in path "<<path<<": "<<msg<<endl;
|
||||
cerr<<"liblo server error "<<num<<endl;
|
||||
}
|
||||
|
||||
int OSC_server::default_handler(const char *path, const char *types, lo_arg **argv,
|
||||
int argc, void *data, void *user_data)
|
||||
{
|
||||
OSC_server *server = (OSC_server*)user_data;
|
||||
int argc, void *data, void *user_data) {
|
||||
OSC_server *server = (OSC_server*)user_data;
|
||||
if (!server) return -1;
|
||||
|
||||
unsigned int size = 0;
|
||||
for (int i=0; i<argc; i++)
|
||||
{
|
||||
size+=lo_arg_size((lo_type)types[i],argv[i]);
|
||||
// add one for the null terminator
|
||||
if (types[i]=='s') size++;
|
||||
}
|
||||
|
||||
char *newdata=new char[size];
|
||||
unsigned int pos=0;
|
||||
for (int i=0; i<argc; i++)
|
||||
{
|
||||
switch (types[i])
|
||||
{
|
||||
case LO_INT32:
|
||||
{
|
||||
if (pos+4>COMMAND_DATA_SIZE)
|
||||
{
|
||||
cerr<<"osc data too big for ringbuffer command"<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
|
||||
memcpy(newdata+pos,(char*)argv[i],4);
|
||||
pos+=4;
|
||||
}
|
||||
break;
|
||||
case LO_FLOAT:
|
||||
{
|
||||
if (pos+4>COMMAND_DATA_SIZE)
|
||||
{
|
||||
cerr<<"osc data too big for ringbuffer command"<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
|
||||
memcpy(newdata+pos,(char*)argv[i],4);
|
||||
pos+=4;
|
||||
}
|
||||
break;
|
||||
case LO_STRING:
|
||||
{
|
||||
int size=strlen(&argv[i]->s);
|
||||
|
||||
if (pos+size+1>COMMAND_DATA_SIZE)
|
||||
{
|
||||
cerr<<"osc data too big for ringbuffer command"<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
|
||||
memcpy(newdata+pos,&argv[i]->s,size);
|
||||
newdata[pos+size]='\0';
|
||||
pos+=size+1;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
{
|
||||
cerr<<"unsupported type: "<<types[i]<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (1)//pos==size) hmm
|
||||
{
|
||||
command_ring_buffer::command command(path,types,newdata,pos);
|
||||
if (!server->m_command_ring_buffer.send(command))
|
||||
{
|
||||
//cerr<<"OSC_server - ringbuffer full!"<<endl;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cerr<<"OSC_server::default_handler: size mismatch ["<<pos<<":"<<size<<"], not sending message"<<endl;
|
||||
}
|
||||
unsigned int size = 0;
|
||||
for (int i=0; i<argc; i++) {
|
||||
size+=lo_arg_size((lo_type)types[i],argv[i]);
|
||||
// add one for the null terminator
|
||||
if (types[i]=='s') size++;
|
||||
}
|
||||
|
||||
char *newdata=new char[size];
|
||||
unsigned int pos=0;
|
||||
for (int i=0; i<argc; i++) {
|
||||
switch (types[i]) {
|
||||
case LO_INT32: {
|
||||
if (pos+4>COMMAND_DATA_SIZE) {
|
||||
cerr<<"osc data too big for ringbuffer command"<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
memcpy(newdata+pos,(char*)argv[i],4);
|
||||
pos+=4;
|
||||
}
|
||||
break;
|
||||
case LO_FLOAT: {
|
||||
if (pos+4>COMMAND_DATA_SIZE) {
|
||||
cerr<<"osc data too big for ringbuffer command"<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
|
||||
memcpy(newdata+pos,(char*)argv[i],4);
|
||||
pos+=4;
|
||||
}
|
||||
break;
|
||||
case LO_STRING: {
|
||||
int size=strlen(&argv[i]->s);
|
||||
|
||||
if (pos+size+1>COMMAND_DATA_SIZE) {
|
||||
cerr<<"osc data too big for ringbuffer command"<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
|
||||
memcpy(newdata+pos,&argv[i]->s,size);
|
||||
newdata[pos+size]='\0';
|
||||
pos+=size+1;
|
||||
}
|
||||
break;
|
||||
default: {
|
||||
cerr<<"unsupported type: "<<types[i]<<endl;
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (1) { //pos==size) hmm
|
||||
|
||||
command_ring_buffer::command command(path,types,newdata,pos);
|
||||
if (!server->m_command_ring_buffer.send(command)) {
|
||||
//cerr<<"OSC_server - ringbuffer full!"<<endl;
|
||||
}
|
||||
}
|
||||
else {
|
||||
cerr<<"OSC_server::default_handler: size mismatch ["<<pos<<":"<<size<<"], not sending message"<<endl;
|
||||
}
|
||||
|
||||
delete[] newdata;
|
||||
return 1;
|
||||
}
|
||||
|
@ -24,20 +24,21 @@
|
||||
class OSC_server
|
||||
{
|
||||
public:
|
||||
OSC_server(const std::string &port);
|
||||
~OSC_server();
|
||||
|
||||
void run();
|
||||
bool get(command_ring_buffer::command& command) { return m_command_ring_buffer.get(command);}
|
||||
|
||||
OSC_server(const std::string &port);
|
||||
~OSC_server();
|
||||
|
||||
void run();
|
||||
bool get(command_ring_buffer::command& command) { return m_command_ring_buffer.get(command);}
|
||||
bool ok() { return m_server!=NULL; }
|
||||
|
||||
private:
|
||||
static int default_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
|
||||
static void error_handler(int num, const char *m, const char *path);
|
||||
static int default_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data);
|
||||
static void error_handler(int num, const char *m, const char *path);
|
||||
|
||||
lo_server_thread m_server;
|
||||
std::string m_port;
|
||||
bool m_exit;
|
||||
command_ring_buffer m_command_ring_buffer;
|
||||
lo_server_thread m_server;
|
||||
std::string m_port;
|
||||
bool m_exit;
|
||||
command_ring_buffer m_command_ring_buffer;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -22,6 +22,10 @@ using namespace std;
|
||||
|
||||
lo_address status::m_address = lo_address_new_from_url("osc.udp://localhost:8890");
|
||||
|
||||
void status::set_port(const std::string &port) {
|
||||
status::m_address = lo_address_new_from_url(string("osc.udp://localhost:"+port).c_str());
|
||||
}
|
||||
|
||||
void status::_update(const std::string &msg) {
|
||||
lo_send(m_address,"/report","s",msg.c_str());
|
||||
}
|
||||
|
@ -24,6 +24,7 @@ namespace spiralcore {
|
||||
|
||||
class status {
|
||||
public:
|
||||
static void set_port(const std::string &port);
|
||||
static void _update(const std::string &msg);
|
||||
static void update(const char *msg, ...);
|
||||
static void sound_item(const std::string &name, const std::string &colour);
|
||||
|
@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>samplebrain 0.18.4</string>
|
||||
<string>samplebrain 0.18.5</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
|
197
gui/settings.ui
197
gui/settings.ui
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>522</height>
|
||||
<width>438</width>
|
||||
<height>656</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -31,7 +31,13 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="deviceComboBox"/>
|
||||
<widget class="QComboBox" name="deviceComboBox">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
@ -57,6 +63,11 @@
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>44100</string>
|
||||
</property>
|
||||
@ -73,7 +84,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>(note: this currently should probably match your sample file's input rate as no conversion is run on them - yet)</string>
|
||||
<string>note: this currently should probably match your sample file's input rate as no conversion is run on them - yet</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
@ -98,6 +109,11 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="buffersizeComboBox">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>5</number>
|
||||
</property>
|
||||
@ -180,6 +196,112 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>restart needed for the ports below to update</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>gui osc port</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="guiOSCLineEdit">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>process osc port</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="processOSCLineEdit">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>audio osc port</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="audioOSCLineEdit">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Comic Sans MS</family>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="applyPushButton">
|
||||
<property name="font">
|
||||
@ -218,8 +340,8 @@
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>231</x>
|
||||
<y>358</y>
|
||||
<x>244</x>
|
||||
<y>642</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
@ -234,8 +356,8 @@
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>299</x>
|
||||
<y>364</y>
|
||||
<x>312</x>
|
||||
<y>642</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
@ -266,8 +388,8 @@
|
||||
<slot>apply()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>112</x>
|
||||
<y>321</y>
|
||||
<x>125</x>
|
||||
<y>592</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>4</x>
|
||||
@ -298,8 +420,8 @@
|
||||
<slot>buffersize(QString)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>326</x>
|
||||
<y>131</y>
|
||||
<x>390</x>
|
||||
<y>215</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>395</x>
|
||||
@ -307,11 +429,62 @@
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>guiOSCLineEdit</sender>
|
||||
<signal>textChanged(QString)</signal>
|
||||
<receiver>SettingsDialog</receiver>
|
||||
<slot>gui_port(QString)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>346</x>
|
||||
<y>432</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>401</x>
|
||||
<y>419</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>processOSCLineEdit</sender>
|
||||
<signal>textChanged(QString)</signal>
|
||||
<receiver>SettingsDialog</receiver>
|
||||
<slot>process_port(QString)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>356</x>
|
||||
<y>482</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>398</x>
|
||||
<y>479</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>audioOSCLineEdit</sender>
|
||||
<signal>textChanged(QString)</signal>
|
||||
<receiver>SettingsDialog</receiver>
|
||||
<slot>audio_port(QString)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>374</x>
|
||||
<y>511</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>398</x>
|
||||
<y>517</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<slots>
|
||||
<slot>output_device(QString)</slot>
|
||||
<slot>samplerate(QString)</slot>
|
||||
<slot>buffersize(QString)</slot>
|
||||
<slot>apply()</slot>
|
||||
<slot>gui_port(QString)</slot>
|
||||
<slot>audio_port(QString)</slot>
|
||||
<slot>process_port(QString)</slot>
|
||||
</slots>
|
||||
</ui>
|
||||
|
Loading…
x
Reference in New Issue
Block a user