From 1dee1b608d2d22b8f58599c48c54714836d11021 Mon Sep 17 00:00:00 2001 From: Sander Vocke Date: Fri, 7 Feb 2025 00:46:34 -0300 Subject: [PATCH] wip --- src/python/shoopdaloop/lib/q_objects/MidiPort.py | 10 +++++++++- src/qml/test/ShoopTestCase.qml | 2 +- src/qml/test/tst_Backend_jack.qml | 1 - src/qml/test/tst_CompositeLoop_running.qml | 1 - src/qml/test/tst_ControlInterface_lua.qml | 1 - src/qml/test/tst_Jack_ports.qml | 1 - src/qml/test/tst_LoopReorder.qml | 1 - src/qml/test/tst_LuaScriptWithEngine.qml | 1 - src/qml/test/tst_Midi.qml | 1 - src/qml/test/tst_MidiControlPort.qml | 1 - src/qml/test/tst_Resample.qml | 1 - src/qml/test/tst_SessionDescriptor_default.qml | 1 - src/qml/test/tst_SessionDescriptor_track_controls.qml | 1 - src/qml/test/tst_Session_channels.qml | 1 - src/qml/test/tst_Session_save_load.qml | 1 - src/qml/test/tst_ThreeLoops.qml | 1 - src/qml/test/tst_TrackControlAndLoop_direct.qml | 1 - src/qml/test/tst_TrackControlAndLoop_drywet.qml | 1 - src/qml/test/tst_TrackControl_direct.qml | 1 - src/qml/test/tst_TrackControl_drywet.qml | 1 - src/qml/test/tst_TwoLoops.qml | 1 - 21 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/python/shoopdaloop/lib/q_objects/MidiPort.py b/src/python/shoopdaloop/lib/q_objects/MidiPort.py index 9799adc45f..31b0d723a6 100644 --- 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 index a9e017da75..ed882b9ed2 100644 --- 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 index bab4f8b010..c92115d508 100644 --- 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 index a17c30a304..950af527d0 100644 --- 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 index 65048b37c4..5791be6783 100644 --- 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 index c067e6dea5..1dac5da23f 100644 --- 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 index bbe5620658..ee47c7a8b4 100644 --- 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 index 92b946263e..f448bda2a0 100644 --- 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 index a6ce95f19a..08525e8ced 100644 --- 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 index a8fbc27f8c..1e26ea57dc 100644 --- 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 index d2d0c26a46..053b303231 100644 --- 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 index 46d68dab46..c2685ffb8d 100644 --- 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 index b46a1fa3a4..ea07fc4cf8 100644 --- 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 index 88f9f96bfc..ba9f066ecb 100644 --- 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 index b5eaaa32e8..aa8ee1db11 100644 --- 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 index e03d929d51..be35230989 100644 --- 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 index faa75f58b8..5eac24ffff 100644 --- 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 index 1948f7a0e5..4c0af46410 100644 --- 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 index c34071259c..206192c849 100644 --- 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 index 71c6149ef7..3e430a3579 100644 --- 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 index 2edcff689d..f283fe3ad4 100644 --- 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