Skip to content

Commit 721c453

Browse files
committed
Use new macros in effects code too
Signed-off-by: falkTX <[email protected]>
1 parent 6044bed commit 721c453

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/effects.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,7 @@ static void* HMIClientThread(void* arg)
17421742
break;
17431743
#endif
17441744
case sys_serial_event_type_pedalboard_gain:
1745-
monitor_client_setup_volume(clampf(atof(msg), -30.0f, 20.0f));
1745+
monitor_client_setup_volume(clampf(atof(msg), MOD_MONITOR_VOLUME_MUTE, 20.0f));
17461746
break;
17471747
default:
17481748
break;
@@ -8386,7 +8386,7 @@ int effects_processing_enable(int enable)
83868386

83878387
// use fade-out while turning off
83888388
case -1:
8389-
monitor_client_setup_volume(-30.f);
8389+
monitor_client_setup_volume(MOD_MONITOR_VOLUME_MUTE);
83908390
if (g_processing_enabled)
83918391
{
83928392
monitor_client_wait_volume();
@@ -8396,7 +8396,7 @@ int effects_processing_enable(int enable)
83968396

83978397
// don't use fade-out while turning off, mute right away
83988398
case -2:
8399-
monitor_client_setup_volume(-30.f);
8399+
monitor_client_setup_volume(MOD_MONITOR_VOLUME_MUTE);
84008400
monitor_client_flush_volume();
84018401
g_processing_enabled = false;
84028402
break;

src/monitor/monitor-client.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@
4545
#define MOD_MONITOR_STEREO_HANDLING
4646
#endif
4747

48-
#if defined(_DARKGLASS_DEVICE_PABLITO)
49-
#define MOD_MONITOR_VOLUME_MUTE -60.f
50-
#define MOD_MONITOR_VOLUME_WAIT 0.02f
51-
#else
52-
#define MOD_MONITOR_VOLUME_MUTE -30.f
53-
#define MOD_MONITOR_VOLUME_WAIT 0.03f
54-
#endif
55-
5648
#if defined(_MOD_DEVICE_DUOX) || defined(_MOD_DEVICE_DWARF)
5749
#define MOD_IO_PROCESSING_ENABLED
5850
#endif
@@ -444,7 +436,7 @@ int jack_initialize(jack_client_t* client, const char* load_init)
444436
#elif defined(_MOD_DEVICE_DUOX)
445437
const uint32_t numports = mon->extra_active ? 4 : 2;
446438
#elif defined(_DARKGLASS_DEVICE_PABLITO)
447-
const uint32_t numports = 6;
439+
const uint32_t numports = 8;
448440
#else
449441
uint32_t numports = 0;
450442

src/monitor/monitor-client.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@
4646
************************************************************************************************************************
4747
*/
4848

49+
#if defined(_DARKGLASS_DEVICE_PABLITO)
50+
#define MOD_MONITOR_VOLUME_MUTE -60.f
51+
#define MOD_MONITOR_VOLUME_WAIT 0.02f
52+
#else
53+
#define MOD_MONITOR_VOLUME_MUTE -30.f
54+
#define MOD_MONITOR_VOLUME_WAIT 0.03f
55+
#endif
56+
4957

5058
/*
5159
************************************************************************************************************************

0 commit comments

Comments
 (0)