Merge branch 'pr1' into 'main'

Little housekeeping

See merge request then-try-this/samplebrain!15

.gitignore

@@ -1,3 +1,7 @@
+*.rej
+*.orig
+.DS_Store
+*.ini
+build
 *.*~
 *.o
-

.gitlab-ci.yml

@@ -0,0 +1,24 @@
+build-ubuntu:
+  stage: build
+  image: ubuntu:22.04
+  script:
+    - apt-get update
+    - apt-get install -y git cmake g++ freeglut3-dev qtbase5-dev qt5-qmake qtbase5-dev-tools
+    - mkdir -p build
+    - cd build
+    - cmake ..
+    - cmake --build . --target samplebrain
+
+build-win64:
+  tags:
+    - "windows"
+  before_script:
+    - choco install -y cmake python qt5-default
+    - $env:Path += ';C:\Program Files\CMake\bin'
+  stage: build
+  script:
+    - set CMAKE_PREFIX_PATH=C:\Qt\5.15.2\mingw81_64
+    - mkdir build 
+    - cd build
+    - cmake ..
+    - cmake --build . --target samplebrain

CMakeLists.txt

@@ -0,0 +1,81 @@
+cmake_minimum_required(VERSION 3.16)
+project(samplebrain VERSION 1.0 LANGUAGES C CXX)
+
+include(Dependencies.cmake)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# Set up AUTOMOC and some sensible defaults for runtime execution
+# When using Qt 6.3, you can replace the code block below with
+# qt_standard_project_setup()
+set(CMAKE_AUTOMOC ON)
+include(GNUInstallDirs)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
+find_package(OpenMP)
+
+add_executable(samplebrain WIN32 MACOSX_BUNDLE
+    app/MainWindow.cpp app/MainWindow.h
+    app/SettingsDialog.cpp app/SettingsDialog.h
+    app/audio_thread.cpp
+    app/feedback.cpp
+    app/process_thread.cpp
+    app/qtmain.cpp
+    app/samplebrain.qrc
+    app/sound_items.cpp
+    brain/src/aquila/filter/MelFilter.cpp
+    brain/src/aquila/filter/MelFilterBank.cpp
+    brain/src/aquila/transform/Dct.cpp
+    brain/src/block.cpp
+    brain/src/block_stream.cpp
+    brain/src/brain.cpp
+    brain/src/fft.cpp
+    brain/src/mfcc.cpp
+    brain/src/renderer.cpp
+    brain/src/search_params.cpp
+    brain/src/spiralcore/OSC_server.cpp
+    brain/src/spiralcore/allocator.cpp
+    brain/src/spiralcore/audio.cpp
+    brain/src/spiralcore/command_ring_buffer.cpp
+    brain/src/spiralcore/portaudio_client.cpp
+    brain/src/spiralcore/ring_buffer.cpp
+    brain/src/spiralcore/sample.cpp
+    brain/src/spiralcore/stream.cpp
+    brain/src/status.cpp
+    brain/src/window.cpp
+    app/gui/samplebrain.ui
+    app/gui/settings.ui
+)
+target_include_directories(samplebrain PRIVATE
+    .
+    brain/src
+)
+
+target_link_libraries(samplebrain PRIVATE
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Widgets
+    fftw3
+    lo_shared
+    portaudio
+    sndfile
+)
+
+if(OpenMP_CXX_FOUND)
+    target_link_libraries(samplebrain PUBLIC OpenMP::OpenMP_CXX)
+endif()
+
+install(TARGETS samplebrain
+    BUNDLE DESTINATION .
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+# Consider using qt_generate_deploy_app_script() for app deployment if
+# the project can use Qt 6.3. In that case rerun qmake2cmake with
+# --min-qt-version=6.3.

Dependencies.cmake

@@ -0,0 +1,49 @@
+################################################################################
+# FetchContent
+################################################################################
+
+include(FetchContent)
+
+################################################################################
+# fftw3
+################################################################################
+
+FetchContent_Declare(
+  fftw3
+  URL       http://fftw.org/fftw-3.3.10.tar.gz
+  URL_HASH  MD5=8ccbf6a5ea78a16dbc3e1306e234cc5c)
+FetchContent_MakeAvailable(fftw3)
+
+include_directories(${fftw3_SOURCE_DIR}/api)
+
+################################################################################
+# liblo
+################################################################################
+
+FetchContent_Declare(
+  liblo
+  URL       http://downloads.sourceforge.net/liblo/liblo-0.31.tar.gz
+  URL_HASH  MD5=14378c1e74c58e777fbb4fcf33ac5315)
+FetchContent_MakeAvailable(liblo)
+
+add_subdirectory(${liblo_SOURCE_DIR}/cmake)
+
+################################################################################
+# PortAudio
+################################################################################
+
+FetchContent_Declare(
+  portaudio
+  URL       http://files.portaudio.com/archives/pa_stable_v190700_20210406.tgz
+  URL_HASH  MD5=ad319249932c6794b551d954b8844402)
+FetchContent_MakeAvailable(portaudio)
+
+################################################################################
+# libsndfile
+################################################################################
+
+FetchContent_Declare(
+  libsndfile
+  GIT_REPOSITORY https://github.com/libsndfile/libsndfile
+  GIT_TAG        1.1.0)
+FetchContent_MakeAvailable(libsndfile)

README.md

@@ -34,6 +34,10 @@ both the target and brain samples). The original samples used to
 create the demo session [can be found here for
 testing](https://static.thentrythis.org/samplebrain/samples/).
 
+# Community
+
+* https://www.reddit.com/r/samplebrain/
+    
 # Download
 
 As this is experimental non-commercial software (only originally
@@ -41,12 +45,16 @@ written to run on a couple of computers!) you will have to bear with
 us as we gradually stabilise things based on your feedback. There
 might currently be problems running it on 64bit Windows.
             
-* **Windows**: [samplebrain_0.18.4_win.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18.4_win.zip)
+* **Windows**: [samplebrain_0.18.5_win.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18.5_win.zip)
-* **Mac (intel/m1)**: [samplebrain_0.18.4_macintel.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18.4_macintel.app.zip)
+* **Mac (intel/m1)**: [samplebrain_0.18.5_macintel.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18.5_macintel.app.zip)
 
-Changes in 0.18.4: New audio device settings window and updated
+Changes in 0.18.5 (relased 28/10/22):
-windows build. Better default block size, tool tip tweaks and fixes
+    
-for dark themes by [Claude Heiland-Allen](https://mathr.co.uk/).
+* Target sound filename shown (and tells you if you don't have one)
+* More soundfile formats supported (aiff,aifc,au,snd,fasttracker xi,flac)
+* New configurable OSC ports in settings
+* Warning boxes if the OSC network connection fails
+* File path memory per-dialog rather than global
 
 For old versions see the [changelog](changelog.md)
     

app/MainWindow.cpp

@@ -27,9 +27,16 @@
 
 using namespace std;
 
-MainWindow::MainWindow() :
+MainWindow::MainWindow(const string &port, const string &audio_port, const string &process_port, QSettings *settings) :
-    m_last_file("."),
+    m_last_sound_file("."),
-    m_feedback("8890")
+    m_last_target_file("."),
+    m_last_brain_file("."),
+    m_last_session_file("."),
+    m_last_recording_file("."),
+    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 +56,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 +66,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_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("osc.udp://localhost:8889");
+      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);
@@ -154,6 +161,12 @@ void MainWindow::init_from_session(const string &filename) {
   m_Ui.spinBoxSlideError->setValue(r.get_slide_error());
 
   // target
+  if (t.get_samples().size()>0) {
+    // extract target filename from brain sample
+    string fn = t.get_samples().begin()->m_filename;    
+    m_Ui.labelTargetSound->setText("loaded: "+QFileInfo(QString::fromStdString(fn)).fileName());
+  }
+  
   m_Ui.spinBoxBlockSizeTarget->setValue(t.get_block_size());
   m_Ui.doubleSpinBoxBlockOverlapTarget->setValue(t.get_overlap()/(float)t.get_block_size());
 

app/MainWindow.h

@@ -18,7 +18,8 @@
 #include <QDirIterator>
 #include <QFileDialog>
 #include <QLineEdit>
-#include "ui_samplebrain.h"
+#include <QMessageBox>
+#include "gui/ui_samplebrain.h"
 #include "SettingsDialog.h"
 
 #include <iostream>
@@ -32,12 +33,22 @@
 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) {
@@ -102,344 +113,360 @@ protected:
 
 private slots:
 
-    void play_slot() { send_audio_osc("/start",""); }
+  void play_slot() { send_audio_osc("/start",""); }
-    void stop_slot() { send_audio_osc("/pause",""); }
+  void stop_slot() { send_audio_osc("/pause",""); }
 
-    void ratio_slot(int s) {
+  void ratio_slot(int s) {
-      send_audio_osc("/ratio","f",s/100.0f);
+    send_audio_osc("/ratio","f",s/100.0f);
-      m_Ui.doubleSpinBoxRatio->setValue(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 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 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 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 run_slot() {}
+  void load_target() {
+    QString path=QFileDialog::getOpenFileName(this,
+                                              QString("Select an audio file"),
+                                              m_last_target_file,
+                                              m_format_string);
+    if (m_last_target_file!="") {
+      m_last_target_file=path;
+      m_Ui.labelTargetSound->setText("loaded: "+QFileInfo(path).fileName());      
+      send_process_osc("/load_target","s",m_last_target_file.toStdString().c_str());
     }
-    void ratio_slot(double s) {
+  }
-        send_audio_osc("/ratio","f",s);
+  void target_block_size(int s) { send_process_osc("/target_block_size","i",s); }
-        m_Ui.sliderRatio->setValue(s*100);
+  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 n_ratio_slot(int s) {
+  void block_overlap(double s) { send_process_osc("/source_overlap","f",s); }
-        send_audio_osc("/n_ratio","f",s/100.0f);
+  void fft_spectrum_size(int) {}
-        m_Ui.doubleSpinBoxNRatio->setValue(s/100.0f);
+  void generate() { send_process_osc("/generate_brain",""); }
-    }
+  void load_sound() {
-    void n_ratio_slot(double s) {
+    QString path=QFileDialog::getOpenFileName(this,
-        send_audio_osc("/n_ratio","f",s);
+                                              QString("Select a wav file"),
-        m_Ui.sliderNRatio->setValue(s*100);
+                                              m_last_sound_file,
-    }
+                                              m_format_string);
-
+
-    void autotune(int s) {
+    if (path!="") {
-        send_audio_osc("/autotune","f",s/100.0f);
+      m_last_sound_file=path;
-        m_Ui.doubleSpinBoxAutotune->setValue(s/100.0f);
+      send_process_osc("/load_sample","s",m_last_sound_file.toStdString().c_str());
-    }
+      sound_items::sound_item &si = m_sound_items.add(m_Ui.brain_contents, m_last_sound_file.toStdString(),true);
-    void autotune(double s) {
+      QObject::connect(si.m_enable, SIGNAL(clicked()), m_sound_item_enable_mapper, SLOT(map()));
-        send_audio_osc("/autotune","f",s);
+      m_sound_item_enable_mapper->setMapping(si.m_enable, si.m_id);
-        m_Ui.sliderAutotune->setValue(s*100);
+      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 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 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 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)"));
-
-        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,
-            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);
-
-        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 load_sounds() {
+  void load_sounds() {
-     m_last_file=QFileDialog::getExistingDirectory(this,
+    QString path=QFileDialog::getExistingDirectory(this,
-                                                   QString("Select a directory"),
+                                                   QString("Select a directory of wav files"),
-                                                   m_last_file);
+                                                   m_last_directory_file);
 
+    if (path!="") {
+      m_last_directory_file=path;
+      QDirIterator dirIt(m_last_directory_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());
 
-     QDirIterator dirIt(m_last_file,QDirIterator::Subdirectories);
+          sound_items::sound_item &si = m_sound_items.add(m_Ui.brain_contents, dirIt.filePath().toStdString(),true);
-     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);
 
-         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 delete_sound(int id) {
+  void select_all() {
-      // search for this id...
+    for (auto &si:m_sound_items.m_sound_items) {
-      for (auto &si:m_sound_items.m_sound_items) {
+      si.m_enable->setChecked(true);
-        if (si.m_id==id) {
+      send_process_osc("/activate_sound","s",si.m_filename.c_str());
-          send_process_osc("/delete_sample","s",si.m_filename.c_str());
+    }
-          m_sound_items.remove(si.m_filename);
+  }
-          // iterator is now invalidated...
+
-          return;
+  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 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 clear_brain() {
-    void brain_shape(int n) { send_process_osc("/window_type","i",n); }
+    for (auto &si:m_sound_items.m_sound_items) {
-    void target_shape(int n) { send_process_osc("/target_window_type","i",n); }
+      send_process_osc("/delete_sample","s",si.m_filename.c_str());
-    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++;
     }
+    m_sound_items.clear();
+  }
+  void restart_audio() { send_audio_osc("/restart_audio",""); }
 
-    void stop_record() {
+  void brain_shape(int n) { send_process_osc("/window_type","i",n); }
-        send_audio_osc("/stop","");
+  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() {
+  void record() {
-        m_last_file=QFileDialog::getOpenFileName(
+    if (m_save_wav=="") {
-            this,
+      m_last_recording_file=QFileDialog::getSaveFileName(this,
-            QString("Select a brain file"),
+                                                         QString("Select a wav file"),
-            m_last_file,
+                                                         m_last_recording_file,
-            QString("Brains (*.brain)"));
+                                                         QString("Sounds (*.wav);;All files (*.*)"));
-
+      m_save_wav = m_last_recording_file.toStdString();
-        send_process_osc("/load_brain","s",m_last_file.toStdString().c_str());
+      // chop off .wav
-    }
+      size_t pos = m_save_wav.find_last_of(".");
-    void save_brain() {
+      if (pos!=string::npos) {
-        m_last_file=QFileDialog::getSaveFileName(
+        m_save_wav = m_save_wav.substr(0,pos);
-            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;
       }
 
     }
 
+    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() {
+    QString path=QFileDialog::getOpenFileName(this,
+                                              QString("Select a brain file"),
+                                              m_last_brain_file,
+                                              QString("Brains (*.brain);;All files (*.*)"));
+
+    if (path!="") {
+      m_last_brain_file=path;
+      send_process_osc("/load_brain","s",m_last_brain_file.toStdString().c_str());
+    }
+  }
+  void save_brain() {
+    QString path=QFileDialog::getSaveFileName(this,
+                                              QString("Select a brain file"),
+                                              m_last_brain_file,
+                                              QString("Brains (*.brain);;All files (*.*)"));
+    if (path!="") {
+      m_last_brain_file=path;
+      send_process_osc("/save_brain","s",m_last_brain_file.toStdString().c_str());
+    }
+  }
+
+  void load_session() {
+    QString path=QFileDialog::getOpenFileName(this,
+                                              QString("Select a session file"),
+                                              m_last_session_file,
+                                              QString("Sessions *.samplebrain (*.samplebrain);;All files (*.*)"));
+    if (path!="") {
+      m_last_session_file=path;    
+      send_process_osc("/load_session","s",m_last_session_file.toStdString().c_str());
+      init_from_session(m_last_session_file.toStdString());
+    }
+  }
+
+  void save_session() {
+    QString path=QFileDialog::getSaveFileName(this,
+                                              QString("Select a session file"),
+                                              m_last_session_file,
+                                              QString("Sessions *.samplebrain (*.samplebrain)"));
+    if (path!="") {
+      m_last_session_file=path;
+      send_process_osc("/save_session","s",m_last_session_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
+  // we want to be able to send out to
-    // multiple addresses over the network
+  // multiple addresses over the network
 
-    ////////////////////////////////////////////////
+  ////////////////////////////////////////////////
 
 
-    // we want to be able to send out to
+  // we want to be able to send out to
-    // multiple addresses over the network
+  // multiple addresses over the network
-    class osc_destination {
+  class osc_destination {
-    public:
+  public:
-      int m_id;
+    int m_id;
-      lo_address m_audio_address;
+    lo_address m_audio_address;
-      lo_address m_process_address;
+    lo_address m_process_address;
-      // can't find a way to address these via qt
+    // can't find a way to address these via qt
-      QLineEdit *m_address;
+    QLineEdit *m_address;
-      QCheckBox *m_enable;
+    QCheckBox *m_enable;
-      bool m_enabled;
+    bool m_enabled;
-    };
+  };
 
-    vector<osc_destination> m_destinations;
+  vector<osc_destination> m_destinations;
 
 
-    void init_from_session(const string &filename);
+  void init_from_session(const string &filename);
-    void add_gui_address(osc_destination &dest,
+  void add_gui_address(osc_destination &dest,
-                         QSignalMapper* enable_mapper);
+                       QSignalMapper* enable_mapper);
 
-    string m_save_wav;
+  string m_save_wav;
-    QString m_last_file;
+  QString m_last_sound_file;
-    unsigned int m_record_id;
+  QString m_last_target_file;
-    Ui_MainWindow m_Ui;
+  QString m_last_directory_file;
-    feedback m_feedback;
+  QString m_last_brain_file;
-    QSignalMapper* m_sound_item_enable_mapper;
+  QString m_last_session_file;
-    QSignalMapper* m_sound_item_delete_mapper;
+  QString m_last_recording_file;
-    sound_items m_sound_items;
+  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;
 };

app/SettingsDialog.cpp

@@ -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() {

app/SettingsDialog.h

@@ -20,7 +20,8 @@
 #include <QtGui>
 #include <QDialog>
 #include <QLineEdit>
-#include "ui_settings.h"
+#include <QSettings>
+#include "gui/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;
@@ -62,14 +63,27 @@ class SettingsDialog : public QDialog
    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();
+  void connect();
-   MainWindow *m_parent;
+  MainWindow *m_parent;
 
-   unsigned int m_buffersize;
+  unsigned int m_buffersize;
-   unsigned int m_samplerate;
+  unsigned int m_samplerate;
   
+  QSettings *m_settings;
 };
 
 #endif

app/audio_thread.cpp

@@ -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("")
+  m_device("") {
-{
+
-  //  start_audio();
   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;

app/audio_thread.h

@@ -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);

app/feedback.h

@@ -29,6 +29,7 @@ class feedback {
 public:
   feedback(std::string address);
   void poll(QStatusBar *s, sound_items *sound_items, SettingsDialog *settings);
+  bool ok() { return m_osc.ok(); }
   
 private:
 

app/gui/samplebrain.ui

@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>1188</width>
-    <height>898</height>
+    <height>939</height>
    </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">
@@ -728,6 +728,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="labelTargetSound">
+            <property name="text">
+             <string>no target sound loaded</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QPushButton" name="pushButtonLoadTarget">
             <property name="font">
@@ -1112,8 +1119,8 @@
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>20</width>
+              <width>17</width>
-              <height>40</height>
+              <height>13</height>
              </size>
             </property>
            </spacer>
@@ -1466,7 +1473,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../app/samplebrain.qrc">
+         <iconset resource="../samplebrain.qrc">
           <normaloff>:/images/images/play.png</normaloff>:/images/images/play.png</iconset>
         </property>
         <property name="iconSize">
@@ -1493,7 +1500,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../app/samplebrain.qrc">
+         <iconset resource="../samplebrain.qrc">
           <normaloff>:/images/images/pause.png</normaloff>:/images/images/pause.png</iconset>
         </property>
         <property name="iconSize">
@@ -1513,7 +1520,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../app/samplebrain.qrc">
+         <iconset resource="../samplebrain.qrc">
           <normaloff>:/images/images/record.png</normaloff>:/images/images/record.png</iconset>
         </property>
         <property name="iconSize">
@@ -1533,7 +1540,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../app/samplebrain.qrc">
+         <iconset resource="../samplebrain.qrc">
           <normaloff>:/images/images/stop.png</normaloff>:/images/images/stop.png</iconset>
         </property>
         <property name="iconSize">
@@ -1599,7 +1606,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../app/samplebrain.qrc">
+         <iconset resource="../samplebrain.qrc">
           <normaloff>:/images/images/settings.png</normaloff>:/images/images/settings.png</iconset>
         </property>
         <property name="iconSize">
@@ -1632,7 +1639,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../app/samplebrain.qrc">:/images/images/at.png</pixmap>
+         <pixmap resource="../samplebrain.qrc">:/images/images/at.png</pixmap>
         </property>
        </widget>
       </item>
@@ -1643,7 +1650,8 @@
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <resources>
-  <include location="../app/samplebrain.qrc"/>
+  <include location="../samplebrain.qrc"/>
+  <include location="../samplebrain.qrc"/>
  </resources>
  <connections>
   <connection>

app/gui/settings.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>438</width>
-    <height>522</height>
+    <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>
+     <x>244</x>
-     <y>358</y>
+     <y>642</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -234,8 +356,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>299</x>
+     <x>312</x>
-     <y>364</y>
+     <y>642</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -266,8 +388,8 @@
    <slot>apply()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>112</x>
+     <x>125</x>
-     <y>321</y>
+     <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>
+     <x>390</x>
-     <y>131</y>
+     <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>

app/process_thread.cpp

@@ -32,8 +32,8 @@ static void* _process(void *c) {
   return NULL;
 }
 
-process_thread::process_thread() :
+process_thread::process_thread(const string &port) :
-  m_osc("8889"),
+  m_osc(port),
   m_source_block_size(1000),
   m_source_overlap(0.75),
   m_target_block_size(1000),

app/process_thread.h

@@ -25,9 +25,9 @@
 
 namespace spiralcore {
 
-class process_thread {
+  class process_thread {
-public:
+  public:
-    process_thread();
+    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;
-};
+  };
 
 }

app/qtmain.cpp

@@ -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);
   
-    return app.exec();
+  QApplication app(argc, argv);
+  cerr<<"Qt version: "<<qVersion()<<endl;
+  QSettings settings("thentrythis", "samplebrain");
+
+  // 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();
 }

brain/src/block.cpp

@@ -112,6 +112,7 @@ void block::process(const sample &pcm, sample &fft, sample &mfcc, float &freq) {
 
   // calculate fft
   std::vector<std::complex<double> > mfspec;
+  mfspec.reserve(m_block_size);
   for (u32 i=0; i<m_block_size; ++i) {
     mfspec.push_back(std::complex<double>(m_fftw->m_spectrum[i][0],
 					  m_fftw->m_spectrum[i][1]));

brain/src/block_stream.cpp

@@ -79,6 +79,7 @@ void block_stream::init(u32 block_size, u32 overlap, window::type t, bool ditchp
   m_window.set_current_type(t);
 
   m_blocks.clear();
+  m_blocks.reserve(MAX_BLOCKS);
   sample dummy(block_size);
   for (u32 i=0; i<MAX_BLOCKS; i++) {
     m_blocks.push_back(block(0,"dummy",dummy,44100,m_window));

brain/src/brain.cpp

@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <algorithm>
+#include <atomic>
 #include <sndfile.h>
 #include <float.h>
 #include <spiralcore/audio.h>
@@ -69,6 +70,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());
   }
 }
 
@@ -226,6 +229,7 @@ u32 brain::rev_search(const block &target, const search_params &params) {
   return furthest_index;
 }
 
+/*
 // really slow - every to every comparison of blocks calculating average distance
 double brain::calc_average_diff(search_params &params) {
   double diff=0;
@@ -242,10 +246,12 @@ void brain::build_synapses_thresh(search_params &params, double thresh) {
   m_average_error = calc_average_diff(params)*thresh;
   double err = m_average_error*thresh;
   u32 brain_size = m_blocks.size();
-  u32 outer_index = 0;
+  std::atomic<u32> progress{0};
-  for (auto &i : m_blocks) {
+  #pragma omp parallel for
+  for (u32 outer_index = 0; outer_index < brain_size; ++outer_index) {
+    auto &i = m_blocks[outer_index];
     u32 index = 0;
-    status::update("building synapses %d%%",(int)(outer_index/(float)brain_size*100));
+    status::update("building synapses %d%%",(int)(progress/(float)brain_size*100));
     for (auto &j : m_blocks) {
       if (index!=outer_index) {
         // collect connections that are under threshold in closeness
@@ -256,30 +262,33 @@ void brain::build_synapses_thresh(search_params &params, double thresh) {
       }
       ++index;
     }
-    ++outer_index;
+    ++progress;
   }  
 }
+*/
 
 void brain::build_synapses_fixed(search_params &params) {
   //m_average_error = calc_average_diff(params)*thresh;
   u32 brain_size = m_blocks.size();
-  u32 outer_index = 0;
   u32 num_synapses = NUM_FIXED_SYNAPSES;
   if (num_synapses>=m_blocks.size()) num_synapses=m_blocks.size()-1;
 
   // need to stop the progress updates flooding osc
   u32 update_period = 100;
-  u32 update_tick = 0;
+  std::atomic<u32> update_tick{0};
-
+  std::atomic<u32> progress{0};
-  for (auto &i:m_blocks) {
+  #pragma omp parallel for
+  for (u32 outer_index = 0; outer_index < brain_size; ++outer_index) {
+    auto &i = m_blocks[outer_index];
     if (update_tick>update_period) {
-      status::update("building synapses %d%%",(int)(outer_index/(float)brain_size*100));     
+      status::update("building synapses %d%%",(int)(progress/(float)brain_size*100));
       update_tick=0;
     }
     update_tick++;
  
     u32 index = 0;
     vector<pair<u32,double>> collect;
+    collect.reserve(brain_size);
 
     // collect comparisons to all other blocks
     for (auto &j:m_blocks) {
@@ -304,7 +313,7 @@ void brain::build_synapses_fixed(search_params &params) {
       i.get_synapse().push_back(collect[n].first);
     }
 
-    ++outer_index;
+    ++progress;
   }
   status::update("Done: %d synapses grown for %d blocks",num_synapses*brain_size,brain_size);
 }

brain/src/brain.h

@@ -62,8 +62,8 @@ public:
     u32 rev_search(const block &target, const search_params &params);
 
     // synaptic search
-    double calc_average_diff(search_params &params);
+    // double calc_average_diff(search_params &params);
-    void build_synapses_thresh(search_params &params, double threshold);
+    // void build_synapses_thresh(search_params &params, double threshold);
     void build_synapses_fixed(search_params &params);
     u32 search_synapses(const block &target, search_params &params);
     double get_current_error() { return m_current_error; }

brain/src/spiralcore/OSC_server.cpp

@@ -31,117 +31,106 @@ extern "C" {
 #endif
 
 OSC_server::OSC_server(const string &port) :
-m_port(port),
+  m_port(port),
-m_exit(false),
+  m_exit(false),
-m_command_ring_buffer(262144)
+  m_command_ring_buffer(262144) {
-{
+  cerr<<"OSC using port: ["<<port<<"]"<<endl;
-        //cerr<<"using port: ["<<port<<"]"<<endl;
+  m_server = lo_server_thread_new(port.c_str(), error_handler);
-    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()
+OSC_server::~OSC_server() {
-{
+  m_exit=true;
-    m_exit=true;
+  lo_server_thread_stop(m_server);
-    lo_server_thread_stop(m_server);
 }
 
-void OSC_server::run()
+void OSC_server::run() {
-{
+  if (!m_server) return;
-    lo_server_thread_start(m_server);
+  lo_server_thread_start(m_server);
-//    while (!m_exit) usleep(1000);
+  //    while (!m_exit) usleep(1000);
 }
 
-void OSC_server::error_handler(int num, const char *msg, const char *path)
+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<<" in path "<<path<<": "<<msg<<endl;
+  cerr<<"liblo server error "<<num<<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)
+                                int argc, void *data, void *user_data) {
-{
+  OSC_server *server = (OSC_server*)user_data;
-        OSC_server *server = (OSC_server*)user_data;
+  if (!server) return -1;
 
-        unsigned int size = 0;
+  unsigned int size = 0;
-        for (int i=0; i<argc; i++)
+  for (int i=0; i<argc; i++) {
-        {
+    size+=lo_arg_size((lo_type)types[i],argv[i]);
-                size+=lo_arg_size((lo_type)types[i],argv[i]);
+    // add one for the null terminator
-                // add one for the null terminator
+    if (types[i]=='s') size++;
-                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;
-        }
 
+  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;
 }

brain/src/spiralcore/OSC_server.h

@@ -24,20 +24,21 @@
 class OSC_server
 {
 public:
-	OSC_server(const std::string &port);
+  OSC_server(const std::string &port);
-	~OSC_server();
+  ~OSC_server();
   
-	void run();
+  void run();
-	bool get(command_ring_buffer::command& command) { return m_command_ring_buffer.get(command);}
+  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 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 void error_handler(int num, const char *m, const char *path);
 
-	lo_server_thread m_server;
+  lo_server_thread m_server;
-    std::string m_port;
+  std::string m_port;
-	bool m_exit;
+  bool m_exit;
-	command_ring_buffer m_command_ring_buffer;
+  command_ring_buffer m_command_ring_buffer;
 };
 
 #endif

brain/src/status.cpp

@@ -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());
 }

brain/src/status.h

@@ -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);

building.md

@@ -1,26 +1,29 @@
 # Building from source
 ## Linux (Ubuntu)
-Install libraries for the sample engine (use brew on mac, MinGW on win):
+Install cmake:
 
-    $ sudo apt install libsndfile1-dev portaudio19-dev liblo-dev libfftw3-dev
+    $ sudo apt install cmake
 
 Install dependencies for the interface:
 
     $ sudo apt install build-essential qtcreator qt5-default
 
+On ubuntu 22.04 it's:
+
+    $ apt install build-essential qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
+    
 Build & run it:
 
     $ mkdir build
     $ cd build
-    $ qmake ..
+    $ cmake ..
-    $ make
+    $ cmake --build .
-    $ sudo make install
+    $ ./samplebrain
-    $ samplebrain
 
 ## Mac
-Install libraries for sample engine:
+Install cmake:
 
-    $ brew install fftw portaudio liblo libsndfile
+    $ brew install cmake
 
 Install dependencies for the interface:
 
@@ -31,10 +34,10 @@ Build & run it:
 
     $ mkdir build
     $ cd build
-    $ qmake ..
+    $ cmake ..
-    $ make
+    $ cmake --build .
 
-`samplebrain.app` should then be in the app folder for you to run.
+`samplebrain.app` should then be in the build folder for you to run.
 
 # Mac build additions
 
@@ -57,3 +60,12 @@ Then edit Info.plist to add samplebrain.icns to CFBundleIconFile. Key `CFBundleI
 You might also need to resign the app bundle after making any changes
 
     $ codesign --force --deep --sign - samplebrain.app
+
+# Windows (Work in progress)
+
+* Install [MSYS2](https://www.msys2.org/)
+* Install dependances via pacman
+* Build with qmake as usual
+* Run `windeployqt` and copy missing .dll files into release directory
+
+ 

changelog.md

@@ -1,5 +1,14 @@
 # Changlog
 
+0.18.4
+
+* **Windows**: [samplebrain_0.18.4_win.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18.4_win.zip)
+* **Mac (intel/m1)**: [samplebrain_0.18.4_macintel.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18.4_macintel.app.zip)
+
+Changes in 0.18.4: New audio device settings window and updated
+windows build. Better default block size, tool tip tweaks and fixes
+for dark themes by [Claude Heiland-Allen](https://mathr.co.uk/).
+
 0.18.3
 
 * **Windows**: [samplebrain_0.18.3_win.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18.3_win.zip)

debian/changelog

@@ -1,6 +1,11 @@
-samplebrain (0.18rc2-1ubuntu0~bionic4) bionic; urgency=medium
+samplebrain (0.18.5rc1-1ubuntu0~bionic1) bionic; urgency=medium
 
-  * Initial release
+* Target sound filename shown (and tells you if you don't have one)
+* More soundfile formats supported (aiff,aifc,au,snd,fasttracker xi,flac)
+* New configurable OSC ports in settings
+* Warning boxes if the OSC network connection fails
+* File path memory per-dialog rather than global
+
+ -- Dave Griffiths <dave@thentrythis.org>  Thu, 29 Oct 2022 08:47:10 +0100
 
- -- Dave Griffiths <dave@thentrythis.org>  Thu, 08 Sep 2022 13:08:26 +0100
 

samplebrain.pro

@@ -1,71 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Sun Jul 5 17:49:45 2015
-######################################################################
-
-TEMPLATE = app
-TARGET = samplebrain
-DEPENDPATH += . 2
-INCLUDEPATH += . 2
-
-QT += core gui widgets
-
-# Input
-HEADERS += app/MainWindow.h \
-           app/SettingsDialog.h
-
-FORMS += gui/samplebrain.ui \
-         gui/settings.ui
-
-SOURCES += app/MainWindow.cpp \
-           app/SettingsDialog.cpp \
-           app/sound_items.cpp \
-           app/audio_thread.cpp \
-           app/process_thread.cpp \
-           app/feedback.cpp \
-           app/qtmain.cpp \
-           brain/src/block.cpp \
-           brain/src/brain.cpp \
-           brain/src/fft.cpp \
-           brain/src/mfcc.cpp \
-           brain/src/renderer.cpp \
-           brain/src/search_params.cpp \
-           brain/src/status.cpp \
-           brain/src/window.cpp \
-           brain/src/block_stream.cpp \
-           brain/src/aquila/filter/MelFilterBank.cpp \
-           brain/src/aquila/filter/MelFilter.cpp \
-           brain/src/aquila/transform/Dct.cpp \
-           brain/src/spiralcore/sample.cpp \
-           brain/src/spiralcore/ring_buffer.cpp \
-           brain/src/spiralcore/command_ring_buffer.cpp \
-           brain/src/spiralcore/portaudio_client.cpp \
-           brain/src/spiralcore/audio.cpp \
-           brain/src/spiralcore/OSC_server.cpp \
-           brain/src/spiralcore/allocator.cpp \
-           brain/src/spiralcore/stream.cpp
-
-INCLUDEPATH += brain/src
-INCLUDEPATH += /usr/local/include
-INCLUDEPATH += /opt/homebrew/include
-LIBS += -L.. -L/usr/local/lib -L/opt/homebrew/lib -lportaudio -lfftw3 -lsndfile -llo -ldl -lpthread -lm
-
-QMAKE_CXXFLAGS += -O3 -Wall -Wno-unused -std=c++11
-
-# assets
-RESOURCES = app/samplebrain.qrc
-ICON      = desktop/samplebrain.icns
-
-PREFIX = $$(PREFIX)
-isEmpty(PREFIX) {
-    PREFIX = /usr
-}
-
-unix:desktopfile.path = $$PREFIX/share/applications/
-unix:desktopfile.files = desktop/samplebrain.desktop
-unix:iconfile.path = $$PREFIX/share/icons/hicolor/scalable/apps
-unix:iconfile.files = desktop/samplebrain.svg
-unix:metainfofile.path = $$PREFIX/share/metainfo
-unix:metainfofile.files = desktop/org.thentrythis.Samplebrain.metainfo.xml
-
-target.path = $$PREFIX/bin
-INSTALLS += target desktopfile iconfile metainfofile