Python rust backend

.github/actions/prepare_build/action.yml

@@ -15,6 +15,10 @@ runs:
     uses: dtolnay/rust-toolchain@nightly
     with:
        targets: x86_64-pc-windows-msvc
+  - name: Install rustfmt
+    shell: wrap-shell {0}
+    if: always() && inputs.variant == 'windows'
+    run: rustup component add rustfmt --toolchain nightly-x86_64-pc-windows-msvc
   - name: Prepare Rust (non-Windows)
     if: always() && inputs.variant != 'windows'
     uses: dtolnay/rust-toolchain@nightly

.github/workflows/build_and_test.yml

@@ -325,7 +325,7 @@ jobs:
           - name: macos_release
             release_build: true
             package_kind: portable_folder
-            second_package_kind: dmg
+            #second_package_kind: dmg
             third_package_kind: test_binaries
             os: macos-13
             upload_release_assets: true
@@ -340,7 +340,7 @@ jobs:
           - name: macos_release_arm
             release_build: true
             package_kind: portable_folder
-            second_package_kind: dmg
+            #second_package_kind: dmg
             third_package_kind: test_binaries
             os: macos-14
             upload_release_assets: true
@@ -459,9 +459,9 @@ jobs:
 
 
 
-  # # ##############################################################
-  # # ## Windows
-  # # ##############################################################
+  ##############################################################
+  ## Windows
+  ##############################################################
 
   build_windows:
     strategy:

.gitignore

@@ -18,3 +18,4 @@ py-build-cmake.cross.toml
 Cargo.lock
 target
 .aider*
+.env

build_python_requirements.txt

@@ -1,5 +1,4 @@
 setuptools
-setuptools-scm 
-ctypesgen @ git+https://github.com/SanderVocke/ctypesgen@9b88a970cb85823de83423add2a4b21ea79b63d9
+setuptools-scm
 meson
 toml

src/backend/CMakeLists.txt

@@ -69,8 +69,6 @@ if (APPLE)
   message(STATUS "MacOS architectures included: ${CMAKE_OSX_ARCHITECTURES}")
 endif()
 
-set(CTYPESGEN_COMMAND ${PYTHON_CMD} -m ctypesgen)
-
 set(PREV_SETTING ${CMAKE_POSITION_INDEPENDENT_CODE})
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 add_subdirectory(third_party/fmt EXCLUDE_FROM_ALL)
@@ -169,8 +167,6 @@ add_custom_target(
 
 set(EXTERNAL_DEPS_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external_deps)
 
-# add_subdirectory(crashhandling)
-
 # Backend lib
 file(GLOB INTERNAL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/internal/*.cpp)
 if (HAVE_LV2)
@@ -274,29 +270,12 @@ else()
   target_compile_definitions(shoopdaloop_backend_internals PUBLIC -DCOMPILE_LOG_LEVEL=${OVERRIDE_COMPILE_LOG_LEVEL})
 endif()
 
-# Generate libshoopdaloop_backend Python bindings into source dir
-set(GENERATED_BINDINGS_PY ${CMAKE_CURRENT_BINARY_DIR}/libshoopdaloop_backend_bindings.py)
-add_custom_command(
-  OUTPUT ${GENERATED_BINDINGS_PY}
-  COMMAND ${RUN_CMD_PREFIX} ${CMAKE_COMMAND} -E env ASAN_OPTIONS=detect_leaks=0 ${CTYPESGEN_COMMAND} --no-macro-warnings -lshoopdaloop_backend ${CMAKE_CURRENT_SOURCE_DIR}/libshoopdaloop_backend.h ${CMAKE_CURRENT_SOURCE_DIR}/types.h -o ${GENERATED_BINDINGS_PY}
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libshoopdaloop_backend.h ${CMAKE_CURRENT_SOURCE_DIR}/libshoopdaloop_backend.cpp shoopdaloop_backend
-  COMMENT "Generating C bindings for libshoopdaloop_backend."
-  )
-add_custom_target(
-  c_bindings
-  ALL
-  DEPENDS ${GENERATED_BINDINGS_PY}
-  )
-
 # Generate javascript copy of enums into source dir
 set(PATH_SEP ":")
 if (WIN32)
   set(PATH_SEP $<SEMICOLON>)
 endif()
 
-install(FILES ${GENERATED_BINDINGS_PY}
-    DESTINATION .)
-
 # Generate and install version.txt and description.txt
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.txt

src/backend/internal/AudioChannel.cpp

@@ -303,19 +303,23 @@ void AudioChannel<SampleT>::PROC_exec_cmd(ProcessingCommand cmd) {
         auto first = (n > 0) ? ((SampleT*)rc.src)[0] : 0.0f;
     }
 
+    float output_peak;
+
     switch (cmd.cmd_type) {
     case ProcessingCommandType::RawCopy:
         memcpy(rc.dst, rc.src, rc.sz);
         break;
     case ProcessingCommandType::AdditiveCopy:
+        output_peak = ma_output_peak.load();
         for (uint32_t i = 0; i < ac.n_elems; i++) {
             auto sample = ac.dst[i] + ac.src[i] * ac.multiplier;
             ac.dst[i] = sample;
             if (ac.update_absmax) {
-                ma_output_peak = std::max((float)ma_output_peak.load(),
+                output_peak = std::max(output_peak,
                                           (float)std::abs(sample));
             }
         }
+        ma_output_peak = output_peak;
         break;
     default:
         throw_error<std::runtime_error>("Unknown processing command");

src/backend/internal/BasicLoop.cpp

@@ -17,7 +17,7 @@ BasicLoop::BasicLoop() :
         ma_triggering_now(false),
         ma_length(0),
         ma_position(0),
-        ma_maybe_next_planned_mode(LOOP_MODE_INVALID),
+        ma_maybe_next_planned_mode(LoopMode_Unknown),
         ma_maybe_next_planned_delay(-1),
         ma_already_triggered(false)
     {
@@ -211,7 +211,7 @@ shoop_shared_ptr<LoopInterface> BasicLoop::get_sync_source(bool thread_safe) {
 void BasicLoop::PROC_update_planned_transition_cache() {
 
     ma_maybe_next_planned_mode = mp_planned_states.size() > 0 ?
-        (shoop_loop_mode_t) mp_planned_states.front() : LOOP_MODE_INVALID;
+        (shoop_loop_mode_t) mp_planned_states.front() : LoopMode_Unknown;
     ma_maybe_next_planned_delay = mp_planned_state_countdowns.size() > 0 ?
         mp_planned_state_countdowns.front() : -1;
 }
@@ -261,7 +261,7 @@ void BasicLoop::PROC_handle_transition(shoop_loop_mode_t new_state) {
             set_length(0, false);
         }
         ma_mode = new_state;
-        if(ma_mode > LOOP_MODE_INVALID) {
+        if(ma_mode >= LOOP_MODE_INVALID) {
             throw_error<std::runtime_error>("invalid mode");
         }
         if (ma_mode == LoopMode_Stopped) { ma_position = 0; }
@@ -415,11 +415,11 @@ shoop_loop_mode_t BasicLoop::get_mode() const {
 void BasicLoop::get_first_planned_transition(shoop_loop_mode_t &maybe_mode_out, uint32_t &delay_out) {
     shoop_loop_mode_t maybe_mode = ma_maybe_next_planned_mode;
     int maybe_delay = ma_maybe_next_planned_delay;
-    if (maybe_delay >= 0 && maybe_mode != LOOP_MODE_INVALID) {
+    if (maybe_delay >= 0 && maybe_mode != LoopMode_Unknown) {
         maybe_mode_out = maybe_mode;
         delay_out = maybe_delay;
     } else {
-        maybe_mode_out = LOOP_MODE_INVALID;
+        maybe_mode_out = LoopMode_Unknown;
         delay_out = 0;
     }
 }

src/backend/internal/GraphLoopChannel.cpp

@@ -74,6 +74,18 @@ void GraphLoopChannel::disconnect_output_port(shoop_shared_ptr<GraphPort> port,
     get_backend().set_graph_node_changes_pending();
 }
 
+void GraphLoopChannel::disconnect_port(shoop_shared_ptr<GraphPort> port, bool thread_safe) {
+    auto in_locked = mp_input_port_mapping.lock();
+    auto out_locked = mp_output_port_mapping.lock();
+    if (in_locked && in_locked == port) {
+        mp_input_port_mapping.reset();
+    } else if (out_locked && out_locked == port) {
+        mp_output_port_mapping.reset();
+    } else {
+        throw std::runtime_error("Attempting to disconnect unconnected port");
+    }
+}
+
 void GraphLoopChannel::disconnect_output_ports(bool thread_safe) {
     mp_output_port_mapping.reset();
     get_backend().set_graph_node_changes_pending();

src/backend/internal/GraphLoopChannel.h

@@ -26,6 +26,7 @@ class GraphLoopChannel:  public HasTwoGraphNodes,
 
     void connect_output_port(shoop_shared_ptr<GraphPort> port, bool thread_safe=true);
     void connect_input_port(shoop_shared_ptr<GraphPort> port, bool thread_safe=true);
+    void disconnect_port(shoop_shared_ptr<GraphPort> port, bool thread_safe=true);
     void disconnect_output_port(shoop_shared_ptr<GraphPort> port, bool thread_safe=true);
     void disconnect_output_ports(bool thread_safe=true);
     void disconnect_input_port(shoop_shared_ptr<GraphPort> port, bool thread_safe=true);