Cleanup, continue previous commit

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

source/backend/engine/CarlaEngine.cpp

@@ -1330,7 +1330,6 @@ void CarlaEngine::callback(const bool sendHost, const bool sendOsc,
 #if defined(HAVE_LIBLO) && ! defined(BUILD_BRIDGE)
         if (pData->osc.isControlRegistered())
         {
-#if defined(HAVE_LIBLO) && ! defined(BUILD_BRIDGE)
             switch (action)
             {
             case ENGINE_CALLBACK_PLUGIN_ADDED:
@@ -1349,7 +1348,6 @@ void CarlaEngine::callback(const bool sendHost, const bool sendOsc,
             default:
                 break;
             }
-#endif
 
             oscSend_control_callback(action, pluginId, value1, value2, value3, valuef, valueStr);
         }

source/backend/engine/CarlaEngineGraph.cpp

@@ -220,7 +220,9 @@ bool ExternalGraph::connect(const uint groupA, const uint portA, const uint grou
     strBuf[STR_MAX] = '\0';
     std::snprintf(strBuf, STR_MAX, "%u:%u:%u:%u", groupA, portA, groupB, portB);
 
-    kEngine->callback(sendCallback, true, ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED, connectionToId.id, 0, 0, 0, 0.0f, strBuf);
+    if (sendCallback)
+        kEngine->callback(true, true,
+                          ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED, connectionToId.id, 0, 0, 0, 0.0f, strBuf);
 
     connections.list.append(connectionToId);
     return true;

source/backend/engine/CarlaEngineRtAudio.cpp

@@ -556,11 +556,13 @@ public:
 
             extGraph.connections.list.append(connectionToId);
 
-            callback(sendCallback, true,
-                     ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED,
-                     connectionToId.id,
-                     0, 0, 0, 0.0f,
-                     strBuf);
+            if (sendCallback) {
+                callback(true, true,
+                         ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED,
+                         connectionToId.id,
+                         0, 0, 0, 0.0f,
+                         strBuf);
+            }
         }
 
         fMidiOutMutex.lock();
@@ -582,11 +584,13 @@ public:
 
             extGraph.connections.list.append(connectionToId);
 
-            callback(sendCallback, true,
-                     ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED,
-                     connectionToId.id,
-                     0, 0, 0, 0.0f,
-                     strBuf);
+            if (sendCallback) {
+                callback(true, true,
+                         ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED,
+                         connectionToId.id,
+                         0, 0, 0, 0.0f,
+                         strBuf);
+            }
         }
 
         fMidiOutMutex.unlock();

source/backend/plugin/CarlaPlugin.cpp

@@ -1733,7 +1733,8 @@ void CarlaPlugin::setChunkData(const void* const data, const std::size_t dataSiz
     CARLA_SAFE_ASSERT(false); // this should never happen
 }
 
-void CarlaPlugin::setProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback, const bool) noexcept
+void CarlaPlugin::setProgram(const int32_t index,
+                             const bool sendGui, const bool sendOsc, const bool sendCallback, const bool) noexcept
 {
     CARLA_SAFE_ASSERT_RETURN(index >= -1 && index < static_cast<int32_t>(pData->prog.count),);
 
@@ -1758,13 +1759,14 @@ void CarlaPlugin::setProgram(const int32_t index, const bool sendGui, const bool
             break;
 
         default:
-            pData->updateParameterValues(this, sendOsc, sendCallback, true);
+            pData->updateParameterValues(this, sendCallback, sendOsc, true);
             break;
         }
     }
 }
 
-void CarlaPlugin::setMidiProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback, const bool) noexcept
+void CarlaPlugin::setMidiProgram(const int32_t index,
+                                 const bool sendGui, const bool sendOsc, const bool sendCallback, const bool) noexcept
 {
     CARLA_SAFE_ASSERT_RETURN(index >= -1 && index < static_cast<int32_t>(pData->midiprog.count),);
 
@@ -1789,7 +1791,7 @@ void CarlaPlugin::setMidiProgram(const int32_t index, const bool sendGui, const
             break;
 
         default:
-            pData->updateParameterValues(this, sendOsc, sendCallback, true);
+            pData->updateParameterValues(this, sendCallback, sendOsc, true);
             break;
         }
     }

source/backend/plugin/CarlaPluginDSSI.cpp

@@ -640,12 +640,7 @@ public:
             }
         }
 
-#if defined(HAVE_LIBLO) && !defined(BUILD_BRIDGE)
-        const bool sendOsc(pData->engine->isOscControlRegistered());
-#else
-        const bool sendOsc(false);
-#endif
-        pData->updateParameterValues(this, sendOsc, true, false);
+        pData->updateParameterValues(this, true, true, false);
     }
 
     void setMidiProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback, const bool doingInit) noexcept override

source/backend/plugin/CarlaPluginInternal.cpp

@@ -808,7 +808,10 @@ void CarlaPlugin::ProtectedData::tryTransient() noexcept
 }
 #endif
 
-void CarlaPlugin::ProtectedData::updateParameterValues(CarlaPlugin* const plugin, const bool sendOsc, const bool sendCallback, const bool useDefault) noexcept
+void CarlaPlugin::ProtectedData::updateParameterValues(CarlaPlugin* const plugin,
+                                                       const bool sendCallback,
+                                                       const bool sendOsc,
+                                                       const bool useDefault) noexcept
 {
     CARLA_SAFE_ASSERT_RETURN(sendOsc || sendCallback || useDefault,);
 
@@ -821,25 +824,22 @@ void CarlaPlugin::ProtectedData::updateParameterValues(CarlaPlugin* const plugin
 
         if (useDefault) {
             engine->callback(sendCallback, sendOsc,
-                              ENGINE_CALLBACK_PARAMETER_DEFAULT_CHANGED,
-                              id,
-                              static_cast<int>(i),
-                              0, 0,
-                              value,
-                              nullptr);
+                             ENGINE_CALLBACK_PARAMETER_DEFAULT_CHANGED,
+                             id,
+                             static_cast<int>(i),
+                             0, 0,
+                             value,
+                             nullptr);
         }
 
         engine->callback(sendCallback, sendOsc,
-                          ENGINE_CALLBACK_PARAMETER_VALUE_CHANGED,
-                          id,
-                          static_cast<int>(i),
-                          0, 0,
-                          value,
-                          nullptr);
+                         ENGINE_CALLBACK_PARAMETER_VALUE_CHANGED,
+                         id,
+                         static_cast<int>(i),
+                         0, 0,
+                         value,
+                         nullptr);
     }
-
-    // may be unused
-    return; (void)sendOsc;
 }
 
 void CarlaPlugin::ProtectedData::updateDefaultParameterValues(CarlaPlugin* const plugin) noexcept

source/backend/plugin/CarlaPluginInternal.hpp

@@ -392,7 +392,8 @@ struct CarlaPlugin::ProtectedData {
 #ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
     void tryTransient() noexcept;
 #endif
-    void updateParameterValues(CarlaPlugin* const plugin, const bool sendOsc, const bool sendCallback, const bool useDefault) noexcept;
+    void updateParameterValues(CarlaPlugin* const plugin,
+                               const bool sendCallback, const bool sendOsc, const bool useDefault) noexcept;
     void updateDefaultParameterValues(CarlaPlugin* const plugin) noexcept;
 
     // -------------------------------------------------------------------

source/backend/plugin/CarlaPluginJuce.cpp

@@ -326,12 +326,7 @@ public:
             std::free(dataCompat);
         }
 
-#if defined(HAVE_LIBLO) && ! defined(BUILD_BRIDGE)
-        const bool sendOsc(pData->engine->isOscControlRegistered());
-#else
-        const bool sendOsc(false);
-#endif
-        pData->updateParameterValues(this, sendOsc, true, false);
+        pData->updateParameterValues(this, true, true, false);
     }
 
     void setProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback, const bool doingInit) noexcept override

source/backend/plugin/CarlaPluginVST2.cpp

@@ -420,12 +420,7 @@ public:
         // simulate an updateDisplay callback
         handleAudioMasterCallback(audioMasterUpdateDisplay, 0, 0, nullptr, 0.0f);
 
-#if defined(HAVE_LIBLO) && ! defined(BUILD_BRIDGE)
-        const bool sendOsc(pData->engine->isOscControlRegistered());
-#else
-        const bool sendOsc(false);
-#endif
-        pData->updateParameterValues(this, sendOsc, true, false);
+        pData->updateParameterValues(this, true, true, false);
     }
 
     void setProgram(const int32_t index, const bool sendGui, const bool sendOsc, const bool sendCallback, const bool doingInit) noexcept override