wip

SanderVocke · Feb 7, 2025 · 1dee1b6 · 1dee1b6
1 parent 29a59ce
commit 1dee1b6
Show file tree

Hide file tree

Showing 21 changed files with 10 additions and 21 deletions.
diff --git a/src/python/shoopdaloop/lib/q_objects/MidiPort.py b/src/python/shoopdaloop/lib/q_objects/MidiPort.py
@@ -177,7 +177,15 @@ def maybe_initialize_external(self, name_hint, input_connectability, output_conn
         if self._backend_obj:
             return # never initialize more than once
         direction = int(shoop_py_backend.PortDirection.Input) if not (input_connectability & int(shoop_py_backend.PortConnectabilityKind.Internal)) else int(shoop_py_backend.PortDirection.Output)
-        self._backend_obj = self.backend.open_driver_midi_port(name_hint, direction, self.n_ringbuffer_samples)
+        from shoop_rust import shoop_rust_open_driver_midi_port
+        from shiboken6 import getCppPointer
+        self._backend_obj = shoop_rust_open_driver_midi_port(
+            getCppPointer(self._backend)[0],
+            name_hint,
+            direction,
+            self.n_ringbuffer_samples
+        )
+        self.logger.trace(lambda: f'backend_obj = {self._backend_obj}')
         self.push_state()
 
     def maybe_initialize_impl(self, name_hint, input_connectability, output_connectability, is_internal):

diff --git a/src/qml/test/ShoopTestCase.qml b/src/qml/test/ShoopTestCase.qml
@@ -237,7 +237,7 @@ PythonTestCase {
             function updated() {
                 done = true
             }
-            connectOnce(backend.updated, updated)
+            connectOnce(backend.updated_on_gui_thread, updated)
             wait_condition(() => done == true, 500, "Backend not updated in time")
         }
         wait_once()

diff --git a/src/qml/test/tst_Backend_jack.qml b/src/qml/test/tst_Backend_jack.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import ShoopConstants
 import './testfilename.js' as TestFilename

diff --git a/src/qml/test/tst_CompositeLoop_running.qml b/src/qml/test/tst_CompositeLoop_running.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 import ShoopDaLoop.PythonDummyProcessHelper
 
 import './testDeepEqual.js' as TestDeepEqual

diff --git a/src/qml/test/tst_ControlInterface_lua.qml b/src/qml/test/tst_ControlInterface_lua.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_Jack_ports.qml b/src/qml/test/tst_Jack_ports.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import ShoopConstants
 import './testfilename.js' as TestFilename

diff --git a/src/qml/test/tst_LoopReorder.qml b/src/qml/test/tst_LoopReorder.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_LuaScriptWithEngine.qml b/src/qml/test/tst_LuaScriptWithEngine.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import ShoopConstants
 import '../js/generate_session.js' as GenerateSession

diff --git a/src/qml/test/tst_Midi.qml b/src/qml/test/tst_Midi.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_MidiControlPort.qml b/src/qml/test/tst_MidiControlPort.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import ShoopConstants
 import './testfilename.js' as TestFilename

diff --git a/src/qml/test/tst_Resample.qml b/src/qml/test/tst_Resample.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_SessionDescriptor_default.qml b/src/qml/test/tst_SessionDescriptor_default.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_SessionDescriptor_track_controls.qml b/src/qml/test/tst_SessionDescriptor_track_controls.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_Session_channels.qml b/src/qml/test/tst_Session_channels.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_Session_save_load.qml b/src/qml/test/tst_Session_save_load.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_ThreeLoops.qml b/src/qml/test/tst_ThreeLoops.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_TrackControlAndLoop_direct.qml b/src/qml/test/tst_TrackControlAndLoop_direct.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_TrackControlAndLoop_drywet.qml b/src/qml/test/tst_TrackControlAndLoop_drywet.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_TrackControl_direct.qml b/src/qml/test/tst_TrackControl_direct.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_TrackControl_drywet.qml b/src/qml/test/tst_TrackControl_drywet.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants

diff --git a/src/qml/test/tst_TwoLoops.qml b/src/qml/test/tst_TwoLoops.qml
@@ -1,6 +1,5 @@
 import QtQuick 6.6
 import QtTest 1.0
-import ShoopDaLoop.PythonBackend
 
 import './testDeepEqual.js' as TestDeepEqual
 import ShoopConstants