Merge recent changes from dev branch

.github/workflows/ci-development.yml

@@ -20,7 +20,7 @@ env:
   PROJECT_NAME: Disflux
   BUNDLE_NAME: disflux
   BUNDLE_ID: com.dimethoxy.disflux
-  VERSION: 1.1.1 # Disflux-Version
+  VERSION: 1.1.2 # Disflux-Version
   BUILD_DIR: build
   DISPLAY: :0 # Linux pluginval needs this
   HOMEBREW_NO_INSTALL_CLEANUP: 1

.github/workflows/ci-release.yml

@@ -20,7 +20,7 @@ env:
   PROJECT_NAME: Disflux
   BUNDLE_NAME: disflux
   BUNDLE_ID: com.dimethoxy.disflux
-  VERSION: 1.1.1 # Disflux-Version
+  VERSION: 1.1.2 # Disflux-Version
   BUILD_DIR: build
   DISPLAY: :0 # Linux pluginval needs this
   HOMEBREW_NO_INSTALL_CLEANUP: 1

.github/workflows/ci-snapshot.yml

@@ -22,7 +22,7 @@ env:
   PROJECT_NAME: Disflux
   BUNDLE_NAME: disflux
   BUNDLE_ID: com.dimethoxy.disflux
-  VERSION: 1.1.1 # Disflux-Version
+  VERSION: 1.1.2 # Disflux-Version
   BUILD_DIR: build
   DISPLAY: :0 # Linux pluginval needs this
   HOMEBREW_NO_INSTALL_CLEANUP: 1

.vscode/c_cpp_properties.json

@@ -0,0 +1,15 @@
+{
+  "configurations": [
+    {
+      "name": "Linux",
+      "includePath": [
+        "${workspaceFolder}/external/**",
+        "${workspaceFolder}/src/**"
+      ],
+      "defines": [],
+      "compilerPath": "/usr/bin/clang",
+      "intelliSenseMode": "linux-gcc-x64"
+    }
+  ],
+  "version": 4
+}

.vscode/launch.json

@@ -16,7 +16,7 @@
       "name": "Launch AudioPluginHost Linux",
       "type": "cppdbg",
       "request": "launch",
-      "program": "/data/development/juce/extras/AudioPluginHost/Builds/LinuxMakefile/build/AudioPluginHost",
+      "program": "/data/development/dimethoxy/juce/extras/AudioPluginHost/Builds/LinuxMakefile/build/AudioPluginHost",
       "args": [],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}",

.vscode/settings.json

@@ -89,5 +89,13 @@
     "typeinfo": "cpp",
     "valarray": "cpp",
     "variant": "cpp"
-  }
+  },
+  "C_Cpp.default.includePath": [
+    "${workspaceFolder}/external/dmt",
+    "${workspaceFolder}/external/melatonin_perfetto",
+    "${workspaceFolder}/external/juce/extras/Projucer/JuceLibraryCode"
+  ],
+  "git.autoRepositoryDetection": true,
+  "git.detectSubmodules": true,
+  "git.openRepositoryInParentFolders": "always"
 }

CMakeLists.txt

@@ -3,7 +3,7 @@
 #==============================================================================
 
 cmake_minimum_required(VERSION 3.30)
-project(Disflux VERSION 1.1.1) # Disflux-Version
+project(Disflux VERSION 1.1.2) # Disflux-Version
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS TRUE) 
 set(EXT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
@@ -22,12 +22,6 @@ CPMAddPackage(
     GIT_TAG master
     SOURCE_DIR ${EXT_DIR}/juce
 )
-CPMAddPackage(
-    NAME DMT
-    GITHUB_REPOSITORY Dimethoxy/DMT
-    GIT_TAG v25.1.3
-    SOURCE_DIR ${EXT_DIR}/dmt
-)
 CPMAddPackage(
     NAME CLAP_JUCE
     GITHUB_REPOSITORY free-audio/clap-juce-extensions

CMakePresets.json

@@ -122,6 +122,7 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_C_COMPILER": "/usr/bin/gcc",
         "CMAKE_CXX_COMPILER": "/usr/bin/g++"
       },
@@ -143,6 +144,7 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_C_COMPILER": "/usr/bin/gcc",
         "CMAKE_CXX_COMPILER": "/usr/bin/g++"
       },
@@ -164,6 +166,7 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_C_COMPILER": "/usr/bin/gcc",
         "CMAKE_CXX_COMPILER": "/usr/bin/g++",
         "CMAKE_CXX_FLAGS": "-DPERFETTO=1"
@@ -186,6 +189,7 @@
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_C_COMPILER": "/usr/bin/gcc",
         "CMAKE_CXX_COMPILER": "/usr/bin/g++",
         "CMAKE_CXX_FLAGS": "-DPERFETTO=1"

Disflux.filtergraph

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<FILTERGRAPH>
+  <FILTER uid="1" x="0.5" y="0.1" useARA="0">
+    <PLUGIN name="Audio Input" descriptiveName="" format="Internal" category="I/O devices"
+            manufacturer="JUCE" version="1.0" file="" uniqueId="246006c0"
+            isInstrument="0" fileTime="0" infoUpdateTime="0" numInputs="0"
+            numOutputs="64" isShell="0" hasARAExtension="0" uid="246006c0"/>
+    <STATE>0.</STATE>
+    <LAYOUT>
+      <INPUTS>
+        <BUS index="0" layout="disabled"/>
+      </INPUTS>
+      <OUTPUTS>
+        <BUS index="0" layout="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64"/>
+      </OUTPUTS>
+    </LAYOUT>
+  </FILTER>
+  <FILTER uid="2" x="0.2466517857142857" y="0.2693726937269373" useARA="0">
+    <PLUGIN name="MIDI Input" descriptiveName="" format="Internal" category="I/O devices"
+            manufacturer="JUCE" version="1.0" file="" uniqueId="a9e4f9eb"
+            isInstrument="0" fileTime="0" infoUpdateTime="0" numInputs="0"
+            numOutputs="0" isShell="0" hasARAExtension="0" uid="a9e4f9eb"/>
+    <STATE>0.</STATE>
+    <LAYOUT>
+      <INPUTS>
+        <BUS index="0" layout="disabled"/>
+      </INPUTS>
+      <OUTPUTS>
+        <BUS index="0" layout="disabled"/>
+      </OUTPUTS>
+    </LAYOUT>
+  </FILTER>
+  <FILTER uid="3" x="0.5" y="0.9" useARA="0">
+    <PLUGIN name="Audio Output" descriptiveName="" format="Internal" category="I/O devices"
+            manufacturer="JUCE" version="1.0" file="" uniqueId="724248cb"
+            isInstrument="0" fileTime="0" infoUpdateTime="0" numInputs="64"
+            numOutputs="0" isShell="0" hasARAExtension="0" uid="724248cb"/>
+    <STATE>0.</STATE>
+    <LAYOUT>
+      <INPUTS>
+        <BUS index="0" layout="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64"/>
+      </INPUTS>
+      <OUTPUTS>
+        <BUS index="0" layout="disabled"/>
+      </OUTPUTS>
+    </LAYOUT>
+  </FILTER>
+  <FILTER uid="4" x="0.25" y="0.9" useARA="0">
+    <PLUGIN name="MIDI Output" descriptiveName="" format="Internal" category="I/O devices"
+            manufacturer="JUCE" version="1.0" file="" uniqueId="9d5bbb00"
+            isInstrument="0" fileTime="0" infoUpdateTime="0" numInputs="0"
+            numOutputs="0" isShell="0" hasARAExtension="0" uid="9d5bbb00"/>
+    <STATE>0.</STATE>
+    <LAYOUT>
+      <INPUTS>
+        <BUS index="0" layout="disabled"/>
+      </INPUTS>
+      <OUTPUTS>
+        <BUS index="0" layout="disabled"/>
+      </OUTPUTS>
+    </LAYOUT>
+  </FILTER>
+  <FILTER uid="5" x="0.4419642857142857" y="0.6309963099630996" useARA="0"
+          uiLastX_Normal="5343" uiLastY_Normal="512" uiopen_Normal="0">
+    <PLUGIN name="Disflux" format="VST3" category="Fx|Analyzer" manufacturer="Dimethoxy"
+            version="1.1.2" file="/data/development/dimethoxy/disflux/build/src/DisfluxPlugin_artefacts/Debug/VST3/Disflux.vst3/Contents/x86_64-linux/Disflux.so"
+            uniqueId="d80b948a" isInstrument="0" fileTime="19c840e61c8" infoUpdateTime="19c84118a88"
+            numInputs="2" numOutputs="2" isShell="0" hasARAExtension="0"
+            uid="b6163bd1"/>
+    <STATE>630.VMjLgzl....O+fWarAhckI2bo8la8HRLt.iHfTlai8FYo41Y8HRUTYTK3HxO9.BOVMEUy.Ea0cVZtMEcgQWY9vSRC8Vav8lak4Fc9LCN33BQqEiXrcmUiMSPt3RPh4BUAkTUP0TPP4hPpYTVtPjcCUDTToUdYYTXvb1UPMGNVMFcQcjKwTjQgASUF4RPp4RPt3hKt3hKt3hcqLjKPUjZTEDLD4RPHAkVpEDTtHEUtD0aM0VVxU0QjYTRWk0cUcUVz0jUj4BVWgkbUcUVtPDTBQjKt3hKt3hKtnFQP4hKUAkTEQ0TtPjYt7VTF4RP1AUPDsVLhw1cVM1LvPkVyDjYic1cVM1ZAAkKIAkKt3hKt3hKt3xMq3hKTETRUAUSAAkKBolQY4BQlMTQPQkV4kkQgAyYGQ0azDCVtEjYic1cVM1ZAAkKIAkKt3hKt3hKt3xMq3hKTETRUAUSAAkKBolQY4BQ1MTQPQkV4kkQgAyYxPkcIcUVmEkQtDSQFEFLUYjKAolKA4hKt3hKt3hKuEDQt.UQpQUPvPjKAgDTZoVPP4hSTYWTxgCaXc1crAEMAcEV40zQtDSQFEFLUYjKAolKA4hKt3hKt3hKt3hKt.UQpQUPvPjKAgDTZoVPP4BSTYWTxgCaXc1cwD0YqwVXtf0UXIWUWkkKDAkPD4hKt3hKt3hKt3hKt3hKt3hKt3hKt3hKJUELPUTPqI1aYcEV5UkQQcVTWgkKDAkKBs1QhcVSxHlKDAkKC4BTG4hKt3hKt3hKt3FUUMTUDQEdqw1XmE0UYQTQFM1YAwyKIMzasA2atUlaz4COuX0TTMCTrU2Yo41TzEFck4C.</STATE>
+    <LAYOUT>
+      <INPUTS>
+        <BUS index="0" layout="L R"/>
+      </INPUTS>
+      <OUTPUTS>
+        <BUS index="0" layout="L R"/>
+      </OUTPUTS>
+    </LAYOUT>
+  </FILTER>
+  <FILTER uid="6" x="0.3839285714285715" y="0.4132841328413284" useARA="0">
+    <PLUGIN name="Sine Wave Synth" format="Internal" category="Synth" manufacturer="JUCE"
+            version="1.0.0" file="Sine Wave Synth" uniqueId="16fd76a8" isInstrument="1"
+            fileTime="0" infoUpdateTime="0" numInputs="0" numOutputs="2"
+            isShell="0" hasARAExtension="0" uid="16fd76a8"/>
+    <STATE>0.</STATE>
+    <LAYOUT>
+      <INPUTS/>
+      <OUTPUTS>
+        <BUS index="0" layout="L R"/>
+      </OUTPUTS>
+    </LAYOUT>
+  </FILTER>
+  <CONNECTION srcFilter="6" srcChannel="0" dstFilter="5" dstChannel="0"/>
+  <CONNECTION srcFilter="6" srcChannel="1" dstFilter="5" dstChannel="1"/>
+</FILTERGRAPH>

src/CMakeLists.txt

@@ -3,7 +3,7 @@
 #==============================================================================
 
 cmake_minimum_required(VERSION 3.22)
-project(DisfluxPlugin VERSION 1.1.1) # Disflux-Version
+project(DisfluxPlugin VERSION 1.1.2) # Disflux-Version
 
 # If we are on MacOS, we need to build for arm64 and x86_64
 if (APPLE)
@@ -41,7 +41,7 @@ juce_add_plugin(${PROJECT_NAME}
     PLUGIN_CODE DFLX
     LV2URI "https://dimethoxy.com/plugins/disflux"      
     BUNDLE_ID com.dimethoxy.disflux           
-    )
+)
 
 # Add the main source files
 target_sources(${PROJECT_NAME}
@@ -53,40 +53,41 @@ target_sources(${PROJECT_NAME}
 # Add the external libraries
 target_include_directories(${PROJECT_NAME}
     PUBLIC
-        ${CMAKE_SOURCE_DIR}/external/dmt
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/src/dmt
         ${CMAKE_SOURCE_DIR}/external/melatonin_perfetto
         ${CMAKE_SOURCE_DIR}/external/tomlplusplus
 )
 
 # Add fonts and icons as binary data so they can be used in the app
 juce_add_binary_data(FontBinaryData
     SOURCES
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-Thin.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-ExtraLight.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-Light.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-Regular.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-Medium.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-SemiBold.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-Bold.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-ExtraBold.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/poppins/Poppins-Black.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/fonts/sedgwick_ave_display/SedgwickAveDisplay-Regular.ttf
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/speed.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/back.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/height.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/thickness.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/gear.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/angles_up.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/bypass.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/download.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/presets.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/close.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/reload.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/save.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/error.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/warning.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/success.svg
-    ${CMAKE_SOURCE_DIR}/external/dmt/icons/info.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-Thin.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-ExtraLight.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-Light.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-Regular.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-Medium.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-SemiBold.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-Bold.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-ExtraBold.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/poppins/Poppins-Black.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/fonts/sedgwick_ave_display/SedgwickAveDisplay-Regular.ttf
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/speed.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/back.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/height.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/thickness.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/gear.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/angles_up.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/bypass.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/download.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/presets.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/close.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/reload.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/save.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/error.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/warning.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/success.svg
+    ${CMAKE_SOURCE_DIR}/src/dmt/icons/info.svg
 )
 
 # Link the libraries
@@ -144,7 +145,7 @@ message("JUCE header file generated!")
 if(MSVC)
     target_compile_definitions(${PROJECT_NAME}
         PRIVATE
-            _SILENCE_CXX23_ALIGEND_STORAGE_DEPRECATION_WARNING
+            _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING
     )
 endif()
 

src/app/PluginEditor.cpp

@@ -5,11 +5,14 @@
 PluginEditor::PluginEditor(PluginProcessor& p)
   : AudioProcessorEditor(&p)
   , p(p)
-  , sizeFactor(p.scaleFactor) // reference to processor's scaleFactor
-  , disfluxPanel(p.apvts, p.oscilloscopeBuffer)
-  , compositor("DisFlux", disfluxPanel, p.apvts, p.properties, sizeFactor)
+  , sizeFactor(p.scaleFactor)
+  , mainLayout({}, {})
+  , compositor("DisFlux", mainLayout, p.apvts, p.properties, sizeFactor)
   , compositorAttached(true)
 {
+  mainLayout.addPanel<dmt::gui::panel::DisfluxPanel<float>>(
+    0, 0, 1, 1, p.apvts, p.oscilloscopeBuffer);
+
   if (OS_IS_WINDOWS) {
     setResizable(false, true);
   }

src/app/PluginEditor.h

@@ -50,7 +50,7 @@ class PluginEditor
   Image image;
   bool isResizing = false;
   //==============================================================================
-  dmt::gui::panel::DisfluxPanel<float> disfluxPanel;
+  dmt::gui::window::Layout mainLayout;
   dmt::gui::window::Compositor compositor;
   //==============================================================================
   juce::Image compositorSnapshot;

src/app/PluginProcessor.cpp

@@ -16,8 +16,8 @@ PluginProcessor::PluginProcessor()
   , oscilloscopeBuffer(2, 4096)
   , disfluxProcessor(apvts,
                      dmt::Settings::Audio::frequencySmoothness,
-                     dmt::Settings::Audio::spreadSmoothness,
                      dmt::Settings::Audio::pinchSmoothness,
+                     dmt::Settings::Audio::spreadSmoothness,
                      dmt::Settings::Audio::useOutputHighpass,
                      dmt::Settings::Audio::outputHighpassFrequency,
                      dmt::Settings::Audio::smoothingInterval)

src/dmt/.gitignore

@@ -0,0 +1,3 @@
+
+
+