Expose canvas and some experimental settings to carla-control

Signed-off-by: falkTX <falktx@falktx.com>

source/backend/engine/CarlaEngineOscHandlers.cpp

@@ -243,6 +243,38 @@ int CarlaEngineOsc::handleMsgRegister(const bool isTCP,
             }
 
             fEngine->patchbayRefresh(false, true, fEngine->pData->graph.isUsingExternal());
+
+#if 0
+void CarlaPlugin::registerToOscClient() noexcept
+{
+    // Programs
+    if (const uint32_t count = std::min<uint32_t>(pData->prog.count, 50U))
+    {
+        pData->engine->oscSend_control_set_program_count(pData->id, count);
+
+        for (uint32_t i=0; i < count; ++i)
+            pData->engine->oscSend_control_set_program_name(pData->id, i, pData->prog.names[i]);
+
+//         pData->engine->oscSend_control_set_current_program(pData->id, pData->prog.current);
+    }
+
+    // MIDI Programs
+    if (const uint32_t count = std::min<uint32_t>(pData->midiprog.count, 50U))
+    {
+        pData->engine->oscSend_control_set_midi_program_count(pData->id, count);
+
+        for (uint32_t i=0; i < count; ++i)
+        {
+            const MidiProgramData& mpData(pData->midiprog.data[i]);
+
+            pData->engine->oscSend_control_set_midi_program_data(pData->id, i, mpData.bank, mpData.program, mpData.name);
+        }
+
+//         pData->engine->oscSend_control_set_current_midi_program(pData->id, pData->midiprog.current);
+    }
+}
+#endif
+
         }
     }
 

source/backend/plugin/CarlaPlugin.cpp

@@ -2127,37 +2127,6 @@ void CarlaPlugin::clearBuffers() noexcept
 // -------------------------------------------------------------------
 // OSC stuff
 
-#if 0
-void CarlaPlugin::registerToOscClient() noexcept
-{
-    // Programs
-    if (const uint32_t count = std::min<uint32_t>(pData->prog.count, 50U))
-    {
-        pData->engine->oscSend_control_set_program_count(pData->id, count);
-
-        for (uint32_t i=0; i < count; ++i)
-            pData->engine->oscSend_control_set_program_name(pData->id, i, pData->prog.names[i]);
-
-//         pData->engine->oscSend_control_set_current_program(pData->id, pData->prog.current);
-    }
-
-    // MIDI Programs
-    if (const uint32_t count = std::min<uint32_t>(pData->midiprog.count, 50U))
-    {
-        pData->engine->oscSend_control_set_midi_program_count(pData->id, count);
-
-        for (uint32_t i=0; i < count; ++i)
-        {
-            const MidiProgramData& mpData(pData->midiprog.data[i]);
-
-            pData->engine->oscSend_control_set_midi_program_data(pData->id, i, mpData.bank, mpData.program, mpData.name);
-        }
-
-//         pData->engine->oscSend_control_set_current_midi_program(pData->id, pData->midiprog.current);
-    }
-}
-#endif
-
 // FIXME
 void CarlaPlugin::handleOscMessage(const char* const, const int, const void* const, const char* const, const lo_message)
 {

source/frontend/carla_host.py

@@ -1683,7 +1683,7 @@ class HostWindow(QMainWindow):
 
         settings2 = QSettings("falkTX", "Carla2")
 
-        if self.host.experimental and not self.host.isControl:
+        if self.host.experimental:
             visible = settings2.value(CARLA_KEY_EXPERIMENTAL_JACK_APPS, CARLA_DEFAULT_EXPERIMENTAL_JACK_APPS, type=bool)
             self.ui.act_add_jack.setVisible(visible)
             self.ui.act_plugin_add_jack.setVisible(visible)

source/frontend/carla_settings.py

@@ -250,13 +250,10 @@ class CarlaSettingsW(QDialog):
             self.ui.ch_main_show_logs.setVisible(False)
 
         if host.isControl:
-            self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)
             self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE)
             self.ui.lw_page.hideRow(self.TAB_INDEX_PATHS)
-            self.ui.lw_page.hideRow(self.TAB_INDEX_EXPERIMENTAL)
-            self.ui.ch_main_experimental.setEnabled(False)
-            self.ui.group_main_experimental.setEnabled(False)
-            self.ui.group_main_experimental.setVisible(False)
+            self.ui.ch_exp_export_lv2.hide()
+            self.ui.group_experimental_engine.hide()
 
         elif not hasCanvas:
             self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)
@@ -387,15 +384,14 @@ class CarlaSettingsW(QDialog):
         # ----------------------------------------------------------------------------------------------------
         # Main
 
-        if not self.host.isControl:
-            self.ui.ch_main_experimental.setChecked(self.host.experimental)
+        self.ui.ch_main_experimental.setChecked(self.host.experimental)
 
-            if not self.host.experimental:
-                self.ui.lw_page.hideRow(self.TAB_INDEX_EXPERIMENTAL)
-                self.ui.lw_page.hideRow(self.TAB_INDEX_WINE)
+        if not self.host.experimental:
+            self.ui.lw_page.hideRow(self.TAB_INDEX_EXPERIMENTAL)
+            self.ui.lw_page.hideRow(self.TAB_INDEX_WINE)
 
-            elif not self.host.showWineBridges:
-                self.ui.lw_page.hideRow(self.TAB_INDEX_WINE)
+        elif not self.host.showWineBridges:
+            self.ui.lw_page.hideRow(self.TAB_INDEX_WINE)
 
         # ----------------------------------------------------------------------------------------------------
         # Engine
@@ -914,7 +910,7 @@ class CarlaSettingsW(QDialog):
     def slot_enableExperimental(self, toggled):
         if toggled:
             self.ui.lw_page.showRow(self.TAB_INDEX_EXPERIMENTAL)
-            if self.ui.ch_exp_wine_bridges.isChecked():
+            if self.ui.ch_exp_wine_bridges.isChecked() and not self.host.isControl:
                 self.ui.lw_page.showRow(self.TAB_INDEX_WINE)
         else:
             self.ui.lw_page.hideRow(self.TAB_INDEX_EXPERIMENTAL)
@@ -922,7 +918,7 @@ class CarlaSettingsW(QDialog):
 
     @pyqtSlot(bool)
     def slot_enableWineBridges(self, toggled):
-        if toggled:
+        if toggled and not self.host.isControl:
             self.ui.lw_page.showRow(self.TAB_INDEX_WINE)
         else:
             self.ui.lw_page.hideRow(self.TAB_INDEX_WINE)