Use new macros in effects code too

Signed-off-by: falkTX <[email protected]>

Author: falkTX

src/effects.c

@@ -1742,7 +1742,7 @@ static void* HMIClientThread(void* arg)
                 break;
 #endif
             case sys_serial_event_type_pedalboard_gain:
-                monitor_client_setup_volume(clampf(atof(msg), -30.0f, 20.0f));
+                monitor_client_setup_volume(clampf(atof(msg), MOD_MONITOR_VOLUME_MUTE, 20.0f));
                 break;
             default:
                 break;
@@ -8386,7 +8386,7 @@ int effects_processing_enable(int enable)
 
     // use fade-out while turning off
     case -1:
-        monitor_client_setup_volume(-30.f);
+        monitor_client_setup_volume(MOD_MONITOR_VOLUME_MUTE);
         if (g_processing_enabled)
         {
             monitor_client_wait_volume();
@@ -8396,7 +8396,7 @@ int effects_processing_enable(int enable)
 
     // don't use fade-out while turning off, mute right away
     case -2:
-        monitor_client_setup_volume(-30.f);
+        monitor_client_setup_volume(MOD_MONITOR_VOLUME_MUTE);
         monitor_client_flush_volume();
         g_processing_enabled = false;
         break;

src/monitor/monitor-client.c

@@ -45,14 +45,6 @@
 #define MOD_MONITOR_STEREO_HANDLING
 #endif
 
-#if defined(_DARKGLASS_DEVICE_PABLITO)
-#define MOD_MONITOR_VOLUME_MUTE -60.f
-#define MOD_MONITOR_VOLUME_WAIT 0.02f
-#else
-#define MOD_MONITOR_VOLUME_MUTE -30.f
-#define MOD_MONITOR_VOLUME_WAIT 0.03f
-#endif
-
 #if defined(_MOD_DEVICE_DUOX) || defined(_MOD_DEVICE_DWARF)
 #define MOD_IO_PROCESSING_ENABLED
 #endif
@@ -519,7 +511,25 @@ int jack_initialize(jack_client_t* client, const char* load_init)
 
     const char* const ourclientname = jack_get_client_name(client);
 
-   #ifdef _MOD_DEVICE_DWARF
+   #if defined(_DARKGLASS_DEVICE_PABLITO)
+    snprintf(ourportname, MAX_CHAR_BUF_SIZE, "%s:out_1", ourclientname);
+    jack_connect(client, ourportname, "system:playback_1");
+
+    snprintf(ourportname, MAX_CHAR_BUF_SIZE, "%s:out_2", ourclientname);
+    jack_connect(client, ourportname, "system:playback_2");
+
+    snprintf(ourportname, MAX_CHAR_BUF_SIZE, "%s:out_3", ourclientname);
+    jack_connect(client, ourportname, "system:playback_3");
+
+    snprintf(ourportname, MAX_CHAR_BUF_SIZE, "%s:out_4", ourclientname);
+    jack_connect(client, ourportname, "system:playback_4");
+
+    snprintf(ourportname, MAX_CHAR_BUF_SIZE, "%s:out_5", ourclientname);
+    jack_connect(client, ourportname, "system:playback_7");
+
+    snprintf(ourportname, MAX_CHAR_BUF_SIZE, "%s:out_6", ourclientname);
+    jack_connect(client, ourportname, "system:playback_8");
+   #elif defined(_MOD_DEVICE_DWARF)
     snprintf(ourportname, MAX_CHAR_BUF_SIZE, "%s:out_2", ourclientname);
     jack_connect(client, ourportname, "system:playback_1");
 

src/monitor/monitor-client.h

@@ -46,6 +46,14 @@
 ************************************************************************************************************************
 */
 
+#if defined(_DARKGLASS_DEVICE_PABLITO)
+#define MOD_MONITOR_VOLUME_MUTE -60.f
+#define MOD_MONITOR_VOLUME_WAIT 0.02f
+#else
+#define MOD_MONITOR_VOLUME_MUTE -30.f
+#define MOD_MONITOR_VOLUME_WAIT 0.03f
+#endif
+
 
 /*
 ************************************************************************************************************************