Carla: s/bridge_set_input_peak_value/bridge_set_inpeak/

c++/carla-backend/carla_engine.cpp

@@ -1970,7 +1970,7 @@ void CarlaEngine::osc_send_bridge_set_chunk_data(const char* const chunkFile)
     }
 }
 
-void CarlaEngine::osc_send_bridge_set_input_peak_value(const int32_t portId, const double value)
+void CarlaEngine::osc_send_bridge_set_inpeak(const int32_t portId, const double value)
 {
     CARLA_ASSERT(m_oscData);
     CARLA_ASSERT(portId == 1 || portId == 2);
@@ -1979,12 +1979,12 @@ void CarlaEngine::osc_send_bridge_set_input_peak_value(const int32_t portId, con
     {
         char target_path[strlen(m_oscData->path)+28];
         strcpy(target_path, m_oscData->path);
-        strcat(target_path, "/bridge_set_input_peak_value");
+        strcat(target_path, "/bridge_set_inpeak");
         lo_send(m_oscData->target, target_path, "id", portId, value);
     }
 }
 
-void CarlaEngine::osc_send_bridge_set_output_peak_value(const int32_t portId, const double value)
+void CarlaEngine::osc_send_bridge_set_outpeak(const int32_t portId, const double value)
 {
     CARLA_ASSERT(m_oscData);
     CARLA_ASSERT(portId == 1 || portId == 2);
@@ -1993,7 +1993,7 @@ void CarlaEngine::osc_send_bridge_set_output_peak_value(const int32_t portId, co
     {
         char target_path[strlen(m_oscData->path)+29];
         strcpy(target_path, m_oscData->path);
-        strcat(target_path, "/bridge_set_output_peak_value");
+        strcat(target_path, "/bridge_set_outpeak");
         lo_send(m_oscData->target, target_path, "id", portId, value);
     }
 }

c++/carla-backend/carla_engine.h

@@ -294,8 +294,8 @@ public:
     void osc_send_bridge_set_midi_program(const int32_t index);
     void osc_send_bridge_set_custom_data(const char* const stype, const char* const key, const char* const value);
     void osc_send_bridge_set_chunk_data(const char* const chunkFile);
-    void osc_send_bridge_set_input_peak_value(const int32_t portId, const double value);
-    void osc_send_bridge_set_output_peak_value(const int32_t portId, const double value);
+    void osc_send_bridge_set_inpeak(const int32_t portId, const double value);
+    void osc_send_bridge_set_outpeak(const int32_t portId, const double value);
 #else
     void osc_send_control_add_plugin_start(const int32_t pluginId, const char* const pluginName);
     void osc_send_control_add_plugin_end(const int32_t pluginId);

c++/carla-backend/carla_osc.cpp

@@ -128,7 +128,7 @@ void CarlaOsc::close()
 int CarlaOsc::handleMessage(const char* const path, const int argc, const lo_arg* const* const argv, const char* const types, const lo_message msg)
 {
 #if DEBUG
-    if (! QString(path).contains("put_peak_value"))
+    if (! QString(path).endsWith("peak"))
         qDebug("CarlaOsc::handleMessage(%s, %i, %p, %s, %p)", path, argc, argv, types, msg);
 #endif
     CARLA_ASSERT(m_serverPathTCP || m_serverPathUDP);
@@ -242,10 +242,10 @@ int CarlaOsc::handleMessage(const char* const path, const int argc, const lo_arg
     // Plugin Bridges
     if (strncmp(method, "/bridge_", 8) == 0 && (plugin->hints() & PLUGIN_IS_BRIDGE) > 0)
     {
-        if (strcmp(method+8, "set_input_peak_value") == 0)
-            return handleMsgBridgeSetInputPeakValue(plugin, argc, argv, types);
-        if (strcmp(method+8, "set_output_peak_value") == 0)
-            return handleMsgBridgeSetOutputPeakValue(plugin, argc, argv, types);
+        if (strcmp(method+8, "set_inpeak") == 0)
+            return handleMsgBridgeSetInPeak(plugin, argc, argv, types);
+        if (strcmp(method+8, "set_outpeak") == 0)
+            return handleMsgBridgeSetOutPeak(plugin, argc, argv, types);
         if (strcmp(method+8, "audio_count") == 0)
             return plugin->setOscBridgeInfo(PluginBridgeAudioCount, argc, argv, types);
         if (strcmp(method+8, "midi_count") == 0)
@@ -616,7 +616,7 @@ int CarlaOsc::handleMsgNoteOff(CARLA_OSC_HANDLE_ARGS2)
     return 0;
 }
 
-int CarlaOsc::handleMsgBridgeSetInputPeakValue(CARLA_OSC_HANDLE_ARGS2)
+int CarlaOsc::handleMsgBridgeSetInPeak(CARLA_OSC_HANDLE_ARGS2)
 {
     CARLA_OSC_CHECK_OSC_TYPES(2, "id");
 
@@ -627,7 +627,7 @@ int CarlaOsc::handleMsgBridgeSetInputPeakValue(CARLA_OSC_HANDLE_ARGS2)
     return 0;
 }
 
-int CarlaOsc::handleMsgBridgeSetOutputPeakValue(CARLA_OSC_HANDLE_ARGS2)
+int CarlaOsc::handleMsgBridgeSetOutPeak(CARLA_OSC_HANDLE_ARGS2)
 {
     CARLA_OSC_CHECK_OSC_TYPES(2, "id");
 

c++/carla-backend/carla_osc.h

@@ -124,8 +124,8 @@ private:
     int handleMsgLv2EventTransfer(CARLA_OSC_HANDLE_ARGS2);
 #endif
 
-    int handleMsgBridgeSetInputPeakValue(CARLA_OSC_HANDLE_ARGS2);
-    int handleMsgBridgeSetOutputPeakValue(CARLA_OSC_HANDLE_ARGS2);
+    int handleMsgBridgeSetInPeak(CARLA_OSC_HANDLE_ARGS2);
+    int handleMsgBridgeSetOutPeak(CARLA_OSC_HANDLE_ARGS2);
 
     static int osc_message_handler(const char* const path, const char* const types, lo_arg** const argv, const int argc, const lo_message msg, void* const userData)
     {

c++/carla-backend/carla_threads.cpp

@@ -131,8 +131,8 @@ void CarlaCheckThread::run()
                     if (plugin->audioInCount() > 0)
                     {
 #ifdef BUILD_BRIDGE
-                        engine->osc_send_bridge_set_input_peak_value(1, engine->getInputPeak(id, 0));
-                        engine->osc_send_bridge_set_input_peak_value(2, engine->getInputPeak(id, 1));
+                        engine->osc_send_bridge_set_inpeak(1, engine->getInputPeak(id, 0));
+                        engine->osc_send_bridge_set_inpeak(2, engine->getInputPeak(id, 1));
 #else
                         engine->osc_send_control_set_input_peak_value(id, 1, engine->getInputPeak(id, 0));
                         engine->osc_send_control_set_input_peak_value(id, 2, engine->getInputPeak(id, 1));
@@ -141,8 +141,8 @@ void CarlaCheckThread::run()
                     if (plugin->audioOutCount() > 0)
                     {
 #ifdef BUILD_BRIDGE
-                        engine->osc_send_bridge_set_output_peak_value(1, engine->getOutputPeak(id, 0));
-                        engine->osc_send_bridge_set_output_peak_value(2, engine->getOutputPeak(id, 1));
+                        engine->osc_send_bridge_set_outpeak(1, engine->getOutputPeak(id, 0));
+                        engine->osc_send_bridge_set_outpeak(2, engine->getOutputPeak(id, 1));
 #else
                         engine->osc_send_control_set_output_peak_value(id, 1, engine->getOutputPeak(id, 0));
                         engine->osc_send_control_set_output_peak_value(id, 2, engine->getOutputPeak(id, 1));