Merge branch 'production' into 'production'

Fix the parameter type of default_handler

Closes #96

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

.gitignore

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

.gitlab-ci.yml

@@ -1,24 +0,0 @@
-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

@@ -1,81 +0,0 @@
-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

@@ -1,49 +0,0 @@
-################################################################################
-# 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

@@ -33,10 +33,6 @@ Load the demo using "load session" not "load brain" (sessions contain
 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
 

app/MainWindow.h

@@ -19,7 +19,7 @@
 #include <QFileDialog>
 #include <QLineEdit>
 #include <QMessageBox>
-#include "gui/ui_samplebrain.h"
+#include "ui_samplebrain.h"
 #include "SettingsDialog.h"
 
 #include <iostream>

app/SettingsDialog.h

@@ -21,7 +21,7 @@
 #include <QDialog>
 #include <QLineEdit>
 #include <QSettings>
-#include "gui/ui_settings.h"
+#include "ui_settings.h"
 
 #include <iostream>
 #include <lo/lo.h>

app/qtmain.cpp

@@ -33,7 +33,7 @@ int main( int argc , char *argv[] ){
 
   
   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

brain/src/brain.cpp

@@ -16,7 +16,6 @@
 
 #include <iostream>
 #include <algorithm>
-#include <atomic>
 #include <sndfile.h>
 #include <float.h>
 #include <spiralcore/audio.h>
@@ -246,12 +245,10 @@ 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();
-  std::atomic<u32> progress{0};
+  u32 outer_index = 0;
-  #pragma omp parallel for
+  for (auto &i : m_blocks) {
-  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)(progress/(float)brain_size*100));
+    status::update("building synapses %d%%",(int)(outer_index/(float)brain_size*100));
     for (auto &j : m_blocks) {
       if (index!=outer_index) {
         // collect connections that are under threshold in closeness
@@ -262,7 +259,7 @@ void brain::build_synapses_thresh(search_params &params, double thresh) {
       }
       ++index;
     }
-    ++progress;
+    ++outer_index;
   }  
 }
 */
@@ -270,25 +267,23 @@ void brain::build_synapses_thresh(search_params &params, double thresh) {
 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;
-  std::atomic<u32> update_tick{0};
+  u32 update_tick = 0;
-  std::atomic<u32> progress{0};
+
-  #pragma omp parallel for
+  for (auto &i:m_blocks) {
-  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)(progress/(float)brain_size*100));
+      status::update("building synapses %d%%",(int)(outer_index/(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) {
@@ -313,7 +308,7 @@ void brain::build_synapses_fixed(search_params &params) {
       i.get_synapse().push_back(collect[n].first);
     }
 
-    ++progress;
+    ++outer_index;
   }
   status::update("Done: %d synapses grown for %d blocks",num_synapses*brain_size,brain_size);
 }

brain/src/spiralcore/OSC_server.cpp

@@ -60,7 +60,7 @@ void OSC_server::error_handler(int num, const char *msg, const char *path) {
 }
 
 int OSC_server::default_handler(const char *path, const char *types, lo_arg **argv,
-                                int argc, void *data, void *user_data) {
+                                int argc, lo_message data, void *user_data) {
   OSC_server *server = (OSC_server*)user_data;
   if (!server) return -1;
 

brain/src/spiralcore/OSC_server.h

@@ -32,7 +32,7 @@ public:
   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, lo_message data, void *user_data);
   static void error_handler(int num, const char *m, const char *path);
 
   lo_server_thread m_server;

building.md

@@ -1,8 +1,8 @@
 # Building from source
 ## Linux (Ubuntu)
-Install cmake:
+Install libraries for the sample engine (use brew on mac, MinGW on win):
 
-    $ sudo apt install cmake
+    $ sudo apt install libsndfile1-dev portaudio19-dev liblo-dev libfftw3-dev
 
 Install dependencies for the interface:
 
@@ -16,14 +16,15 @@ Build & run it:
 
     $ mkdir build
     $ cd build
-    $ cmake ..
+    $ qmake ..
-    $ cmake --build .
+    $ make
-    $ ./samplebrain
+    $ sudo make install
+    $ samplebrain
 
 ## Mac
-Install cmake:
+Install libraries for sample engine:
 
-    $ brew install cmake
+    $ brew install fftw portaudio liblo libsndfile
 
 Install dependencies for the interface:
 
@@ -34,10 +35,10 @@ Build & run it:
 
     $ mkdir build
     $ cd build
-    $ cmake ..
+    $ qmake ..
-    $ cmake --build .
+    $ make
 
-`samplebrain.app` should then be in the build folder for you to run.
+`samplebrain.app` should then be in the app folder for you to run.
 
 # Mac build additions
 

gui/samplebrain.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1188</width>
-    <height>939</height>
+    <height>898</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1473,7 +1473,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../samplebrain.qrc">
+         <iconset resource="../app/samplebrain.qrc">
           <normaloff>:/images/images/play.png</normaloff>:/images/images/play.png</iconset>
         </property>
         <property name="iconSize">
@@ -1500,7 +1500,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../samplebrain.qrc">
+         <iconset resource="../app/samplebrain.qrc">
           <normaloff>:/images/images/pause.png</normaloff>:/images/images/pause.png</iconset>
         </property>
         <property name="iconSize">
@@ -1520,7 +1520,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../samplebrain.qrc">
+         <iconset resource="../app/samplebrain.qrc">
           <normaloff>:/images/images/record.png</normaloff>:/images/images/record.png</iconset>
         </property>
         <property name="iconSize">
@@ -1540,7 +1540,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../samplebrain.qrc">
+         <iconset resource="../app/samplebrain.qrc">
           <normaloff>:/images/images/stop.png</normaloff>:/images/images/stop.png</iconset>
         </property>
         <property name="iconSize">
@@ -1606,7 +1606,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../samplebrain.qrc">
+         <iconset resource="../app/samplebrain.qrc">
           <normaloff>:/images/images/settings.png</normaloff>:/images/images/settings.png</iconset>
         </property>
         <property name="iconSize">
@@ -1639,7 +1639,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../samplebrain.qrc">:/images/images/at.png</pixmap>
+         <pixmap resource="../app/samplebrain.qrc">:/images/images/at.png</pixmap>
         </property>
        </widget>
       </item>
@@ -1650,8 +1650,7 @@
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <resources>
-  <include location="../samplebrain.qrc"/>
+  <include location="../app/samplebrain.qrc"/>
-  <include location="../samplebrain.qrc"/>
  </resources>
  <connections>
   <connection>

samplebrain.pro

@@ -0,0 +1,71 @@
+######################################################################
+# 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