From 7757581b1fb3d7c6deb1b26355cfbcc853984e37 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 09:18:24 +0200 Subject: [PATCH 01/13] refactor(enginevumeter): Use regular control object, not `ControlPotmeter` --- src/engine/enginevumeter.cpp | 30 +- src/engine/enginevumeter.h | 12 +- src/test/co_dumps/co_dump_inital.csv | 720 --------------------------- 3 files changed, 19 insertions(+), 743 deletions(-) diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp index 332bc154bbf..e9c46f82dfd 100644 --- a/src/engine/enginevumeter.cpp +++ b/src/engine/enginevumeter.cpp @@ -19,23 +19,19 @@ constexpr CSAMPLE kDecaySmoothing = 0.1f; //.16//.4 } // namespace EngineVuMeter::EngineVuMeter(const QString& group) - : m_sampleRate(QStringLiteral("[App]"), QStringLiteral("samplerate")) { - // The VUmeter widget is controlled via a controlpotmeter, which means - // that it should react on the setValue(int) signal. - m_ctrlVuMeter = new ControlPotmeter(ConfigKey(group, "VuMeter"), 0., 1.); - // left channel VU meter - m_ctrlVuMeterL = new ControlPotmeter(ConfigKey(group, "VuMeterL"), 0., 1.); - // right channel VU meter - m_ctrlVuMeterR = new ControlPotmeter(ConfigKey(group, "VuMeterR"), 0., 1.); - - // Used controlpotmeter as the example used it :/ perhaps someone with more - // knowledge could use something more suitable... - m_ctrlPeakIndicator = new ControlPotmeter(ConfigKey(group, "PeakIndicator"), - 0., 1.); - m_ctrlPeakIndicatorL = new ControlPotmeter(ConfigKey(group, "PeakIndicatorL"), - 0., 1.); - m_ctrlPeakIndicatorR = new ControlPotmeter(ConfigKey(group, "PeakIndicatorR"), - 0., 1.); + : m_ctrlVuMeter(new ControlObject( + ConfigKey(group, QStringLiteral("VuMeter")))), + m_ctrlVuMeterL(new ControlObject( + ConfigKey(group, QStringLiteral("VuMeterL")))), + m_ctrlVuMeterR(new ControlObject( + ConfigKey(group, QStringLiteral("VuMeterR")))), + m_ctrlPeakIndicator(new ControlObject( + ConfigKey(group, QStringLiteral("PeakIndicator")))), + m_ctrlPeakIndicatorL(new ControlObject( + ConfigKey(group, QStringLiteral("PeakIndicatorL")))), + m_ctrlPeakIndicatorR(new ControlObject( + ConfigKey(group, QStringLiteral("PeakIndicatorR")))), + m_sampleRate(QStringLiteral("[App]"), QStringLiteral("samplerate")) { // Initialize the calculation: reset(); } diff --git a/src/engine/enginevumeter.h b/src/engine/enginevumeter.h index f0c36f46d44..862523aafad 100644 --- a/src/engine/enginevumeter.h +++ b/src/engine/enginevumeter.h @@ -18,18 +18,18 @@ class EngineVuMeter : public EngineObject { private: void doSmooth(CSAMPLE ¤tVolume, CSAMPLE newVolume); - ControlPotmeter* m_ctrlVuMeter; - ControlPotmeter* m_ctrlVuMeterL; - ControlPotmeter* m_ctrlVuMeterR; + ControlObject* m_ctrlVuMeter; + ControlObject* m_ctrlVuMeterL; + ControlObject* m_ctrlVuMeterR; CSAMPLE m_fRMSvolumeL; CSAMPLE m_fRMSvolumeSumL; CSAMPLE m_fRMSvolumeR; CSAMPLE m_fRMSvolumeSumR; int m_iSamplesCalculated; - ControlPotmeter* m_ctrlPeakIndicator; - ControlPotmeter* m_ctrlPeakIndicatorL; - ControlPotmeter* m_ctrlPeakIndicatorR; + ControlObject* m_ctrlPeakIndicator; + ControlObject* m_ctrlPeakIndicatorL; + ControlObject* m_ctrlPeakIndicatorR; int m_peakDurationL; int m_peakDurationR; diff --git a/src/test/co_dumps/co_dump_inital.csv b/src/test/co_dumps/co_dump_inital.csv index 20a80bdb66e..20cfe6c5138 100644 --- a/src/test/co_dumps/co_dump_inital.csv +++ b/src/test/co_dumps/co_dump_inital.csv @@ -12,12 +12,10 @@ [EffectRack1_EffectUnit3_Effect1],parameter3_minus_toggle,0 [Channel2],visual_key_distance_up_small,0 [EqualizerRack1_[Master]_Effect1],button_parameter14_loaded,0 -[Microphone2],VuMeter_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter3_set_zero,0 [EffectRack1_EffectUnit1_Effect3],parameter4_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter3_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter12_down,0 -[Microphone],PeakIndicator_down,0 [EffectRack1_EffectUnit2_Effect1],parameter2_link_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1_up_small,0 [Channel3],hotcue_2_activate,0 @@ -45,8 +43,6 @@ [Channel2],beatloop_16_enabled,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter4_set_default,0 -[Sampler1],VuMeterL_up,0 -[Auxiliary1],VuMeter_toggle,0 [Master],headDelay_set_one,0 [EffectRack1_EffectUnit2_Effect2],parameter4_set_default,0 [Channel3],hotcue_15_enabled,0 @@ -58,10 +54,7 @@ [Channel4],hotcue_35_enabled,0 [EffectRack1_EffectUnit1_Effect2],parameter4_minus_toggle,0 [Channel1],beatloop_16_enabled,0 -[Microphone2],VuMeter_set_minus_one,0 [QuickEffectRack1_[Channel2]],mix_up_small,0 -[Sampler2],VuMeterL_up,0 -[Auxiliary2],VuMeter_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter4_set_default,0 [EffectRack1_EffectUnit3_Effect1],parameter4_minus_toggle,0 [Master],duckStrength_up,0 @@ -84,7 +77,6 @@ [Channel4],hotcue_6_set,0 [PreviewDeck1],playposition_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_up_small,0 -[Microphone],VuMeterL_down_small,0 [App],num_preview_decks,1 [EffectRack1_EffectUnit3_Effect3],parameter3_minus_toggle,0 [EqualizerRack1_[Master]_Effect1],button_parameter15_loaded,0 @@ -104,7 +96,6 @@ [EqualizerRack1_[Channel1]_Effect1],parameter6_type,0 [EffectRack1_EffectUnit1_Effect2],parameter5_minus_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter4_set_default,0 -[PreviewDeck1],VuMeter_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],parameter13_down,0 [Sampler2],hotcue_17_gotoandplay,0 [EffectRack1_EffectUnit3_Effect3],parameter14_set_minus_one,0 @@ -151,7 +142,6 @@ [Sampler4],visual_key_distance,0 [Sampler1],hotcue_27_gotoandplay,0 [EqualizerRack1_[Channel1]],super1_set_one,0 -[Master],PeakIndicator_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter2_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter9_set_zero,0 @@ -166,7 +156,6 @@ [EffectRack1_EffectUnit1_Effect4],parameter10_set_one,0 [EffectRack1_EffectUnit1_Effect3],parameter9_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_toggle,0 -[Sampler3],VuMeterL_up,0 [QuickEffectRack1_[Channel4]_Effect1],parameter3_set_zero,0 [Sampler3],hotcue_27_gotoandplay,0 [Channel3],sync_leader,0 @@ -179,7 +168,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter3_link_type,0 [EffectRack1_EffectUnit1_Effect4],parameter9_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_type,0 -[Sampler4],VuMeterL_up,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter4_type,0 [Channel3],volume_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_set_one,0 @@ -243,7 +231,6 @@ [QuickEffectRack1_[Channel1]_Effect1],button_parameter3_type,0 [QuickEffectRack1_[Channel1]],super1_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter8_up,0 -[Auxiliary1],VuMeter_set_one,0 [Sampler4],hotcue_17_gotoandplay,0 [EffectRack1_EffectUnit3_Effect1],parameter14_set_minus_one,0 [EffectRack1_EffectUnit4_Effect1],parameter3_link_type,0 @@ -254,7 +241,6 @@ [PreviewDeck1],hotcue_26_goto,0 [EffectRack1_EffectUnit1_Effect1],parameter8_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_set_one,0 -[Auxiliary2],VuMeter_set_one,0 [EffectRack1_EffectUnit3_Effect2],parameter14_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter3_link_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_toggle,0 @@ -267,7 +253,6 @@ [EffectRack1_EffectUnit4_Effect3],parameter2_link_type,0 [EqualizerRack1_[Channel2]],super1_up,0 [QuickEffectRack1_[Channel3]],mix_up_small,0 -[Auxiliary3],VuMeter_set_one,0 [Channel3],hotcue_22_goto,0 [EqualizerRack1_[Channel4]_Effect1],parameter6_type,0 [EffectRack1_EffectUnit3_Effect1],parameter8_minus_toggle,0 @@ -280,7 +265,6 @@ [QuickEffectRack1_[Channel4]],super1_up,0 [PreviewDeck1],waveform_zoom_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter9_set_one,0 -[Auxiliary4],VuMeter_set_one,0 [Channel4],hotcue_22_goto,0 [EffectRack1_EffectUnit3_Effect2],parameter8_minus_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter15_set_minus_one,0 @@ -291,7 +275,6 @@ [EffectRack1_EffectUnit1_Effect4],parameter7_minus_toggle,0 [Channel1],hotcue_22_goto,0 [EffectRack1_EffectUnit4_Effect1],parameter6_set_minus_one,0 -[Auxiliary3],VuMeterL_down_small,0 [Skin],show_vinylcontrol,0 [EffectRack1_EffectUnit3_Effect3],parameter7_minus_toggle,0 [Sampler3],hotcue_13_goto,0 @@ -302,7 +285,6 @@ [EffectRack1_EffectUnit1_Effect1],parameter9_minus_toggle,0 [Channel2],hotcue_22_goto,0 [EffectRack1_EffectUnit4_Effect2],parameter6_set_minus_one,0 -[Auxiliary4],VuMeterL_down_small,0 [EffectRack1_EffectUnit3_Effect4],parameter7_minus_toggle,0 [Sampler4],hotcue_13_goto,0 [EffectRack1_EffectUnit4_Effect1],button_parameter11_type,0 @@ -311,7 +293,6 @@ [Channel4],visual_key_distance_set_minus_one,0 [EffectRack1_EffectUnit3_Effect4],parameter10_set_one,0 [EffectRack1_EffectUnit1_Effect2],parameter9_minus_toggle,0 -[Microphone],VuMeterR_set_one,0 [EffectRack1_EffectUnit4_Effect3],parameter6_set_minus_one,0 [EffectRack1_EffectUnit4_Effect3],parameter1_type,0 [EffectRack1_EffectUnit3_Effect1],parameter9_minus_toggle,0 @@ -338,7 +319,6 @@ [EqualizerRack1_[Channel3]_Effect1],parameter4_set_one,0 [EffectRack1_EffectUnit2_Effect1],parameter4_link_type,0 [Sampler4],hotcue_6_enabled,0 -[Microphone2],VuMeterR_down,0 [EffectRack1_EffectUnit3_Effect3],parameter6_minus_toggle,0 [EqualizerRack1_[Channel2]],mix_down,0 [EffectRack1_EffectUnit2_Effect2],button_parameter9_type,0 @@ -466,7 +446,6 @@ [EffectRack1_EffectUnit2_Effect3],parameter15_link_type,0 [Sampler1],hotcue_34_activate_preview,0 [QuickEffectRack1_[Channel4]],mix_up_small,0 -[Auxiliary1],VuMeterL_down_small,0 [Channel3],waveform_zoom_minus_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter15_link_type,0 [Sampler2],hotcue_34_activate_preview,0 @@ -474,7 +453,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter15_link_type,0 [EffectRack1_EffectUnit3_Effect3],parameter11_type,0 [PreviewDeck1],hotcue_14_gotoandplay,0 -[Auxiliary2],VuMeterL_down_small,0 [Channel4],waveform_zoom_minus_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter15_link_type,0 [EffectRack1_EffectUnit3_Effect4],parameter11_type,0 @@ -515,7 +493,6 @@ [EffectRack1_EffectUnit2_Effect3],button_parameter8,0 [QuickEffectRack1_[Channel1]_Effect1],parameter13_set_default,0 [Sampler2],hotcue_6_enabled,0 -[Microphone4],VuMeterR_down,0 [EffectRack1_EffectUnit2_Effect4],button_parameter9_type,0 [EffectRack1_EffectUnit2_Effect3],button_parameter5,0 [EffectRack1_EffectUnit1_Effect2],parameter14_loaded,0 @@ -537,7 +514,6 @@ [Channel3],loop_move_4_backward,0 [EffectRack1_EffectUnit2_Effect2],button_parameter8,0 [Sampler1],hotcue_6_enabled,0 -[Microphone3],VuMeterR_down,0 [EffectRack1_EffectUnit2_Effect2],button_parameter5,0 [EffectRack1_EffectUnit1_Effect1],parameter14_loaded,0 [EffectRack1_EffectUnit2_Effect2],button_parameter4,0 @@ -623,7 +599,6 @@ [Sampler4],start_stop,0 [Sampler1],beatloop_0.25,0 [EffectRack1_EffectUnit2_Effect3],parameter16_link_type,0 -[PreviewDeck1],VuMeter_set_one,0 [PreviewDeck1],pitch_set_default,0 [Sampler2],hotcue_23_position,-1 [Channel2],hotcue_24_goto,0 @@ -646,7 +621,6 @@ [EffectRack1_EffectUnit4_Effect2],parameter16_link_type,0 [EffectRack1_EffectUnit1_Effect2],parameter13_loaded,0 [Sampler3],hotcue_29_clear,0 -[Auxiliary2],VuMeterL_down,0 [EffectRack1_EffectUnit3_Effect2],parameter16_loaded,0 [EffectRack1_EffectUnit3_Effect1],parameter11_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_set_one,0 @@ -664,11 +638,9 @@ [EffectRack1_EffectUnit1_Effect1],parameter1_up_small,0 [EffectRack1_EffectUnit3_Effect1],parameter3_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter8_up_small,0 -[Auxiliary1],VuMeterL_down,0 [EffectRack1_EffectUnit3_Effect1],parameter16_loaded,0 [EffectRack1_EffectUnit3_Effect2],parameter11_type,0 [EqualizerRack1_[Channel4]],super1_up,0 -[Channel1],VuMeterR_up_small,0 [EffectRack1_EffectUnit2_Effect2],parameter6_link_type,0 [Channel2],hotcue_13_enabled,0 [Channel1],pregain_set_one,0 @@ -683,7 +655,6 @@ [EffectRack1_EffectUnit4_Effect2],parameter8_up_small,0 [Sampler4],beatloop_0.25,0 [EffectRack1_EffectUnit3_Effect4],parameter16_loaded,0 -[Channel2],VuMeterR_up_small,0 [QuickEffectRack1_[Channel2]],super1_up,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_set_default,0 [Sampler2],waveform_zoom_set_default,0 @@ -698,8 +669,6 @@ [EffectRack1_EffectUnit3_Effect1],parameter5_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter6_up_small,0 [EffectRack1_EffectUnit1_Effect1],parameter16_loaded,0 -[Microphone],PeakIndicator_set_default,0 -[Channel1],VuMeterL_up_small,0 [EffectRack1_EffectUnit2_Effect4],parameter5_link_type,0 [Channel2],hotcue_33_enabled,0 [EqualizerRack1_[Channel1]_Effect1],parameter13_down_small,0 @@ -718,7 +687,6 @@ [EffectRack1_EffectUnit3_Effect2],parameter5_up_small,0 [EffectRack1_EffectUnit4_Effect2],parameter6_up_small,0 [EffectRack1_EffectUnit1_Effect4],parameter16_loaded,0 -[Channel2],VuMeterL_up_small,0 [Sampler1],beatjump_64_forward,0 [Sampler1],visual_key_distance_down_small,0 [Channel1],hotcue_33_enabled,0 @@ -729,7 +697,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter4_up_small,0 [Channel3],rate,0 [EffectRack1_EffectUnit2_Effect2],parameter16_link_type,0 -[PreviewDeck1],VuMeterL_down_small,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_set_one,0 [EffectRack1_EffectUnit1_Effect3],parameter16_loaded,0 [Channel1],rateSearch_up_small,0 @@ -750,7 +717,6 @@ [Channel4],rate,0 [Sampler1],vinylcontrol_status,0 [Channel1],beat_prev,-1 -[PreviewDeck1],VuMeterR_set_minus_one,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter10_type,0 [EffectRack1_EffectUnit1_Effect4],parameter13_loaded,0 [PreviewDeck1],beatloop_0.125_toggle,0 @@ -762,7 +728,6 @@ [Sampler3],beatloop_8_enabled,0 [Sampler4],playposition_set_zero,0 [EffectRack1_EffectUnit4_Effect2],parameter6_link_type,0 -[Auxiliary4],VuMeterL_down,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter13_link_type,0 [Sampler2],vinylcontrol_status,0 @@ -778,7 +743,6 @@ [EffectRack1_EffectUnit1],group_[Sampler2]_enable,0 [Sampler2],beatloop_8_enabled,0 [Sampler4],rate_set_default,0 -[Auxiliary3],VuMeterL_down,0 [EffectRack1_EffectUnit1_Effect1],parameter9_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter6_up_small,0 [Sampler3],vinylcontrol_status,0 @@ -786,7 +750,6 @@ [EffectRack1_EffectUnit2],super1_set_zero,0 [EffectRack1_EffectUnit4_Effect4],parameter5_link_type,0 [Channel3],sync_enabled,0 -[PreviewDeck1],VuMeter_toggle,0 [PreviewDeck1],beatloop_0.5_activate,0 [PreviewDeck1],vinylcontrol_signal_enabled,1 [QuickEffectRack1_[Channel3]_Effect1],parameter4_down,0 @@ -802,7 +765,6 @@ [Sampler3],volume_set_zero,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_up,0 [Sampler2],hotcue_21_position,-1 -[Master],VuMeterL_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter7_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter8_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_loaded,0 @@ -835,13 +797,11 @@ [PreviewDeck1],hotcue_12_activate_preview,0 [EffectRack1_EffectUnit4_Effect1],parameter13_link_type,0 [EffectRack1_EffectUnit3_Effect3],parameter12_loaded,0 -[Channel3],VuMeterR_up_small,0 [Sampler1],hotcue_13_position,-1 [EffectRack1_EffectUnit1_Effect2],parameter5_up_small,0 [EffectRack1_EffectUnit2_Effect2],parameter2_up_small,0 [EffectRack1_EffectUnit1_Effect4],parameter12_loaded,0 [PreviewDeck1],beatjump_32_backward,0 -[PreviewDeck1],VuMeter_up,0 [Sampler4],hotcue_23_position,-1 [Sampler2],hotcue_15_position,-1 [Sampler1],hotcue_19_clear,0 @@ -857,7 +817,6 @@ [Master],headGain_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter13_link_type,0 [EffectRack1_EffectUnit3_Effect2],parameter10_loaded,0 -[Channel4],VuMeterR_up_small,0 [EffectRack1_EffectUnit1_Effect3],parameter16_down_small,0 [EffectRack1_EffectUnit3_Effect3],parameter5_up_small,0 [EffectRack1_EffectUnit4_Effect3],parameter6_up_small,0 @@ -865,7 +824,6 @@ [EffectRack1_EffectUnit1_Effect3],parameter12_loaded,0 [EqualizerRack1_[Channel4]_Effect1],parameter4_set_one,0 [EffectRack1_EffectUnit2_Effect1],parameter7_link_type,0 -[Channel3],VuMeterL_up_small,0 [Sampler3],hotcue_23_position,-1 [Sampler1],hotcue_15_position,-1 [EffectRack1_EffectUnit1],group_[Auxiliary4]_enable,0 @@ -890,7 +848,6 @@ [Channel1],sync_enabled,0 [EffectRack1_EffectUnit1_Effect2],parameter10_loaded,0 [EffectRack1_EffectUnit2_Effect2],parameter7_link_type,0 -[Channel4],VuMeterL_up_small,0 [EffectRack1_EffectUnit2],group_[Auxiliary4]_enable,0 [Channel3],rateSearch_set_minus_one,0 [Sampler1],hotcue_29_clear,0 @@ -980,7 +937,6 @@ [EffectRack1_EffectUnit4],group_[Sampler2]_enable,0 [Sampler4],pitch_minus_toggle,0 [Channel3],hotcue_9_gotoandplay,0 -[Sampler3],VuMeterL_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter10_type,0 [EffectRack1_EffectUnit3_Effect3],parameter4_down,0 [EffectRack1_EffectUnit3_Effect2],parameter11_loaded,0 @@ -988,7 +944,6 @@ [QuickEffectRack1_[Channel3]],super1_up,0 [EffectRack1_EffectUnit1_Effect4],parameter9_up_small,0 [EffectRack1_EffectUnit2_Effect4],parameter6_up_small,0 -[Microphone3],VuMeterR_set_minus_one,0 [Channel2],beatloop_4_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter7_link_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_set_minus_one,0 @@ -1006,10 +961,8 @@ [Sampler3],volume_down_small,0 [EffectRack1_EffectUnit4_Effect3],parameter6_link_type,0 [Channel4],hotcue_9_gotoandplay,0 -[Sampler4],VuMeterL_minus_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter11_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_down,0 -[Microphone4],VuMeterR_set_minus_one,0 [Channel3],beat_prev,-1 [Channel4],beatlooproll_4_activate,0 [EffectRack1_EffectUnit1_Effect3],parameter4_down,0 @@ -1093,7 +1046,6 @@ [EffectRack1_EffectUnit4],group_[Auxiliary4]_enable,0 [EqualizerRack1_[Channel4]_Effect1],parameter3_loaded,1 [EffectRack1_EffectUnit4_Effect2],parameter9_down,0 -[Sampler1],VuMeterR_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter12_loaded,0 [Sampler1],beatloop_0.5,0 [EffectRack1_EffectUnit3_Effect3],parameter7_down_small,0 @@ -1106,12 +1058,10 @@ [Channel1],hotcue_37_goto,0 [Sampler1],rate_minus_toggle,0 [EffectRack1_EffectUnit4_Effect1],parameter9_down,0 -[Sampler2],VuMeterR_minus_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter12_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter7_down_small,0 [EffectRack1_EffectUnit2_Effect1],parameter8_link_type,0 [Sampler3],hotcue_13_position,-1 -[Microphone2],VuMeterR_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter9_type,0 [EffectRack1_EffectUnit1_Effect2],parameter12_loaded,0 [Sampler2],beatlooproll_0.03125_activate,0 @@ -1124,7 +1074,6 @@ [Channel3],hotcue_24_activate_preview,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_loaded,1 [EffectRack1_EffectUnit4_Effect4],parameter9_down,0 -[Sampler3],VuMeterR_minus_toggle,0 [EqualizerRack1_[Master]],insertion_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter8_link_type,0 @@ -1143,7 +1092,6 @@ [Sampler1],hotcue_18_activate_preview,0 [EffectRack1_EffectUnit4_Effect3],parameter9_down,0 [EffectRack1_EffectUnit1_Effect1],parameter5_set_one,0 -[Sampler4],VuMeterR_minus_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_up,0 [PreviewDeck1],loop_move_2_forward,0 [QuickEffectRack1_[Channel4]_Effect1],parameter6_set_default,0 @@ -1212,7 +1160,6 @@ [Channel3],talkover,0 [EqualizerRack1_[Channel4]_Effect1],parameter7_loaded,0 [Channel2],LoadSelectedTrack,0 -[Sampler1],VuMeterL_minus_toggle,0 [Channel1],orientation_right,0 [Channel1],vinylcontrol_mode,1 [QuickEffectRack1_[Channel3]_Effect1],parameter13_down,0 @@ -1229,7 +1176,6 @@ [Channel1],LoadSelectedTrack,0 [EffectRack1_EffectUnit1_Effect3],parameter5_set_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_toggle,0 -[Sampler2],VuMeterL_minus_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter11_up,0 [QuickEffectRack1_[Channel2]],num_effectslots,1 [Channel2],vinylcontrol_mode,1 @@ -1244,7 +1190,6 @@ [EffectRack1_EffectUnit2_Effect4],parameter9_down,0 [EqualizerRack1_[Channel4]_Effect1],parameter6_loaded,0 [EffectRack1_EffectUnit1_Effect4],parameter5_set_one,0 -[Auxiliary4],VuMeterL_set_default,0 [Channel1],beatlooproll_2_activate,0 [PreviewDeck1],hotcue_16_position,-1 [Channel1],hotcue_18_enabled,0 @@ -1256,7 +1201,6 @@ [PreviewDeck1],hotcue_25_clear,0 [Channel3],hotcue_15_gotoandplay,0 [PreviewDeck1],hotcue_18_enabled,0 -[Auxiliary3],VuMeterL_set_default,0 [Channel2],beatlooproll_2_activate,0 [Sampler4],hotcue_11_position,-1 [QuickEffectRack1_[Channel3]_Effect1],parameter9_up,0 @@ -1283,7 +1227,6 @@ [Channel2],beatlooproll_8_activate,0 [EffectRack1_EffectUnit4_Effect3],prev_effect,0 [Sampler2],hotcue_35_position,-1 -[PreviewDeck1],VuMeter_up_small,0 [Sampler2],hotcue_31_activate_preview,0 [QuickEffectRack1_[Channel2]_Effect1],parameter13_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter15_down,0 @@ -1421,7 +1364,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter9_up,0 [Sampler2],beatlooproll_64_activate,0 [EffectRack1_EffectUnit4_Effect3],parameter2_type,0 -[Auxiliary2],VuMeterL_set_default,0 [Channel1],hotcue_18_goto,0 [Sampler1],hotcue_36_clear,0 [Master],rate,0 @@ -1432,7 +1374,6 @@ [EffectRack1_EffectUnit1_Effect3],parameter9_set_default,0 [EffectRack1_EffectUnit4_Effect4],parameter2_type,0 [Channel1],hotcue_15_gotoandplay,0 -[Auxiliary1],VuMeterL_set_default,0 [Channel2],hotcue_18_goto,0 [Sampler2],hotcue_36_clear,0 [Sampler2],beatloop_64_enabled,0 @@ -1591,7 +1532,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter1_set_default,0 [EqualizerRack1_[Channel3]_Effect1],parameter5_up,0 [Sampler3],beatlooproll_64_activate,0 -[Channel4],VuMeterL_down,0 [Sampler1],eject,0 [Sampler3],visual_key_distance_up_small,0 [PreviewDeck1],cue_cdj,0 @@ -1610,7 +1550,6 @@ [EffectRack1_EffectUnit3_Effect1],button_parameter16,0 [Sampler4],beatlooproll_64_activate,0 [EffectRack1_EffectUnit3_Effect1],button_parameter11,0 -[Channel3],VuMeterL_down,0 [Sampler2],eject,0 [EffectRack1_EffectUnit3_Effect1],button_parameter10,0 [EffectRack1_EffectUnit3_Effect1],button_parameter13,0 @@ -1635,7 +1574,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter4_set_zero,0 [EffectRack1_EffectUnit3_Effect2],button_parameter16,0 [EffectRack1_EffectUnit3_Effect2],button_parameter11,0 -[Channel2],VuMeterL_down,0 [EffectRack1_EffectUnit3_Effect2],button_parameter10,0 [EffectRack1_EffectUnit3_Effect2],button_parameter13,0 [QuickEffectRack1_[Channel2]_Effect1],parameter12_toggle,0 @@ -1657,7 +1595,6 @@ [EffectRack1_EffectUnit3_Effect1],parameter1_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter7_set_zero,0 [EffectRack1_EffectUnit4_Effect2],parameter4_set_zero,0 -[Channel1],VuMeterL_down,0 [PreviewDeck1],hotcue_18_position,-1 [QuickEffectRack1_[Channel4]_Effect1],parameter16_toggle,0 [Sampler3],hotcue_15_activate_preview,0 @@ -1669,7 +1606,6 @@ [EffectRack1_EffectUnit2_Effect4],parameter6_set_zero,0 [EffectRack1_EffectUnit3_Effect4],parameter7_link_inverse,0 [QuickEffectRack1_[Channel3]_Effect1],parameter13_set_default,0 -[Master],VuMeter_up_small,0 [EffectRack1_EffectUnit1_Effect4],parameter10_down_small,0 [Auxiliary1],orientation_center,0 [EffectRack1_EffectUnit3_Effect2],parameter9_set_default,0 @@ -1911,7 +1847,6 @@ [Sampler1],hotcue_15_activate_preview,0 [Channel1],hotcue_35_clear,0 [EffectRack1_EffectUnit1_Effect1],parameter8_link_inverse,0 -[Sampler3],PeakIndicator_up_small,0 [EffectRack1_EffectUnit1_Effect2],parameter10_down_small,0 [Sampler2],hotcue_12_gotoandplay,0 [EffectRack1_EffectUnit1_Effect2],parameter7_type,0 @@ -1924,10 +1859,8 @@ [EffectRack1_EffectUnit1_Effect4],parameter6_link_inverse,0 [Channel4],hotcue_19_enabled,0 [EqualizerRack1_[Channel2]_Effect1],parameter2_loaded,1 -[Sampler4],PeakIndicator_up_small,0 [Sampler3],beatsync_phase,0 [EqualizerRack1_[Master]_Effect1],parameter1_set_default,0 -[Sampler1],VuMeterR_set_one,0 [Sampler1],hotcue_31_gotoandstop,0 [Sampler3],hotcue_29_gotoandstop,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_up_small,0 @@ -1938,7 +1871,6 @@ [Channel3],hotcue_19_enabled,0 [EqualizerRack1_[Channel3]],super1_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter2_loaded,1 -[Sampler2],VuMeterR_set_one,0 [Master],enabled,1 [Sampler2],hotcue_31_gotoandstop,0 [Sampler4],hotcue_29_gotoandstop,0 @@ -1982,7 +1914,6 @@ [Microphone3],VuMeterL,0 [PreviewDeck1],reset_key,0 [Channel4],hotcue_32_set,0 -[Sampler1],PeakIndicator_up_small,0 [Sampler4],hotcue_32_gotoandplay,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_up_small,0 [Sampler2],hotcue_21_gotoandstop,0 @@ -1998,7 +1929,6 @@ [Sampler3],beat_next,-1 [Microphone4],VuMeterL,0 [EffectRack1_EffectUnit3_Effect1],parameter10_down_small,0 -[Sampler2],PeakIndicator_up_small,0 [Sampler1],hotcue_32_gotoandplay,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_up,0 [Sampler3],pitch_down_small,0 @@ -2058,7 +1988,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter1_link_inverse,0 [EffectRack1_EffectUnit2_Effect3],button_parameter8_type,0 [Sampler4],hotcue_22_gotoandplay,0 -[Microphone],VuMeterR_up,0 [Sampler4],pitch,0 [Channel1],hotcue_16_gotoandstop,0 [Sampler2],hotcue_11_gotoandstop,0 @@ -2117,12 +2046,10 @@ [EffectRack1_EffectUnit4_Effect3],button_parameter8_type,0 [Channel1],loop_in,0 [QuickEffectRack1_[Channel4]_Effect1],enabled,1 -[Sampler3],VuMeterR_set_one,0 [EffectRack1_EffectUnit2_Effect1],parameter14_link_inverse,0 [Sampler3],beatjump_32_backward,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_down,0 [EffectRack1_EffectUnit4_Effect4],button_parameter8_type,0 -[Sampler4],VuMeterR_set_one,0 [Channel3],hotcue_23_goto,0 [Sampler4],beatjump_32_backward,0 [Channel1],waveform_zoom_down_small,0 @@ -2221,7 +2148,6 @@ [PreviewDeck1],waveform_zoom_down_small,0 [EffectRack1_EffectUnit3_Effect3],button_parameter5_type,0 [EffectRack1_EffectUnit2_Effect1],parameter8_down_small,0 -[Microphone3],PeakIndicator_minus_toggle,0 [Sampler1],pitch,0 [EffectRack1_EffectUnit2_Effect3],parameter14_link_inverse,0 [Channel2],volume_set_default,0 @@ -2231,14 +2157,12 @@ [EffectRack1_EffectUnit3_Effect4],button_parameter5_type,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter4_type,0 [EffectRack1_EffectUnit2_Effect2],parameter8_down_small,0 -[Microphone4],PeakIndicator_minus_toggle,0 [QuickEffectRack1_[Channel4]],mix,1 [Channel1],waveform_zoom_toggle,0 [Channel1],volume_set_default,0 [Channel3],waveform_zoom_up,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter15_type,0 [EffectRack1_EffectUnit3_Effect3],parameter12_set_minus_one,0 -[Auxiliary1],VuMeterL_up,0 [EffectRack1_EffectUnit4_Effect3],parameter8_down_small,0 [Channel2],waveform_zoom_toggle,0 [Channel4],waveform_zoom_up,0 @@ -2248,7 +2172,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter12_set_minus_one,0 [Microphone],main_mix,0 [QuickEffectRack1_[Channel3]_Effect1],parameter12_down,0 -[Auxiliary2],VuMeterL_up,0 [PreviewDeck1],loop_scale,0 [EffectRack1_EffectUnit4_Effect4],parameter8_down_small,0 [PreviewDeck1],scratch2_enable,0 @@ -2294,7 +2217,6 @@ [Sampler],SaveSamplerBank,0 [EqualizerRack1_[Channel1]_Effect1],parameter10_set_default,0 [Sampler1],hotcue_6_position,-1 -[Sampler2],VuMeterL_down,0 [Channel2],hotcue_3_gotoandstop,0 [Channel4],rateSearch_set_default,0 [Channel2],volume_set_minus_one,0 @@ -2304,7 +2226,6 @@ [EffectRack1_EffectUnit4_Effect4],loaded,0 [Channel2],waveform_zoom_up,0 [EffectRack1_EffectUnit1_Effect1],num_parameterslots,16 -[Sampler1],VuMeterL_down,0 [Sampler4],hotcue_6_position,-1 [EqualizerRack1_[Master]_Effect1],parameter5_set_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter7_down_small,0 @@ -2341,7 +2262,6 @@ [Sampler4],waveform_zoom_minus_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter12_set_minus_one,0 [Sampler3],beatjump_16_backward,0 -[Auxiliary3],VuMeterL_up,0 [QuickEffectRack1_[Channel4]_Effect1],parameter14_toggle,0 [Sampler1],hotcue_4_position,-1 [Channel3],visual_key_distance_set_zero,0 @@ -2352,13 +2272,11 @@ [EffectRack1_EffectUnit3_Effect2],parameter12_set_minus_one,0 [PreviewDeck1],hotcue_24_goto,0 [Sampler4],beatjump_16_backward,0 -[Auxiliary4],VuMeterL_up,0 [Sampler4],hotcue_4_position,-1 [Channel4],visual_key_distance_set_zero,0 [Microphone2],mute,0 [Channel1],keylockMode,0 [Playlist],SelectNextTrack,0 -[Sampler4],VuMeterL_down,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter11_type,0 [Sampler2],hotcue_2_enabled,0 [PreviewDeck1],hotcue_8_gotoandstop,0 @@ -2372,16 +2290,13 @@ [Sampler2],hotcue_8_position,-1 [Sampler3],sync_mode,0 [EqualizerRack1_[Channel2]],mix_set_default,0 -[Sampler3],VuMeterL_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter9,0 [EqualizerRack1_[Channel3]_Effect1],parameter8,0 [Sampler1],hotcue_2_enabled,0 [EqualizerRack1_[Channel3]_Effect1],parameter5,0 [EqualizerRack1_[Channel3]_Effect1],parameter4,0 [PreviewDeck1],start_stop,0 -[Microphone2],PeakIndicator_minus_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter7,0 -[Channel1],VuMeterL_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter6,0 [Channel4],bpm_set_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter1,1 @@ -2396,7 +2311,6 @@ [Sampler4],sync_mode,0 [QuickEffectRack1_[Channel2]_Effect1],parameter12_down,0 [Sampler4],vinylcontrol_signal_enabled,1 -[Channel2],VuMeterL_down_small,0 [EffectRack1_EffectUnit2_Effect4],loaded,0 [EffectRack1_EffectUnit3_Effect1],num_parameterslots,16 [Channel1],waveform_zoom_set_zero,0 @@ -2412,7 +2326,6 @@ [EffectRack1_EffectUnit3_Effect4],num_parameterslots,16 [Channel2],waveform_zoom_set_zero,0 [Sampler3],hotcue_8_position,-1 -[Sampler3],VuMeterR_down_small,0 [Master],headMix,-1 [Sampler4],hotcue_21_goto,0 [EffectRack1_EffectUnit4_Effect1],parameter5_down_small,0 @@ -2424,7 +2337,6 @@ [Sampler1],beatjump_16_backward,0 [EffectRack1_EffectUnit3_Effect3],num_parameterslots,16 [Sampler1],volume_up_small,0 -[Sampler4],VuMeterR_down_small,0 [EffectRack1_EffectUnit4_Effect2],parameter5_down_small,0 [Sampler2],beatjump_16_backward,0 [Channel4],loop_end_position,-1 @@ -2492,9 +2404,7 @@ [Sampler1],sync_mode,0 [Sampler3],volume_up_small,0 [Channel4],hotcue_33_set,0 -[PreviewDeck1],PeakIndicator_minus_toggle,0 [Channel4],pitch_adjust_set_zero,0 -[Channel3],VuMeterL_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter14_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_down,0 [EffectRack1_EffectUnit1_Effect3],parameter4_set_one,0 @@ -2508,10 +2418,8 @@ [Channel1],pitch_adjust_set_zero,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter4_type,0 [Sampler4],beatloop_4_enabled,0 -[Channel4],VuMeterL_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter4_set_one,0 [Channel2],beatloop_0.25_activate,0 -[Channel3],VuMeter_set_zero,0 [Sampler2],hotcue_12_activate_preview,0 [Channel1],hotcue_33_activate_preview,0 [Sampler4],hotcue_37_clear,0 @@ -2527,13 +2435,11 @@ [Channel2],hotcue_37_enabled,0 [Sampler3],beats_adjust_faster,0 [EffectRack1_EffectUnit4_Effect4],parameter13_link_inverse,0 -[Channel4],VuMeter_set_zero,0 [Channel2],hotcue_33_activate_preview,0 [Sampler1],hotcue_37_clear,0 [EqualizerRack1_[Channel4]_Effect1],parameter8_set_zero,0 [EffectRack1_EffectUnit4_Effect3],parameter5_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter1_link_inverse,0 -[PreviewDeck1],VuMeterL_up_small,0 [Sampler4],hotcue_8_gotoandstop,0 [EffectRack1_EffectUnit2_Effect2],parameter8_down,0 [Channel2],pitch_adjust,0 @@ -2546,19 +2452,15 @@ [QuickEffectRack1_[Channel4]],enabled,1 [EffectRack1_EffectUnit4_Effect4],parameter5_down_small,0 [QuickEffectRack1_[Channel1]_Effect1],parameter4_down,0 -[PreviewDeck1],PeakIndicator_down_small,0 [EffectRack1_EffectUnit2_Effect1],parameter8_down,0 [Sampler1],beatloop_4_enabled,0 [EqualizerRack1_[Channel4]_Effect1],parameter6_set_zero,0 -[Microphone2],VuMeter_up_small,0 [Channel4],pitch_adjust_up_small,0 -[PreviewDeck1],VuMeterR_up_small,0 [Channel1],reverseroll,0 [Channel1],hotcue_33_set,0 [EqualizerRack1_[Channel2]_Effect1],parameter1_set_one,0 [EffectRack1_EffectUnit2_Effect4],parameter8_down,0 [ReplayGain],DefaultBoost_down,0 -[Microphone3],VuMeter_up_small,0 [EffectRack1_EffectUnit3_Effect1],parameter4_set_one,0 [Channel1],pitch_adjust_up_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter13_up,0 @@ -2568,18 +2470,15 @@ [Master],crossfader_set_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter4_set_zero,0 [ReplayGain],DefaultBoost_toggle,0 -[Microphone],VuMeterR_set_default,0 [Sampler1],start_play,0 [EffectRack1_EffectUnit2_Effect3],parameter8_down,0 [EffectRack1_EffectUnit1_Effect1],parameter15_up,0 -[Microphone4],VuMeter_up_small,0 [EffectRack1_EffectUnit3_Effect2],parameter4_set_one,0 [Channel2],pitch_adjust_up_small,0 [EffectRack1_EffectUnit4_Effect4],parameter16_link_inverse,0 [PreviewDeck1],hotcue_34_activate,0 [Sampler1],hotcue_17_clear,0 [Channel3],reverse,0 -[Sampler1],VuMeterR_down_small,0 [Sampler3],pregain_set_zero,0 [QuickEffectRack1_[Channel3]_Effect1],num_button_parameterslots,16 [Channel1],orientation_center,0 @@ -2592,13 +2491,11 @@ [Sampler1],beatloop_32_toggle,0 [Sampler2],hotcue_17_clear,0 [Sampler3],hotcue_20_activate_preview,0 -[Sampler2],VuMeterR_down_small,0 [EffectRack1_EffectUnit2_Effect1],parameter13_up,0 [Sampler4],pregain_set_zero,0 [QuickEffectRack1_[Channel2]_Effect1],num_button_parameters,0 [Sampler1],hotcue_8_gotoandstop,0 [Channel2],orientation_center,0 -[Master],VuMeter_set_zero,0 [Channel4],visual_key_distance_set_one,0 [EffectRack1_EffectUnit4_Effect2],parameter15_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],parameter1_set_minus_one,0 @@ -2613,7 +2510,6 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter11,0 [QuickEffectRack1_[Channel3]_Effect1],parameter10,0 [QuickEffectRack1_[Channel3]_Effect1],parameter13,0 -[PreviewDeck1],VuMeterL_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter12,0 [Sampler2],hotcue_8_gotoandstop,0 [EqualizerRack1_[Channel2]_Effect1],num_parameterslots,16 @@ -2621,7 +2517,6 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter2_type,2 [QuickEffectRack1_[Channel3]_Effect1],parameter5_set_default,0 [EffectRack1_EffectUnit4_Effect1],parameter15_link_inverse,0 -[Microphone],VuMeterR_down,0 [EqualizerRack1_[Channel2]],mix_down_small,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter4_type,0 [Sampler2],hotcue_27_clear,0 @@ -2702,12 +2597,9 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter9_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_set_zero,0 [QuickEffectRack1_[Channel2]],group_[Channel2]_enable,1 -[Sampler1],VuMeterL_set_one,0 [EffectRack1_EffectUnit2_Effect3],parameter16_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],parameter13_up,0 [Master],delay_up_small,0 -[Channel1],VuMeter_set_zero,0 -[Sampler4],PeakIndicator_down,0 [Channel2],hotcue_8_gotoandplay,0 [Channel2],reverse,0 [Sampler2],cue_gotoandplay,0 @@ -2722,15 +2614,12 @@ [PreviewDeck1],hotcue_28_activate,0 [PreviewDeck1],hotcue_33_goto,0 [EqualizerRack1_[Master]],mix_up_small,0 -[Sampler2],VuMeterL_set_one,0 [EffectRack1_EffectUnit1_Effect3],parameter15_up,0 [Sampler3],hotcue_2_activate_preview,0 [EffectRack1_EffectUnit2_Effect2],parameter15_link_inverse,0 [Channel4],hotcue_37_enabled,0 [Sampler1],beats_adjust_faster,0 [EffectRack1_EffectUnit4_Effect2],parameter13_link_inverse,0 -[Channel2],VuMeter_set_zero,0 -[Sampler3],PeakIndicator_down,0 [Channel1],reverse,0 [EqualizerRack1_[Channel1]_Effect1],parameter6_set_zero,0 [Channel3],hotcue_7_clear,0 @@ -2844,7 +2733,6 @@ [Channel2],hotcue_7_clear,0 [PreviewDeck1],hotcue_22_activate,0 [Master],crossfader_set_zero,0 -[PreviewDeck1],VuMeterL_set_one,0 [EffectRack1_EffectUnit2_Effect3],parameter5_type,0 [EffectRack1_EffectUnit1_Effect3],parameter3_up,0 [EffectRack1_EffectUnit2_Effect3],parameter9_up,0 @@ -2859,7 +2747,6 @@ [EffectRack1_EffectUnit1_Effect1],parameter7_up,0 [EffectRack1_EffectUnit2_Effect1],parameter5_up,0 [EffectRack1_EffectUnit2_Effect4],parameter5_type,0 -[PreviewDeck1],PeakIndicator_set_one,0 [EffectRack1_EffectUnit1_Effect4],parameter3_up,0 [EffectRack1_EffectUnit2_Effect4],parameter9_up,0 [EffectRack1_EffectUnit2_Effect1],parameter13_link_inverse,0 @@ -2916,7 +2803,6 @@ [Sampler1],loop_move_0.03125_backward,0 [EqualizerRack1_[Channel2]_Effect1],parameter3,1 [EqualizerRack1_[Channel2]_Effect1],parameter2,1 -[Master],PeakIndicator_down,0 [EffectRack1_EffectUnit3_Effect4],parameter15_up,0 [EffectRack1_EffectUnit3_Effect3],parameter6_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_type,0 @@ -2936,7 +2822,6 @@ [Sampler2],loop_move_0.03125_backward,0 [EffectRack1_EffectUnit4_Effect2],parameter11_down,0 [EffectRack1_EffectUnit3_Effect4],parameter6_type,0 -[Sampler3],VuMeterL_set_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter5_type,0 [EffectRack1_EffectUnit2_Effect1],parameter1_up,0 @@ -2944,7 +2829,6 @@ [Sampler3],hotcue_25_activate,0 [PreviewDeck1],beatloop_64,0 [EffectRack1_EffectUnit4_Effect1],parameter12_link_inverse,0 -[Sampler2],PeakIndicator_down,0 [PreviewDeck1],hotcue_23_clear,0 [Channel3],hotcue_14_gotoandplay,0 [Sampler2],hotcue_9_clear,0 @@ -2955,7 +2839,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter11_down,0 [EffectRack1_EffectUnit2_Effect1],parameter3_set_minus_one,0 [Sampler1],beatjump_0.25_forward,0 -[Sampler4],VuMeterL_set_one,0 [EffectRack1_EffectUnit4_Effect2],parameter5_type,0 [EffectRack1_EffectUnit2_Effect2],parameter1_up,0 [EffectRack1_EffectUnit2_Effect4],parameter12_link_inverse,0 @@ -2963,7 +2846,6 @@ [Sampler4],hotcue_25_activate,0 [EffectRack1_EffectUnit4_Effect3],parameter5_up,0 [QuickEffectRack1_[Channel4]_Effect1],parameter13_up,0 -[Sampler1],PeakIndicator_down,0 [Channel4],hotcue_14_gotoandplay,0 [Sampler3],hotcue_9_clear,0 [Channel1],passthrough,0 @@ -3088,7 +2970,6 @@ [Channel4],hotcue_32_clear,0 [Sampler3],loop_move_0.03125_backward,0 [Sampler2],hotcue_15_goto,0 -[Channel1],VuMeter_up,0 [PreviewDeck1],playposition_set_one,0 [EffectRack1_EffectUnit3_Effect1],parameter6_type,0 [EffectRack1_EffectUnit3_Effect2],parameter9_set_one,0 @@ -3105,7 +2986,6 @@ [Sampler4],loop_move_0.03125_backward,0 [EqualizerRack1_[Channel3]_Effect1],parameter8_link_inverse,0 [EffectRack1_EffectUnit1_Effect3],parameter6_type,0 -[Channel2],VuMeter_up,0 [EffectRack1_EffectUnit3_Effect2],parameter6_type,0 [EffectRack1_EffectUnit2_Effect3],parameter15_toggle,0 [PreviewDeck1],hotcue_10_goto,0 @@ -3141,7 +3021,6 @@ [Channel3],beatloop_0.0625,0 [EffectRack1_EffectUnit4_Effect1],parameter11_toggle,0 [Sampler4],beat_closest,-1 -[Master],VuMeterL_down,0 [Sampler4],bpm_toggle,0 [Channel4],hotcue_12_clear,0 [EqualizerRack1_[Channel2]],super1_down,0 @@ -3181,7 +3060,6 @@ [Sampler4],hotcue_13_activate,0 [QuickEffectRack1_[Channel4]_Effect1],num_button_parameterslots,16 [Channel2],hotcue_14_gotoandplay,0 -[Auxiliary2],VuMeter_set_default,0 [EffectRack1_EffectUnit1_Effect3],button_parameter6_type,0 [Sampler1],hotcue_23_activate,0 [Sampler3],hotcue_19_activate,0 @@ -3193,7 +3071,6 @@ [EffectRack1_EffectUnit4],mix_up,0 [EffectRack1_EffectUnit4_Effect3],parameter10_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter13_set_one,0 -[Auxiliary1],VuMeter_set_default,0 [EffectRack1_EffectUnit1_Effect4],button_parameter6_type,0 [Sampler2],hotcue_23_activate,0 [Sampler1],visual_key_distance_toggle,0 @@ -3209,8 +3086,6 @@ [Sampler3],hotcue_17_activate,0 [EqualizerRack1_[Channel1]_Effect1],num_parameterslots,16 [QuickEffectRack1_[Channel4]_Effect1],parameter16_set_default,0 -[Microphone2],VuMeterR_up,0 -[Auxiliary3],PeakIndicator_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter6_link_inverse,0 [Sampler2],visual_key_distance_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter16_type,0 @@ -3224,8 +3099,6 @@ [Sampler2],hotcue_29_activate,0 [Sampler4],hotcue_17_activate,0 [EqualizerRack1_[Channel1]],super1_down_small,0 -[Microphone3],VuMeterR_up,0 -[Auxiliary4],PeakIndicator_up_small,0 [PreviewDeck1],rate_temp_down,0 [EffectRack1_EffectUnit4_Effect4],parameter16_type,0 [EffectRack1_EffectUnit2_Effect4],parameter12_down_small,0 @@ -3240,7 +3113,6 @@ [EffectRack1_EffectUnit4_Effect2],parameter12_toggle,0 [Channel1],hotcue_20_set,0 [PreviewDeck1],beat_next,-1 -[Microphone4],VuMeterR_up,0 [Channel2],visual_key_distance_down,0 [Sampler2],hotcue_27_activate,0 [EffectRack1_EffectUnit1_Effect1],parameter6_type,0 @@ -3290,7 +3162,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter16_set_zero,0 [PreviewDeck1],loop_move_32_backward,0 [EffectRack1_EffectUnit3_Effect2],parameter11_set_minus_one,0 -[Channel3],VuMeter_up,0 [EffectRack1_EffectUnit1_Effect1],parameter5_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter6_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter9_minus_toggle,0 @@ -3314,11 +3185,9 @@ [Sampler1],beatloop_0.25_enabled,0 [EffectRack1_EffectUnit3_Effect1],parameter3_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter8_toggle,0 -[Auxiliary1],PeakIndicator_up_small,0 [EqualizerRack1_[Channel4]_Effect1],parameter3,1 [EffectRack1_EffectUnit4_Effect4],parameter15_set_default,0 [EqualizerRack1_[Channel4]_Effect1],parameter2,1 -[Channel4],VuMeter_up,0 [EffectRack1_EffectUnit1_Effect2],parameter5_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter6_toggle,0 [EffectRack1_EffectUnit2_Effect3],parameter10_toggle,0 @@ -3331,7 +3200,6 @@ [Channel1],rate_set_one,0 [EffectRack1_EffectUnit3_Effect2],parameter3_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter8_toggle,0 -[Auxiliary2],PeakIndicator_up_small,0 [EffectRack1_EffectUnit4_Effect3],parameter15_set_default,0 [EffectRack1_EffectUnit1_Effect1],parameter4_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter7_toggle,0 @@ -3357,7 +3225,6 @@ [EqualizerRack1_[Master]_Effect1],parameter6_type,0 [Microphone],volume_down,0 [Sampler4],end_of_track,0 -[Channel1],VuMeterL_set_minus_one,0 [EffectRack1_EffectUnit4],mix_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter2_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter9_toggle,0 @@ -3380,7 +3247,6 @@ [Channel2],loop_move_32_backward,0 [QuickEffectRack1_[Channel2]_Effect1],parameter10_set_zero,0 [Sampler3],end_of_track,0 -[Channel2],VuMeterL_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter5_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter6_toggle,0 [Sampler2],hotcue_15_activate,0 @@ -3398,7 +3264,6 @@ [Sampler3],keylockMode,0 [EffectRack1_EffectUnit3_Effect2],parameter5_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter6_toggle,0 -[Microphone],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter6_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter5_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter12_toggle,0 @@ -3406,7 +3271,6 @@ [Sampler4],loop_move_1_forward,0 [EffectRack1_EffectUnit1_Effect1],parameter6_set_one,0 [Sampler2],hotcue_13_activate,0 -[Auxiliary4],VuMeter_set_default,0 [Sampler4],orientation_center,0 [Sampler4],keylockMode,0 [EffectRack1_EffectUnit3_Effect1],parameter4_toggle,0 @@ -3421,12 +3285,10 @@ [Channel3],scratch2,0 [EffectRack1_EffectUnit1_Effect2],parameter6_set_one,0 [EffectRack1_EffectUnit2_Effect3],parameter13_set_one,0 -[Auxiliary3],VuMeter_set_default,0 [Channel2],visual_key_distance,0 [QuickEffectRack1_[Channel3]_Effect1],parameter14_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter4_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter7_toggle,0 -[Master],VuMeterR_set_default,0 [EffectRack1_EffectUnit4_Effect1],parameter15_set_default,0 [Sampler2],hotcue_19_activate,0 [Sampler3],visual_key_distance_toggle,0 @@ -3470,7 +3332,6 @@ [EffectRack1_EffectUnit1_Effect1],parameter8_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter3_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter10_link_inverse,0 -[Channel1],PeakIndicator_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter1,0 [Channel2],hotcue_29_activate_preview,0 [Channel3],hotcue_30_activate_preview,0 @@ -3483,7 +3344,6 @@ [EffectRack1_EffectUnit1_Effect4],parameter3_toggle,0 [EffectRack1_EffectUnit2_Effect3],parameter11_toggle,0 [Channel1],pitch_down_small,0 -[Channel2],PeakIndicator_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter5_type,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter1,0 [Channel4],hotcue_30_activate_preview,0 @@ -3509,9 +3369,7 @@ [EffectRack1_EffectUnit2_Effect4],parameter6_set_default,0 [EffectRack1_EffectUnit1_Effect3],parameter6_set_one,0 [EqualizerRack1_[Master]_Effect1],button_parameter12,0 -[Channel3],PeakIndicator_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter16_set_zero,0 -[Microphone2],PeakIndicator_down_small,0 [Sampler2],keylockMode,0 [Sampler3],beatjump_0.03125_forward,0 [EqualizerRack1_[Channel1]_Effect1],parameter9,0 @@ -3527,19 +3385,15 @@ [EqualizerRack1_[Channel1]_Effect1],parameter7,0 [EqualizerRack1_[Channel1]_Effect1],parameter6,0 [Sampler1],hotcue_11_activate,0 -[PreviewDeck1],VuMeter_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter1,1 [Channel4],hotcue_27_position,-1 [EffectRack1_EffectUnit2_Effect3],parameter6_set_default,0 [EffectRack1_EffectUnit1_Effect4],parameter6_set_one,0 [Channel3],beatloop_0.25_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter3,1 -[Channel4],PeakIndicator_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter2,1 -[Microphone3],PeakIndicator_down_small,0 [Channel3],loop_move_32_backward,0 [Sampler1],pitch_adjust_up,0 -[Channel3],VuMeterL_set_minus_one,0 [Sampler4],beatjump_0.03125_forward,0 [EffectRack1_EffectUnit3_Effect2],parameter9_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter2_toggle,0 @@ -3551,11 +3405,9 @@ [Sampler2],hotcue_11_activate,0 [Channel3],hotcue_27_position,-1 [Channel4],beatloop_0.25_toggle,0 -[Microphone4],PeakIndicator_down_small,0 [Channel4],loop_move_32_backward,0 [PreviewDeck1],rateSearch_up_small,0 [Sampler2],pitch_adjust_up,0 -[Channel4],VuMeterL_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter8_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter3_toggle,0 [Channel4],hotcue_29_position,-1 @@ -3578,7 +3430,6 @@ [Sampler4],hotcue_7_activate_preview,0 [Channel4],hotcue_23_position,-1 [Sampler3],hotcue_33_activate,0 -[Auxiliary4],PeakIndicator_down,0 [EffectRack1_EffectUnit1],mix_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter12_down_small,0 [EffectRack1_EffectUnit2_Effect4],parameter10_type,0 @@ -3593,7 +3444,6 @@ [Channel3],hotcue_23_position,-1 [Sampler4],hotcue_33_activate,0 [Channel1],hotcue_19_gotoandstop,0 -[Auxiliary3],PeakIndicator_down,0 [EffectRack1_EffectUnit2],mix_set_zero,0 [EffectRack1_EffectUnit4_Effect2],parameter12_down_small,0 [Channel2],hotcue_13_clear,0 @@ -3622,7 +3472,6 @@ [EffectRack1_EffectUnit1_Effect4],parameter5_loaded,0 [EffectRack1_EffectUnit2_Effect1],parameter6_set_default,0 [EffectRack1_EffectUnit1_Effect4],button_parameter4_type,0 -[Auxiliary2],VuMeterR_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1_set_minus_one,0 [Sampler3],visual_key_distance_down,0 [EffectRack1_EffectUnit2_Effect1],button_parameter1_type,0 @@ -3639,7 +3488,6 @@ [EffectRack1_EffectUnit1_Effect1],parameter6_loaded,0 [EffectRack1_EffectUnit1_Effect3],parameter5_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter14_set_zero,0 -[Auxiliary1],VuMeterR_down,0 [QuickEffectRack1],num_effectunits,4 [Microphone3],volume_set_one,0 [EffectRack1_EffectUnit2_Effect2],button_parameter1_type,0 @@ -3690,11 +3538,9 @@ [EffectRack1_EffectUnit1_Effect2],parameter8_loaded,0 [EffectRack1_EffectUnit1_Effect4],parameter3_loaded,0 [Channel2],hotcue_27_position,-1 -[Sampler1],PeakIndicator_toggle,0 [Sampler2],hotcue_15_gotoandplay,0 [Channel2],loop_move_0.25_backward,0 [Channel1],hotcue_21_gotoandstop,0 -[Microphone],VuMeterR_toggle,0 [Sampler2],beatjump_0.0625_forward,0 [EffectRack1_EffectUnit3_Effect2],parameter11_set_default,0 [Sampler2],beatjump_0.03125_forward,0 @@ -3710,7 +3556,6 @@ [EffectRack1_EffectUnit1_Effect1],parameter8_loaded,0 [EffectRack1_EffectUnit1_Effect3],parameter3_loaded,0 [Channel1],hotcue_27_position,-1 -[Sampler2],PeakIndicator_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter14_up_small,0 [Sampler3],hotcue_35_gotoandplay,0 [EqualizerRack1_[Master]_Effect1],parameter2_set_default,0 @@ -3730,7 +3575,6 @@ [EqualizerRack1_[Master]_Effect1],parameter13_up_small,0 [Sampler1],hotcue_7_activate_preview,0 [Sampler4],hotcue_35_gotoandplay,0 -[Auxiliary4],VuMeterR_down,0 [Channel3],hotcue_21_gotoandstop,0 [QuickEffectRack1_[Channel4]_Effect1],parameter10_type,0 [Channel4],hotcue_17_position,-1 @@ -3740,7 +3584,6 @@ [EffectRack1_EffectUnit1_Effect3],parameter8_loaded,0 [Sampler1],hotcue_25_gotoandplay,0 [Sampler2],hotcue_7_activate_preview,0 -[Auxiliary3],VuMeterR_down,0 [Channel2],hotcue_23_position,-1 [Sampler3],PeakIndicator,0 [Channel4],hotcue_21_gotoandstop,0 @@ -3760,7 +3603,6 @@ [Sampler3],beatlooproll_0.125_activate,0 [Sampler4],PeakIndicator,0 [Channel1],hotcue_31_gotoandstop,0 -[Microphone],VuMeterL_toggle,0 [Channel3],hotcue_29_gotoandstop,0 [Channel1],hotcue_27_set,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_minus_toggle,0 @@ -3791,7 +3633,6 @@ [Sampler3],beatjump_32_forward,0 [EffectRack1_EffectUnit3_Effect1],parameter7_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter4_loaded,0 -[Microphone],VuMeter_down,0 [EffectRack1_EffectUnit1_Effect2],parameter5_loaded,0 [EffectRack1_EffectUnit1_Effect4],parameter6_loaded,0 [Sampler4],hotcue_25_gotoandplay,0 @@ -3820,14 +3661,12 @@ [EffectRack1_EffectUnit1_Effect3],parameter2_set_default,0 [EffectRack1_EffectUnit4_Effect3],parameter13_up_small,0 [Channel4],hotcue_11_gotoandstop,0 -[Auxiliary2],PeakIndicator_down,0 [Channel1],hotcue_17_activate_preview,0 [PreviewDeck1],hotcue_17_gotoandstop,0 [EffectRack1_EffectUnit2_Effect2],parameter10_type,0 [Channel3],hotcue_13_clear,0 [Sampler2],beatloop_0.03125_activate,0 [EffectRack1_EffectUnit1_Effect2],button_parameter2_type,0 -[PreviewDeck1],VuMeter_down,0 [Channel2],hotcue_11_position,-1 [EffectRack1_EffectUnit3_Effect1],parameter6_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter5_loaded,0 @@ -3842,7 +3681,6 @@ [Channel3],hotcue_15_position,-1 [EffectRack1_EffectUnit4_Effect4],parameter13_up_small,0 [Channel3],hotcue_19_gotoandstop,0 -[Auxiliary1],PeakIndicator_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_minus_toggle,0 [Channel2],hotcue_17_activate_preview,0 [Channel4],hotcue_13_clear,0 @@ -3869,7 +3707,6 @@ [EffectRack1_EffectUnit3_Effect1],parameter9_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter2_loaded,0 [Channel2],visual_key,0 -[Sampler3],PeakIndicator_toggle,0 [PreviewDeck1],VuMeterL,0 [Sampler4],hotcue_15_gotoandplay,0 [Sampler2],visual_key_distance_set_one,0 @@ -3887,7 +3724,6 @@ [EffectRack1_EffectUnit3_Effect2],parameter8_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter3_loaded,0 [EqualizerRack1_[Master]_Effect1],parameter12_link_inverse,0 -[Sampler4],PeakIndicator_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_set_zero,0 [Sampler2],beatlooproll_0.125_activate,0 [EffectRack1_EffectUnit2_Effect4],button_parameter1_type,0 @@ -3916,7 +3752,6 @@ [Channel2],hotcue_17_position,-1 [EqualizerRack1_[Channel4]_Effect1],parameter5_down,0 [Sampler3],beatloop_0.03125_activate,0 -[PreviewDeck1],VuMeterR_set_one,0 [PreviewDeck1],hotcue_27_goto,0 [EffectRack1_EffectUnit1_Effect2],parameter6_down_small,0 [EffectRack1_EffectUnit3_Effect2],parameter3_loaded,0 @@ -4100,7 +3935,6 @@ [PreviewDeck1],hotcue_16_enabled,0 [Channel1],hotcue_28_set,0 [Sampler3],visual_key_distance_set_one,0 -[Microphone3],VuMeterL_up_small,0 [EffectRack1_EffectUnit3_Effect2],parameter2_set_default,0 [Channel3],hotcue_23_set,0 [Channel1],loop_move_4_forward,0 @@ -4116,7 +3950,6 @@ [Channel2],hotcue_28_set,0 [Sampler4],visual_key_distance_set_one,0 [Channel3],filterWaveformEnable,1 -[Microphone4],VuMeterL_up_small,0 [Channel1],scratch_position_enable,0 [EffectRack1_EffectUnit3_Effect1],parameter2_set_default,0 [EffectRack1_EffectUnit4_Effect1],parameter11_up_small,0 @@ -4126,7 +3959,6 @@ [Channel2],loop_move_4_forward,0 [EffectRack1_EffectUnit4_Effect2],parameter2_set_minus_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter12_minus_toggle,0 -[Microphone3],VuMeterR_up_small,0 [Sampler3],file_bpm,0 [EffectRack1_EffectUnit3_Effect2],parameter1_loaded,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_down,0 @@ -4139,7 +3971,6 @@ [Auxiliary4],pregain_set_zero,0 [EffectRack1_EffectUnit3_Effect3],button_parameter2_type,0 [EffectRack1_EffectUnit4_Effect3],parameter2_set_minus_one,0 -[Microphone4],VuMeterR_up_small,0 [Sampler4],file_bpm,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter5_type,0 [EffectRack1_EffectUnit3_Effect1],parameter1_loaded,0 @@ -4161,7 +3992,6 @@ [PreviewDeck1],hotcue_36_enabled,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_down,0 [EffectRack1_EffectUnit2_Effect2],parameter3_down,0 -[Auxiliary3],PeakIndicator_up,0 [Channel3],rate_perm_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter11_minus_toggle,0 [Channel3],hotcue_37_position,-1 @@ -4169,18 +3999,14 @@ [Channel1],hotcue_4_clear,0 [EffectRack1_EffectUnit2_Effect1],parameter3_down,0 [Microphone],VuMeter,0 -[Auxiliary4],PeakIndicator_up,0 [Channel1],hotcue_23_set,0 [Channel2],hotcue_4_clear,0 [Channel3],beatlooproll_0.5_activate,0 [PreviewDeck1],wheel,0 [EffectRack1_EffectUnit4_Effect3],parameter10_set_minus_one,0 [EffectRack1_EffectUnit2_Effect4],parameter3_down,0 -[PreviewDeck1],PeakIndicator_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_down_small,0 -[Microphone2],VuMeterL_up_small,0 [Sampler1],waveform_zoom_up,0 -[Auxiliary1],PeakIndicator_up,0 [Channel2],hotcue_23_set,0 [Channel4],hotcue_33_position,-1 [Sampler1],loop_move_16_backward,0 @@ -4192,13 +4018,10 @@ [EqualizerRack1_[Channel3]],enabled,1 [PreviewDeck1],hotcue_22_gotoandplay,0 [Sampler2],waveform_zoom_up,0 -[Auxiliary2],PeakIndicator_up,0 [Channel3],hotcue_33_position,-1 [Sampler2],loop_move_16_backward,0 -[Microphone2],VuMeterR_up_small,0 [QuickEffectRack1_[Channel2]],super1_set_zero,0 [Sampler2],file_bpm,0 -[Sampler3],VuMeterR_set_zero,0 [EffectRack1_EffectUnit3_Effect3],parameter1_loaded,0 [Sampler1],beatlooproll_32_activate,0 [EffectRack1_EffectUnit3_Effect3],parameter3_set_one,0 @@ -4211,7 +4034,6 @@ [QuickEffectRack1_[Channel2]],mix_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter13_set_default,0 [Sampler3],beatlooproll_0.25_activate,0 -[Sampler4],VuMeterR_set_zero,0 [Channel2],hotcue_31_position,-1 [Sampler2],beatlooproll_32_activate,0 [EffectRack1_EffectUnit1],group_[Auxiliary3]_enable,0 @@ -4222,7 +4044,6 @@ [EqualizerRack1_[Channel3]_Effect1],parameter13_down,0 [Channel3],hotcue_35_position,-1 [Sampler4],waveform_zoom_up,0 -[Sampler3],VuMeterL_set_zero,0 [PreviewDeck1],playposition_set_minus_one,0 [PreviewDeck1],hotcue_18_clear,0 [EqualizerRack1_[Channel3]_Effect1],parameter6_down_small,0 @@ -4239,7 +4060,6 @@ [EqualizerRack1_[Channel4]_Effect1],parameter8_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter13,0 [EffectRack1_EffectUnit4_Effect1],parameter12,0 -[Sampler4],VuMeterL_set_zero,0 [Sampler3],hotcue_14_gotoandstop,0 [Sampler1],hotcue_6_clear,0 [Sampler1],loop_move_0.5_forward,0 @@ -4291,7 +4111,6 @@ [Sampler4],hotcue_6_clear,0 [PreviewDeck1],beatloop_0.03125_enabled,0 [Sampler2],beatloop_1_activate,0 -[PreviewDeck1],VuMeterR_up,0 [Channel3],hotcue_32_enabled,0 [EffectRack1_EffectUnit2_Effect4],button_parameter10_type,0 [Channel1],rate_perm_down,0 @@ -4299,11 +4118,9 @@ [EffectRack1_EffectUnit1_Effect2],parameter3_down_small,0 [EqualizerRack1_[Master]_Effect1],parameter5_down_small,0 [Channel4],loop_move_4_forward,0 -[PreviewDeck1],VuMeterL_toggle,0 [Channel1],hotcue_37_position,-1 [Sampler3],loop_move_32_backward,0 [Sampler1],rate_temp_up_small,0 -[Microphone2],PeakIndicator_set_minus_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_up_small,0 [PreviewDeck1],hotcue_3_gotoandstop,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter16_type,0 @@ -4311,7 +4128,6 @@ [EqualizerRack1_[Master]_Effect1],parameter11_type,0 [Sampler4],hotcue_24_gotoandstop,0 [Sampler4],loop_move_32_backward,0 -[Auxiliary3],VuMeterR_set_minus_one,0 [Sampler2],rate_temp_up_small,0 [Channel1],beatlooproll_0.5_activate,0 [EffectRack1_EffectUnit4_Effect1],parameter10_set_minus_one,0 @@ -4336,7 +4152,6 @@ [Channel3],playposition_minus_toggle,0 [EffectRack1],num_effectunits,4 [Channel2],hotcue_33_position,-1 -[Auxiliary4],VuMeterR_set_minus_one,0 [Sampler3],rate_temp_up_small,0 [Channel2],beatlooproll_0.5_activate,0 [Sampler3],loop_move_0.5_forward,0 @@ -4374,7 +4189,6 @@ [Channel2],hotcue_35_position,-1 [EqualizerRack1_[Master]_Effect1],button_parameter12_type,0 [Sampler3],hotcue_34_gotoandstop,0 -[PreviewDeck1],VuMeterR_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter12_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],prev_effect,0 [Sampler3],hotcue_25_clear,0 @@ -4415,7 +4229,6 @@ [EffectRack1_EffectUnit4_Effect2],parameter1_down,0 [Sampler4],hotcue_15_clear,0 [Sampler1],rate_up,0 -[Sampler1],VuMeterR_set_zero,0 [Sampler2],hotcue_29_enabled,0 [EffectRack1_EffectUnit3_Effect3],parameter3_down_small,0 [Channel3],visual_key_distance_up,0 @@ -4431,7 +4244,6 @@ [Sampler2],rate_up,0 [Channel3],beatloop_32_toggle,0 [Sampler1],hotcue_29_enabled,0 -[Sampler2],VuMeterR_set_zero,0 [EffectRack1_EffectUnit3_Effect4],parameter3_down_small,0 [Channel4],visual_key_distance_up,0 [Sampler4],beatlooproll_32_activate,0 @@ -4439,8 +4251,6 @@ [Sampler3],pitch_adjust_down,0 [EffectRack1_EffectUnit3_Effect3],parameter13_down,0 [EffectRack1_EffectUnit3_Effect3],parameter12_minus_toggle,0 -[Microphone],PeakIndicator_up,0 -[Sampler1],VuMeterL_set_zero,0 [EffectRack1_EffectUnit1_Effect3],parameter3_down_small,0 [Channel3],pitch_adjust_minus_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter11_minus_toggle,0 @@ -4469,7 +4279,6 @@ [PreviewDeck1],loop_move_0.125_backward,0 [EffectRack1_EffectUnit3_Effect4],parameter12_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter6_up_small,0 -[Sampler2],VuMeterL_set_zero,0 [EffectRack1_EffectUnit1_Effect4],parameter3_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_minus_toggle,0 [Channel4],pitch_adjust_minus_toggle,0 @@ -4511,7 +4320,6 @@ [Channel2],beatjump_0.25_forward,0 [Sampler2],hotcue_35_clear,0 [Sampler3],rate_up,0 -[Microphone3],PeakIndicator_set_minus_one,0 [Preferences],updated,0 [EffectRack1_EffectUnit3_Effect4],parameter11_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],enabled,1 @@ -4520,7 +4328,6 @@ [PreviewDeck1],volume,1 [Sampler1],loop_move_32_backward,0 [Sampler4],rate_up,0 -[Microphone4],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit3_Effect3],parameter9_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter9_type,0 [Channel2],pitch_adjust_set_default,0 @@ -4530,7 +4337,6 @@ [EffectRack1_EffectUnit1_Effect2],parameter10_minus_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter7_link_type,0 [Sampler2],loop_move_32_backward,0 -[Auxiliary1],VuMeterR_set_minus_one,0 [EqualizerRack1_[Channel3]],super1_toggle,0 [PreviewDeck1],hotcue_22_activate_preview,0 [EffectRack1_EffectUnit3_Effect4],parameter9_type,0 @@ -4544,7 +4350,6 @@ [Sampler2],hotcue_4_activate_preview,0 [EffectRack1_EffectUnit2_Effect1],parameter1_down,0 [Channel1],playposition_minus_toggle,0 -[Auxiliary2],VuMeterR_set_minus_one,0 [Channel3],hotcue_26_set,0 [Sampler1],hotcue_15_clear,0 [Channel3],hotcue_3_gotoandplay,0 @@ -4575,7 +4380,6 @@ [Sampler1],hotcue_25_clear,0 [Sampler4],hotcue_28_activate_preview,0 [Sampler3],orientation_left,0 -[Channel4],VuMeterR_down,0 [PreviewDeck1],hotcue_4_gotoandplay,0 [Sampler1],hotcue_36_goto,0 [EffectRack1_EffectUnit3_Effect1],parameter10_minus_toggle,0 @@ -4587,7 +4391,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter2_link_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter3_link_type,3 [QuickEffectRack1_[Channel4]_Effect1],parameter4_link_type,0 -[Channel3],VuMeterR_down,0 [Sampler2],back,0 [EffectRack1_EffectUnit3_Effect1],parameter8_set_one,0 [Channel4],slip_enabled,0 @@ -4595,12 +4398,10 @@ [Sampler2],hotcue_36_goto,0 [EffectRack1_EffectUnit3_Effect2],parameter10_minus_toggle,0 [EffectRack1_EffectUnit1],group_[Channel3]_enable,0 -[PreviewDeck1],VuMeter_minus_toggle,0 [Channel2],pitch_adjust_minus_toggle,0 [Channel1],hotcue_14_activate_preview,0 [EffectRack1_EffectUnit2_Effect1],parameter4_type,0 [PreviewDeck1],rateSearch_set_default,0 -[Channel2],VuMeterR_down,0 [Sampler1],back,0 [Sampler1],sync_key,0 [EffectRack1_EffectUnit3_Effect2],parameter8_set_one,0 @@ -4613,9 +4414,7 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter14_set_zero,0 [Channel2],hotcue_14_activate_preview,0 [EffectRack1_EffectUnit2_Effect2],parameter4_type,0 -[Channel1],VuMeterR_down,0 [Sampler2],sync_key,0 -[Sampler1],VuMeter_down_small,0 [Channel3],track_samples,0 [EqualizerRack1_[Channel3]_Effect1],parameter14_type,0 [Channel3],rate_perm_up,0 @@ -4626,7 +4425,6 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter2_up,0 [Channel3],hotcue_11_set,0 [EffectRack1_EffectUnit2_Effect1],button_parameter12_type,0 -[Sampler2],VuMeter_down_small,0 [Channel4],track_samples,0 [Channel3],hotcue_5_goto,0 [Sampler1],hotcue_6_gotoandplay,0 @@ -4651,7 +4449,6 @@ [EffectRack1_EffectUnit3_Effect1],parameter9_type,0 [EffectRack1_EffectUnit2_Effect3],button_parameter12_type,0 [Channel4],pitch_adjust_set_default,0 -[Master],VuMeterR_down_small,0 [Sampler3],hotcue_36_goto,0 [Channel2],pregain_minus_toggle,0 [Sampler3],hotcue_6_gotoandplay,0 @@ -4774,7 +4571,6 @@ [EffectRack1_EffectUnit3_Effect3],button_parameter16_loaded,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_down_small,0 [Sampler2],cue_goto,0 -[Sampler3],VuMeter_down_small,0 [Channel2],hotcue_10_set,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_set_one,0 [Sampler3],beatloop_16_enabled,0 @@ -4783,7 +4579,6 @@ [EffectRack1_EffectUnit1_Effect2],parameter9_type,0 [EffectRack1_EffectUnit3_Effect2],button_parameter14_loaded,0 [EffectRack1_EffectUnit3_Effect4],button_parameter13_loaded,0 -[Sampler4],VuMeter_down_small,0 [EffectRack1_EffectUnit1_Effect3],button_parameter15_loaded,0 [PreviewDeck1],hotcue_11_clear,0 [Channel1],file_key,0 @@ -4794,7 +4589,6 @@ [EffectRack1_EffectUnit1_Effect2],button_parameter15_loaded,0 [Sampler1],hotcue_7_clear,0 [Channel2],file_key,0 -[Auxiliary4],VuMeterR_set_default,0 [Channel1],hotcue_20_clear,0 [EffectRack1_EffectUnit3],clear,0 [EffectRack1_EffectUnit3_Effect4],button_parameter10_loaded,0 @@ -4808,7 +4602,6 @@ [EqualizerRack1_[Channel3]_Effect1],parameter13_up,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_set_one,0 [Sampler2],hotcue_7_clear,0 -[Auxiliary3],VuMeterR_set_default,0 [Sampler2],hotcue_28_enabled,0 [Channel2],hotcue_20_clear,0 [EqualizerRack1_[Channel3]_Effect1],parameter8_type,0 @@ -4846,7 +4639,6 @@ [EqualizerRack1_[Master]_Effect1],parameter7_type,0 [EffectRack1_EffectUnit1_Effect2],button_parameter13_loaded,0 [EffectRack1_EffectUnit1_Effect4],button_parameter14_loaded,0 -[Microphone3],VuMeter_minus_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter16_up,0 [EqualizerRack1_[Master]],mix_set_one,0 [EffectRack1_EffectUnit3],super1_up,0 @@ -4864,7 +4656,6 @@ [EffectRack1_EffectUnit1_Effect1],button_parameter13_loaded,0 [EffectRack1_EffectUnit1_Effect3],button_parameter14_loaded,0 [Sampler3],reloop_exit,0 -[Microphone4],VuMeter_minus_toggle,0 [EffectRack1_EffectUnit4],super1_up,0 [Channel3],hotcue_27_gotoandplay,0 [Channel3],volume_set_one,0 @@ -4875,9 +4666,7 @@ [PreviewDeck1],loop_move_1_backward,0 [EffectRack1_EffectUnit1_Effect2],button_parameter16_loaded,0 [Sampler4],reloop_exit,0 -[Microphone],PeakIndicator_down_small,0 [Channel4],hotcue_27_gotoandplay,0 -[Microphone],PeakIndicator_minus_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter5_set_minus_one,0 [Channel3],eject,0 [Channel2],cue_default,0 @@ -4926,7 +4715,6 @@ [QuickEffectRack1_[Channel2]_Effect1],button_parameter11,0 [Channel2],hotcue_10_enabled,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter10,0 -[Channel2],VuMeterL_set_default,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter13,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter12,0 [Channel1],hotcue_12_set,0 @@ -4947,7 +4735,6 @@ [QuickEffectRack1_[Channel2]_Effect1],next_effect,0 [QuickEffectRack1_[Channel4]],super1_down,0 [Channel1],hotcue_10_enabled,0 -[Channel1],VuMeterL_set_default,0 [Channel2],hotcue_12_set,0 [Channel4],hotcue_37_gotoandplay,0 [Sampler3],hotcue_12_clear,0 @@ -5004,7 +4791,6 @@ [Mixer Profile],LoEQFrequency_toggle,0 [Sampler2],volume_up,0 [EffectRack1_EffectUnit4_Effect4],parameter5_set_minus_one,0 -[Auxiliary2],VuMeterR_set_default,0 [Channel3],loop_move_0.03125_forward,0 [Sampler3],hotcue_32_clear,0 [EqualizerRack1_[Master]_Effect1],parameter2_link_type,0 @@ -5017,7 +4803,6 @@ [Sampler3],volume_up,0 [EffectRack1_EffectUnit1_Effect1],parameter12_type,0 [Channel1],hotcue_17_gotoandplay,0 -[Auxiliary1],VuMeterR_set_default,0 [Channel4],loop_move_0.03125_forward,0 [Sampler4],hotcue_32_clear,0 [PreviewDeck1],hotcue_3_position,-1 @@ -5042,7 +4827,6 @@ [Channel2],hotcue_21_goto,0 [EqualizerRack1_[Channel2]_Effect1],clear,0 [EqualizerRack1_[Channel3]_Effect1],parameter4_toggle,0 -[Microphone2],VuMeter_set_one,0 [Channel4],hotcue_32_goto,0 [Channel3],rate_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter11_type,0 @@ -5055,8 +4839,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter5_link_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_link_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter3_link_type,3 -[Microphone2],VuMeter_minus_toggle,0 -[Channel4],VuMeterL_set_default,0 [Channel4],rate_minus_toggle,0 [EqualizerRack1_[Channel2]_Effect1],parameter13_down,0 [EqualizerRack1_[Channel4]_Effect1],parameter1_down_small,0 @@ -5072,7 +4854,6 @@ [Channel2],hotcue_32_goto,0 [EffectRack1_EffectUnit2_Effect4],parameter16_set_default,0 [EqualizerRack1_[Channel3]_Effect1],parameter14_minus_toggle,0 -[Channel3],VuMeterL_set_default,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_up_small,0 [Sampler2],hotcue_7_goto,0 [Sampler1],hotcue_12_clear,0 @@ -5089,7 +4870,6 @@ [EffectRack1_EffectUnit2],group_[Auxiliary1]_enable,0 [EffectRack1_EffectUnit3_Effect3],button_parameter12_loaded,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_toggle,0 -[Microphone],PeakIndicator_up_small,0 [EffectRack1_EffectUnit1_Effect4],button_parameter11_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_up,0 [Channel3],hotcue_17_set,0 @@ -5133,7 +4913,6 @@ [EffectRack1_EffectUnit4],group_[Channel4]_enable,0 [Channel1],beatloop_0.0625_activate,0 [EffectRack1_EffectUnit1_Effect2],parameter14_minus_toggle,0 -[Master],PeakIndicator_toggle,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter13_type,0 [Channel3],playposition_up,0 [Channel1],pregain_set_default,0 @@ -5151,7 +4930,6 @@ [Sampler1],playposition_minus_toggle,0 [EffectRack1_EffectUnit3_Effect4],button_parameter11_loaded,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_set_one,0 -[Microphone3],VuMeter_set_one,0 [ReplayGain],DefaultBoost_set_one,0 [PreviewDeck1],slip_enabled,0 [EffectRack1_EffectUnit2_Effect1],parameter16_set_default,0 @@ -5164,7 +4942,6 @@ [EffectRack1_EffectUnit4_Effect2],num_button_parameters,0 [Sampler2],playposition_minus_toggle,0 [EffectRack1_EffectUnit3_Effect3],button_parameter11_loaded,0 -[Microphone4],VuMeter_set_one,0 [Channel1],loop_move_64_forward,0 [Channel1],hotcue_17_set,0 [Channel4],beatloop_0.0625_activate,0 @@ -5187,7 +4964,6 @@ [Sampler4],hotcue_6_activate,0 [Sampler3],hotcue_25_activate_preview,0 [EffectRack1_EffectUnit4_Effect3],num_button_parameters,0 -[Microphone3],PeakIndicator_up_small,0 [EffectRack1_EffectUnit3],group_[Auxiliary1]_enable,0 [EffectRack1_EffectUnit4_Effect2],parameter16_set_default,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter11_type,0 @@ -5201,7 +4977,6 @@ [Sampler1],hotcue_6_activate,0 [Sampler4],hotcue_25_activate_preview,0 [Channel3],beatjump,0 -[Microphone4],PeakIndicator_up_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_link_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_link_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_link_type,0 @@ -5212,7 +4987,6 @@ [Sampler4],hotcue_4_activate,0 [QuickEffectRack1_[Channel1]_Effect1],parameter15,0 [QuickEffectRack1_[Channel1]_Effect1],parameter14,0 -[Channel1],VuMeterR_set_minus_one,0 [PreviewDeck1],loop_out,0 [QuickEffectRack1_[Channel1]_Effect1],parameter16,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11,0 @@ -5231,7 +5005,6 @@ [EqualizerRack1_[Channel2]_Effect1],parameter6_link_inverse,0 [Sampler1],hotcue_4_activate,0 [EqualizerRack1_[Channel1]_Effect1],num_button_parameters,3 -[Channel2],VuMeterR_set_minus_one,0 [Sampler3],hotcue_7_goto,0 [Channel1],hotcue_11_activate_preview,0 [Sampler2],hotcue_27_enabled,0 @@ -5252,7 +5025,6 @@ [EqualizerRack1_[Channel4]_Effect1],parameter16_loaded,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter12,0 [Sampler4],hotcue_7_goto,0 -[Sampler1],VuMeter_up_small,0 [Channel2],hotcue_11_activate_preview,0 [Sampler1],hotcue_27_enabled,0 [Channel3],vinylcontrol_speed_type,33.3 @@ -5264,7 +5036,6 @@ [EqualizerRack1_[Channel3]_Effect1],parameter8_up,0 [Sampler4],hotcue_8_activate,0 [Channel1],playposition_up,0 -[Sampler2],VuMeter_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_set_default,0 [Channel4],vinylcontrol_speed_type,33.3 [PreviewDeck1],hotcue_4_enabled,0 @@ -5324,13 +5095,11 @@ [Channel2],hotcue_19_clear,0 [EffectRack1_EffectUnit4_Effect3],parameter7_set_default,0 [EffectRack1_EffectUnit1_Effect3],parameter12_set_default,0 -[PreviewDeck1],VuMeterL_set_zero,0 [Channel4],hotcue_18_set,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_link_inverse,0 [QuickEffectRack1_[Channel2]],super1_down,0 [EffectRack1_EffectUnit2_Effect2],parameter7_set_default,0 [Channel1],hotcue_11_enabled,0 -[Channel3],VuMeterR_set_minus_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter12_loaded,0 [EffectRack1_EffectUnit4_Effect2],parameter4_down_small,0 [Channel2],hotcue_18_gotoandstop,0 @@ -5345,12 +5114,9 @@ [EffectRack1_EffectUnit3_Effect3],parameter14_minus_toggle,0 [Channel2],vinylcontrol_seek,0 [EffectRack1_EffectUnit2_Effect1],parameter7_set_default,0 -[Channel4],VuMeterR_set_minus_one,0 [Sampler1],waveform_zoom_up_small,0 [Channel1],hotcue_10_gotoandstop,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_set_default,0 -[PreviewDeck1],VuMeterR_set_zero,0 -[Sampler1],VuMeter_set_one,0 [Channel3],hotcue_11_activate_preview,0 [Channel4],hotcue_34_goto,0 [Master],gain_set_minus_one,0 @@ -5374,12 +5140,9 @@ [Sampler2],waveform_zoom_up_small,0 [Channel2],hotcue_10_gotoandstop,0 [EffectRack1_EffectUnit2_Effect3],parameter13_down_small,0 -[Sampler3],VuMeter_up_small,0 [PreviewDeck1],hotcue_21_enabled,0 -[Sampler2],VuMeter_set_one,0 [Channel4],hotcue_11_activate_preview,0 [Sampler1],hotcue_25_activate_preview,0 -[Sampler3],VuMeterR_toggle,0 [Channel1],hotcue_34_goto,0 [PreviewDeck1],pitch_up,0 [Sampler3],rate_set_minus_one,0 @@ -5397,37 +5160,27 @@ [EffectRack1_EffectUnit2_Effect4],parameter13_down_small,0 [Channel3],hotcue_30_gotoandstop,0 [QuickEffectRack1_[Channel4]_Effect1],parameter4_type,0 -[Sampler4],VuMeter_up_small,0 -[Sampler3],VuMeter_set_one,0 [EffectRack1_EffectUnit3_Effect4],parameter12_set_default,0 [Sampler2],hotcue_25_activate_preview,0 -[Sampler4],VuMeterR_toggle,0 [Channel1],beatjump,0 [Channel2],hotcue_34_goto,0 -[Microphone2],PeakIndicator_up_small,0 [EqualizerRack1_[Channel4]_Effect1],num_button_parameters,3 -[Master],VuMeter_set_one,0 [Sampler4],rate_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter2_down,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_link_inverse,0 -[Channel3],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter14_down,0 [Sampler1],hotcue_18_gotoandplay,0 [Channel2],hotcue_28_gotoandstop,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_link_inverse,0 [Channel4],hotcue_30_gotoandstop,0 -[Microphone4],PeakIndicator_down,0 -[Sampler4],VuMeter_set_one,0 [EffectRack1_EffectUnit3_Effect3],parameter12_set_default,0 [Channel2],beatjump,0 [EqualizerRack1_[Channel1]_Effect1],parameter13_set_zero,0 -[Channel3],VuMeterL_up,0 [EffectRack1_EffectUnit4_Effect2],parameter7_set_default,0 [EffectRack1_EffectUnit4_Effect3],parameter2_down,0 [EqualizerRack1_[Channel1]_Effect1],parameter16_loaded,0 [Channel1],hotcue_18_set,0 [Channel2],pitch,0 -[Channel4],PeakIndicator_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter2_up,0 [EffectRack1_EffectUnit1_Effect1],parameter14_down,0 [Channel3],hotcue_13_set,0 @@ -5435,9 +5188,7 @@ [EqualizerRack1_[Master]_Effect1],parameter16_down,0 [EqualizerRack1_[Channel2]_Effect1],parameter10_up_small,0 [Channel1],hotcue_20_gotoandstop,0 -[Microphone3],PeakIndicator_down,0 [EffectRack1_EffectUnit3_Effect2],parameter12_set_default,0 -[Channel4],VuMeterL_up,0 [EffectRack1_EffectUnit4_Effect1],parameter7_set_default,0 [Channel2],hotcue_18_set,0 [Channel1],pitch,0 @@ -5448,7 +5199,6 @@ [EqualizerRack1_[Master]_Effect1],parameter3_set_default,0 [Channel2],hotcue_20_gotoandstop,0 [EffectRack1_EffectUnit3_Effect1],parameter12_set_default,0 -[Sampler3],VuMeterL_toggle,0 [Channel1],vinylcontrol_speed_type,33.3 [QuickEffectRack1_[Channel4]_Effect1],parameter6_up,0 [EqualizerRack1_[Channel1]_Effect1],parameter6_down,0 @@ -5460,7 +5210,6 @@ [Sampler3],waveform_zoom_up_small,0 [Channel3],hotcue_20_gotoandstop,0 [QuickEffectRack1_[Channel3]_Effect1],parameter3_set_minus_one,0 -[Sampler4],VuMeterL_toggle,0 [Channel2],vinylcontrol_speed_type,33.3 [PreviewDeck1],hotcue_27_activate_preview,0 [EffectRack1_EffectUnit2],loaded,1 @@ -5475,7 +5224,6 @@ [Channel4],hotcue_20_gotoandstop,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter13_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter14_up_small,0 -[Sampler1],VuMeterL_toggle,0 [Channel1],loop_out,0 [EqualizerRack1_[Channel1]],enabled,1 [Sampler1],rate_set_minus_one,0 @@ -5487,7 +5235,6 @@ [EffectRack1_EffectUnit4_Effect3],parameter4_down_small,0 [Channel1],hotcue_30_gotoandstop,0 [Channel3],hotcue_28_gotoandstop,0 -[Sampler2],VuMeterL_toggle,0 [Channel2],loop_out,0 [EffectRack1_EffectUnit4_Effect1],parameter1_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter2_down,0 @@ -5507,7 +5254,6 @@ [EffectRack1_EffectUnit4_Effect4],parameter4_down_small,0 [Channel2],hotcue_30_gotoandstop,0 [Channel4],hotcue_28_gotoandstop,0 -[Microphone2],PeakIndicator_down,0 [Master],headDelay_down_small,0 [Sampler3],hotcue_7_set,0 [EffectRack1_EffectUnit4_Effect2],parameter1_minus_toggle,0 @@ -5523,7 +5269,6 @@ [Sampler2],hotcue_30_gotoandplay,0 [Sampler4],hotcue_28_gotoandplay,0 [EffectRack1_EffectUnit4_Effect4],parameter13_down_small,0 -[Microphone3],VuMeterL_set_zero,0 [EffectRack1_EffectUnit1_Effect4],parameter3_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter14_set_one,0 [Channel3],hotcue_10_gotoandstop,0 @@ -5538,18 +5283,15 @@ [Microphone2],pregain_down,0 [Channel2],hotcue_13_set,0 [Sampler3],hotcue_20_gotoandplay,0 -[Microphone4],VuMeterL_set_zero,0 [Channel2],beatloop_32_enabled,0 [EffectRack1_EffectUnit1_Effect3],parameter3_set_default,0 [EqualizerRack1_[Channel4]_Effect1],parameter10_loaded,0 [EqualizerRack1_[Channel1]_Effect1],parameter2_link_inverse,0 [Channel4],hotcue_10_gotoandstop,0 -[Sampler1],VuMeterR_toggle,0 [Channel3],hotcue_8_position,-1 [EffectRack1_EffectUnit2_Effect3],parameter2_down,0 [Sampler4],playposition_up_small,0 [Channel3],hotcue_19_clear,0 -[Microphone3],VuMeterR_set_zero,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_loaded,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter6_loaded,0 [Sampler4],hotcue_20_gotoandplay,0 @@ -5557,13 +5299,10 @@ [EqualizerRack1_[Channel1]_Effect1],clear,0 [Channel1],beatloop_32_enabled,0 [Channel3],hotcue_18_gotoandstop,0 -[Channel1],PeakIndicator_up_small,0 [Master],balance_toggle,0 [Sampler1],beatlooproll_0.5_activate,0 -[Sampler2],VuMeterR_toggle,0 [ReplayGain],DefaultBoost_minus_toggle,0 [Channel4],hotcue_19_clear,0 -[Microphone4],VuMeterR_set_zero,0 [Sampler1],loop_move_32_forward,0 [EffectRack1_EffectUnit3],group_[PreviewDeck1]_enable,0 [EqualizerRack1_[Master]_Effect1],parameter2_down,0 @@ -5574,7 +5313,6 @@ [EqualizerRack1_[Master]_Effect1],parameter8_set_one,0 [Channel4],hotcue_18_gotoandstop,0 [QuickEffectRack1_[Channel4]_Effect1],parameter10_set_one,0 -[Channel2],PeakIndicator_up_small,0 [Channel1],beatloop_16_toggle,0 [Sampler2],beatlooproll_0.5_activate,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_link_type,0 @@ -5594,15 +5332,11 @@ [EffectRack1_EffectUnit1_Effect1],num_button_parameterslots,16 [EqualizerRack1_[Channel2]_Effect1],parameter13_loaded,0 [Channel2],beatloop_16_toggle,0 -[Channel3],PeakIndicator_up_small,0 -[PreviewDeck1],VuMeter_set_minus_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter11_set_zero,0 [Channel3],hotcue_4_position,-1 [Channel3],hotcue_31_enabled,0 -[Microphone2],VuMeterL_set_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter6_link_inverse,0 -[Microphone],VuMeterL_down,0 [Channel2],beatloop_0.25_enabled,0 [Channel3],pitch,0 [Channel3],hotcue_4_activate_preview,0 @@ -5614,7 +5348,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter13_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter15_type,0 [Channel3],beatloop_16_toggle,0 -[Channel4],PeakIndicator_up_small,0 [PreviewDeck1],vinylcontrol_cueing,0 [PreviewDeck1],hotcue_16_activate_preview,0 [EffectRack1_EffectUnit3_Effect3],parameter11_link_type,0 @@ -5639,23 +5372,18 @@ [Sampler1],hotcue_29_goto,0 [Sampler4],hotcue_8_set,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_up,0 -[Channel1],PeakIndicator_toggle,0 [EffectRack1_EffectUnit2_Effect2],button_parameter13_type,0 [EffectRack1_EffectUnit2_Effect4],parameter4_down_small,0 -[Microphone2],VuMeterL_set_zero,0 [EffectRack1_EffectUnit1_Effect1],parameter3_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter7_down,0 [Channel1],hotcue_8_position,-1 -[Microphone],VuMeterL_minus_toggle,0 [Channel4],hotcue_15_set,0 [Sampler2],playposition_up_small,0 -[Channel1],VuMeterL_up,0 [EffectRack1_EffectUnit2_Effect2],parameter14_toggle,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_set_zero,0 [PreviewDeck1],beatloop_4_enabled,0 [Sampler2],hotcue_29_goto,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter15_loaded,0 -[Channel2],PeakIndicator_toggle,0 [EffectRack1_EffectUnit2_Effect3],button_parameter13_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_loaded,0 [Channel4],hotcue_2_position,-1 @@ -5663,9 +5391,7 @@ [Channel1],hotcue_20_activate,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter1_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_up,0 -[Channel2],VuMeterL_up,0 [Channel1],PeakIndicator,0 -[Microphone2],VuMeterR_set_zero,0 [Sampler3],beatjump_1_forward,0 [EffectRack1_EffectUnit4_Effect3],parameter14_toggle,0 [Sampler3],loop_move_32_forward,0 @@ -5683,7 +5409,6 @@ [Channel2],hotcue_4_position,-1 [EffectRack1_EffectUnit3],group_[Auxiliary2]_enable,0 [Channel2],PeakIndicator,0 -[Microphone3],VuMeterL_set_one,0 [Sampler4],beatjump_1_forward,0 [EffectRack1_EffectUnit4_Effect4],parameter14_toggle,0 [Sampler4],loop_move_32_forward,0 @@ -5702,7 +5427,6 @@ [EqualizerRack1_[Channel2]_Effect1],num_parameters,3 [Channel1],hotcue_4_position,-1 [EffectRack1_EffectUnit4],group_[Auxiliary2]_enable,0 -[Microphone4],VuMeterL_set_one,0 [EffectRack1_EffectUnit3_Effect2],parameter16_down,0 [Channel2],pitch_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter7_down,0 @@ -5710,7 +5434,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter3_set_default,0 [Channel2],hotcue_6_position,-1 [EffectRack1_EffectUnit1_Effect2],parameter14_set_one,0 -[Master],VuMeterR_minus_toggle,0 [PreviewDeck1],hotcue_35_goto,0 [EqualizerRack1_[Channel4]_Effect1],parameter16_up_small,0 [Channel3],loop_out,0 @@ -5736,7 +5459,6 @@ [Sampler4],hotcue_9_set,0 [Channel1],hotcue_22_activate,0 [EffectRack1_EffectUnit4_Effect1],parameter13_down_small,0 -[PreviewDeck1],VuMeterR_set_default,0 [Channel3],cue_preview,0 [EffectRack1_EffectUnit3_Effect3],parameter14_set_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter7_link_inverse,0 @@ -5780,7 +5502,6 @@ [Channel1],hotcue_2_position,-1 [Channel2],beatlooproll_0.03125_activate,0 [EqualizerRack1_[Channel2]_Effect1],parameter13_set_one,0 -[Microphone],VuMeterR_minus_toggle,0 [Channel2],hotcue_28_activate,0 [Sampler1],hotcue_8_set,0 [Channel2],hotcue_15_goto,0 @@ -5837,7 +5558,6 @@ [App],audio_latency_overload_count,1 [EqualizerRack1_[Master]_Effect1],parameter10_set_zero,0 [Auxiliary4],volume_up,0 -[Master],VuMeterL_minus_toggle,0 [Channel1],cue_preview,0 [EffectRack1_EffectUnit3_Effect4],parameter12_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter10_up_small,0 @@ -5868,7 +5588,6 @@ [EqualizerRack1_[Channel3]_Effect1],parameter7_set_default,0 [EqualizerRack1_[Master]_Effect1],num_button_parameterslots,16 [Channel2],hotcue_10_activate,0 -[Microphone],VuMeterR_down_small,0 [Sampler1],hotcue_9_set,0 [EffectRack1_EffectUnit3_Effect2],button_parameter14_type,0 [Channel1],hotcue_26_activate,0 @@ -6004,7 +5723,6 @@ [EffectRack1_EffectUnit3_Effect3],parameter4_set_minus_one,0 [EffectRack1_EffectUnit3_Effect2],parameter8,0 [Sampler1],hotcue_37_gotoandstop,0 -[Channel3],VuMeter_down_small,0 [EffectRack1_EffectUnit3_Effect2],parameter5,0 [EqualizerRack1_[Channel1]],mix_up,0 [Master],gain_set_default,0 @@ -6027,7 +5745,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter4_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter8,0 [Sampler2],hotcue_37_gotoandstop,0 -[Channel4],VuMeter_down_small,0 [EffectRack1_EffectUnit3_Effect1],parameter5,0 [EffectRack1_EffectUnit3_Effect1],parameter4,0 [EffectRack1_EffectUnit1_Effect4],parameter9,0 @@ -6088,7 +5805,6 @@ [Channel4],hotcue_35_activate_preview,0 [Sampler3],scratch2,0 [PreviewDeck1],pfl,1 -[Master],VuMeter_down_small,0 [PreviewDeck1],talkover,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter7_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_up,0 @@ -6141,7 +5857,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter6,0 [EffectRack1_EffectUnit3_Effect4],parameter1,0 [EffectRack1_EffectUnit3_Effect4],parameter3,0 -[Master],VuMeterR_down,0 [EffectRack1_EffectUnit3_Effect4],parameter2,0 [Sampler3],hotcue_5_set,0 [Channel4],rateSearch_set_one,0 @@ -6169,7 +5884,6 @@ [EqualizerRack1_[Master]_Effect1],parameter9_up_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_down_small,0 [Channel4],hotcue_18_activate,0 -[Auxiliary3],VuMeterL_set_minus_one,0 [Sampler1],hotcue_17_gotoandstop,0 [EqualizerRack1_[Channel3]_Effect1],parameter14_link_inverse,0 [Sampler1],pregain_up,0 @@ -6180,7 +5894,6 @@ [Sampler1],loop_move_1_backward,0 [Channel3],hotcue_1_enabled,0 [EqualizerRack1_[Channel4]_Effect1],parameter16_set_default,0 -[Auxiliary4],VuMeterL_set_minus_one,0 [Sampler2],hotcue_17_gotoandstop,0 [Sampler2],pregain_up,0 [Sampler4],hotcue_13_clear,0 @@ -6191,7 +5904,6 @@ [EqualizerRack1_[Master]_Effect1],parameter13_set_minus_one,0 [Channel3],hotcue_14_activate,0 [PreviewDeck1],rateSearch_down_small,0 -[Channel1],VuMeter_down_small,0 [EqualizerRack1_[Channel4]_Effect1],parameter13_set_one,0 [Sampler2],rate_set_one,0 [Sampler1],hotcue_4_set,0 @@ -6200,7 +5912,6 @@ [Channel1],pitch_set_zero,0 [EqualizerRack1_[Master]_Effect1],parameter5_up_small,0 [Channel4],hotcue_14_activate,0 -[Channel2],VuMeter_down_small,0 [EffectRack1_EffectUnit3_Effect1],parameter16_set_minus_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter16_minus_toggle,0 [Sampler1],bpm_set_one,0 @@ -6243,7 +5954,6 @@ [Channel3],hotcue_16_activate,0 [EffectRack1_EffectUnit1_Effect1],parameter10_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter15_set_minus_one,0 -[Channel1],VuMeter_minus_toggle,0 [EqualizerRack1_[Channel3]],super1_down,0 [EffectRack1_EffectUnit3_Effect3],parameter15_set_one,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter15_loaded,0 @@ -6257,7 +5967,6 @@ [EqualizerRack1_[Channel2]_Effect1],parameter4_up,0 [Channel4],hotcue_16_activate,0 [Sampler3],hotcue_6_gotoandstop,0 -[Channel2],VuMeter_minus_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter15_set_one,0 [QuickEffectRack1_[Channel1]],super1_set_zero,0 [EqualizerRack1_[Channel4]_Effect1],parameter12_up,0 @@ -6269,7 +5978,6 @@ [Sampler1],hotcue_5_set,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_up_small,0 [Sampler4],hotcue_6_gotoandstop,0 -[Channel3],VuMeter_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter10_loaded,0 [EqualizerRack1_[Channel2]_Effect1],parameter16_set_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter10_up,0 @@ -6284,7 +5992,6 @@ [PreviewDeck1],pitch_down_small,0 [Library],font_size_increment,0 [EffectRack1_EffectUnit1_Effect3],parameter15_type,0 -[Channel4],VuMeter_minus_toggle,0 [Sampler1],hotcue_13_clear,0 [Channel4],rateSearch_down_small,0 [Sampler2],hotcue_6_gotoandstop,0 @@ -6318,7 +6025,6 @@ [Sampler2],hotcue_23_clear,0 [EqualizerRack1_[Master]_Effect1],parameter14_loaded,0 [QuickEffectRack1_[Channel3]_Effect1],parameter14_up,0 -[Auxiliary1],VuMeterL_set_minus_one,0 [Channel1],beatjump_2_backward,0 [Sampler2],hotcue_33_activate_preview,0 [Channel3],hotcue_2_gotoandplay,0 @@ -6329,8 +6035,6 @@ [EqualizerRack1_[Channel1]_Effect1],parameter13_set_one,0 [Sampler1],hotcue_6_set,0 [Sampler1],hotcue_9_gotoandplay,0 -[Channel1],PeakIndicator_up,0 -[Auxiliary2],VuMeterL_set_minus_one,0 [Channel2],beatjump_2_backward,0 [EqualizerRack1_[Master]_Effect1],parameter7_loaded,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_link_type,0 @@ -6343,7 +6047,6 @@ [EffectRack1_EffectUnit1_Effect3],parameter10_link_type,0 [Sampler2],hotcue_6_set,0 [Sampler2],hotcue_9_gotoandplay,0 -[Channel2],PeakIndicator_up,0 [Channel3],beatjump_2_backward,0 [Channel2],rateSearch_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter10_link_type,0 @@ -6390,7 +6093,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter16_up,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter12_type,0 [Sampler3],hotcue_9_gotoandplay,0 -[Channel3],PeakIndicator_up,0 [EqualizerRack1_[Master]_Effect1],parameter4_loaded,0 [Channel1],beat_active,0 [Channel2],hotcue_2_gotoandplay,0 @@ -6402,7 +6104,6 @@ [EffectRack1_EffectUnit2_Effect2],parameter16_up,0 [PreviewDeck1],bpm_down_small,0 [Sampler4],hotcue_9_gotoandplay,0 -[Channel4],PeakIndicator_up,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter9_loaded,0 [EqualizerRack1_[Channel1]_Effect1],parameter16_link_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_link_type,0 @@ -6425,7 +6126,6 @@ [Auxiliary1],pregain_set_minus_one,0 [Sampler3],hotcue_1_set,0 [EffectRack1_EffectUnit4_Effect1],effect_selector,0 -[Master],PeakIndicator_minus_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter15_type,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter8_loaded,0 [QuickEffectRack1_[Channel4]_Effect1],parameter6_down,0 @@ -6457,7 +6157,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter14_up,0 [EffectRack1_EffectUnit2_Effect1],parameter12_set_one,0 [EffectRack1_EffectUnit4_Effect2],parameter16_up,0 -[Auxiliary1],PeakIndicator_toggle,0 [EffectRack1_EffectUnit4_Effect4],effect_selector,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter12_type,0 [PreviewDeck1],beatlooproll_0.25_activate,0 @@ -6469,7 +6168,6 @@ [Mixer Profile],HiEQFrequency_set_one,0 [Sampler3],bpm_up_small,0 [EffectRack1_EffectUnit2_Effect2],parameter12_set_one,0 -[Auxiliary2],PeakIndicator_toggle,0 [Channel3],end,0 [QuickEffectRack1_[Channel1]_Effect1],parameter6_link_type,0 [QuickEffectRack1_[Channel2]],mix_toggle,0 @@ -6490,7 +6188,6 @@ [Channel1],hotcue_6_goto,0 [EffectRack1_EffectUnit3_Effect3],parameter14_up,0 [Channel3],rate_perm_up_small,0 -[Master],VuMeterL_set_zero,0 [Auxiliary3],pregain_set_minus_one,0 [Channel3],rate_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter15_type,0 @@ -6508,7 +6205,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter14_up,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_set_zero,0 [Channel4],rate_perm_up_small,0 -[Microphone2],VuMeterR_set_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_loaded,0 [Sampler1],rate_perm_up_small,0 [Channel1],hotcue_26_clear,0 @@ -6519,7 +6215,6 @@ [Channel1],beatjump_64_forward,0 [EffectRack1_EffectUnit2_Effect3],parameter16_up,0 [Sampler4],hotcue_2_set,0 -[Master],VuMeterR_set_zero,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter11_loaded,0 [EffectRack1_EffectUnit4_Effect1],parameter12_set_one,0 [EffectRack1_EffectUnit1_Effect2],parameter14_up,0 @@ -6591,7 +6286,6 @@ [Channel1],rate_perm_up_small,0 [Channel1],hotcue_32_activate_preview,0 [Sampler4],hotcue_5_clear,0 -[Microphone3],VuMeterR_set_one,0 [Channel4],hotcue_36_clear,0 [EffectRack1_EffectUnit4_Effect3],parameter16_up,0 [EffectRack1_EffectUnit1_Effect3],parameter6_up,0 @@ -6605,11 +6299,9 @@ [AutoDJ],fade_now,0 [Channel2],rate_perm_up_small,0 [Channel2],hotcue_32_activate_preview,0 -[Microphone4],VuMeterR_set_one,0 [Channel1],hotcue_16_clear,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter8_loaded,0 [EffectRack1_EffectUnit4_Effect4],parameter16_up,0 -[Auxiliary3],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter6_up,0 [EffectRack1_EffectUnit2_Effect4],parameter4_up,0 [Sampler4],pregain_minus_toggle,0 @@ -6624,7 +6316,6 @@ [Sampler1],bpm_up_small,0 [EqualizerRack1_[Channel1]],num_effectslots,1 [Skin],show_maximized_library,0 -[Auxiliary4],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter15_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter16_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter10_set_zero,0 @@ -6650,7 +6341,6 @@ [EffectRack1_EffectUnit1_Effect2],parameter6_up,0 [EffectRack1_EffectUnit2_Effect2],parameter4_up,0 [EffectRack1_EffectUnit2],prev_chain,0 -[Microphone2],VuMeterR_minus_toggle,0 [Channel2],rate_temp_down_small,0 [Sampler1],hotcue_24_enabled,0 [EffectRack1_EffectUnit4_Effect1],parameter12_set_zero,0 @@ -6665,7 +6355,6 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter16_link_type,0 [EffectRack1_EffectUnit1],prev_chain,0 [PreviewDeck1],hotcue_7_activate,0 -[Microphone3],VuMeterL_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter14_type,0 [Sampler1],hotcue_2_set,0 [EffectRack1_EffectUnit4_Effect2],parameter12_set_zero,0 @@ -6683,7 +6372,6 @@ [EffectRack1_EffectUnit2_Effect3],parameter12_set_one,0 [EqualizerRack1_[Channel1]],clear,0 [EqualizerRack1_[Channel4]_Effect1],effect_selector,0 -[Microphone4],VuMeterL_minus_toggle,0 [Sampler2],hotcue_2_set,0 [EffectRack1_EffectUnit1_Effect4],parameter14_up,0 [EffectRack1_EffectUnit4_Effect4],parameter12_up,0 @@ -6776,12 +6464,10 @@ [EffectRack1_EffectUnit3_Effect2],button_parameter3_loaded,0 [EffectRack1_EffectUnit3_Effect4],button_parameter8_loaded,0 [Channel4],hotcue_26_clear,0 -[Master],VuMeterL_set_one,0 [Channel3],vinylcontrol_scratching,0 [Channel4],vinylcontrol_wantenabled,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter12_type,0 [Auxiliary3],pregain_set_one,0 -[Sampler4],VuMeterR_set_default,0 [EffectRack1_EffectUnit3_Effect4],parameter2_up,0 [EffectRack1_EffectUnit1_Effect4],parameter7_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter12_set_zero,0 @@ -6801,7 +6487,6 @@ [EqualizerRack1_[Channel1]_Effect1],parameter16_set_one,0 [Channel3],bpm_up_small,0 [QuickEffectRack1_[Channel4]_Effect1],parameter10_up,0 -[Microphone2],VuMeterL_minus_toggle,0 [Channel3],vinylcontrol_wantenabled,0 [EffectRack1_EffectUnit1_Effect3],parameter13_minus_toggle,0 [Auxiliary4],pregain_set_one,0 @@ -6809,7 +6494,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter12_set_zero,0 [EffectRack1_EffectUnit3_Effect1],parameter13_set_zero,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter9_loaded,0 -[Sampler3],VuMeterR_set_default,0 [EffectRack1_EffectUnit3_Effect1],parameter2_up,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_link_type,0 @@ -6826,13 +6510,11 @@ [Microphone],pregain_set_one,0 [Sampler3],beatjump_0.125_forward,0 [Channel2],vinylcontrol_wantenabled,0 -[Microphone3],VuMeterR_minus_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter13_minus_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter11_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter12_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter13_set_zero,0 [EffectRack1_EffectUnit3_Effect2],parameter2_up,0 -[Microphone],PeakIndicator_set_one,0 [EffectRack1_EffectUnit4_Effect4],button_parameter3_type,0 [SoundManager],status,2 [EffectRack1_EffectUnit2_Effect3],parameter10_set_zero,0 @@ -6848,7 +6530,6 @@ [EffectRack1_EffectUnit4],prev_chain,0 [Sampler4],beatjump_0.125_forward,0 [Channel1],vinylcontrol_wantenabled,0 -[Microphone4],VuMeterR_minus_toggle,0 [PreviewDeck1],beatloop_4,0 [EffectRack1_EffectUnit1_Effect1],parameter15_minus_toggle,0 [Sampler3],hotcue_22_goto,0 @@ -7049,8 +6730,6 @@ [EqualizerRack1_[Channel2]_Effect1],parameter6_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter9_set_zero,0 [Sampler1],hotcue_9_activate_preview,0 -[Sampler2],VuMeterR_set_default,0 -[Auxiliary1],VuMeter_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter11_link_inverse,0 [Sampler4],hotcue_23_enabled,0 [PreviewDeck1],loop_move_0.5_forward,0 @@ -7065,10 +6744,8 @@ [EffectRack1_EffectUnit3_Effect4],next_effect,0 [Channel2],beatjump_0.5_backward,0 [EqualizerRack1_[Master]_Effect1],parameter7_set_one,0 -[Sampler1],VuMeterR_set_default,0 [Sampler2],hotcue_9_activate_preview,0 [QuickEffectRack1_[Channel1]_Effect1],parameter1_down,0 -[Auxiliary2],VuMeter_down_small,0 [Sampler3],hotcue_23_enabled,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter5_down,0 @@ -7094,11 +6771,8 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter2_up_small,0 [Channel4],beatjump_0.5_backward,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter1_loaded,1 -[PreviewDeck1],PeakIndicator_set_zero,0 [EqualizerRack1_[Master]_Effect1],parameter5_set_zero,0 -[Master],VuMeterL_up,0 [EffectRack1_EffectUnit2_Effect3],parameter5_down,0 -[Auxiliary1],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],button_parameter4_loaded,0 [EffectRack1_EffectUnit1_Effect3],button_parameter7_loaded,0 [Channel2],beatsync_tempo,0 @@ -7113,7 +6787,6 @@ [PreviewDeck1],beats_translate_earlier,0 [QuickEffectRack1_[Channel4]_Effect1],parameter4_up_small,0 [Sampler1],hotcue_30_activate_preview,0 -[Auxiliary2],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit1_Effect2],button_parameter7_loaded,0 [EffectRack1_EffectUnit1_Effect4],button_parameter4_loaded,0 [EffectRack1_EffectUnit3_Effect1],button_parameter2_loaded,0 @@ -7179,14 +6852,12 @@ [EffectRack1_EffectUnit1_Effect4],next_effect,0 [EffectRack1_EffectUnit2_Effect2],button_parameter16_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_down_small,0 -[Master],PeakIndicator_set_zero,0 [Skin],show_effectrack,1 [EffectRack1_EffectUnit2_Effect3],parameter8_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter6_down,0 [EffectRack1_EffectUnit3_Effect2],parameter2_down_small,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter12_loaded,0 [EqualizerRack1_[Master]_Effect1],button_parameter7_type,0 -[Auxiliary3],PeakIndicator_set_minus_one,0 [Microphone3],pfl,0 [EffectRack1_EffectUnit1_Effect1],button_parameter9_loaded,0 [Sampler2],hotcue_28_goto,0 @@ -7196,7 +6867,6 @@ [EqualizerRack1_[Channel2]_Effect1],parameter1_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter6_down,0 [Sampler2],hotcue_23_enabled,0 -[Auxiliary4],PeakIndicator_set_minus_one,0 [Microphone4],pfl,0 [EffectRack1_EffectUnit1_Effect2],button_parameter8_loaded,0 [EffectRack1_EffectUnit1_Effect4],button_parameter3_loaded,0 @@ -7244,7 +6914,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter14_down_small,0 [EffectRack1_EffectUnit3_Effect1],next_effect,0 [EffectRack1_EffectUnit2_Effect2],parameter8_set_default,0 -[Auxiliary3],VuMeter_down_small,0 [EffectRack1_EffectUnit2_Effect4],clear,0 [EqualizerRack1_[Master]],mix_down_small,0 [EffectRack1_EffectUnit3_Effect3],parameter15_down_small,0 @@ -7264,7 +6933,6 @@ [EffectRack1_EffectUnit3_Effect2],next_effect,0 [EffectRack1_EffectUnit2_Effect1],parameter8_set_default,0 [EqualizerRack1_[Channel1]_Effect1],parameter14_link_inverse,0 -[Auxiliary4],VuMeter_down_small,0 [EffectRack1_EffectUnit2_Effect1],clear,0 [Channel1],hotcue_13_gotoandstop,0 [EffectRack1_EffectUnit3_Effect4],parameter15_down_small,0 @@ -7278,7 +6946,6 @@ [Channel4],hotcue_14_goto,0 [EffectRack1_EffectUnit4_Effect1],button_parameter16_type,0 [Channel1],hotcue_9_activate,0 -[Microphone2],VuMeter_set_zero,0 [EqualizerRack1_[Master]_Effect1],effect_selector,0 [Channel2],hotcue_27_clear,0 [PreviewDeck1],loop_move,0 @@ -7294,7 +6961,6 @@ [Channel1],hotcue_14_goto,0 [EffectRack1_EffectUnit4_Effect2],button_parameter16_type,0 [Channel2],hotcue_9_activate,0 -[Microphone3],VuMeter_set_zero,0 [Channel1],hotcue_37_clear,0 [Sampler3],hotcue_31_goto,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter2_loaded,1 @@ -7311,7 +6977,6 @@ [Sampler1],replaygain,0 [Channel2],hotcue_14_goto,0 [EffectRack1_EffectUnit4_Effect3],button_parameter16_type,0 -[Microphone4],VuMeter_set_zero,0 [Channel2],hotcue_37_clear,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_set_zero,0 [Sampler4],hotcue_31_goto,0 @@ -7373,7 +7038,6 @@ [EffectRack1_EffectUnit4_Effect3],clear,0 [Sampler2],hotcue_23_gotoandplay,0 [Sampler4],rate,0 -[PreviewDeck1],PeakIndicator_up_small,0 [Channel2],hotcue_3_activate,0 [Channel3],hotcue_23_gotoandstop,0 [EqualizerRack1_[Master]_Effect1],parameter13_minus_toggle,0 @@ -7573,7 +7237,6 @@ [Sampler1],hotcue_26_goto,0 [Channel1],loop_move,0 [Sampler1],loop_move_16_forward,0 -[Sampler1],VuMeterR_up,0 [EffectRack1_EffectUnit4_Effect3],parameter5_minus_toggle,0 [Channel3],hotcue_25_enabled,0 [Channel3],hotcue_36_gotoandplay,0 @@ -7592,7 +7255,6 @@ [Sampler2],hotcue_26_goto,0 [Channel2],loop_move,0 [Sampler2],loop_move_16_forward,0 -[Sampler2],VuMeterR_up,0 [EffectRack1_EffectUnit3_Effect1],parameter3_type,0 [EffectRack1_EffectUnit4_Effect1],parameter10_set_one,0 [EffectRack1_EffectUnit4_Effect4],parameter5_minus_toggle,0 @@ -7607,7 +7269,6 @@ [Sampler3],vinylcontrol_scratching,0 [Channel2],loop_move_0.5_forward,0 [QuickEffectRack1_[Channel3]_Effect1],num_parameterslots,16 -[Sampler3],PeakIndicator_up,0 [PreviewDeck1],pregain_up,0 [EffectRack1_EffectUnit1_Effect3],parameter3_type,0 [EffectRack1_EffectUnit3_Effect4],parameter4_set_default,0 @@ -7624,7 +7285,6 @@ [Channel3],hotcue_4_enabled,0 [Sampler4],vinylcontrol_scratching,0 [EffectRack1_EffectUnit3_Effect3],parameter1_link_type,0 -[Sampler4],PeakIndicator_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter6_up_small,0 [QuickEffectRack1_[Channel4]_Effect1],parameter14_down,0 [EffectRack1_EffectUnit1_Effect4],parameter3_type,0 @@ -7641,7 +7301,6 @@ [EffectRack1_EffectUnit1_Effect2],num_parameters,0 [EffectRack1_EffectUnit3_Effect4],parameter1_link_type,0 [PreviewDeck1],hotcue_30_gotoandplay,0 -[Sampler1],PeakIndicator_up,0 [EffectRack1_EffectUnit4_Effect3],parameter4_minus_toggle,0 [PreviewDeck1],reloop_exit,0 [Microphone3],volume,1 @@ -7653,7 +7312,6 @@ [EffectRack1_EffectUnit1_Effect1],num_parameters,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8_up_small,0 [EffectRack1_EffectUnit1],super1_toggle,0 -[Sampler2],PeakIndicator_up,0 [EffectRack1_EffectUnit4_Effect4],parameter4_minus_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter2_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_toggle,0 @@ -7670,10 +7328,8 @@ [EqualizerRack1_[Channel3]_Effect1],parameter13_link_inverse,0 [EffectRack1_EffectUnit4_Effect1],parameter4_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter2_up_small,0 -[Sampler1],VuMeter_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter6_minus_toggle,0 [EffectRack1_EffectUnit2_Effect3],parameter12_down,0 -[Sampler3],VuMeter_set_minus_one,0 [Channel2],loop_move_0.125_forward,0 [EffectRack1_EffectUnit4_Effect3],parameter14_set_minus_one,0 [EffectRack1_EffectUnit3],super1_toggle,0 @@ -7684,13 +7340,10 @@ [Sampler4],loop_move_16_forward,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_set_zero,0 [EffectRack1_EffectUnit4_Effect2],parameter4_minus_toggle,0 -[Sampler2],VuMeter_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter6_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_toggle,0 [Channel3],hotcue_8_clear,0 -[Channel1],VuMeterL_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_up_small,0 -[Sampler4],VuMeter_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter14_set_minus_one,0 [EffectRack1_EffectUnit4],super1_toggle,0 [Channel1],hotcue_16_goto,0 @@ -7705,9 +7358,7 @@ [EffectRack1_EffectUnit3_Effect2],num_parameters,0 [EffectRack1_EffectUnit2_Effect3],parameter9_minus_toggle,0 [Channel4],hotcue_8_clear,0 -[Channel2],VuMeterL_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter2_set_zero,0 -[Sampler1],VuMeter_set_minus_one,0 [Channel2],hotcue_16_goto,0 [EqualizerRack1_[Channel1]_Effect1],parameter10_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter4_set_default,0 @@ -7721,12 +7372,9 @@ [EffectRack1_EffectUnit2_Effect4],parameter9_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_toggle,0 [Channel1],hotcue_3_goto,0 -[Channel3],VuMeterR_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter14_minus_toggle,0 -[Sampler2],VuMeter_set_minus_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_link_inverse,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter1_type,4 -[Sampler3],VuMeterR_up,0 [PreviewDeck1],hotcue_9_enabled,0 [EffectRack1_EffectUnit4_Effect1],parameter5_minus_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter3_link_type,0 @@ -7738,9 +7386,7 @@ [EqualizerRack1_[Channel2]_Effect1],parameter16_type,0 [Channel3],vinylcontrol_cueing,0 [Channel2],hotcue_3_goto,0 -[Channel4],VuMeterR_minus_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter2_link_type,0 -[Sampler4],VuMeterR_up,0 [EffectRack1_EffectUnit4_Effect2],parameter5_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter7_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter2_toggle,0 @@ -7785,7 +7431,6 @@ [EffectRack1_EffectUnit1_Effect2],parameter6_set_minus_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter15_link_inverse,0 [EffectRack1_EffectUnit4_Effect1],parameter6_minus_toggle,0 -[Microphone3],PeakIndicator_set_one,0 [EffectRack1_EffectUnit4],mix_down_small,0 [QuickEffectRack1_[Channel4]_Effect1],parameter16_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],button_parameter11_type,0 @@ -7803,15 +7448,12 @@ [Channel3],bpm,0 [EffectRack1_EffectUnit4_Effect3],parameter10_set_one,0 [EffectRack1_EffectUnit4_Effect2],parameter6_minus_toggle,0 -[Microphone4],PeakIndicator_set_one,0 [EqualizerRack1_[Master]_Effect1],parameter6_up,0 [EffectRack1_EffectUnit3_Effect2],button_parameter11_type,0 [EffectRack1_EffectUnit2_Effect2],parameter8_minus_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter2_link_type,0 -[Master],VuMeterR_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter14_down,0 -[Channel1],VuMeterR_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter11_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter10_link_type,0 [Channel1],volume,1 @@ -7827,14 +7469,12 @@ [EqualizerRack1_[Channel3]],super1_set_default,0 [EffectRack1_EffectUnit4_Effect4],parameter10_set_one,0 [EffectRack1_EffectUnit4_Effect3],parameter9_minus_toggle,0 -[Sampler3],VuMeter_set_zero,0 [EffectRack1_EffectUnit3_Effect3],button_parameter11_type,0 [EffectRack1_EffectUnit2_Effect3],parameter7_minus_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter2_link_type,0 [Auxiliary4],pregain_down,0 [Channel1],loop_double,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_up_small,0 -[Channel2],VuMeterR_minus_toggle,0 [Master],talkover_mix,0 [EffectRack1_EffectUnit3_Effect3],parameter1_type,0 [EqualizerRack1_[Master]_Effect1],parameter2_up,0 @@ -7842,8 +7482,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter14_set_minus_one,0 [Channel1],visual_key_distance_toggle,0 [EffectRack1_EffectUnit4_Effect4],parameter9_minus_toggle,0 -[Microphone2],PeakIndicator_set_one,0 -[Sampler4],VuMeter_set_zero,0 [Sampler3],hotcue_12_gotoandstop,0 [PreviewDeck1],rate_temp_down_small,0 [EffectRack1_EffectUnit3_Effect4],button_parameter11_type,0 @@ -7851,7 +7489,6 @@ [Auxiliary3],pregain_down,0 [Channel2],loop_double,0 [EffectRack1_EffectUnit1_Effect4],num_parameters,0 -[Channel3],VuMeterL_minus_toggle,0 [PreviewDeck1],hotcue_18_activate_preview,0 [EffectRack1_EffectUnit3_Effect4],parameter1_type,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter10_loaded,0 @@ -7865,7 +7502,6 @@ [PreviewDeck1],hotcue_14_clear,0 [EffectRack1_EffectUnit1_Effect3],num_parameters,0 [EqualizerRack1_[Master]_Effect1],parameter9_type,0 -[Channel4],VuMeterL_minus_toggle,0 [Sampler3],VuMeterL,0 [Sampler1],pitch_adjust_toggle,0 [Channel2],beatloop_0.5_toggle,0 @@ -7895,7 +7531,6 @@ [Channel1],beatloop_64_enabled,0 [Sampler3],hotcue_22_gotoandstop,0 [EffectRack1_EffectUnit2_Effect4],parameter6_minus_toggle,0 -[Auxiliary3],VuMeter_minus_toggle,0 [Sampler3],hotcue_2_clear,0 [EqualizerRack1_[Channel4]_Effect1],parameter10_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter4_link_type,0 @@ -7908,7 +7543,6 @@ [EffectRack1_EffectUnit3_Effect4],num_parameters,0 [Channel4],beatloop_64_enabled,0 [Sampler4],hotcue_22_gotoandstop,0 -[Auxiliary4],VuMeter_minus_toggle,0 [Channel1],hotcue_26_activate_preview,0 [Channel3],loop_double,0 [Sampler4],hotcue_2_clear,0 @@ -7925,7 +7559,6 @@ [Channel3],beatloop_64_enabled,0 [Sampler1],hotcue_32_gotoandstop,0 [EffectRack1_EffectUnit3_Effect3],parameter15_link_type,0 -[Master],PeakIndicator_set_minus_one,0 [Channel2],hotcue_26_activate_preview,0 [Channel4],loop_double,0 [Channel2],hotcue_5_enabled,0 @@ -7984,13 +7617,11 @@ [PreviewDeck1],play_stutter,0 [EffectRack1_EffectUnit4_Effect2],parameter9_minus_toggle,0 [EffectRack1_EffectUnit3_Effect4],button_parameter5,0 -[Microphone3],VuMeterR_down_small,0 [EffectRack1_EffectUnit3_Effect4],button_parameter4,0 [Channel1],waveform_zoom_set_one,0 [EffectRack1_EffectUnit3_Effect4],button_parameter7,0 [Sampler1],hotcue_22_gotoandstop,0 [EffectRack1_EffectUnit3_Effect4],button_parameter6,0 -[Auxiliary1],VuMeter_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter4_link_type,0 [Sampler2],beatjump_8_forward,0 [EffectRack1_EffectUnit3_Effect4],button_parameter1,0 @@ -8008,14 +7639,12 @@ [EqualizerRack1_[Channel4]_Effect1],parameter11_set_default,0 [EffectRack1_EffectUnit4_Effect3],parameter6_minus_toggle,0 [EffectRack1_EffectUnit3_Effect3],button_parameter5,0 -[Microphone4],VuMeterR_down_small,0 [EffectRack1_EffectUnit3_Effect3],button_parameter4,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter15_loaded,0 [EffectRack1_EffectUnit3_Effect3],button_parameter7,0 [Channel2],waveform_zoom_set_one,0 [Sampler2],hotcue_22_gotoandstop,0 [EffectRack1_EffectUnit3_Effect3],button_parameter6,0 -[Auxiliary2],VuMeter_minus_toggle,0 [EffectRack1_EffectUnit3_Effect3],button_parameter1,0 [EffectRack1_EffectUnit2_Effect1],parameter11_set_one,0 [EffectRack1_EffectUnit3_Effect3],button_parameter3,0 @@ -8063,7 +7692,6 @@ [Sampler3],hotcue_11_enabled,0 [Sampler1],hotcue_12_gotoandstop,0 [EffectRack1_EffectUnit4_Effect2],parameter14_loaded,0 -[Channel4],PeakIndicator_set_default,0 [Channel1],loop_move_1_backward,0 [Sampler4],hotcue_31_enabled,0 [Channel1],bpm_down_small,0 @@ -8074,7 +7702,6 @@ [Master],balance_down_small,0 [Sampler2],hotcue_12_gotoandstop,0 [EffectRack1_EffectUnit4_Effect1],parameter14_loaded,0 -[Channel3],PeakIndicator_set_default,0 [Channel2],loop_move_1_backward,0 [Channel3],hotcue_26_activate_preview,0 [QuickEffectRack1_[Channel1]],super1_down,0 @@ -8086,7 +7713,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter11_set_one,0 [EffectRack1_EffectUnit2_Effect4],parameter14_loaded,0 [EqualizerRack1_[Channel3]_Effect1],loaded,1 -[Channel2],PeakIndicator_set_default,0 [EffectRack1_EffectUnit1_Effect3],button_parameter9_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter10_set_one,0 [Channel4],hotcue_26_activate_preview,0 @@ -8100,9 +7726,7 @@ [EffectRack1_EffectUnit2_Effect3],parameter14_loaded,0 [EffectRack1_EffectUnit1_Effect1],parameter5_link_type,0 [Master],rate_set_default,0 -[Microphone2],VuMeterR_down_small,0 [EffectRack1_EffectUnit1_Effect3],parameter15_link_type,0 -[Channel1],PeakIndicator_set_default,0 [EffectRack1_EffectUnit1_Effect4],button_parameter9_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter5_down_small,0 [Sampler4],hotcue_31_clear,0 @@ -8230,7 +7854,6 @@ [QuickEffectRack1_[Channel1]],super1_set_minus_one,0 [Auxiliary3],orientation_left,0 [Sampler2],hotcue_9_gotoandstop,0 -[Sampler3],VuMeterR_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1_down,0 [PreviewDeck1],hotcue_2_enabled,0 [Shoutcast],update_from_prefs,1 @@ -8245,7 +7868,6 @@ [Channel4],orientation,2 [EqualizerRack1_[Master]_Effect1],button_parameter9_loaded,0 [EffectRack1_EffectUnit3_Effect2],parameter16_link_type,0 -[Sampler4],VuMeterR_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter16_loaded,0 [EffectRack1_EffectUnit2_Effect4],parameter11_set_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter2_set_minus_one,0 @@ -8375,7 +7997,6 @@ [EffectRack1_EffectUnit4_Effect2],parameter3_up_small,0 [Channel2],pregain_set_zero,0 [EffectRack1_EffectUnit2_Effect4],parameter16_loaded,0 -[Channel1],VuMeterR_down_small,0 [EffectRack1_EffectUnit4_Effect4],parameter12_loaded,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_link_inverse,0 [EffectRack1_EffectUnit1_Effect1],parameter8_up_small,0 @@ -8386,7 +8007,6 @@ [Sampler1],rate_set_zero,0 [EffectRack1_EffectUnit2_Effect3],parameter16_loaded,0 [QuickEffectRack1_[Channel4]_Effect1],parameter10_down,0 -[Channel2],VuMeterR_down_small,0 [EffectRack1_EffectUnit3_Effect1],parameter13_link_type,0 [EffectRack1_EffectUnit4_Effect3],parameter12_loaded,0 [EffectRack1_EffectUnit1_Effect2],parameter8_up_small,0 @@ -8408,7 +8028,6 @@ [Channel1],hotcue_1_clear,0 [Channel4],hotcue_29_goto,0 [EffectRack1_EffectUnit4_Effect1],parameter7_down_small,0 -[Sampler1],VuMeterR_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter2_set_minus_one,0 [EffectRack1_EffectUnit2_Effect3],parameter13_loaded,0 [Sampler1],loop_move_64_forward,0 @@ -8424,7 +8043,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter3_up_small,0 [Channel1],hotcue_29_goto,0 [EffectRack1_EffectUnit4_Effect2],parameter7_down_small,0 -[Sampler2],VuMeterR_set_minus_one,0 [Sampler2],loop_move_64_forward,0 [EffectRack1_EffectUnit3_Effect3],parameter2_up_small,0 [EffectRack1_EffectUnit4_Effect3],parameter9_up_small,0 @@ -8510,7 +8128,6 @@ [EffectRack1_EffectUnit4_Effect4],parameter3_up_small,0 [EffectRack1_EffectUnit2_Effect2],parameter10_loaded,0 [Sampler4],loop_move_64_forward,0 -[Channel3],VuMeterR_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_down,0 [Channel4],hotcue_23_enabled,0 [PreviewDeck1],hotcue_2_goto,0 @@ -8534,7 +8151,6 @@ [QuickEffectRack1_[Channel4]_Effect1],button_parameter8_type,0 [EffectRack1_EffectUnit2_Effect1],parameter10_loaded,0 [Channel1],loop_scale,0 -[Channel4],VuMeterR_down_small,0 [Channel3],hotcue_23_enabled,0 [Channel4],beatlooproll_1_activate,0 [Sampler4],hotcue_28_position,-1 @@ -8637,7 +8253,6 @@ [Sampler1],hotcue_10_position,-1 [Channel3],loop_scale,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter7_loaded,0 -[Channel2],VuMeterR_set_default,0 [Sampler2],pitch_set_default,0 [EqualizerRack1_[Master]_Effect1],parameter4_down,0 [QuickEffectRack1_[Channel4]_Effect1],parameter10_link_type,0 @@ -8648,7 +8263,6 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter6_link_inverse,0 [QuickEffectRack1_[Channel1]_Effect1],parameter2_set_zero,0 [Channel4],loop_scale,0 -[Channel1],VuMeterR_set_default,0 [Sampler1],pitch_set_default,0 [EffectRack1_EffectUnit1_Effect1],parameter8_link_type,0 [Sampler3],hotcue_20_position,-1 @@ -8669,7 +8283,6 @@ [EffectRack1_EffectUnit1_Effect4],parameter14_link_type,0 [Auxiliary4],VuMeterR,0 [EffectRack1_EffectUnit2_Effect1],parameter16_down_small,0 -[Auxiliary1],VuMeter_set_zero,0 [Auxiliary4],VuMeterL,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_type,0 [Sampler1],hotcue_10_enabled,0 @@ -8686,7 +8299,6 @@ [EqualizerRack1_[Channel1]_Effect1],parameter14_toggle,0 [Auxiliary3],VuMeterR,0 [EffectRack1_EffectUnit2_Effect2],parameter16_down_small,0 -[Auxiliary2],VuMeter_set_zero,0 [EffectRack1_EffectUnit1_Effect4],parameter7_link_type,0 [EffectRack1_EffectUnit2_Effect3],parameter10_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter9_loaded,0 @@ -8715,7 +8327,6 @@ [EffectRack1_EffectUnit3_Effect1],parameter8_link_type,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter8_loaded,0 [EffectRack1_EffectUnit2_Effect1],parameter5_set_one,0 -[Microphone3],VuMeter_toggle,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_link_inverse,0 [Channel4],beatloop_0.125_activate,0 [EffectRack1_EffectUnit1_Effect2],parameter9_down,0 @@ -8729,7 +8340,6 @@ [EffectRack1_EffectUnit3_Effect2],parameter8_link_type,0 [Channel1],beatlooproll_1_activate,0 [EffectRack1_EffectUnit2_Effect2],parameter5_set_one,0 -[Microphone4],VuMeter_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter9_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_set_one,0 [Sampler2],hotcue_30_goto,0 @@ -8779,21 +8389,17 @@ [Sampler3],hotcue_23_goto,0 [EffectRack1_EffectUnit3_Effect2],prev_effect,0 [Channel3],hotcue_13_goto,0 -[Channel4],VuMeterR_set_default,0 -[Master],PeakIndicator_up_small,0 [Sampler2],loop_move,0 [EffectRack1_EffectUnit4_Effect1],parameter16_down_small,0 [Channel1],beatloop_0.03125_toggle,0 [Channel1],pregain_toggle,0 [EffectRack1_EffectUnit1_Effect1],prev_effect,0 [EqualizerRack1_[Channel1]_Effect1],parameter13_link_inverse,0 -[Channel2],VuMeter_down,0 [Sampler1],hotcue_16_position,-1 [EffectRack1_EffectUnit4_Effect1],parameter5_set_one,0 [Channel2],hotcue_28_enabled,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter6_loaded,0 [Sampler4],hotcue_23_goto,0 -[Channel3],VuMeterR_set_default,0 [Channel4],hotcue_13_goto,0 [Channel1],beatloop_0.125_activate,0 [Sampler4],hotcue_26_position,-1 @@ -8804,11 +8410,9 @@ [Channel2],beatloop_0.03125_toggle,0 [Channel2],pregain_toggle,0 [EffectRack1_EffectUnit1_Effect2],prev_effect,0 -[Channel1],VuMeter_down,0 [EffectRack1_EffectUnit4_Effect2],parameter5_set_one,0 [Sampler3],bpm_tap,0 [Channel1],hotcue_28_enabled,0 -[Microphone],VuMeter_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter5_loaded,0 [Channel1],hotcue_13_goto,0 [EffectRack1_EffectUnit2_Effect3],parameter5_set_one,0 @@ -8821,7 +8425,6 @@ [EqualizerRack1_[Master]_Effect1],parameter11_set_one,0 [EffectRack1_EffectUnit2_Effect4],parameter13_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter7_loaded,0 -[Auxiliary3],VuMeter_set_zero,0 [Channel3],pregain_toggle,0 [PreviewDeck1],hotcue_28_enabled,0 [Sampler4],bpm_tap,0 @@ -8834,7 +8437,6 @@ [EqualizerRack1_[Channel1]],super1_minus_toggle,0 [Sampler4],hotcue_30_goto,0 [PreviewDeck1],vinylcontrol_mode,0 -[Auxiliary4],VuMeter_set_zero,0 [Channel4],pregain_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter9_link_type,0 @@ -8930,21 +8532,17 @@ [ReplayGain],ReplayGainBoost_set_one,0 [EffectRack1_EffectUnit1_Effect3],prev_effect,0 [EffectRack1_EffectUnit3_Effect4],parameter9_set_minus_one,0 -[Channel4],VuMeter_down,0 [EffectRack1_EffectUnit3_Effect3],parameter2_type,0 [QuickEffectRack1_[Channel1]_Effect1],loaded,1 [QuickEffectRack1_[Channel2]_Effect1],parameter15_type,0 [Sampler1],beatlooproll_8_activate,0 [EffectRack1_EffectUnit3_Effect4],parameter8_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_toggle,0 -[PreviewDeck1],PeakIndicator_down,0 [PreviewDeck1],hotcue_31_position,-1 -[Microphone2],VuMeter_toggle,0 [Sampler1],volume_set_one,0 [EffectRack1_EffectUnit2_Effect1],parameter13_set_minus_one,0 [EffectRack1_EffectUnit1_Effect4],prev_effect,0 [EffectRack1_EffectUnit4_Effect2],parameter15_down,0 -[Channel3],VuMeter_down,0 [EffectRack1_EffectUnit3_Effect4],parameter2_type,0 [Auxiliary3],talkover,0 [Sampler1],play,0 @@ -9042,7 +8640,6 @@ [Sampler4],key,0 [Sampler4],volume_toggle,0 [EffectRack1_EffectUnit2_Effect3],parameter1_set_default,0 -[Microphone],VuMeterR_up_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter16_set_one,0 [Sampler3],beatloop_16_activate,0 [EffectRack1_EffectUnit2_Effect1],parameter2_link_inverse,0 @@ -9067,7 +8664,6 @@ [EqualizerRack1_[Channel3]_Effect1],button_parameter15,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter14,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_toggle,0 -[Microphone],VuMeterL_up_small,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter16,0 [EqualizerRack1_[Channel4]],mix_toggle,0 [EffectRack1_EffectUnit4_Effect4],parameter9_set_default,0 @@ -9078,7 +8674,6 @@ [Playlist],SelectPrevPlaylist,0 [EffectRack1_EffectUnit1_Effect3],parameter2_type,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter13,0 -[Sampler3],VuMeter_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter2_type,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter12,0 [PreviewDeck1],hotcue_14_goto,0 @@ -9099,7 +8694,6 @@ [EffectRack1_EffectUnit4_Effect2],parameter4_link_inverse,0 [QuickEffectRack1_[Channel2]_Effect1],parameter3_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter2_type,0 -[Sampler4],VuMeter_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter9_set_default,0 [Sampler3],beatjump_0.5_backward,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter3_loaded,0 @@ -9131,7 +8725,6 @@ [Channel4],beatloop_8,0 [Channel4],hotcue_11_gotoandplay,0 [EffectRack1_EffectUnit2_Effect1],parameter3_link_inverse,0 -[Microphone3],PeakIndicator_up,0 [Channel4],beatloop_4,0 [EffectRack1_EffectUnit4_Effect3],parameter1_set_default,0 [EffectRack1_EffectUnit1_Effect1],parameter10_set_default,0 @@ -9152,7 +8745,6 @@ [Channel3],hotcue_29_gotoandplay,0 [EffectRack1_EffectUnit2_Effect4],parameter3_link_inverse,0 [EffectRack1_EffectUnit2_Effect4],parameter15_down,0 -[Microphone4],PeakIndicator_up,0 [Channel1],beatloop_4,0 [Sampler3],hotcue_11_goto,0 [EffectRack1_EffectUnit4_Effect2],parameter1_set_default,0 @@ -9206,7 +8798,6 @@ [EffectRack1_EffectUnit4_Effect2],parameter9_set_default,0 [Sampler3],pitch_adjust,0 [EffectRack1_EffectUnit4_Effect1],parameter5_link_inverse,0 -[Sampler1],VuMeter_toggle,0 [Sampler4],hotcue_30_position,-1 [Sampler4],hotcue_16_gotoandplay,0 [Sampler3],jog,0 @@ -9226,7 +8817,6 @@ [Sampler3],playposition_toggle,0 [Sampler4],pitch_adjust,0 [EffectRack1_EffectUnit4_Effect4],parameter9_link_inverse,0 -[Sampler2],VuMeter_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter1_set_zero,0 [EffectRack1_EffectUnit3_Effect1],parameter4_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter7_set_zero,0 @@ -9336,9 +8926,7 @@ [PreviewDeck1],hotcue_13_position,-1 [PreviewDeck1],hotcue_29_enabled,0 [Master],rate_toggle,0 -[Master],VuMeter_up,0 [EffectRack1_EffectUnit4_Effect2],parameter7_link_inverse,0 -[Channel2],PeakIndicator_down,0 [Channel4],loop_halve,0 [EffectRack1_EffectUnit4_Effect2],button_parameter15,0 [EffectRack1_EffectUnit4_Effect2],button_parameter14,0 @@ -9360,12 +8948,10 @@ [EffectRack1_EffectUnit3_Effect1],enabled,1 [QuickEffectRack1_[Channel2]_Effect1],parameter14_set_minus_one,0 [EffectRack1_EffectUnit1_Effect3],parameter13_type,0 -[Microphone2],PeakIndicator_up,0 [PreviewDeck1],hotcue_18_gotoandstop,0 [EffectRack1_EffectUnit1_Effect3],parameter2_set_zero,0 [EffectRack1_EffectUnit2_Effect3],parameter5_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter7_link_inverse,0 -[Channel1],PeakIndicator_down,0 [QuickEffectRack1_[Channel3]_Effect1],loaded,1 [PreviewDeck1],playposition_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter11_toggle,0 @@ -9485,7 +9071,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter6_set_zero,0 [EffectRack1_EffectUnit4_Effect4],parameter5_set_zero,0 [EffectRack1_EffectUnit2_Effect4],parameter7_link_inverse,0 -[PreviewDeck1],VuMeterL_minus_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter6_link_inverse,0 [EffectRack1_EffectUnit3_Effect3],parameter8_set_zero,0 [EffectRack1_EffectUnit4_Effect3],parameter3_set_zero,0 @@ -9504,7 +9089,6 @@ [EffectRack1_EffectUnit3_Effect4],parameter8_set_zero,0 [EffectRack1_EffectUnit4_Effect4],parameter3_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter7_type,0 -[Auxiliary2],PeakIndicator_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter12_down_small,0 [EffectRack1_EffectUnit2_Effect2],parameter8_link_inverse,0 [Sampler1],beatloop_0.5_enabled,0 @@ -9516,11 +9100,9 @@ [EffectRack1_EffectUnit3_Effect1],button_parameter8_type,0 [Sampler2],hotcue_21_set,0 [PreviewDeck1],loop_move_32_forward,0 -[Auxiliary1],PeakIndicator_set_default,0 [Channel1],hotcue_28_activate_preview,0 [EffectRack1_EffectUnit2_Effect1],parameter8_link_inverse,0 [EffectRack1_EffectUnit2_Effect2],parameter10_down_small,0 -[Channel4],PeakIndicator_down,0 [EffectRack1_EffectUnit3_Effect2],button_parameter8_type,0 [Sampler3],hotcue_21_set,0 [Sampler1],hotcue_36_gotoandplay,0 @@ -9530,7 +9112,6 @@ [EffectRack1_EffectUnit2_Effect4],parameter6_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_down,0 [PreviewDeck1],hotcue_30_gotoandstop,0 -[Channel3],PeakIndicator_down,0 [Sampler4],hotcue_26_enabled,0 [Sampler4],hotcue_21_set,0 [Sampler2],hotcue_36_gotoandplay,0 @@ -9550,7 +9131,6 @@ [EqualizerRack1_[Channel1]_Effect1],button_parameter12,0 [PreviewDeck1],hotcue_33_gotoandplay,0 [Channel4],hotcue_29_enabled,0 -[PreviewDeck1],VuMeterL_set_default,0 [Sampler4],beatjump_16_forward,0 [EffectRack1_EffectUnit2_Effect2],parameter9_link_inverse,0 [PreviewDeck1],hotcue_12_goto,0 @@ -9582,13 +9162,11 @@ [EffectRack1_EffectUnit4_Effect4],button_parameter11,0 [Sampler1],hotcue_22_set,0 [EffectRack1_EffectUnit4_Effect4],button_parameter10,0 -[Auxiliary4],PeakIndicator_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],parameter8_up_small,0 [EffectRack1_EffectUnit4_Effect4],button_parameter13,0 [EffectRack1_EffectUnit4_Effect4],button_parameter12,0 [Channel4],hotcue_8_enabled,0 [EffectRack1_EffectUnit1_Effect1],parameter13_type,0 -[PreviewDeck1],VuMeterR_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter14_link_inverse,0 [Microphone2],pregain_up_small,0 [Channel2],rate_down,0 @@ -9597,14 +9175,12 @@ [EqualizerRack1_[Channel1]_Effect1],parameter6_set_minus_one,0 [Sampler2],hotcue_22_set,0 [EqualizerRack1_[Channel1]_Effect1],parameter7_up,0 -[Auxiliary3],PeakIndicator_set_default,0 [Channel3],hotcue_8_enabled,0 [Sampler3],hotcue_35_activate_preview,0 [EffectRack1_EffectUnit1_Effect2],parameter13_type,0 [EffectRack1_EffectUnit3_Effect1],parameter14_link_inverse,0 [Channel1],rate_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter2_up_small,0 -[Auxiliary3],VuMeterR_down_small,0 [Sampler3],hotcue_36_gotoandplay,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_down_small,0 [PreviewDeck1],beatjump_4_backward,0 @@ -9619,7 +9195,6 @@ [EqualizerRack1_[Channel1]_Effect1],parameter3_up,0 [EqualizerRack1_[Channel4]_Effect1],parameter10_set_one,0 [InternalClock],bpm_up_small,0 -[Auxiliary4],VuMeterR_down_small,0 [Sampler4],hotcue_36_gotoandplay,0 [EffectRack1_EffectUnit3_Effect1],parameter5_set_default,0 [QuickEffectRack1_[Channel3]_Effect1],parameter13_set_one,0 @@ -9628,7 +9203,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter7_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter8_set_minus_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter4_up_small,0 -[Microphone],VuMeterR_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter10_down_small,0 [Channel2],loop_move_0.25_forward,0 [EffectRack1_EffectUnit2_Effect3],button_parameter15,0 @@ -9673,7 +9247,6 @@ [EqualizerRack1_[Master]_Effect1],parameter8,0 [Mixer Profile],xFaderCalibration_up_small,0 [Channel1],beatloop_4_enabled,0 -[Microphone],VuMeterL_up,0 [PreviewDeck1],hotcue_13_gotoandplay,0 [EqualizerRack1_[Master]_Effect1],parameter5,0 [EqualizerRack1_[Master]_Effect1],parameter4,0 @@ -9696,14 +9269,12 @@ [Sampler1],hotcue_26_enabled,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_set_minus_one,0 [Sampler2],rate_temp_down,0 -[Microphone2],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter14_link_inverse,0 [EffectRack1_EffectUnit3_Effect3],button_parameter8_type,0 [Sampler3],sync_leader,0 [EqualizerRack1_[Master]_Effect1],button_parameter1,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_set_default,0 [Sampler1],rate_temp_down,0 -[Microphone3],PeakIndicator_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter14_link_inverse,0 [Sampler3],talkover,0 [EqualizerRack1_[Master]],super1_down_small,0 @@ -9722,7 +9293,6 @@ [EqualizerRack1_[Channel4]_Effect1],button_parameter13,0 [Sampler3],rateSearch_set_zero,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter12,0 -[Microphone4],PeakIndicator_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter14_link_inverse,0 [Sampler4],talkover,0 [Sampler1],sync_leader,0 @@ -9730,7 +9300,6 @@ [EffectRack1_EffectUnit4_Effect2],button_parameter5_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9,0 [QuickEffectRack1_[Channel1]_Effect1],parameter8,0 -[Microphone],VuMeter_set_one,0 [EffectRack1_EffectUnit2_Effect2],parameter8_set_minus_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter14_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5,0 @@ -9770,7 +9339,6 @@ [Channel1],hotcue_7_gotoandstop,0 [EffectRack1_EffectUnit2_Effect3],parameter12_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter11_down_small,0 -[PreviewDeck1],VuMeter_set_zero,0 [EqualizerRack1_[Channel1]_Effect1],parameter10_set_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter3_up,0 [Sampler1],hotcue_35_gotoandstop,0 @@ -9778,7 +9346,6 @@ [Sampler3],hotcue_8_clear,0 [Channel2],hotcue_7_gotoandstop,0 [EffectRack1_EffectUnit2_Effect4],parameter12_set_minus_one,0 -[Auxiliary1],VuMeterR_down_small,0 [PreviewDeck1],hotcue_32_enabled,0 [PreviewDeck1],beatjump_2_backward,0 [Sampler2],hotcue_35_gotoandstop,0 @@ -9786,7 +9353,6 @@ [Sampler2],hotcue_35_activate_preview,0 [Sampler4],hotcue_8_clear,0 [Channel3],hotcue_7_gotoandstop,0 -[Auxiliary2],VuMeterR_down_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_down,0 [EqualizerRack1_[Master]_Effect1],parameter12_down_small,0 [Sampler3],rateSearch_minus_toggle,0 @@ -9815,7 +9381,6 @@ [EffectRack1_EffectUnit1_Effect3],parameter14_link_inverse,0 [EqualizerRack1_[Channel3]_Effect1],parameter14_toggle,0 [Sampler4],hotcue_8_goto,0 -[Master],VuMeterL_up_small,0 [Master],gain_down_small,0 [Sampler2],rateSearch_minus_toggle,0 [EffectRack1_EffectUnit2_Effect4],button_parameter5_type,0 @@ -9830,7 +9395,6 @@ [EffectRack1_EffectUnit1_Effect1],parameter8_down_small,0 [EffectRack1_EffectUnit2_Effect2],parameter11_down_small,0 [Sampler3],hotcue_35_gotoandstop,0 -[Master],VuMeterR_up_small,0 [Channel4],loop_move_32_forward,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_toggle,0 @@ -9865,7 +9429,6 @@ [Sampler2],beatjump_8_backward,0 [Sampler2],hotcue_15_gotoandstop,0 [QuickEffectRack1_[Channel4]_Effect1],loaded,1 -[Auxiliary1],VuMeterR_up,0 [Sampler2],talkover,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_down_small,0 [EffectRack1_EffectUnit4_Effect4],button_parameter5_type,0 @@ -9873,13 +9436,11 @@ [Sampler3],beatjump_2_backward,0 [Sampler2],rateSearch_set_zero,0 [EqualizerRack1_[Master]],group_[Master]_enable,1 -[Auxiliary2],VuMeterR_up,0 [Channel3],hotcue_28_goto,0 [EqualizerRack1_[Channel3]_Effect1],parameter15_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter1_link_inverse,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_down,0 [EffectRack1_EffectUnit2_Effect2],parameter12_set_minus_one,0 -[Sampler1],PeakIndicator_down_small,0 [Sampler4],beatjump_2_backward,0 [Sampler2],cue_default,0 [Channel4],hotcue_28_goto,0 @@ -9888,7 +9449,6 @@ [EqualizerRack1_[Master]_Effect1],parameter7_link_inverse,0 [Channel1],hotcue_1_activate_preview,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_down_small,0 -[Sampler2],PeakIndicator_down_small,0 [Sampler1],cue_default,0 [Channel1],hotcue_28_goto,0 [EffectRack1_EffectUnit3_Effect4],loaded,0 @@ -9953,7 +9513,6 @@ [Sampler1],hotcue_5_position,-1 [Channel3],hotcue_9_enabled,0 [Sampler3],hotcue_27_set,0 -[Microphone4],VuMeterR_set_default,0 [Sampler3],hotcue_3_position,-1 [EffectRack1_EffectUnit3_Effect2],loaded,0 [Sampler2],hotcue_7_position,-1 @@ -9967,8 +9526,6 @@ [EffectRack1_EffectUnit4],super1_set_default,0 [Sampler4],hotcue_27_set,0 [EffectRack1_EffectUnit4_Effect2],num_parameterslots,16 -[Auxiliary3],VuMeterR_up,0 -[Microphone3],VuMeterR_set_default,0 [QuickEffectRack1_[Channel4]],insertion_type,0 [EffectRack1_EffectUnit3_Effect1],loaded,0 [Sampler1],hotcue_7_position,-1 @@ -9979,7 +9536,6 @@ [EqualizerRack1_[Channel2]_Effect1],button_parameter15,0 [Channel3],waveform_zoom,1 [EqualizerRack1_[Channel2]_Effect1],button_parameter14,0 -[PreviewDeck1],VuMeterR_down_small,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter16,0 [QuickEffectRack1_[Channel2]],super1,0.5 [Sampler3],hotcue_5_position,-1 @@ -9992,11 +9548,9 @@ [EqualizerRack1_[Channel2]_Effect1],button_parameter12,0 [EffectRack1_EffectUnit1_Effect4],loaded,0 [EffectRack1_EffectUnit4_Effect1],num_parameterslots,16 -[Auxiliary4],VuMeterR_up,0 [Sampler4],hotcue_7_position,-1 [PreviewDeck1],hotcue_5_gotoandplay,0 [EqualizerRack1_[Channel4]_Effect1],parameter15_up,0 -[Sampler3],PeakIndicator_down_small,0 [Sampler2],orientation,1 [Sampler1],hotcue_9_position,-1 [EqualizerRack1_[Master]_Effect1],parameter12_toggle,0 @@ -10007,7 +9561,6 @@ [Sampler3],hotcue_7_position,-1 [Channel1],rate_up_small,0 [QuickEffectRack1_[Channel4]_Effect1],parameter16_type,0 -[Sampler4],PeakIndicator_down_small,0 [Sampler1],orientation,1 [EqualizerRack1_[Channel3]_Effect1],num_button_parameterslots,16 [Sampler4],hotcue_9_position,-1 @@ -10026,14 +9579,12 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter15_up,0 [EqualizerRack1_[Master]_Effect1],parameter8_link_inverse,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_set_minus_one,0 -[Microphone2],VuMeterR_set_default,0 [Channel3],hotcue_4_gotoandplay,0 [Sampler3],hotcue_28_set,0 [EffectRack1_EffectUnit2],super1_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_up,0 [Channel4],hotcue_4_gotoandplay,0 -[Sampler3],VuMeterL_set_minus_one,0 [Sampler4],hotcue_28_set,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_up,0 [PreviewDeck1],hotcue_6_enabled,0 @@ -10043,7 +9594,6 @@ [EffectRack1_EffectUnit1_Effect2],loaded,0 [EqualizerRack1_[Channel2]],insertion_type,0 [Channel1],hotcue_4_gotoandplay,0 -[Sampler4],VuMeterL_set_minus_one,0 [Channel4],hotcue_1_activate_preview,0 [QuickEffectRack1_[Channel4]_Effect1],parameter4_set_minus_one,0 [EqualizerRack1_[Channel3]],mix,1 @@ -10057,7 +9607,6 @@ [Sampler3],hotcue_19_activate_preview,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter1_set_zero,0 -[Auxiliary3],VuMeterL_minus_toggle,0 [Channel2],waveform_zoom,3 [Sampler1],hotcue_29_set,0 [Sampler3],hotcue_6_goto,0 @@ -10065,7 +9614,6 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter12_minus_toggle,0 [EffectRack1_EffectUnit4],super1_down_small,0 [Sampler4],hotcue_19_activate_preview,0 -[Auxiliary4],VuMeterL_minus_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter5_down_small,0 [Channel1],waveform_zoom,3 [Sampler2],hotcue_29_set,0 @@ -10128,7 +9676,6 @@ [EffectRack1_EffectUnit1],super1_down_small,0 [Sampler1],reverse,0 [EqualizerRack1_[Channel3]_Effect1],parameter11_toggle,0 -[Auxiliary1],VuMeterR_minus_toggle,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_set_zero,0 [Sampler3],rate_down_small,0 [EffectRack1_EffectUnit2_Effect4],parameter4_set_one,0 @@ -10138,7 +9685,6 @@ [QuickEffectRack1_[Channel3]],insertion_type,0 [PreviewDeck1],rate_up,0 [EffectRack1_EffectUnit3_Effect4],parameter16_link_inverse,0 -[Auxiliary2],VuMeterR_minus_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter5_link_inverse,0 [Sampler4],rate_down_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter15_up,0 @@ -10146,7 +9692,6 @@ [EqualizerRack1_[Channel4]_Effect1],parameter7_set_zero,0 [EffectRack1_EffectUnit3_Effect3],parameter16_link_inverse,0 [QuickEffectRack1_[Channel1]_Effect1],parameter2_set_minus_one,0 -[Auxiliary3],VuMeterR_minus_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter13_up,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_set_minus_one,0 [Sampler3],hotcue_3_activate_preview,0 @@ -10156,7 +9701,6 @@ [Sampler3],hotcue_32_activate_preview,0 [EffectRack1_EffectUnit3_Effect2],parameter15_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_set_minus_one,0 -[Auxiliary4],VuMeterR_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_up,0 [EffectRack1_EffectUnit1_Effect2],parameter13_up,0 [EqualizerRack1_[Channel4]_Effect1],parameter5_set_zero,0 @@ -10164,7 +9708,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter15_up,0 [Sampler4],hotcue_32_activate_preview,0 [EffectRack1_EffectUnit3_Effect1],parameter15_link_inverse,0 -[Sampler2],PeakIndicator_set_default,0 [Microphone],volume_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter14_link_type,0 [PreviewDeck1],hotcue_35_activate,0 @@ -10175,8 +9718,6 @@ [Channel1],playposition_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter15_link_inverse,0 [EqualizerRack1_[Channel4]_Effect1],parameter3_set_zero,0 -[Sampler1],PeakIndicator_set_default,0 -[Sampler1],VuMeterL_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_set_minus_one,0 [EqualizerRack1_[Master]_Effect1],parameter4_link_inverse,0 [EffectRack1_EffectUnit4_Effect4],parameter4_set_one,0 @@ -10189,7 +9730,6 @@ [EffectRack1_EffectUnit1_Effect3],parameter13_link_inverse,0 [Channel2],playposition_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter15_link_inverse,0 -[Sampler2],VuMeterL_set_minus_one,0 [QuickEffectRack1_[Channel1]],mix_set_default,0 [EffectRack1_EffectUnit3_Effect4],parameter5_down_small,0 [Sampler1],rate_down_small,0 @@ -10216,7 +9756,6 @@ [Channel4],hotcue_25_activate_preview,0 [Sampler1],hotcue_19_activate_preview,0 [EffectRack1_EffectUnit3_Effect1],parameter16_link_inverse,0 -[Auxiliary1],VuMeterL_minus_toggle,0 [PreviewDeck1],beatjump_0.5_backward,0 [EffectRack1_EffectUnit1_Effect1],button_parameter15_type,0 [Microphone2],PeakIndicator,0 @@ -10231,7 +9770,6 @@ [ReplayGain],ReplayGainBoost_up,0 [Sampler2],hotcue_19_activate_preview,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter6_type,0 -[Auxiliary2],VuMeterL_minus_toggle,0 [PreviewDeck1],replaygain,0 [EffectRack1_EffectUnit1_Effect2],button_parameter15_type,0 [EqualizerRack1_[Channel3]_Effect1],parameter8_down,0 @@ -10243,14 +9781,12 @@ [Sampler4],hotcue_23_set,0 [EffectRack1_EffectUnit3_Effect1],button_parameter15_type,0 [PreviewDeck1],hotcue_3_goto,0 -[Sampler4],PeakIndicator_set_default,0 [EffectRack1_EffectUnit1_Effect3],button_parameter15_type,0 [Sampler4],beatloop_64_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter16_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter15_link_inverse,0 [EffectRack1_EffectUnit3_Effect2],button_parameter15_type,0 [EffectRack1_EffectUnit3_Effect2],parameter13_link_inverse,0 -[Sampler3],PeakIndicator_set_default,0 [Sampler3],beatloop_0.25_toggle,0 [Sampler3],loop_move_0.5_backward,0 [EffectRack1_EffectUnit1_Effect4],button_parameter15_type,0 @@ -10358,7 +9894,6 @@ [QuickEffectRack1_[Channel4]],super1,0.5 [QuickEffectRack1_[Channel2]_Effect1],parameter4_set_minus_one,0 [Sampler4],beatjump_0.125_backward,0 -[Microphone],PeakIndicator_toggle,0 [Sampler2],hotcue_32_activate_preview,0 [Channel1],hotcue_13_activate_preview,0 [EffectRack1_EffectUnit3_Effect3],parameter12_link_inverse,0 @@ -10384,7 +9919,6 @@ [Sampler1],hotcue_9_enabled,0 [EffectRack1_EffectUnit4_Effect4],parameter15_up,0 [Sampler1],rateSearch_set_default,0 -[Sampler4],VuMeterL_set_default,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_link_type,0 [EffectRack1_EffectUnit1_Effect4],parameter9_up,0 [EffectRack1_EffectUnit2_Effect4],parameter3_up,0 @@ -10397,11 +9931,9 @@ [EffectRack1_EffectUnit3_Effect1],parameter11_link_inverse,0 [EffectRack1_EffectUnit1_Effect3],parameter5_up,0 [EffectRack1_EffectUnit2_Effect3],parameter7_up,0 -[Sampler3],VuMeterR_up_small,0 [Sampler2],hotcue_25_set,0 [Sampler4],loop_exit,0 [Sampler1],beatjump_4_backward,0 -[Sampler3],VuMeterL_set_default,0 [EffectRack1_EffectUnit1_Effect1],parameter9_up,0 [EffectRack1_EffectUnit2_Effect1],parameter3_up,0 [Sampler3],quantize,0 @@ -10409,7 +9941,6 @@ [Sampler1],hotcue_10_goto,0 [EffectRack1_EffectUnit1_Effect4],parameter5_up,0 [EffectRack1_EffectUnit2_Effect4],parameter7_up,0 -[Sampler4],VuMeterR_up_small,0 [Channel3],beatjump_0.125_forward,0 [Sampler3],hotcue_25_set,0 [QuickEffectRack1_[Channel4]_Effect1],parameter8_link_inverse,0 @@ -10422,7 +9953,6 @@ [Sampler3],beatloop_4_toggle,0 [PreviewDeck1],pitch_adjust_up_small,0 [EffectRack1_EffectUnit1_Effect3],parameter1_up,0 -[Sampler3],VuMeterL_up_small,0 [Sampler4],quantize,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_set_default,0 [PreviewDeck1],beatloop_16_enabled,0 @@ -10433,18 +9963,15 @@ [EffectRack1_EffectUnit3_Effect1],parameter5_type,0 [EffectRack1_EffectUnit1_Effect1],parameter5_up,0 [EffectRack1_EffectUnit2_Effect1],parameter7_up,0 -[Auxiliary3],VuMeterL_up_small,0 [Channel4],beatjump_0.125_forward,0 [Sampler4],beatloop_0.125_enabled,0 [Sampler4],hotcue_25_set,0 -[Master],VuMeterL_down_small,0 [EffectRack1_EffectUnit3_Effect4],parameter16_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter8_type,0 [Sampler4],loop_out,0 [Sampler4],beatloop_4_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter1_up,0 [Sampler1],beatjump_0.125_backward,0 -[Sampler4],VuMeterL_up_small,0 [Sampler4],start,0 [EffectRack1_EffectUnit3_Effect2],parameter12_link_inverse,0 [Mixer Profile],HiEQFrequency,2485 @@ -10456,7 +9983,6 @@ [EffectRack1_EffectUnit3_Effect2],parameter5_type,0 [EffectRack1_EffectUnit1_Effect2],parameter5_up,0 [EffectRack1_EffectUnit2_Effect2],parameter7_up,0 -[Auxiliary4],VuMeterL_up_small,0 [Sampler3],beatloop_0.125_enabled,0 [PreviewDeck1],hotcue_17_goto,0 [EqualizerRack1_[Master]_Effect1],parameter8_down_small,0 @@ -10465,7 +9991,6 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter1_set_default,0 [EqualizerRack1_[Channel4]],insertion_type,0 [Sampler2],beatjump_0.125_backward,0 -[Auxiliary3],VuMeterR_up_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter9,0 [Sampler3],volume_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8,0 @@ -10491,7 +10016,6 @@ [Mixer Profile],LoEQFrequency_set_one,0 [EffectRack1_EffectUnit1_Effect2],parameter1_up,0 [EffectRack1_EffectUnit1_Effect4],parameter12_link_inverse,0 -[Auxiliary4],VuMeterR_up_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter16_type,0 [Sampler4],volume_set_minus_one,0 [PreviewDeck1],beatjump_1_forward,0 @@ -10501,7 +10025,6 @@ [EqualizerRack1_[Master]_Effect1],parameter15,0 [Channel3],loop_start_position,-1 [EqualizerRack1_[Master]_Effect1],parameter14,0 -[Microphone],VuMeter_set_zero,0 [EqualizerRack1_[Master]_Effect1],parameter16,0 [EffectRack1_EffectUnit1_Effect1],parameter14_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_set_zero,0 @@ -10540,7 +10063,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter7_up,0 [ReplayGain],ReplayGainBoost_set_minus_one,0 [Sampler3],hotcue_10_goto,0 -[Sampler3],PeakIndicator_set_one,0 [EffectRack1_EffectUnit1_Effect2],parameter3_set_minus_one,0 [Sampler1],wheel,0 [EqualizerRack1_[Master]_Effect1],button_parameter10_type,0 @@ -10558,7 +10080,6 @@ [Sampler4],hotcue_10_goto,0 [EffectRack1_EffectUnit3_Effect3],parameter5_up,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_set_minus_one,0 -[Sampler4],PeakIndicator_set_one,0 [EffectRack1_EffectUnit1_Effect3],parameter3_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_up,0 [PreviewDeck1],reverseroll,0 @@ -10602,7 +10123,6 @@ [Sampler2],hotcue_27_activate_preview,0 [EffectRack1_EffectUnit2_Effect1],button_parameter6_type,0 [EffectRack1_EffectUnit3_Effect1],parameter5_up,0 -[Auxiliary3],VuMeterL_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter9_set_one,0 [EffectRack1_EffectUnit1_Effect4],parameter16_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter11_set_minus_one,0 @@ -10619,16 +10139,12 @@ [EffectRack1_EffectUnit2_Effect2],button_parameter6_type,0 [EffectRack1_EffectUnit3_Effect2],parameter5_up,0 [EffectRack1_EffectUnit3_Effect4],parameter11_down,0 -[Auxiliary4],VuMeterL_set_zero,0 [EffectRack1_EffectUnit4_Effect2],parameter9_set_one,0 [EffectRack1_EffectUnit1_Effect3],parameter13_toggle,0 -[Microphone2],VuMeter_down_small,0 [EffectRack1_EffectUnit2_Effect3],parameter9_set_one,0 [Sampler4],loop_double,0 [EffectRack1_EffectUnit3_Effect1],parameter9_up,0 [Sampler1],loop_out,0 -[Auxiliary3],VuMeterR_set_zero,0 -[PreviewDeck1],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter12_link_inverse,0 [PreviewDeck1],waveform_zoom_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter10_link_inverse,0 @@ -10643,7 +10159,6 @@ [Sampler1],loop_double,0 [EffectRack1_EffectUnit3_Effect2],parameter9_up,0 [Sampler2],loop_out,0 -[Auxiliary4],VuMeterR_set_zero,0 [EffectRack1_EffectUnit1_Effect2],parameter11_down,0 [EqualizerRack1_[Channel1]_Effect1],parameter1_loaded,1 [EffectRack1_EffectUnit1_Effect1],parameter5_type,0 @@ -10653,7 +10168,6 @@ [EffectRack1_EffectUnit3_Effect1],parameter13_toggle,0 [Sampler2],loop_double,0 [EffectRack1_EffectUnit2_Effect3],parameter6_type,0 -[Sampler2],VuMeterL_set_default,0 [Sampler3],hotcue_7_gotoandplay,0 [PreviewDeck1],hotcue_6_set,0 [Mixer Profile],xFaderCurve_set_minus_one,0 @@ -10662,31 +10176,25 @@ [QuickEffectRack1_[Channel4]_Effect1],button_parameter6_type,0 [Mixer Profile],xFaderMode,0 [EffectRack1_EffectUnit1_Effect2],parameter5_type,0 -[Sampler1],VuMeterR_up_small,0 [Sampler4],hotcue_22_activate,0 [QuickEffectRack1_[Channel2]_Effect1],parameter5_link_inverse,0 [QuickEffectRack1_[Channel3]_Effect1],parameter12_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter13_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter6_type,0 -[Sampler1],VuMeterL_set_default,0 [Sampler4],hotcue_7_gotoandplay,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_set_minus_one,0 [EffectRack1_EffectUnit4_Effect1],button_parameter6_type,0 [Sampler3],hotcue_20_activate,0 [Sampler3],beatloop_1_enabled,0 -[Sampler2],VuMeterR_up_small,0 [EffectRack1_EffectUnit1_Effect3],parameter15_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter16_toggle,0 [Channel1],LoadSelectedTrackAndPlay,0 [EffectRack1_EffectUnit4_Effect2],button_parameter6_type,0 -[Sampler1],VuMeterL_up_small,0 [Sampler4],hotcue_20_activate,0 [Sampler2],beatloop_1_enabled,0 [EffectRack1_EffectUnit4_Effect3],parameter9_set_one,0 [EffectRack1_EffectUnit1_Effect4],parameter15_toggle,0 -[Auxiliary1],VuMeterL_up_small,0 [QuickEffectRack1_[Channel4]_Effect1],parameter1_set_default,0 -[Microphone3],VuMeter_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter9,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8,0 [EffectRack1_EffectUnit3_Effect2],parameter16_toggle,0 @@ -10698,7 +10206,6 @@ [Channel2],hotcue_7_enabled,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7,0 [QuickEffectRack1_[Channel3]_Effect1],parameter6,0 -[Sampler2],VuMeterL_up_small,0 [EffectRack1_EffectUnit1_Effect3],parameter16_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1,0.5 [Sampler1],beatloop_1_enabled,0 @@ -10706,18 +10213,14 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter3,0.0003 [EffectRack1_EffectUnit3_Effect1],parameter3_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter2,0.707107 -[Sampler1],PeakIndicator_set_one,0 [EffectRack1_EffectUnit4_Effect3],parameter11_set_minus_one,0 [EffectRack1_EffectUnit4_Effect4],parameter9_set_one,0 [EffectRack1_EffectUnit1_Effect1],parameter15_toggle,0 -[Auxiliary2],VuMeterL_up_small,0 -[Microphone4],VuMeter_down_small,0 [EffectRack1_EffectUnit3_Effect1],parameter11_toggle,0 [Sampler3],hotcue_8_enabled,0 [Channel1],hotcue_7_enabled,0 [EffectRack1_EffectUnit2],next_chain,0 [EffectRack1_EffectUnit1_Effect4],parameter16_type,0 -[Auxiliary1],VuMeterR_up_small,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_type,2 [Sampler1],start,0 [Sampler3],hotcue_14_activate,0 @@ -10725,7 +10228,6 @@ [EffectRack1_EffectUnit3_Effect2],parameter3_set_minus_one,0 [EqualizerRack1_[Channel4]_Effect1],parameter1_loaded,1 [Sampler1],hotcue_10_set,0 -[Sampler2],PeakIndicator_set_one,0 [EffectRack1_EffectUnit4_Effect4],parameter11_set_minus_one,0 [QuickEffectRack1_[Channel3]],mix_set_default,0 [EffectRack1_EffectUnit1_Effect2],parameter15_toggle,0 @@ -10736,7 +10238,6 @@ [EffectRack1_EffectUnit3_Effect2],parameter11_toggle,0 [EffectRack1_EffectUnit1],next_chain,0 [EffectRack1_EffectUnit1_Effect2],parameter10_link_inverse,0 -[Auxiliary2],VuMeterR_up_small,0 [EffectRack1_EffectUnit1_Effect4],parameter11_down,0 [EffectRack1_EffectUnit4_Effect1],parameter6_type,0 [Sampler4],hotcue_14_activate,0 @@ -10761,7 +10262,6 @@ [Sampler2],reset_key,0 [PreviewDeck1],rate_minus_toggle,0 [EffectRack1_EffectUnit2_Effect2],parameter11_set_minus_one,0 -[Channel3],PeakIndicator_set_minus_one,0 [Sampler2],hotcue_24_activate,0 [Auxiliary4],pfl,0 [EffectRack1_EffectUnit3_Effect4],parameter10_link_inverse,0 @@ -10770,7 +10270,6 @@ [Sampler4],hotcue_10_set,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_set_default,0 [EffectRack1_EffectUnit1_Effect1],parameter13_toggle,0 -[Channel4],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit3_Effect3],parameter10_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter16_type,0 [QuickEffectRack1_[Channel2]],mix_down,0 @@ -10778,7 +10277,6 @@ [EffectRack1_EffectUnit3_Effect3],parameter10_link_inverse,0 [Sampler4],hotcue_18_activate,0 [EffectRack1_EffectUnit1_Effect2],parameter13_toggle,0 -[Channel1],PeakIndicator_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter3_link_inverse,0 [Channel3],start_stop,0 [EffectRack1_EffectUnit3_Effect4],parameter10_toggle,0 @@ -10786,24 +10284,19 @@ [Sampler1],hotcue_28_activate,0 [QuickEffectRack1_[Channel1]_Effect1],parameter16_minus_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter4_set_minus_one,0 -[Microphone2],VuMeterL_up,0 -[Microphone],VuMeter_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter4_link_inverse,0 [EffectRack1_EffectUnit1_Effect1],parameter16_toggle,0 -[Channel2],PeakIndicator_set_minus_one,0 [Channel4],start_stop,0 [EffectRack1_EffectUnit3_Effect1],parameter12_toggle,0 [Sampler2],hotcue_28_activate,0 [EffectRack1_EffectUnit2_Effect1],parameter6_type,0 [PreviewDeck1],orientation_right,0 [EffectRack1_EffectUnit4],next_chain,0 -[Microphone3],VuMeterL_up,0 [Microphone4],orientation,1 [Mixer Profile],LoEQFrequency_set_minus_one,0 [EffectRack1_EffectUnit2_Effect3],button_parameter6_type,0 [EqualizerRack1_[Master]_Effect1],parameter15_down_small,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter9_type,0 -[Auxiliary1],VuMeterL_set_zero,0 [EffectRack1_EffectUnit1_Effect2],parameter16_toggle,0 [Sampler1],hotcue_11_set,0 [EffectRack1_EffectUnit1_Effect4],parameter15_set_default,0 @@ -10814,12 +10307,10 @@ [EqualizerRack1_[Channel2]_Effect1],parameter2_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter4_link_type,0 [EffectRack1_EffectUnit3],next_chain,0 -[Microphone4],VuMeterL_up,0 [Microphone3],orientation,1 [EffectRack1_EffectUnit2_Effect4],button_parameter6_type,0 [Sampler1],hotcue_1_clear,0 [Sampler3],hotcue_26_activate_preview,0 -[Auxiliary2],VuMeterL_set_zero,0 [Mixer Profile],xFaderCalibration_minus_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter11_toggle,0 [Sampler2],hotcue_11_set,0 @@ -10829,7 +10320,6 @@ [Microphone3],pregain_minus_toggle,0 [Auxiliary1],pfl,0 [EffectRack1_EffectUnit1_Effect4],parameter12_down_small,0 -[Auxiliary1],VuMeterR_set_zero,0 [Sampler3],hotcue_12_activate,0 [QuickEffectRack1_[Channel4]],clear,0 [Channel3],hotcue_18_gotoandplay,0 @@ -10844,7 +10334,6 @@ [Microphone4],pregain_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter13_minus_toggle,0 [Auxiliary2],pfl,0 -[Auxiliary2],VuMeterR_set_zero,0 [Channel4],hotcue_7_enabled,0 [Sampler4],hotcue_12_activate,0 [QuickEffectRack1_[Channel3]_Effect1],parameter5_link_inverse,0 @@ -11070,10 +10559,8 @@ [EffectRack1_EffectUnit4_Effect3],parameter7_toggle,0 [Channel3],hotcue_22_activate_preview,0 [Channel4],pitch_adjust_set_one,0 -[Channel3],PeakIndicator_down_small,0 [PreviewDeck1],hotcue_23_gotoandstop,0 [Channel4],hotcue_20_position,-1 -[PreviewDeck1],PeakIndicator_set_default,0 [EffectRack1_EffectUnit2_Effect2],parameter6_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter5_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter7_link_inverse,0 @@ -11093,7 +10580,6 @@ [Sampler1],hotcue_26_activate_preview,0 [Mixer Profile],xFaderCalibration_down,0 [Sampler3],hotcue_34_clear,0 -[Channel4],PeakIndicator_down_small,0 [Sampler3],loop_move_0.25_backward,0 [Channel3],hotcue_20_position,-1 [EffectRack1_EffectUnit1_Effect3],parameter11_toggle,0 @@ -11214,7 +10700,6 @@ [EffectRack1_EffectUnit2_Effect4],parameter1_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter12_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter12_down_small,0 -[Microphone],VuMeter_minus_toggle,0 [EffectRack1_EffectUnit2_Effect4],parameter11_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_link_inverse,0 [QuickEffectRack1_[Channel3]_Effect1],parameter6_link_inverse,0 @@ -11230,7 +10715,6 @@ [Sampler4],hotcue_24_activate_preview,0 [Channel1],beats_translate_curpos,0 [Channel1],rate_down_small,0 -[Channel3],VuMeterR_set_one,0 [Sampler2],bpm_down_small,0 [EffectRack1_EffectUnit3_Effect2],parameter12_down_small,0 [Channel4],hotcue_24_position,-1 @@ -11249,7 +10733,6 @@ [Channel2],beat_next,-1 [Channel2],rate_down_small,0 [Channel1],playposition_set_one,0 -[Channel4],VuMeterR_set_one,0 [Sampler4],hotcue_7_enabled,0 [Channel3],hotcue_24_position,-1 [EffectRack1_EffectUnit2_Effect2],parameter11_set_default,0 @@ -11274,10 +10757,8 @@ [EqualizerRack1_[Channel1]_Effect1],parameter7_link_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter8_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter6_link_type,0 -[Channel3],VuMeter_up_small,0 [Channel2],hotcue_22_position,-1 [EffectRack1_EffectUnit3_Effect4],parameter6_set_default,0 -[Auxiliary3],PeakIndicator_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter6_loaded,0 [EffectRack1_EffectUnit2_Effect3],parameter5_loaded,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_set_zero,0 @@ -11292,13 +10773,11 @@ [Channel2],bpm_set_zero,0 [PreviewDeck1],loop_double,0 [EffectRack1_EffectUnit3_Effect1],button_parameter1_type,0 -[Channel4],VuMeter_up_small,0 [Channel4],hotcue_10_position,-1 [Sampler3],hotcue_32_activate,0 [Channel1],hotcue_22_position,-1 [EffectRack1_EffectUnit3_Effect3],parameter6_set_default,0 [EffectRack1_EffectUnit2_Effect3],parameter14_up_small,0 -[Auxiliary4],PeakIndicator_set_zero,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_link_inverse,0 [EffectRack1_EffectUnit2_Effect2],parameter9_loaded,0 [EffectRack1_EffectUnit2_Effect4],parameter2_loaded,0 @@ -11317,7 +10796,6 @@ [EqualizerRack1_[Master]_Effect1],parameter14_up_small,0 [EffectRack1_EffectUnit2_Effect1],parameter9_loaded,0 [EffectRack1_EffectUnit2_Effect3],parameter2_loaded,0 -[Channel1],PeakIndicator_down_small,0 [Channel3],beats_translate_later,0 [Channel4],hotcue_12_position,-1 [Sampler3],bpm_down_small,0 @@ -11333,8 +10811,6 @@ [EffectRack1_EffectUnit2_Effect4],parameter3_loaded,0 [QuickEffectRack1_[Channel4]_Effect1],parameter15_set_zero,0 [Auxiliary4],pregain_set_default,0 -[Microphone2],VuMeter_set_default,0 -[Channel2],PeakIndicator_down_small,0 [Channel3],hotcue_12_position,-1 [Channel4],beats_translate_later,0 [Sampler4],bpm_down_small,0 @@ -11379,7 +10855,6 @@ [PreviewDeck1],hotcue_16_gotoandplay,0 [Sampler4],hotcue_6_activate_preview,0 [EffectRack1_EffectUnit3_Effect2],parameter6_set_default,0 -[Auxiliary1],PeakIndicator_set_zero,0 [EffectRack1_EffectUnit2_Effect1],parameter3_loaded,0 [EffectRack1_EffectUnit2_Effect3],parameter8_loaded,0 [Channel3],hotcue_27_goto,0 @@ -11396,7 +10871,6 @@ [Sampler4],hotcue_32_enabled,0 [EffectRack1_EffectUnit3_Effect1],parameter6_set_default,0 [EffectRack1_EffectUnit2_Effect1],parameter14_up_small,0 -[Auxiliary2],PeakIndicator_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter2_loaded,0 [EffectRack1_EffectUnit2_Effect4],parameter9_loaded,0 [Channel4],hotcue_27_goto,0 @@ -11406,8 +10880,6 @@ [Channel4],vinylcontrol_enabled,0 [Channel4],loop_move_0.0625_backward,0 [PreviewDeck1],hotcue_24_set,0 -[Channel1],VuMeterR_set_one,0 -[Master],PeakIndicator_set_default,0 [PreviewDeck1],hotcue_5_set,0 [EffectRack1_EffectUnit1_Effect2],parameter10_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_loaded,0 @@ -11427,10 +10899,8 @@ [Channel3],hotcue_18_position,-1 [Channel3],vinylcontrol_enabled,0 [Channel3],hotcue_30_goto,0 -[Channel2],VuMeterR_set_one,0 [Channel3],playposition_set_one,0 [Channel4],beat_next,-1 -[Master],VuMeter_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter13_set_one,0 [EffectRack1_EffectUnit4_Effect1],parameter8_loaded,0 [EffectRack1_EffectUnit4_Effect3],parameter3_loaded,0 @@ -11443,13 +10913,11 @@ [Channel2],hotcue_27_goto,0 [Sampler3],loop_move_0.0625_forward,0 [EffectRack1_EffectUnit4],group_[Sampler4]_enable,0 -[Microphone4],VuMeter_set_default,0 [Channel3],hotcue_10_activate_preview,0 [Channel2],hotcue_26_position,-1 [Channel4],hotcue_30_goto,0 [Channel3],beat_next,-1 [Channel4],playposition_set_one,0 -[Sampler3],VuMeter_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter3_loaded,0 [EffectRack1_EffectUnit4_Effect4],parameter8_loaded,0 @@ -11466,7 +10934,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter1_toggle,0 [EffectRack1_EffectUnit1_Effect3],button_parameter1_type,0 [Sampler2],waveform_zoom,1 -[Microphone3],VuMeter_set_default,0 [Channel4],hotcue_10_activate_preview,0 [Channel4],hotcue_14_position,-1 [Sampler1],hotcue_24_activate_preview,0 @@ -11475,7 +10942,6 @@ [EffectRack1_EffectUnit2_Effect3],parameter10_up_small,0 [EffectRack1_EffectUnit4_Effect3],parameter16_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter8_set_default,0 -[Sampler4],VuMeter_minus_toggle,0 [EqualizerRack1_[Channel4]_Effect1],parameter4_down_small,0 [Sampler1],hotcue_1_goto,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_up_small,0 @@ -11515,7 +10981,6 @@ [Sampler1],hotcue_17_set,0 [EffectRack1_EffectUnit2_Effect1],parameter4_loaded,0 [EffectRack1_EffectUnit2_Effect3],parameter7_loaded,0 -[Microphone],VuMeterL_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter15_loaded,0 [PreviewDeck1],hotcue_30_clear,0 [EffectRack1_EffectUnit3_Effect2],parameter10_type,0 @@ -11555,14 +11020,12 @@ [EffectRack1_EffectUnit4_Effect4],parameter6_loaded,0 [Channel3],bpm_set_zero,0 [EqualizerRack1_[Channel2]_Effect1],parameter5_up_small,0 -[Channel1],VuMeter_up_small,0 [PreviewDeck1],passthrough,0 [QuickEffectRack1_[Channel4]_Effect1],parameter14_set_one,0 [Sampler3],hotcue_17_set,0 [PreviewDeck1],vinylcontrol_rate,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter9,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter8,0 -[Sampler3],VuMeter_up,0 [Channel1],vinylcontrol_enabled,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter5,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter4,0 @@ -11577,7 +11040,6 @@ [EqualizerRack1_[Channel3]_Effect1],button_parameter2,0 [Channel4],bpm_set_zero,0 [EffectRack1_EffectUnit4_Effect1],parameter14_up_small,0 -[Channel2],VuMeter_up_small,0 [EffectRack1_EffectUnit3_Effect3],button_parameter1_type,0 [Sampler1],hotcue_6_activate_preview,0 [Sampler1],hotcue_32_activate,0 @@ -11587,13 +11049,11 @@ [EffectRack1_EffectUnit2_Effect3],parameter12_up_small,0 [EffectRack1_EffectUnit3_Effect3],parameter13_up_small,0 [Sampler3],hotcue_10_gotoandstop,0 -[Sampler4],VuMeter_up,0 [Sampler2],hotcue_12_enabled,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter2_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_up_small,0 [PreviewDeck1],hotcue_28_activate_preview,0 [EffectRack1_EffectUnit4_Effect4],parameter2_set_default,0 -[Sampler1],VuMeter_minus_toggle,0 [Sampler4],waveform_zoom_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter4_loaded,0 [EffectRack1_EffectUnit4_Effect4],parameter7_loaded,0 @@ -11609,7 +11069,6 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter13_loaded,0 [Sampler4],hotcue_10_gotoandstop,0 [PreviewDeck1],hotcue_10_clear,0 -[Master],PeakIndicator_set_one,0 [Sampler1],hotcue_12_enabled,0 [EffectRack1_EffectUnit2_Effect1],parameter10_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter16_up_small,0 @@ -11618,7 +11077,6 @@ [Sampler1],hotcue_30_activate,0 [Sampler3],hotcue_36_activate,0 [EffectRack1_EffectUnit4_Effect3],parameter2_set_default,0 -[Sampler2],VuMeter_minus_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter13_up_small,0 [EffectRack1_EffectUnit3_Effect3],parameter11_up_small,0 [EffectRack1_EffectUnit4_Effect1],parameter4_loaded,0 @@ -11675,7 +11133,6 @@ [Channel2],pitch_down,0 [EffectRack1_EffectUnit3],num_effects,0 [Channel4],bpm_tap,0 -[Sampler2],VuMeter_set_default,0 [EffectRack1_EffectUnit2_Effect1],parameter3_set_one,0 [Channel1],beatloop_0.03125_enabled,0 [EffectRack1_EffectUnit4_Effect3],parameter12_up_small,0 @@ -11692,7 +11149,6 @@ [Sampler1],LoadSelectedTrackAndPlay,0 [EffectRack1_EffectUnit3_Effect2],parameter15_up_small,0 [Channel1],pitch_down,0 -[Sampler1],VuMeter_set_default,0 [EffectRack1_EffectUnit2_Effect2],parameter3_set_one,0 [EffectRack1_EffectUnit4_Effect4],parameter12_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_set_one,0 @@ -11760,7 +11216,6 @@ [EqualizerRack1_[Master]_Effect1],parameter3_up,0 [Sampler2],loop_move_0.0625_forward,0 [EqualizerRack1_[Channel1]_Effect1],parameter14_set_minus_one,0 -[Sampler1],VuMeter_up,0 [Sampler2],hotcue_28_gotoandstop,0 [Sampler4],hotcue_30_gotoandstop,0 [EffectRack1_EffectUnit1_Effect1],parameter15_up_small,0 @@ -11786,7 +11241,6 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter1_link_inverse,1 [EffectRack1_EffectUnit1_Effect3],parameter10_set_minus_one,0 [Sampler1],hotcue_20_gotoandstop,0 -[Sampler2],VuMeter_up,0 [EffectRack1_EffectUnit1_Effect2],parameter15_up_small,0 [EffectRack1_EffectUnit2_Effect2],parameter16_up_small,0 [EffectRack1_EffectUnit4_Effect2],parameter10_up_small,0 @@ -11833,7 +11287,6 @@ [Sampler2],hotcue_25_goto,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter8,0 [EffectRack1_EffectUnit2_Effect4],parameter3_set_one,0 -[Auxiliary3],PeakIndicator_minus_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter12_up_small,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter5,0 [Channel3],hotcue_30_position,-1 @@ -11849,7 +11302,6 @@ [EqualizerRack1_[Channel3]_Effect1],parameter11_set_minus_one,0 [Channel4],hotcue_32_position,-1 [Sampler4],hotcue_19_set,0 -[Auxiliary4],PeakIndicator_minus_toggle,0 [EffectRack1_EffectUnit4_Effect4],parameter1_loaded,0 [EffectRack1_EffectUnit1_Effect2],parameter3_down,0 [Sampler1],hotcue_32_goto,0 @@ -11908,26 +11360,21 @@ [Sampler1],beatsync_tempo,0 [EffectRack1_EffectUnit3_Effect2],parameter2_set_minus_one,0 [PreviewDeck1],hotcue_28_set,0 -[Sampler3],VuMeterL_down_small,0 [PreviewDeck1],hotcue_9_set,0 [Sampler4],hotcue_25_goto,0 [Channel1],bpm_tap,0 [Channel4],hotcue_11_goto,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_loaded,0 [EffectRack1_EffectUnit4_Effect1],parameter3_down_small,0 -[Auxiliary1],PeakIndicator_minus_toggle,0 [Auxiliary3],volume_down,0 [EffectRack1_EffectUnit3_Effect3],parameter10_set_minus_one,0 [Sampler2],beatsync_tempo,0 [EffectRack1_EffectUnit3_Effect3],parameter2_set_minus_one,0 [Sampler2],pregain_set_default,0 [Sampler1],pregain_down_small,0 -[Sampler4],VuMeterL_down_small,0 [Channel2],bpm_tap,0 [Channel1],hotcue_11_goto,0 -[Sampler4],VuMeter_set_default,0 [EffectRack1_EffectUnit4_Effect2],parameter3_down_small,0 -[Auxiliary2],PeakIndicator_minus_toggle,0 [Sampler1],play_indicator,0 [Sampler3],hotcue_32_goto,0 [EffectRack1_EffectUnit3_Effect4],parameter10_set_minus_one,0 @@ -11937,7 +11384,6 @@ [Sampler2],pregain_down_small,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter15_type,0 [Channel2],hotcue_11_goto,0 -[Sampler3],VuMeter_set_default,0 [EqualizerRack1_[Channel3]_Effect1],parameter4_minus_toggle,0 [Sampler2],play_indicator,0 [Sampler4],hotcue_32_goto,0 @@ -11975,7 +11421,6 @@ [Sampler1],beatloop_2_activate,0 [Sampler3],beatloop_4_activate,0 [Sampler3],hotcue_19_enabled,0 -[Microphone3],VuMeter_up,0 [Channel3],track_samplerate,0 [Microphone2],pregain_set_zero,0 [EffectRack1_EffectUnit1_Effect1],button_parameter10_type,0 @@ -11997,12 +11442,10 @@ [Sampler4],pregain_set_default,0 [Sampler4],beatloop_4_activate,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter5,0 -[Microphone4],VuMeter_up,0 [Channel4],track_samplerate,0 [EqualizerRack1_[Channel4]],mix_set_zero,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter4,0 [Microphone3],pregain_set_zero,0 -[PreviewDeck1],VuMeterL_up,0 [EffectRack1_EffectUnit1_Effect2],button_parameter10_type,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter7,0 [EqualizerRack1_[Channel1]_Effect1],button_parameter6,0 @@ -12026,7 +11469,6 @@ [Sampler2],pitch_adjust_set_minus_one,0 [EffectRack1_EffectUnit3_Effect2],button_parameter10_type,0 [Microphone4],orientation_center,0 -[Microphone2],VuMeter_up,0 [Channel1],hotcue_34_activate_preview,0 [EffectRack1_EffectUnit1_Effect4],button_parameter10_type,0 [EffectRack1_EffectUnit2_Effect2],parameter3_down_small,0 @@ -12116,7 +11558,6 @@ [Channel1],hotcue_34_position,-1 [PreviewDeck1],scratch2,0 [Channel2],hotcue_7_gotoandplay,0 -[Sampler1],VuMeterL_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter9_minus_toggle,0 [Channel2],hotcue_36_position,-1 [Microphone2],orientation_center,0 @@ -12127,7 +11568,6 @@ [Sampler3],hotcue_21_activate_preview,0 [EqualizerRack1_[Channel1]],next_chain,0 [Sampler4],beatloop_0.125,0 -[Sampler2],VuMeterL_down_small,0 [EffectRack1_EffectUnit3_Effect3],parameter15,0 [EqualizerRack1_[Channel3]],super1_set_one,0 [EffectRack1_EffectUnit3_Effect3],parameter14,0 @@ -12189,7 +11629,6 @@ [EffectRack1_EffectUnit1_Effect4],parameter13,0 [EffectRack1_EffectUnit1_Effect4],parameter12,0 [Channel2],cue_gotoandstop,0 -[Auxiliary3],VuMeter_set_minus_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter8_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter6_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter11_minus_toggle,0 @@ -12204,7 +11643,6 @@ [EqualizerRack1_[Channel2]_Effect1],button_parameter9,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter8,0 [EffectRack1_EffectUnit2_Effect1],parameter8_set_one,0 -[Auxiliary4],VuMeter_set_minus_one,0 [EffectRack1_EffectUnit3_Effect2],parameter1_down,0 [EffectRack1_EffectUnit4_Effect3],parameter12_minus_toggle,0 [EqualizerRack1_[Channel2]_Effect1],button_parameter5,0 @@ -12225,22 +11663,17 @@ [EqualizerRack1_[Channel2]],mix_minus_toggle,0 [Sampler4],hotcue_15_set,0 [EffectRack1_EffectUnit2_Effect2],parameter8_set_one,0 -[Auxiliary1],VuMeter_set_minus_one,0 [EffectRack1_EffectUnit3_Effect1],parameter1_down,0 [EffectRack1_EffectUnit4_Effect4],parameter12_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_up_small,0 -[Auxiliary1],VuMeterL_set_one,0 [Auxiliary2],volume_set_default,0 [Sampler2],beatloop_4_activate,0 [EffectRack1_EffectUnit1_Effect3],parameter4_type,0 [EffectRack1_EffectUnit1_Effect2],parameter1_down,0 [EffectRack1_EffectUnit3_Effect2],parameter4_type,0 [PreviewDeck1],visual_key,0 -[Auxiliary2],VuMeter_set_minus_one,0 -[Sampler1],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit3_Effect4],parameter1_down,0 [EffectRack1_EffectUnit4_Effect1],parameter12_minus_toggle,0 -[Auxiliary2],VuMeterL_set_one,0 [Auxiliary1],volume_set_default,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter4_type,0 @@ -12248,9 +11681,7 @@ [EqualizerRack1_[Channel1]_Effect1],parameter1_up_small,0 [EqualizerRack1_[Master]_Effect1],parameter10_type,0 [QuickEffectRack1_[Channel3]],super1_toggle,0 -[Auxiliary1],VuMeter_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter7_minus_toggle,0 -[Sampler2],PeakIndicator_set_minus_one,0 [EffectRack1_EffectUnit3_Effect3],parameter1_down,0 [EffectRack1_EffectUnit4_Effect2],parameter12_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter7_down_small,0 @@ -12261,7 +11692,6 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter15_link_inverse,0 [EqualizerRack1_[Channel2]_Effect1],parameter4_type,0 [Channel1],hotcue_6_gotoandstop,0 -[Auxiliary2],VuMeter_up_small,0 [Sampler1],hotcue_16_set,0 [EffectRack1_EffectUnit4_Effect3],parameter11_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter16_link_inverse,0 @@ -12306,16 +11736,13 @@ [Channel3],beatloop_0.125,0 [Channel4],beatloop_64_toggle,0 [Channel1],hotcue_28_clear,0 -[Sampler3],PeakIndicator_set_minus_one,0 [QuickEffectRack1_[Channel3]_Effect1],parameter13_link_inverse,0 [EffectRack1_EffectUnit4_Effect4],parameter9_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter4_set_minus_one,0 [Channel2],hotcue_28_clear,0 -[Sampler4],PeakIndicator_set_minus_one,0 [Sampler1],cue_indicator,0 [EqualizerRack1_[Channel2]_Effect1],parameter7_set_minus_one,0 [Sampler1],hotcue_21_activate_preview,0 -[Channel3],VuMeterL_set_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter11_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_type,0 [Channel3],hotcue_6_gotoandstop,0 @@ -12328,7 +11755,6 @@ [EqualizerRack1_[Channel3]_Effect1],parameter8_link_type,0 [EffectRack1_EffectUnit4_Effect3],parameter8_set_one,0 [Sampler2],hotcue_21_activate_preview,0 -[Channel4],VuMeterL_set_one,0 [Sampler4],hotcue_5_enabled,0 [Channel4],hotcue_6_gotoandstop,0 [EffectRack1_EffectUnit4_Effect2],parameter10_minus_toggle,0 @@ -12351,7 +11777,6 @@ [EffectRack1_EffectUnit1_Effect2],parameter4_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_loaded,1 [Channel1],beatloop_64_toggle,0 -[Auxiliary3],VuMeter_up_small,0 [EffectRack1_EffectUnit2_Effect4],parameter9_type,0 [EffectRack1_EffectUnit3],chain_selector,0 [EffectRack1_EffectUnit1_Effect2],button_parameter12_type,0 @@ -12363,7 +11788,6 @@ [Channel2],beatloop_64_toggle,0 [EffectRack1_EffectUnit3_Effect1],button_parameter12_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter15_set_zero,0 -[Auxiliary4],VuMeter_up_small,0 [QuickEffectRack1_[Channel1]],mix_set_minus_one,0 [PreviewDeck1],beatloop_64_activate,0 [EffectRack1_EffectUnit4],chain_selector,0 @@ -12377,14 +11801,12 @@ [PreviewDeck1],hotcue_23_activate_preview,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_set_default,0 [QuickEffectRack1_[Channel4]_Effect1],parameter16_up_small,0 -[Auxiliary3],VuMeterL_set_one,0 [EffectRack1_EffectUnit1_Effect4],button_parameter12_type,0 [EffectRack1_EffectUnit1_Effect2],parameter16_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter13_set_zero,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_down_small,0 [EffectRack1_EffectUnit3_Effect3],button_parameter12_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter15_link_inverse,0 -[Auxiliary4],VuMeterL_set_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter5_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_loaded,0 @@ -12420,7 +11842,6 @@ [EqualizerRack1_[Channel2]],mix_set_zero,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_link_inverse,0 [PreviewDeck1],sync_enabled,0 -[Channel1],VuMeterL_set_one,0 [Channel3],hotcue_18_clear,0 [Sampler3],beatloop,0 [QuickEffectRack1_[Channel3]_Effect1],parameter12_link_inverse,0 @@ -12431,7 +11852,6 @@ [Channel4],rate_temp_up,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter13_link_inverse,0 -[Channel2],VuMeterL_set_one,0 [Channel4],hotcue_18_clear,0 [Mixer Profile],xFaderCurve_down,0 [Sampler4],beatloop,0 @@ -12457,7 +11877,6 @@ [Channel3],cue_cdj,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_set_zero,0 [EqualizerRack1_[Channel4]_Effect1],parameter12_set_one,0 -[Master],VuMeter_set_default,0 [QuickEffectRack1_[Channel4]_Effect1],parameter11_set_default,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_set_minus_one,0 [EffectRack1_EffectUnit4_Effect3],parameter10_minus_toggle,0 @@ -12578,7 +11997,6 @@ [EqualizerRack1_[Channel2]_Effect1],parameter10_down,0 [Sampler3],hotcue_2_gotoandplay,0 [EffectRack1_EffectUnit1_Effect2],parameter5_set_minus_one,0 -[Auxiliary1],PeakIndicator_down_small,0 [PreviewDeck1],loop_move_2_backward,0 [Sampler1],local_bpm,0 [PreviewDeck1],hotcue_6_position,-1 @@ -12592,21 +12010,18 @@ [Sampler4],hotcue_2_gotoandplay,0 [EqualizerRack1_[Channel4]_Effect1],parameter7_set_minus_one,0 [EffectRack1_EffectUnit1_Effect3],parameter5_set_minus_one,0 -[Auxiliary2],PeakIndicator_down_small,0 [Channel1],hotcue_2_goto,0 [Channel1],beatloop_2_activate,0 [Sampler2],local_bpm,0 [Channel3],hotcue_5_clear,0 [EffectRack1_EffectUnit4_Effect1],button_parameter15_loaded,0 [EqualizerRack1_[Master]_Effect1],parameter10_up,0 -[Microphone2],VuMeterL_down,0 [Channel1],rateSearch_minus_toggle,0 [EqualizerRack1_[Channel4]_Effect1],parameter11_type,0 [Sampler2],cue_gotoandstop,0 [EffectRack1_EffectUnit2_Effect2],button_parameter7_type,0 [EffectRack1_EffectUnit4_Effect3],parameter12_type,0 [EffectRack1_EffectUnit2_Effect2],button_parameter16_loaded,0 -[Master],VuMeter_minus_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter15_loaded,0 [EffectRack1_EffectUnit1_Effect4],parameter5_set_minus_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter12_minus_toggle,0 @@ -12690,7 +12105,6 @@ [PreviewDeck1],hotcue_4_position,-1 [Sampler1],main_mix,1 [Channel2],hotcue_31_activate_preview,0 -[Sampler4],VuMeter_down,0 [Channel2],hotcue_5_clear,0 [EqualizerRack1_[Channel2]_Effect1],parameter15,0 [EffectRack1_EffectUnit4_Effect2],button_parameter11_loaded,0 @@ -12705,8 +12119,6 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter15_up,0 [EqualizerRack1_[Channel3]_Effect1],parameter6_set_one,0 [Sampler2],main_mix,1 -[Auxiliary3],VuMeterR_toggle,0 -[Sampler3],VuMeter_down,0 [EqualizerRack1_[Channel2]_Effect1],parameter2_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_toggle,0 [EffectRack1_EffectUnit4_Effect1],button_parameter11_loaded,0 @@ -12716,9 +12128,7 @@ [EffectRack1_EffectUnit3_Effect1],parameter5_set_minus_one,0 [Channel1],beats_adjust_slower,0 [Sampler4],playposition_set_one,0 -[Auxiliary3],PeakIndicator_down_small,0 [Sampler1],waveform_zoom_set_one,0 -[Auxiliary4],VuMeterR_toggle,0 [Sampler3],hotcue_4_enabled,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter10_link_inverse,0 @@ -12729,7 +12139,6 @@ [EffectRack1_EffectUnit3_Effect2],parameter5_set_minus_one,0 [Channel2],beats_adjust_slower,0 [EffectRack1_EffectUnit1],super1_set_one,0 -[Auxiliary4],PeakIndicator_down_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_link_inverse,0 [Sampler2],waveform_zoom_set_one,0 @@ -12759,7 +12168,6 @@ [EffectRack1_EffectUnit3],super1_set_one,0 [Sampler4],playposition,0.5 [Channel2],beatloop_8_activate,0 -[Auxiliary3],VuMeterL_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_toggle,0 [Channel1],pregain_up,0 [EffectRack1_EffectUnit1_Effect3],parameter16_set_default,0 @@ -12772,7 +12180,6 @@ [EqualizerRack1_[Master]_Effect1],parameter4_toggle,0 [Sampler3],playposition,0.5 [PreviewDeck1],hotcue_29_clear,0 -[Auxiliary4],VuMeterL_toggle,0 [Channel2],pregain_up,0 [EffectRack1_EffectUnit4_Effect2],button_parameter12_loaded,0 [QuickEffectRack1_[Channel4]_Effect1],parameter14_up_small,0 @@ -12786,14 +12193,10 @@ [PreviewDeck1],beatloop_16_toggle,0 [Channel1],hotcue_14_gotoandstop,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_set_default,0 -[Auxiliary1],VuMeterL_toggle,0 [Channel1],beatloop_4_activate,0 -[Channel1],VuMeterR_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter2_toggle,0 [Auxiliary3],pregain_toggle,0 [EffectRack1_EffectUnit4_Effect1],button_parameter12_loaded,0 -[Microphone4],VuMeterL_down,0 -[Auxiliary4],VuMeter_down,0 [EffectRack1_EffectUnit2_Effect4],button_parameter7_type,0 [Playlist],ToggleSelectedSidebarItem,0 [EffectRack1_EffectUnit4_Effect1],parameter12_type,0 @@ -12813,14 +12216,10 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter4_up,0 [Channel3],hotcue_13_gotoandplay,0 [Sampler3],waveform_zoom_set_one,0 -[Auxiliary2],VuMeterL_toggle,0 [Channel2],beatloop_4_activate,0 -[Channel2],VuMeterR_toggle,0 [Auxiliary4],pregain_toggle,0 [EffectRack1_EffectUnit4_Effect4],button_parameter12_loaded,0 -[Microphone3],VuMeterL_down,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter6_type,0 -[Auxiliary3],VuMeter_down,0 [EffectRack1_EffectUnit4_Effect2],parameter12_type,0 [Master],crossfader_set_default,0 [PreviewDeck1],beatloop_1_enabled,0 @@ -12840,7 +12239,6 @@ [Sampler2],beatloop_2_toggle,0 [EffectRack1_EffectUnit2_Effect4],button_parameter11_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_up,0 -[PreviewDeck1],PeakIndicator_up,0 [QuickEffectRack1_[Channel4]],mix_up,0 [EqualizerRack1_[Master]_Effect1],parameter2_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter1_minus_toggle,0 @@ -12858,8 +12256,6 @@ [EffectRack1_EffectUnit4_Effect3],button_parameter7_type,0 [Channel2],hotcue_33_gotoandplay,0 [Sampler1],beatloop_0.125_activate,0 -[Auxiliary1],VuMeterR_toggle,0 -[Channel1],VuMeterL_toggle,0 [Sampler1],pregain,1 [QuickEffectRack1_[Channel1]_Effect1],parameter4_toggle,0 [EffectRack1_EffectUnit1_Effect1],parameter16_set_default,0 @@ -12873,8 +12269,6 @@ [EffectRack1_EffectUnit4_Effect4],button_parameter7_type,0 [Channel3],hotcue_23_gotoandplay,0 [Sampler2],beatloop_0.125_activate,0 -[Auxiliary2],VuMeterR_toggle,0 -[Channel2],VuMeterL_toggle,0 [Sampler4],pregain,1 [EqualizerRack1_[Channel1]_Effect1],parameter5_minus_toggle,0 [Channel2],bpm_up,0 @@ -12889,7 +12283,6 @@ [Sampler3],beatloop_0.125_activate,0 [Sampler3],pregain,1 [Auxiliary1],pregain_toggle,0 -[Master],VuMeter_toggle,0 [Channel3],bpm_up,0 [Sampler3],hotcue_8_activate_preview,0 [Sampler4],cue_mode,0 @@ -12903,7 +12296,6 @@ [Channel1],hotcue_23_gotoandplay,0 [Channel3],beatloop_8_activate,0 [Sampler4],beatloop_0.125_activate,0 -[Sampler2],VuMeter_down,0 [Auxiliary2],pregain_toggle,0 [EffectRack1_EffectUnit4_Effect4],button_parameter11_loaded,0 [Channel4],bpm_up,0 @@ -12920,7 +12312,6 @@ [Channel2],hotcue_23_gotoandplay,0 [Channel4],beatloop_8_activate,0 [EffectRack1_EffectUnit3_Effect2],parameter16_set_default,0 -[Sampler1],VuMeter_down,0 [EffectRack1_EffectUnit4_Effect3],button_parameter11_loaded,0 [Channel2],start,0 [Sampler2],hotcue_4_enabled,0 @@ -12951,7 +12342,6 @@ [EqualizerRack1_[Channel1]_Effect1],parameter14_set_zero,0 [Channel3],hotcue_24_gotoandstop,0 [Channel4],hotcue_33_gotoandplay,0 -[Channel3],VuMeterL_toggle,0 [Channel3],beatloop_4_activate,0 [QuickEffectRack1_[Channel1]_Effect1],parameter1_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter14_minus_toggle,0 @@ -12966,7 +12356,6 @@ [EqualizerRack1_[Master]_Effect1],parameter6_toggle,0 [Channel4],hotcue_24_gotoandstop,0 [Channel1],hotcue_13_gotoandplay,0 -[Channel4],VuMeterL_toggle,0 [Channel4],beatloop_4_activate,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_minus_toggle,0 [Sampler2],beatloop_0.0625,0 @@ -12978,7 +12367,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter12_minus_toggle,0 [Sampler1],hotcue_17_enabled,0 [EffectRack1_EffectUnit1_Effect4],parameter7_set_default,0 -[Microphone],VuMeterR_set_zero,0 [EqualizerRack1_[Channel2]_Effect1],parameter1_link_type,0 [EqualizerRack1_[Channel3]_Effect1],parameter4_link_type,0 [Sampler1],hotcue_5_activate,0 @@ -13001,56 +12389,43 @@ [Channel4],pregain_up,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_minus_toggle,0 [Sampler1],hotcue_37_enabled,0 -[Microphone],VuMeterL_set_zero,0 [Sampler1],hotcue_3_activate,0 [Auxiliary3],VuMeter,0 [EqualizerRack1_[Channel1]_Effect1],parameter14_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter1_minus_toggle,0 [PreviewDeck1],visual_key_distance_minus_toggle,0 -[Channel1],VuMeterR_set_zero,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_up,0 [Sampler4],playposition_set_default,0 [Channel3],hotcue_14_gotoandstop,0 [Sampler4],hotcue_9_activate,0 -[Channel3],VuMeterR_toggle,0 [EffectRack1_EffectUnit3_Effect3],parameter1_minus_toggle,0 -[Auxiliary2],VuMeter_down,0 [Sampler2],hotcue_3_activate,0 [Auxiliary4],VuMeter,0 [Sampler3],hotcue_7_activate,0 -[Channel2],VuMeterR_set_zero,0 [Sampler3],playposition_set_default,0 [Channel4],hotcue_14_gotoandstop,0 [QuickEffectRack1_[Channel1]_Effect1],parameter4_minus_toggle,0 [Sampler1],hotcue_9_activate,0 -[Channel4],VuMeterR_toggle,0 [PreviewDeck1],hotcue_26_gotoandstop,0 [EffectRack1_EffectUnit3_Effect4],parameter1_minus_toggle,0 -[Auxiliary1],VuMeter_down,0 [PreviewDeck1],hotcue_36_activate_preview,0 -[Channel1],VuMeterL_set_zero,0 [Sampler3],beatloop_2_toggle,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_set_one,0 [Sampler4],hotcue_7_activate,0 -[Auxiliary3],PeakIndicator_set_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter1_minus_toggle,0 [EqualizerRack1_[Channel2]_Effect1],parameter13_set_minus_one,0 [QuickEffectRack1_[Channel2]],super1_set_default,0 [Sampler2],hotcue_9_activate,0 -[Channel2],VuMeterL_set_zero,0 [EqualizerRack1_[Channel3]_Effect1],parameter11_set_one,0 [Sampler4],beatloop_2_toggle,0 -[Auxiliary1],VuMeterR_set_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter12_type,0 [Channel1],playposition_set_minus_one,0 [Sampler1],hotcue_7_activate,0 -[Auxiliary4],PeakIndicator_set_one,0 [Sampler1],hotcue_8_activate_preview,0 [EqualizerRack1_[Channel2]_Effect1],parameter13_up_small,0 [EqualizerRack1_[Channel4]_Effect1],parameter7_minus_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter14_down,0 [EqualizerRack1_[Channel1]_Effect1],parameter2_minus_toggle,0 -[Auxiliary2],VuMeterR_set_one,0 [Channel2],playposition_set_minus_one,0 [Sampler2],hotcue_7_activate,0 [EqualizerRack1_[Channel1]],loaded,1 @@ -13101,7 +12476,6 @@ [Channel3],play_stutter,0 [PreviewDeck1],hotcue_11_enabled,0 [Master],headGain_down_small,0 -[Master],VuMeter_set_minus_one,0 [Channel1],loop_move_1_forward,0 [EqualizerRack1_[Channel3]],super1,0 [Channel1],hotcue_18_activate_preview,0 @@ -13125,7 +12499,6 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter9_set_minus_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter12_set_default,0 [QuickEffectRack1_[Channel2]_Effect1],parameter11_minus_toggle,0 -[Channel3],VuMeterR_set_zero,0 [EffectRack1_EffectUnit3],mix,1 [EqualizerRack1_[Channel1]_Effect1],parameter16_set_zero,0 [QuickEffectRack1_[Channel2]_Effect1],parameter10_set_minus_one,0 @@ -13140,7 +12513,6 @@ [Sampler3],visual_bpm,0 [PreviewDeck1],hotcue_31_gotoandplay,0 [EqualizerRack1_[Channel2]_Effect1],parameter2_set_minus_one,0 -[Channel4],VuMeterR_set_zero,0 [EffectRack1_EffectUnit3_Effect1],parameter4_down_small,0 [EffectRack1_EffectUnit4],mix,1 [EffectRack1_EffectUnit2_Effect2],parameter14_down,0 @@ -13148,11 +12520,8 @@ [EffectRack1_EffectUnit3_Effect2],parameter1_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_minus_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter12_set_default,0 -[Channel3],VuMeterL_set_zero,0 [Sampler2],cue_point,-1 -[Channel3],VuMeterR_up,0 [Sampler4],visual_bpm,0 -[Auxiliary1],PeakIndicator_set_one,0 [PreviewDeck1],hotcue_17_set,0 [PreviewDeck1],scratch_position_enable,0 [EffectRack1_EffectUnit3_Effect2],parameter2_down,0 @@ -13166,11 +12535,8 @@ [PreviewDeck1],hotcue_35_activate_preview,0 [PreviewDeck1],volume_set_minus_one,0 [EffectRack1_EffectUnit4_Effect2],parameter12_set_default,0 -[Channel4],VuMeterL_set_zero,0 [EffectRack1_EffectUnit1_Effect1],parameter4_down_small,0 [Sampler1],cue_point,-1 -[Channel4],VuMeterR_up,0 -[Auxiliary2],PeakIndicator_set_one,0 [Microphone3],talkover,0 [EffectRack1_EffectUnit3_Effect1],parameter2_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_minus_toggle,0 @@ -13211,7 +12577,6 @@ [EffectRack1_EffectUnit1_Effect3],parameter2_down,0 [EqualizerRack1_[Channel2]],mix,1 [Sampler2],beatloop_8_toggle,0 -[Auxiliary3],VuMeterR_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_set_default,0 [QuickEffectRack1_[Channel4]_Effect1],parameter15_down,0 [Channel4],hotcue_9_position,-1 @@ -13223,7 +12588,6 @@ [Sampler3],hotcue_24_goto,0 [Channel3],hotcue_10_goto,0 [EqualizerRack1_[Channel4]_Effect1],parameter6_set_one,0 -[Auxiliary4],VuMeterR_set_one,0 [Sampler4],cue_point,-1 [EqualizerRack1_[Channel2]_Effect1],parameter10_set_zero,0 [QuickEffectRack1_[Channel3]],super1_set_default,0 @@ -13241,7 +12605,6 @@ [Sampler3],cue_point,-1 [PreviewDeck1],hotcue_11_gotoandplay,0 [EffectRack1_EffectUnit2_Effect1],num_button_parameterslots,16 -[Microphone],VuMeter_up_small,0 [Channel4],hotcue_18_activate_preview,0 [Channel1],hotcue_10_goto,0 [Sampler4],scratch_position,0 @@ -13347,18 +12710,15 @@ [Channel1],hotcue_3_position,-1 [Sampler4],vinylcontrol_cueing,0 [EffectRack1_EffectUnit3_Effect1],button_parameter13_type,0 -[Channel1],VuMeterR_up,0 [PreviewDeck1],hotcue_5_goto,0 [EffectRack1_EffectUnit2_Effect2],parameter3_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],parameter14_set_default,0 [EffectRack1_EffectUnit4_Effect2],num_button_parameterslots,16 [EffectRack1_EffectUnit1_Effect3],button_parameter13_type,0 [Channel2],hotcue_5_position,-1 -[Channel3],VuMeter_set_one,0 [EffectRack1_EffectUnit2_Effect2],parameter14_set_one,0 [EffectRack1_EffectUnit2],super1_minus_toggle,0 [EffectRack1_EffectUnit3_Effect4],parameter14_toggle,0 -[Channel1],PeakIndicator_set_zero,0 [Sampler1],hotcue_4_clear,0 [Sampler2],hotcue_3_enabled,0 [Channel1],hotcue_21_clear,0 @@ -13366,7 +12726,6 @@ [QuickEffectRack1_[Channel3]_Effect1],parameter5_set_one,0 [QuickEffectRack1_[Channel4]_Effect1],parameter1_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],button_parameter13_type,0 -[Channel2],VuMeterR_up,0 [EffectRack1_EffectUnit2_Effect1],parameter3_set_default,0 [Sampler1],bpm_minus_toggle,0 [EffectRack1_EffectUnit4_Effect3],parameter11_link_type,0 @@ -13374,9 +12733,7 @@ [EffectRack1_EffectUnit4_Effect1],num_button_parameterslots,16 [EffectRack1_EffectUnit1_Effect4],button_parameter13_type,0 [Channel1],hotcue_5_position,-1 -[Channel4],VuMeter_set_one,0 [VinylControl],gain,0 -[Channel2],PeakIndicator_set_zero,0 [Sampler1],hotcue_3_enabled,0 [Sampler2],hotcue_4_clear,0 [EqualizerRack1_[Channel1]],chain_selector,0 @@ -13386,9 +12743,7 @@ [Sampler2],bpm_minus_toggle,0 [EffectRack1_EffectUnit4_Effect4],parameter11_link_type,0 [EqualizerRack1_[Channel4]_Effect1],parameter13_up_small,0 -[Auxiliary3],VuMeter_up,0 [Sampler3],hotcue_23_gotoandstop,0 -[Channel3],PeakIndicator_set_zero,0 [Sampler3],hotcue_4_clear,0 [EqualizerRack1_[Channel1]_Effect1],parameter16_set_minus_one,0 [Channel1],hotcue_31_clear,0 @@ -13398,12 +12753,10 @@ [Master],balance_down,0 [Channel1],beatjump_2_forward,0 [Channel3],beatloop,0 -[Auxiliary4],VuMeter_up,0 [QuickEffectRack1_[Channel1]_Effect1],parameter7_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter15_down,0 [Sampler4],hotcue_23_gotoandstop,0 [Channel2],hotcue_1_position,-1 -[Channel4],PeakIndicator_set_zero,0 [Sampler4],hotcue_4_clear,0 [Channel2],hotcue_31_clear,0 [QuickEffectRack1_[Channel1]_Effect1],parameter3_down,0 @@ -13423,7 +12776,6 @@ [EffectRack1_EffectUnit2_Effect4],parameter7_down,0 [Sampler2],hotcue_14_gotoandplay,0 [Sampler4],rate_temp_down_small,0 -[Channel1],VuMeter_set_minus_one,0 [Sampler2],hotcue_33_gotoandstop,0 [Channel1],pitch_set_minus_one,0 [EffectRack1_EffectUnit3],super1_minus_toggle,0 @@ -13434,11 +12786,9 @@ [EffectRack1_EffectUnit2_Effect3],parameter11_link_type,0 [EffectRack1_EffectUnit3_Effect1],parameter7_set_one,0 [Sampler3],hotcue_34_gotoandplay,0 -[Channel2],VuMeter_set_minus_one,0 [PreviewDeck1],loop_move_4_forward,0 [EffectRack1_EffectUnit4_Effect4],num_button_parameterslots,16 [EqualizerRack1_[Master]_Effect1],parameter7_set_default,0 -[Channel1],VuMeter_set_one,0 [Channel1],local_bpm,0 [QuickEffectRack1_[Channel4]_Effect1],parameter4_set_one,0 [Sampler3],hotcue_33_gotoandstop,0 @@ -13453,7 +12803,6 @@ [EffectRack1_EffectUnit4_Effect1],parameter11_link_type,0 [QuickEffectRack1_[Channel4]_Effect1],parameter15_minus_toggle,0 [EffectRack1_EffectUnit4_Effect3],num_button_parameterslots,16 -[Channel2],VuMeter_set_one,0 [Channel2],local_bpm,0 [EffectRack1_EffectUnit1_Effect3],parameter14_toggle,0 [Sampler4],hotcue_33_gotoandstop,0 @@ -13496,7 +12845,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter4_set_minus_one,0 [Sampler4],pitch_up_small,0 [Channel3],jog,0 -[Microphone],VuMeter_set_minus_one,0 [Channel4],beat_closest,-1 [Channel1],hotcue_25_activate,0 [EffectRack1_EffectUnit4_Effect3],parameter16_down,0 @@ -13516,9 +12864,7 @@ [Channel2],hotcue_25_activate,0 [Sampler2],rate_perm_down,0 [Sampler4],hotcue_24_gotoandplay,0 -[Channel3],VuMeter_set_minus_one,0 [Sampler3],beats_translate_later,0 -[Channel1],VuMeter_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter9_set_one,0 [EffectRack1_EffectUnit1],group_[BusRight]_enable,0 [EffectRack1_EffectUnit2_Effect2],button_parameter14_type,0 @@ -13538,10 +12884,7 @@ [Sampler2],hotcue_12_goto,0 [Sampler1],rate_perm_down,0 [Sampler1],hotcue_34_gotoandplay,0 -[Channel4],VuMeter_set_minus_one,0 [Sampler4],beats_translate_later,0 -[Channel2],VuMeter_toggle,0 -[Auxiliary1],VuMeter_up,0 [EffectRack1_EffectUnit2],group_[BusRight]_enable,0 [EffectRack1_EffectUnit2_Effect3],button_parameter14_type,0 [Sampler1],hotcue_13_gotoandstop,0 @@ -13562,8 +12905,6 @@ [EqualizerRack1_[Master]_Effect1],parameter14_down_small,0 [Channel1],beatloop,0 [Channel1],hotcue_11_activate,0 -[Channel3],VuMeter_toggle,0 -[Auxiliary2],VuMeter_up,0 [Sampler1],hotcue_33_goto,0 [EffectRack1_EffectUnit2_Effect4],button_parameter14_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter5_set_one,0 @@ -13584,7 +12925,6 @@ [Sampler3],loop_move_2_backward,0 [Channel2],beatloop,0 [Channel2],hotcue_11_activate,0 -[Channel4],VuMeter_toggle,0 [Sampler2],hotcue_33_goto,0 [Channel1],key,0 [EffectRack1_EffectUnit2_Effect4],parameter14_set_one,0 @@ -13678,7 +13018,6 @@ [EffectRack1_EffectUnit2_Effect1],parameter9,0 [EffectRack1_EffectUnit2_Effect1],parameter8,0 [EqualizerRack1_[Channel4]],mix_set_one,0 -[Microphone4],VuMeterL_set_default,0 [EffectRack1_EffectUnit4_Effect2],parameter12_link_type,0 [EffectRack1_EffectUnit2_Effect1],parameter5,0 [EffectRack1_EffectUnit2_Effect1],parameter4,0 @@ -13696,7 +13035,6 @@ [EffectRack1_EffectUnit4_Effect4],button_parameter14_type,0 [EffectRack1_EffectUnit2_Effect1],parameter2,0 [Sampler1],beatjump_4_forward,0 -[Microphone3],VuMeterL_set_default,0 [EqualizerRack1_[Channel2]_Effect1],parameter12_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter7_type,0 [Channel3],hotcue_23_activate,0 @@ -13726,7 +13064,6 @@ [Channel2],hotcue_15_activate,0 [EffectRack1_EffectUnit2_Effect3],parameter8_type,0 [PreviewDeck1],visual_bpm,0 -[Microphone2],PeakIndicator_set_default,0 [Channel1],jog,0 [EqualizerRack1_[Channel4]_Effect1],parameter9_set_one,0 [Channel4],cue_indicator,0 @@ -13785,7 +13122,6 @@ [EffectRack1_EffectUnit4],group_[BusRight]_enable,0 [EffectRack1_EffectUnit2_Effect3],parameter9,0 [EffectRack1_EffectUnit2_Effect3],parameter8,0 -[Microphone2],VuMeterL_set_default,0 [QuickEffectRack1_[Channel1]_Effect1],parameter5_down_small,0 [EffectRack1_EffectUnit4_Effect1],parameter15_set_one,0 [EffectRack1_EffectUnit2_Effect3],parameter5,0 @@ -13967,7 +13303,6 @@ [Sampler1],fwd,0 [Channel2],beatloop_8_toggle,0 [Sampler2],hotcue_18_goto,0 -[Microphone4],PeakIndicator_set_default,0 [Sampler1],hotcue_35_enabled,0 [PreviewDeck1],hotcue_30_activate_preview,0 [EqualizerRack1_[Channel3]_Effect1],parameter3_up_small,0 @@ -13976,20 +13311,16 @@ [Channel4],waveform_zoom_set_default,0 [Channel1],hotcue_31_activate,0 [QuickEffectRack1_[Channel3]_Effect1],parameter12_up,0 -[Microphone3],VuMeterL_down_small,0 [QuickEffectRack1_[Channel3]_Effect1],parameter1_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter5_set_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter8_loaded,0 [Sampler3],scratch2_enable,0 [EffectRack1_EffectUnit4_Effect3],parameter10_link_type,0 -[Microphone3],PeakIndicator_set_default,0 -[Microphone],PeakIndicator_set_zero,0 [Channel1],hotcue_1_gotoandstop,0 [Channel3],waveform_zoom_set_default,0 [PreviewDeck1],beatloop_0.5_enabled,0 [PreviewDeck1],beatjump_16_forward,0 [Channel2],hotcue_31_activate,0 -[Microphone4],VuMeterL_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter1_up_small,0 [QuickEffectRack1_[Channel1]],mix_down,0 [Sampler4],scratch2_enable,0 @@ -14032,7 +13363,6 @@ [Channel3],hotcue_15_activate_preview,0 [Sampler4],hotcue_18_goto,0 [Sampler4],hotcue_32_set,0 -[Microphone],VuMeter_up,0 [QuickEffectRack1_[Channel1]],clear,0 [Channel4],hotcue_9_gotoandstop,0 [Skin],show_library_coverart,1 @@ -14053,7 +13383,6 @@ [Sampler4],waveform_zoom_toggle,0 [Channel2],hotcue_8_activate_preview,0 [EqualizerRack1_[Channel3]_Effect1],parameter14_set_zero,0 -[Microphone2],VuMeterL_down_small,0 [QuickEffectRack1_[Channel2]_Effect1],parameter2_set_one,0 [PreviewDeck1],beat_distance,0 [EffectRack1_EffectUnit2_Effect3],parameter15_set_one,0 @@ -14114,7 +13443,6 @@ [Channel4],wheel,0 [PreviewDeck1],hotcue_11_set,0 [Channel3],beatloop_0.03125_activate,0 -[PreviewDeck1],VuMeterL_set_minus_one,0 [Channel2],hotcue_35_activate,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_set_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter14_down_small,0 @@ -14142,7 +13470,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter12_up,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter1_loaded,1 [Sampler2],waveform_zoom_toggle,0 -[Sampler3],PeakIndicator_set_zero,0 [Master],headDelay_down,0 [Sampler1],beatloop_16,0 [Library],font_size_knob,0 @@ -14153,9 +13480,7 @@ [Sampler3],hotcue_1_enabled,0 [Master],crossfader_toggle,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter1_loaded,1 -[Master],VuMeterR_set_minus_one,0 [Sampler1],pregain_set_minus_one,0 -[Sampler4],PeakIndicator_set_zero,0 [QuickEffectRack1_[Channel1]_Effect1],parameter6_down_small,0 [Sampler2],beatloop_16,0 [PreviewDeck1],loop_move_64_forward,0 @@ -14189,18 +13514,15 @@ [Sampler3],pitch_adjust_minus_toggle,0 [QuickEffectRack1_[Channel3]_Effect1],parameter5_minus_toggle,0 [Sampler2],beatloop_32,0 -[Microphone3],PeakIndicator_set_zero,0 [EffectRack1_EffectUnit3_Effect1],parameter12_up,0 [Channel4],beatloop_0.25,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_set_zero,0 [Channel1],hotcue_7_set,0 [EffectRack1_EffectUnit3_Effect3],effect_selector,0 [EffectRack1_EffectUnit1_Effect2],parameter12_set_one,0 -[Master],VuMeterL_toggle,0 [Sampler2],beatloop_64,0 [Sampler4],pitch_adjust_minus_toggle,0 [Sampler3],beatloop_32,0 -[Microphone4],PeakIndicator_set_zero,0 [Auxiliary3],pregain_down_small,0 [EffectRack1_EffectUnit3_Effect2],parameter12_up,0 [Channel3],beatloop_0.25,0 @@ -14221,7 +13543,6 @@ [QuickEffectRack1_[Channel4]_Effect1],button_parameter15_type,0 [EffectRack1_EffectUnit2_Effect2],parameter15_type,0 [Channel4],hotcue_37_activate,0 -[Sampler1],PeakIndicator_set_zero,0 [EffectRack1_EffectUnit1_Effect2],button_parameter3_type,0 [Sampler3],hotcue_2_gotoandstop,0 [Sampler4],hotcue_14_enabled,0 @@ -14233,7 +13554,6 @@ [PreviewDeck1],beatloop_2_enabled,0 [QuickEffectRack1_[Channel2]_Effect1],parameter9_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_down_small,0 -[Sampler2],PeakIndicator_set_zero,0 [Sampler3],pregain_set_minus_one,0 [Channel3],hotcue_8_activate_preview,0 [Sampler4],hotcue_2_gotoandstop,0 @@ -14256,13 +13576,11 @@ [Sampler3],bpm_set_zero,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter1,0 [Sampler3],hotcue_5_goto,0 -[Master],VuMeterR_toggle,0 [Sampler4],pregain_set_minus_one,0 [EqualizerRack1_[Channel1]_Effect1],parameter12_type,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter3,0 [Channel4],hotcue_8_activate_preview,0 [Sampler1],hotcue_2_gotoandstop,0 -[Microphone],VuMeterL_set_default,0 [QuickEffectRack1_[Channel2]_Effect1],button_parameter2,0 [Channel3],hotcue_33_activate,0 [EffectRack1_EffectUnit3_Effect1],parameter16_up,0 @@ -14273,7 +13591,6 @@ [Sampler3],hotcue_34_enabled,0 [Sampler4],bpm_set_zero,0 [Sampler4],hotcue_5_goto,0 -[Channel4],VuMeter_set_default,0 [Sampler2],hotcue_2_gotoandstop,0 [Channel4],hotcue_33_activate,0 [EffectRack1_EffectUnit3_Effect2],parameter16_up,0 @@ -14285,9 +13602,7 @@ [Sampler3],hotcue_10_activate_preview,0 [EffectRack1_EffectUnit4_Effect1],parameter15_type,0 [EffectRack1_EffectUnit3_Effect1],button_parameter3_type,0 -[Channel3],VuMeter_set_default,0 [Playlist],AutoDjAddBottom,0 -[Microphone3],VuMeterL_set_minus_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter1,1 [Sampler4],pregain_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_set_minus_one,0 @@ -14301,7 +13616,6 @@ [QuickEffectRack1_[Channel2]_Effect1],parameter8_set_minus_one,0 [Sampler1],hotcue_16_goto,0 [QuickEffectRack1_[Channel3]_Effect1],parameter3_minus_toggle,0 -[Microphone4],VuMeterL_set_minus_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter2_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter7_set_default,0 [PreviewDeck1],hotcue_6_activate,0 @@ -14402,7 +13716,6 @@ [Channel2],hotcue_9_set,0 [Channel1],VuMeterR,0 [Microphone4],volume_minus_toggle,0 -[Microphone2],VuMeterL_set_minus_one,0 [Channel3],VuMeterL,0 [Sampler1],beatjump_0.03125_backward,0 [Sampler2],beatloop_32_enabled,0 @@ -14426,7 +13739,6 @@ [Channel4],VuMeterR,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter15_type,0 [Channel4],VuMeterL,0 -[Microphone2],PeakIndicator_set_zero,0 [Master],headGain,1 [Sampler1],beatloop_32_enabled,0 [Sampler2],beatjump_0.03125_backward,0 @@ -14443,7 +13755,6 @@ [Sampler2],bpm_set_zero,0 [Sampler4],loop_move_8_forward,0 [PreviewDeck1],beatjump_0.125_forward,0 -[Channel2],VuMeter_set_default,0 [EffectRack1_EffectUnit1_Effect3],button_parameter3_type,0 [Channel1],play,0 [EffectRack1_EffectUnit3_Effect4],parameter16_up,0 @@ -14463,7 +13774,6 @@ [EffectRack1_EffectUnit4_Effect3],parameter6_up,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter9,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter8,0 -[Channel1],VuMeter_set_default,0 [EffectRack1_EffectUnit1_Effect4],button_parameter3_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter8_down_small,0 [Channel2],play,0 @@ -14625,7 +13935,6 @@ [Channel3],play,0 [EffectRack1_EffectUnit4_Effect1],button_parameter3_loaded,0 [EffectRack1_EffectUnit4_Effect3],button_parameter8_loaded,0 -[Microphone],VuMeterL_set_one,0 [EffectRack1_EffectUnit4_Effect3],parameter7_set_minus_one,0 [EffectRack1_EffectUnit1_Effect3],parameter10_set_zero,0 [EffectRack1_EffectUnit4_Effect3],parameter15_set_zero,0 @@ -14656,8 +13965,6 @@ [EffectRack1_EffectUnit4_Effect3],parameter1_set_one,0 [EqualizerRack1_[Channel3]_Effect1],parameter2_set_one,0 [Channel4],hotcue_9_set,0 -[Microphone],VuMeter_set_default,0 -[Sampler2],VuMeterR_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_down,0 [PreviewDeck1],hotcue_27_clear,0 [EffectRack1_EffectUnit4_Effect4],parameter15_set_minus_one,0 @@ -14670,7 +13977,6 @@ [EffectRack1_EffectUnit4_Effect2],button_parameter5_loaded,0 [EffectRack1_EffectUnit4_Effect4],parameter1_set_one,0 [Sampler1],bpm_up,0 -[Sampler1],VuMeterR_down,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter9,0 [QuickEffectRack1_[Channel4]_Effect1],button_parameter8,0 [EffectRack1_EffectUnit3_Effect3],parameter16_set_zero,0 @@ -14761,7 +14067,6 @@ [EffectRack1_EffectUnit4_Effect3],button_parameter4_loaded,0 [EqualizerRack1_[Channel3]],mix_minus_toggle,0 [Sampler3],rateSearch,0 -[Sampler4],VuMeterR_down,0 [Channel4],hotcue_8_set,0 [Channel2],hotcue_27_gotoandstop,0 [Channel3],hotcue_22_gotoandplay,0 @@ -14777,7 +14082,6 @@ [Sampler4],hotcue_13_enabled,0 [QuickEffectRack1_[Channel1]_Effect1],parameter16_up_small,0 [EffectRack1_EffectUnit4_Effect4],button_parameter5_loaded,0 -[Sampler3],VuMeterR_down,0 [Auxiliary2],enabled,0 [Channel3],hotcue_37_gotoandstop,0 [Channel4],hotcue_22_gotoandplay,0 @@ -14803,14 +14107,12 @@ [Auxiliary1],enabled,0 [Channel4],hotcue_37_gotoandstop,0 [Channel1],hotcue_22_gotoandplay,0 -[Sampler3],PeakIndicator_minus_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter16_minus_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter5_down,0 [Channel4],pitch_minus_toggle,0 [Sampler3],hotcue_37_activate_preview,0 [Sampler4],hotcue_33_enabled,0 [PreviewDeck1],hotcue_8_activate_preview,0 -[Channel1],PeakIndicator_set_one,0 [EffectRack1_EffectUnit4],super1_down,0 [QuickEffectRack1_[Channel2]_Effect1],parameter5_loaded,0 [Channel3],cue_mode,0 @@ -14830,12 +14132,10 @@ [Channel2],hotcue_22_gotoandplay,0 [Microphone3],pregain_up,0 [EffectRack1_EffectUnit4_Effect1],parameter15_set_minus_one,0 -[Sampler4],PeakIndicator_minus_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter13_set_default,0 [EffectRack1_EffectUnit4_Effect3],parameter15_minus_toggle,0 [Sampler3],hotcue_33_enabled,0 [Sampler4],hotcue_37_activate_preview,0 -[Channel2],PeakIndicator_set_one,0 [EffectRack1_EffectUnit3],super1_down,0 [Channel4],cue_mode,0 [QuickEffectRack1_[Channel4]_Effect1],parameter3_up_small,0 @@ -14847,7 +14147,6 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter9_toggle,0 [EqualizerRack1_[Master]_Effect1],parameter6_set_zero,0 [EqualizerRack1_[Channel3]],super1_up,0 -[Master],VuMeterR_up,0 [EffectRack1_EffectUnit4_Effect1],button_parameter9_loaded,0 [Channel1],hotcue_5_set,0 [Channel4],rateSearch,0 @@ -14920,7 +14219,6 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter8_type,0 [PreviewDeck1],rateSearch_set_one,0 [EqualizerRack1_[Channel3]],group_[Channel3]_enable,1 -[Sampler1],PeakIndicator_minus_toggle,0 [Sampler4],beatloop_0.0625_activate,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_loaded,0 [Sampler3],playposition_down,0 @@ -14939,7 +14237,6 @@ [EffectRack1_EffectUnit4_Effect4],button_parameter1_loaded,0 [Channel3],hotcue_17_gotoandstop,0 [EqualizerRack1_[Channel3]],chain_selector,0 -[Sampler2],PeakIndicator_minus_toggle,0 [Sampler1],hotcue_30_clear,0 [Sampler2],hotcue_33_set,0 [EffectRack1_EffectUnit2_Effect2],button_parameter8_loaded,0 @@ -15033,10 +14330,8 @@ [EffectRack1_EffectUnit4_Effect4],parameter2_down_small,0 [QuickEffectRack1_[Channel1]_Effect1],parameter2_down,0 [Sampler1],hotcue_20_clear,0 -[Master],PeakIndicator_down_small,0 [EffectRack1_EffectUnit2_Effect1],parameter6_down,0 [QuickEffectRack1_[Channel1]_Effect1],parameter9_set_one,0 -[Microphone3],VuMeterL_toggle,0 [EffectRack1_EffectUnit1_Effect3],clear,0 [Sampler3],bpm,0 [Channel4],beatjump_32_backward,0 @@ -15051,11 +14346,9 @@ [Auxiliary3],enabled,0 [Channel1],hotcue_8_activate,0 [Sampler1],hotcue_37_activate_preview,0 -[Channel3],PeakIndicator_set_one,0 [Sampler2],hotcue_20_clear,0 [EffectRack1_EffectUnit1_Effect4],clear,0 [EffectRack1_EffectUnit2_Effect4],parameter6_down,0 -[Microphone4],VuMeterL_toggle,0 [Auxiliary3],volume_set_zero,0 [Sampler4],bpm,0 [Sampler3],hotcue_34_set,0 @@ -15069,7 +14362,6 @@ [Sampler3],stop,0 [Channel2],hotcue_8_activate,0 [Sampler2],hotcue_37_activate_preview,0 -[Channel4],PeakIndicator_set_one,0 [PreviewDeck1],mute,0 [EffectRack1_EffectUnit1_Effect1],clear,0 [EffectRack1_EffectUnit2_Effect3],parameter6_down,0 @@ -15096,7 +14388,6 @@ [Channel1],rateSearch_down,0 [Channel1],hotcue_4_activate,0 [Channel1],playposition_up_small,0 -[Microphone3],VuMeterR_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter1_toggle,0 [EffectRack1_EffectUnit4_Effect1],button_parameter1_loaded,0 [EffectRack1_EffectUnit4_Effect3],button_parameter2_loaded,0 @@ -15104,10 +14395,8 @@ [EffectRack1_EffectUnit3_Effect2],clear,0 [Channel2],hotcue_15_enabled,0 [PreviewDeck1],hotcue_35_enabled,0 -[PreviewDeck1],VuMeterR_down,0 [Channel2],hotcue_4_activate,0 [Channel2],playposition_up_small,0 -[Microphone4],VuMeterR_toggle,0 [EffectRack1_EffectUnit2_Effect1],parameter1_link_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_up_small,0 [Sampler3],reverseroll,0 @@ -15136,7 +14425,6 @@ [Channel3],rateEngine,0 [Sampler4],hotcue_36_gotoandstop,0 [Channel4],playposition_up_small,0 -[Microphone2],VuMeterR_toggle,0 [Sampler4],rate_toggle,0 [Channel3],scratch2_enable,0 [Channel1],hotcue_35_enabled,0 @@ -15163,13 +14451,11 @@ [Channel4],rateSearch_down,0 [EqualizerRack1_[Channel2]_Effect1],parameter3_set_one,0 [QuickEffectRack1_[Channel3]],super1_set_one,0 -[Master],VuMeterL_set_default,0 [EffectRack1_EffectUnit2_Effect1],button_parameter1_loaded,0 [EffectRack1_EffectUnit2_Effect3],button_parameter2_loaded,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_set_zero,0 [QuickEffectRack1_[Channel2]_Effect1],parameter7_toggle,0 [EffectRack1_EffectUnit3_Effect2],parameter14_down_small,0 -[Microphone3],VuMeter_set_minus_one,0 [EffectRack1_EffectUnit2_Effect2],next_effect,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8_loaded,0 [Channel3],beatloop_0.125_enabled,0 @@ -15184,7 +14470,6 @@ [Channel3],hotcue_4_activate,0 [EqualizerRack1_[Channel3]_Effect1],button_parameter15_type,0 [QuickEffectRack1_[Channel1]_Effect1],parameter8_set_default,0 -[Microphone4],VuMeter_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter5_down_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter5_set_one,0 [QuickEffectRack1_[Channel1]_Effect1],parameter12_type,0 @@ -15193,9 +14478,7 @@ [Sampler4],rate_temp_up,0 [Channel4],hotcue_4_activate,0 [QuickEffectRack1_[Channel4]_Effect1],parameter6_down_small,0 -[Microphone4],VuMeter_down,0 [QuickEffectRack1_[Channel2]_Effect1],parameter1_loaded,1 -[Microphone2],VuMeterL_toggle,0 [Channel4],cue_point,-1 [EffectRack1_EffectUnit1_Effect1],parameter2_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter6_toggle,0 @@ -15207,7 +14490,6 @@ [Sampler1],hotcue_36_set,0 [PreviewDeck1],hotcue_31_goto,0 [Sampler1],hotcue_36_gotoandstop,0 -[Microphone3],VuMeter_down,0 [QuickEffectRack1_[Channel2]_Effect1],parameter16_down,0 [Channel3],cue_point,-1 [Channel3],mute,0 @@ -15238,7 +14520,6 @@ [Channel1],hotcue_1_set,0 [Sampler2],visual_key_distance,0 [EqualizerRack1_[Master]_Effect1],button_parameter13_type,0 -[Auxiliary3],VuMeter_toggle,0 [EffectRack1_EffectUnit4_Effect1],parameter15_down_small,0 [EffectRack1_EffectUnit2_Effect4],parameter4_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter2_minus_toggle,0 @@ -15253,7 +14534,6 @@ [Sampler1],visual_key_distance,0 [PreviewDeck1],pitch_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter5_up_small,0 -[Auxiliary4],VuMeter_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter15_down_small,0 [EffectRack1_EffectUnit2_Effect3],parameter4_set_default,0 [Channel3],hotcue_6_activate,0 From 72d1cfa13f6a31141d0da6646fae523d98caaa65 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 09:50:10 +0200 Subject: [PATCH 02/13] refactor(enginevumeter): Use plain members instead control object ptrs --- src/engine/enginevumeter.cpp | 64 ++++++++++++++---------------------- src/engine/enginevumeter.h | 14 ++++---- 2 files changed, 31 insertions(+), 47 deletions(-) diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp index e9c46f82dfd..0fd714ee5c9 100644 --- a/src/engine/enginevumeter.cpp +++ b/src/engine/enginevumeter.cpp @@ -19,33 +19,17 @@ constexpr CSAMPLE kDecaySmoothing = 0.1f; //.16//.4 } // namespace EngineVuMeter::EngineVuMeter(const QString& group) - : m_ctrlVuMeter(new ControlObject( - ConfigKey(group, QStringLiteral("VuMeter")))), - m_ctrlVuMeterL(new ControlObject( - ConfigKey(group, QStringLiteral("VuMeterL")))), - m_ctrlVuMeterR(new ControlObject( - ConfigKey(group, QStringLiteral("VuMeterR")))), - m_ctrlPeakIndicator(new ControlObject( - ConfigKey(group, QStringLiteral("PeakIndicator")))), - m_ctrlPeakIndicatorL(new ControlObject( - ConfigKey(group, QStringLiteral("PeakIndicatorL")))), - m_ctrlPeakIndicatorR(new ControlObject( - ConfigKey(group, QStringLiteral("PeakIndicatorR")))), + : m_vuMeter(ConfigKey(group, QStringLiteral("VuMeter"))), + m_vuMeterLeft(ConfigKey(group, QStringLiteral("VuMeterL"))), + m_vuMeterRight(ConfigKey(group, QStringLiteral("VuMeterR"))), + m_peakIndicator(ConfigKey(group, QStringLiteral("PeakIndicator"))), + m_peakIndicatorLeft(ConfigKey(group, QStringLiteral("PeakIndicatorL"))), + m_peakIndicatorRight(ConfigKey(group, QStringLiteral("PeakIndicatorR"))), m_sampleRate(QStringLiteral("[App]"), QStringLiteral("samplerate")) { // Initialize the calculation: reset(); } -EngineVuMeter::~EngineVuMeter() -{ - delete m_ctrlVuMeter; - delete m_ctrlVuMeterL; - delete m_ctrlVuMeterR; - delete m_ctrlPeakIndicator; - delete m_ctrlPeakIndicatorL; - delete m_ctrlPeakIndicatorR; -} - void EngineVuMeter::process(CSAMPLE* pIn, const int iBufferSize) { CSAMPLE fVolSumL, fVolSumR; @@ -71,16 +55,16 @@ void EngineVuMeter::process(CSAMPLE* pIn, const int iBufferSize) { // ControlObject will not prevent us from causing tons of extra // work. Because of this, we use an epsilon here to be gentle on the GUI // and MIDI controllers. - if (fabs(m_fRMSvolumeL - m_ctrlVuMeterL->get()) > epsilon) { - m_ctrlVuMeterL->set(m_fRMSvolumeL); + if (fabs(m_fRMSvolumeL - m_vuMeterLeft.get()) > epsilon) { + m_vuMeterLeft.set(m_fRMSvolumeL); } - if (fabs(m_fRMSvolumeR - m_ctrlVuMeterR->get()) > epsilon) { - m_ctrlVuMeterR->set(m_fRMSvolumeR); + if (fabs(m_fRMSvolumeR - m_vuMeterRight.get()) > epsilon) { + m_vuMeterRight.set(m_fRMSvolumeR); } double fRMSvolume = (m_fRMSvolumeL + m_fRMSvolumeR) / 2.0; - if (fabs(fRMSvolume - m_ctrlVuMeter->get()) > epsilon) { - m_ctrlVuMeter->set(fRMSvolume); + if (fabs(fRMSvolume - m_vuMeter.get()) > epsilon) { + m_vuMeter.set(fRMSvolume); } // Reset calculation: @@ -90,25 +74,25 @@ void EngineVuMeter::process(CSAMPLE* pIn, const int iBufferSize) { } if (clipped & SampleUtil::CLIPPING_LEFT) { - m_ctrlPeakIndicatorL->set(1.); + m_peakIndicatorLeft.set(1.0); m_peakDurationL = kPeakDuration * sampleRate / iBufferSize / 2000; } else if (m_peakDurationL <= 0) { - m_ctrlPeakIndicatorL->set(0.); + m_peakIndicatorLeft.set(0.0); } else { --m_peakDurationL; } if (clipped & SampleUtil::CLIPPING_RIGHT) { - m_ctrlPeakIndicatorR->set(1.); + m_peakIndicatorRight.set(1.0); m_peakDurationR = kPeakDuration * sampleRate / iBufferSize / 2000; } else if (m_peakDurationR <= 0) { - m_ctrlPeakIndicatorR->set(0.); + m_peakIndicatorRight.set(0.0); } else { --m_peakDurationR; } - m_ctrlPeakIndicator->set( - (m_ctrlPeakIndicatorR->toBool() || m_ctrlPeakIndicatorL->toBool()) + m_peakIndicator.set( + (m_peakIndicatorRight.toBool() || m_peakIndicatorLeft.toBool()) ? 1.0 : 0.0); } @@ -129,12 +113,12 @@ void EngineVuMeter::doSmooth(CSAMPLE ¤tVolume, CSAMPLE newVolume) } void EngineVuMeter::reset() { - m_ctrlVuMeter->set(0); - m_ctrlVuMeterL->set(0); - m_ctrlVuMeterR->set(0); - m_ctrlPeakIndicator->set(0); - m_ctrlPeakIndicatorL->set(0); - m_ctrlPeakIndicatorR->set(0); + m_vuMeter.set(0); + m_vuMeterLeft.set(0); + m_vuMeterRight.set(0); + m_peakIndicator.set(0); + m_peakIndicatorLeft.set(0); + m_peakIndicatorRight.set(0); m_iSamplesCalculated = 0; m_fRMSvolumeL = 0; diff --git a/src/engine/enginevumeter.h b/src/engine/enginevumeter.h index 862523aafad..a64061900e7 100644 --- a/src/engine/enginevumeter.h +++ b/src/engine/enginevumeter.h @@ -1,5 +1,6 @@ #pragma once +#include "control/controlobject.h" #include "control/pollingcontrolproxy.h" #include "engine/engineobject.h" @@ -9,7 +10,6 @@ class EngineVuMeter : public EngineObject { Q_OBJECT public: EngineVuMeter(const QString& group); - virtual ~EngineVuMeter(); virtual void process(CSAMPLE* pInOut, const int iBufferSize); @@ -18,18 +18,18 @@ class EngineVuMeter : public EngineObject { private: void doSmooth(CSAMPLE ¤tVolume, CSAMPLE newVolume); - ControlObject* m_ctrlVuMeter; - ControlObject* m_ctrlVuMeterL; - ControlObject* m_ctrlVuMeterR; + ControlObject m_vuMeter; + ControlObject m_vuMeterLeft; + ControlObject m_vuMeterRight; CSAMPLE m_fRMSvolumeL; CSAMPLE m_fRMSvolumeSumL; CSAMPLE m_fRMSvolumeR; CSAMPLE m_fRMSvolumeSumR; int m_iSamplesCalculated; - ControlObject* m_ctrlPeakIndicator; - ControlObject* m_ctrlPeakIndicatorL; - ControlObject* m_ctrlPeakIndicatorR; + ControlObject m_peakIndicator; + ControlObject m_peakIndicatorLeft; + ControlObject m_peakIndicatorRight; int m_peakDurationL; int m_peakDurationR; From 8b14e5ea8cd4e27e51b764cfa7e6f278227e6971 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 10:47:20 +0200 Subject: [PATCH 03/13] refactor(enginevumeter): Rename controls and add support for aliases --- src/engine/enginemixer.cpp | 3 +- src/engine/enginevumeter.cpp | 25 +++-- src/engine/enginevumeter.h | 2 +- src/test/co_dumps/co_dump_inital.csv | 144 +++++++++++++-------------- 4 files changed, 91 insertions(+), 83 deletions(-) diff --git a/src/engine/enginemixer.cpp b/src/engine/enginemixer.cpp index 772e7b2147b..9d4b7e88730 100644 --- a/src/engine/enginemixer.cpp +++ b/src/engine/enginemixer.cpp @@ -31,6 +31,7 @@ namespace { const QString kAppGroup = QStringLiteral("[App]"); const QString kLegacyGroup = QStringLiteral("[Master]"); +const QString kMainGroup = QStringLiteral("[Main]"); } // namespace EngineMixer::EngineMixer( @@ -119,7 +120,7 @@ EngineMixer::EngineMixer( m_pMainGain->addAlias(ConfigKey(group, QStringLiteral("volume"))); // VU meter: - m_pVumeter = new EngineVuMeter(group); + m_pVumeter = new EngineVuMeter(kMainGroup, kLegacyGroup); m_pMainDelay = new EngineDelay(group, ConfigKey(group, "delay")); m_pHeadDelay = new EngineDelay(group, ConfigKey(group, "headDelay")); diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp index 0fd714ee5c9..4ee238c46c6 100644 --- a/src/engine/enginevumeter.cpp +++ b/src/engine/enginevumeter.cpp @@ -18,16 +18,23 @@ constexpr CSAMPLE kDecaySmoothing = 0.1f; //.16//.4 } // namespace -EngineVuMeter::EngineVuMeter(const QString& group) - : m_vuMeter(ConfigKey(group, QStringLiteral("VuMeter"))), - m_vuMeterLeft(ConfigKey(group, QStringLiteral("VuMeterL"))), - m_vuMeterRight(ConfigKey(group, QStringLiteral("VuMeterR"))), - m_peakIndicator(ConfigKey(group, QStringLiteral("PeakIndicator"))), - m_peakIndicatorLeft(ConfigKey(group, QStringLiteral("PeakIndicatorL"))), - m_peakIndicatorRight(ConfigKey(group, QStringLiteral("PeakIndicatorR"))), +EngineVuMeter::EngineVuMeter(const QString& group, const QString& legacyGroup) + : m_vuMeter(ConfigKey(group, QStringLiteral("vu_meter"))), + m_vuMeterLeft(ConfigKey(group, QStringLiteral("vu_meter_left"))), + m_vuMeterRight(ConfigKey(group, QStringLiteral("vu_meter_right"))), + m_peakIndicator(ConfigKey(group, QStringLiteral("peak_indicator"))), + m_peakIndicatorLeft(ConfigKey(group, QStringLiteral("peak_indicator_left"))), + m_peakIndicatorRight(ConfigKey(group, QStringLiteral("peak_indicator_right"))), m_sampleRate(QStringLiteral("[App]"), QStringLiteral("samplerate")) { - // Initialize the calculation: - reset(); + const QString& aliasGroup = legacyGroup.isEmpty() ? group : legacyGroup; + m_vuMeter.addAlias(ConfigKey(aliasGroup, QStringLiteral("VuMeter"))), + m_vuMeterLeft.addAlias(ConfigKey(aliasGroup, QStringLiteral("VuMeterL"))), + m_vuMeterRight.addAlias(ConfigKey(aliasGroup, QStringLiteral("VuMeterR"))), + m_peakIndicator.addAlias(ConfigKey(aliasGroup, QStringLiteral("PeakIndicator"))), + m_peakIndicatorLeft.addAlias(ConfigKey(aliasGroup, QStringLiteral("PeakIndicatorL"))), + m_peakIndicatorRight.addAlias(ConfigKey(aliasGroup, QStringLiteral("PeakIndicatorR"))), + // Initialize the calculation: + reset(); } void EngineVuMeter::process(CSAMPLE* pIn, const int iBufferSize) { diff --git a/src/engine/enginevumeter.h b/src/engine/enginevumeter.h index a64061900e7..a8e35123892 100644 --- a/src/engine/enginevumeter.h +++ b/src/engine/enginevumeter.h @@ -9,7 +9,7 @@ class ControlPotmeter; class EngineVuMeter : public EngineObject { Q_OBJECT public: - EngineVuMeter(const QString& group); + EngineVuMeter(const QString& group, const QString& legacyGroup = QString()); virtual void process(CSAMPLE* pInOut, const int iBufferSize); diff --git a/src/test/co_dumps/co_dump_inital.csv b/src/test/co_dumps/co_dump_inital.csv index 20cfe6c5138..c13bae305ff 100644 --- a/src/test/co_dumps/co_dump_inital.csv +++ b/src/test/co_dumps/co_dump_inital.csv @@ -615,7 +615,7 @@ [QuickEffectRack1_[Channel3]],mix_minus_toggle,0 [EffectRack1_EffectUnit3_Effect1],parameter13_loaded,0 [Channel4],loop_move_2_backward,0 -[Sampler1],VuMeter,0 +[Sampler1],vu_meter,0 [Sampler2],hotcue_25_position,-1 [Sampler1],hotcue_2_goto,0 [EffectRack1_EffectUnit4_Effect2],parameter16_link_type,0 @@ -625,7 +625,7 @@ [EffectRack1_EffectUnit3_Effect1],parameter11_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_set_one,0 [EqualizerRack1_[Channel3]_Effect1],num_parameterslots,16 -[Sampler2],VuMeter,0 +[Sampler2],vu_meter,0 [EffectRack1_EffectUnit2_Effect1],parameter6_link_type,0 [Sampler1],hotcue_25_position,-1 [Sampler2],hotcue_2_goto,0 @@ -835,7 +835,7 @@ [EqualizerRack1_[Channel3]_Effect1],parameter12_type,0 [PreviewDeck1],hotcue_6_clear,0 [EffectRack1_EffectUnit3_Effect1],parameter10_loaded,0 -[Sampler3],VuMeter,0 +[Sampler3],vu_meter,0 [Sampler1],hotcue_5_gotoandstop,0 [Sampler4],hotcue_25_position,-1 [QuickEffectRack1_[Channel1]_Effect1],parameter1_up,0 @@ -856,7 +856,7 @@ [EffectRack1_EffectUnit3_Effect3],parameter7_up_small,0 [EffectRack1_EffectUnit4_Effect3],parameter4_up_small,0 [EffectRack1_EffectUnit3_Effect1],parameter7_down_small,0 -[Sampler4],VuMeter,0 +[Sampler4],vu_meter,0 [EffectRack1_EffectUnit2_Effect3],parameter6_link_type,0 [Sampler2],hotcue_5_gotoandstop,0 [Sampler3],hotcue_25_position,-1 @@ -1911,7 +1911,7 @@ [PreviewDeck1],hotcue_24_gotoandstop,0 [Channel3],hotcue_35_clear,0 [Sampler4],beat_next,-1 -[Microphone3],VuMeterL,0 +[Microphone3],vu_meter_left,0 [PreviewDeck1],reset_key,0 [Channel4],hotcue_32_set,0 [Sampler4],hotcue_32_gotoandplay,0 @@ -1925,9 +1925,9 @@ [EffectRack1_EffectUnit3_Effect4],parameter8_set_minus_one,0 [Sampler4],passthrough,0 [Channel4],hotcue_35_clear,0 -[Microphone4],VuMeterR,0 +[Microphone4],vu_meter_right,0 [Sampler3],beat_next,-1 -[Microphone4],VuMeterL,0 +[Microphone4],vu_meter_left,0 [EffectRack1_EffectUnit3_Effect1],parameter10_down_small,0 [Sampler1],hotcue_32_gotoandplay,0 [EqualizerRack1_[Channel1]_Effect1],parameter5_up,0 @@ -1943,7 +1943,7 @@ [Channel3],hotcue_25_clear,0 [EqualizerRack1_[Channel4]],mix_set_default,0 [PreviewDeck1],back,0 -[Microphone3],VuMeterR,0 +[Microphone3],vu_meter_right,0 [Master],headDelay_toggle,0 [Mixer Profile],HiEQFrequency_set_default,0 [EffectRack1_EffectUnit3_Effect2],parameter10_down_small,0 @@ -2102,11 +2102,11 @@ [Sampler1],hotcue_23_activate_preview,0 [Sampler2],passthrough,0 [PreviewDeck1],hotcue_36_activate,0 -[Microphone2],VuMeterR,0 +[Microphone2],vu_meter_right,0 [EffectRack1_EffectUnit1_Effect4],parameter1_link_inverse,0 [Channel1],loop_move_8_forward,0 [Sampler1],beat_next,-1 -[Microphone2],VuMeterL,0 +[Microphone2],vu_meter_left,0 [EqualizerRack1_[Channel2]_Effect1],parameter15_down,0 [EqualizerRack1_[Channel4]_Effect1],parameter2_down_small,0 [PreviewDeck1],rateSearch_up,0 @@ -2182,7 +2182,7 @@ [Channel1],bpm_set_one,0 [Channel4],back,0 [EffectRack1_EffectUnit1_Effect1],parameter12_set_minus_one,0 -[PreviewDeck1],VuMeter,0 +[PreviewDeck1],vu_meter,0 [Channel4],waveform_zoom_toggle,0 [Sampler3],beatjump_1_backward,0 [Sampler1],hotcue_2_position,-1 @@ -3585,7 +3585,7 @@ [Sampler1],hotcue_25_gotoandplay,0 [Sampler2],hotcue_7_activate_preview,0 [Channel2],hotcue_23_position,-1 -[Sampler3],PeakIndicator,0 +[Sampler3],peak_indicator,0 [Channel4],hotcue_21_gotoandstop,0 [EqualizerRack1_[Channel3]],super1_set_zero,0 [Channel3],hotcue_17_position,-1 @@ -3601,7 +3601,7 @@ [Sampler2],hotcue_25_gotoandplay,0 [Channel1],hotcue_23_position,-1 [Sampler3],beatlooproll_0.125_activate,0 -[Sampler4],PeakIndicator,0 +[Sampler4],peak_indicator,0 [Channel1],hotcue_31_gotoandstop,0 [Channel3],hotcue_29_gotoandstop,0 [Channel1],hotcue_27_set,0 @@ -3695,7 +3695,7 @@ [EffectRack1_EffectUnit1_Effect3],parameter7_loaded,0 [Channel1],visual_key,0 [Sampler3],hotcue_15_gotoandplay,0 -[PreviewDeck1],PeakIndicator,0 +[PreviewDeck1],peak_indicator,0 [EqualizerRack1_[Channel3]_Effect1],parameter10_type,0 [Sampler1],visual_key_distance_set_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter8_up_small,0 @@ -3707,7 +3707,7 @@ [EffectRack1_EffectUnit3_Effect1],parameter9_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter2_loaded,0 [Channel2],visual_key,0 -[PreviewDeck1],VuMeterL,0 +[PreviewDeck1],vu_meter_left,0 [Sampler4],hotcue_15_gotoandplay,0 [Sampler2],visual_key_distance_set_one,0 [EqualizerRack1_[Master]_Effect1],num_parameters,0 @@ -3738,7 +3738,7 @@ [Sampler2],hotcue_20_goto,0 [EffectRack1_EffectUnit1_Effect1],parameter6_down_small,0 [Channel4],hotcue_29_set,0 -[PreviewDeck1],VuMeterR,0 +[PreviewDeck1],vu_meter_right,0 [EffectRack1_EffectUnit3_Effect1],parameter8_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter3_loaded,0 [EffectRack1_EffectUnit3_Effect3],parameter16_up_small,0 @@ -3758,7 +3758,7 @@ [EffectRack1_EffectUnit3_Effect4],parameter8_loaded,0 [EffectRack1_EffectUnit3_Effect4],parameter16_up_small,0 [EqualizerRack1_[Master]_Effect1],parameter11_up_small,0 -[Sampler1],PeakIndicator,0 +[Sampler1],peak_indicator,0 [EffectRack1_EffectUnit1_Effect1],parameter2_set_default,0 [EffectRack1_EffectUnit4_Effect1],parameter13_up_small,0 [Sampler3],beatjump_0.0625_forward,0 @@ -3774,7 +3774,7 @@ [EffectRack1_EffectUnit1_Effect2],parameter1_loaded,0 [Channel2],hotcue_19_position,-1 [EqualizerRack1_[Channel1]_Effect1],button_parameter16_type,0 -[Sampler2],PeakIndicator,0 +[Sampler2],peak_indicator,0 [Sampler3],beatloop_16_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter13_up_small,0 [Sampler4],beatjump_0.0625_forward,0 @@ -3998,7 +3998,7 @@ [Sampler4],pitch_set_minus_one,0 [Channel1],hotcue_4_clear,0 [EffectRack1_EffectUnit2_Effect1],parameter3_down,0 -[Microphone],VuMeter,0 +[Microphone],vu_meter,0 [Channel1],hotcue_23_set,0 [Channel2],hotcue_4_clear,0 [Channel3],beatlooproll_0.5_activate,0 @@ -4719,7 +4719,7 @@ [QuickEffectRack1_[Channel2]_Effect1],button_parameter12,0 [Channel1],hotcue_12_set,0 [Channel3],hotcue_37_gotoandplay,0 -[Microphone],VuMeterL,0 +[Microphone],vu_meter_left,0 [EffectRack1_EffectUnit2_Effect4],parameter5_set_minus_one,0 [Sampler4],hotcue_22_clear,0 [EffectRack1_EffectUnit3_Effect1],button_parameter7_type,0 @@ -4752,7 +4752,7 @@ [Sampler1],reloop_exit,0 [EffectRack1_EffectUnit4_Effect1],parameter5_set_minus_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter6_down,0 -[Microphone],VuMeterR,0 +[Microphone],vu_meter_right,0 [Channel1],hotcue_27_gotoandplay,0 [Sampler4],hotcue_12_clear,0 [Channel4],hotcue_20_clear,0 @@ -5391,7 +5391,7 @@ [Channel1],hotcue_20_activate,0 [QuickEffectRack1_[Channel1]_Effect1],button_parameter1_type,0 [EqualizerRack1_[Channel1]_Effect1],parameter4_up,0 -[Channel1],PeakIndicator,0 +[Channel1],peak_indicator,0 [Sampler3],beatjump_1_forward,0 [EffectRack1_EffectUnit4_Effect3],parameter14_toggle,0 [Sampler3],loop_move_32_forward,0 @@ -5408,7 +5408,7 @@ [Sampler1],hotcue_7_set,0 [Channel2],hotcue_4_position,-1 [EffectRack1_EffectUnit3],group_[Auxiliary2]_enable,0 -[Channel2],PeakIndicator,0 +[Channel2],peak_indicator,0 [Sampler4],beatjump_1_forward,0 [EffectRack1_EffectUnit4_Effect4],parameter14_toggle,0 [Sampler4],loop_move_32_forward,0 @@ -5597,7 +5597,7 @@ [Channel3],reloop_exit,0 [EffectRack1_EffectUnit2_Effect2],parameter1_down_small,0 [EffectRack1_EffectUnit1_Effect1],parameter11_link_type,0 -[Channel3],PeakIndicator,0 +[Channel3],peak_indicator,0 [Channel3],beatloop_64_activate,0 [Sampler4],volume_down,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8_down_small,0 @@ -5617,7 +5617,7 @@ [Sampler3],orientation_right,0 [Channel4],reloop_exit,0 [EffectRack1_EffectUnit1_Effect2],parameter11_link_type,0 -[Channel4],PeakIndicator,0 +[Channel4],peak_indicator,0 [EqualizerRack1_[Master]_Effect1],parameter16_set_zero,0 [Channel4],beatloop_64_activate,0 [EffectRack1_EffectUnit4_Effect3],parameter1_down_small,0 @@ -5829,7 +5829,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter12_link_type,0 [Sampler1],rateRange,0.1 [Sampler2],hotcue_27_gotoandstop,0 -[Master],PeakIndicator,0 +[Main],peak_indicator,0 [QuickEffectRack1_[Channel2]_Effect1],parameter8_down_small,0 [Sampler3],hotcue_25_enabled,0 [EffectRack1_EffectUnit1_Effect4],parameter8_type,0 @@ -7207,7 +7207,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter4_set_default,0 [EffectRack1_EffectUnit1_Effect3],parameter1_link_type,0 [Sampler2],rateSearch_set_one,0 -[Auxiliary3],PeakIndicator,0 +[Auxiliary3],peak_indicator,0 [EffectRack1_EffectUnit2],group_[Headphone]_enable,0 [Channel1],cue_goto,0 [EffectRack1_EffectUnit2_Effect1],parameter4_minus_toggle,0 @@ -7221,7 +7221,7 @@ [EffectRack1_EffectUnit4_Effect3],parameter12_down,0 [EffectRack1_EffectUnit4_Effect2],parameter2_minus_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter1_link_type,0 -[Auxiliary4],PeakIndicator,0 +[Auxiliary4],peak_indicator,0 [Channel4],hotcue_25_enabled,0 [EffectRack1_EffectUnit2_Effect2],parameter4_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter8_toggle,0 @@ -7354,7 +7354,7 @@ [Sampler1],visual_key,0 [EffectRack1_EffectUnit4_Effect3],parameter3_minus_toggle,0 [Sampler3],hotcue_37_goto,0 -[Auxiliary1],PeakIndicator,0 +[Auxiliary1],peak_indicator,0 [EffectRack1_EffectUnit3_Effect2],num_parameters,0 [EffectRack1_EffectUnit2_Effect3],parameter9_minus_toggle,0 [Channel4],hotcue_8_clear,0 @@ -7367,7 +7367,7 @@ [EffectRack1_EffectUnit1_Effect1],parameter3_link_type,0 [Sampler4],hotcue_37_goto,0 [PreviewDeck1],beatjump_0.03125_forward,0 -[Auxiliary2],PeakIndicator,0 +[Auxiliary2],peak_indicator,0 [EffectRack1_EffectUnit3_Effect1],num_parameters,0 [EffectRack1_EffectUnit2_Effect4],parameter9_minus_toggle,0 [EqualizerRack1_[Channel1]_Effect1],parameter3_toggle,0 @@ -7502,7 +7502,7 @@ [PreviewDeck1],hotcue_14_clear,0 [EffectRack1_EffectUnit1_Effect3],num_parameters,0 [EqualizerRack1_[Master]_Effect1],parameter9_type,0 -[Sampler3],VuMeterL,0 +[Sampler3],vu_meter_left,0 [Sampler1],pitch_adjust_toggle,0 [Channel2],beatloop_0.5_toggle,0 [EffectRack1_EffectUnit4_Effect2],parameter7_minus_toggle,0 @@ -7510,8 +7510,8 @@ [EffectRack1_EffectUnit2_Effect2],parameter9_minus_toggle,0 [EffectRack1_EffectUnit1_Effect1],button_parameter9_type,0 [Sampler1],hotcue_2_clear,0 -[Sampler4],VuMeterR,0 -[Sampler4],VuMeterL,0 +[Sampler4],vu_meter_right,0 +[Sampler4],vu_meter_left,0 [Sampler2],pitch_adjust_toggle,0 [PreviewDeck1],hotcue_1_gotoandstop,0 [EffectRack1_EffectUnit4_Effect3],parameter8_minus_toggle,0 @@ -7524,7 +7524,7 @@ [QuickEffectRack1_[Channel1]_Effect1],parameter15_link_type,0 [QuickEffectRack1_[Channel2]_Effect1],parameter12_link_type,0 [QuickEffectRack1_[Channel1]_Effect1],clear,0 -[Sampler3],VuMeterR,0 +[Sampler3],vu_meter_right,0 [Channel1],hotcue_4_gotoandstop,0 [Sampler3],pitch_adjust_toggle,0 [EffectRack1_EffectUnit4_Effect4],parameter8_minus_toggle,0 @@ -7576,7 +7576,7 @@ [Channel1],hotcue_5_enabled,0 [EffectRack1_EffectUnit2_Effect1],parameter14_set_minus_one,0 [EqualizerRack1_[Master]_Effect1],button_parameter2_loaded,0 -[Sampler1],VuMeterL,0 +[Sampler1],vu_meter_left,0 [Master],headMix_down_small,0 [Channel2],waveform_zoom_down,0 [EffectRack1_EffectUnit3_Effect2],parameter6_set_minus_one,0 @@ -7588,11 +7588,11 @@ [Sampler3],hotcue_32_gotoandstop,0 [EffectRack1_EffectUnit4_Effect4],parameter14_loaded,0 [EffectRack1_EffectUnit2_Effect2],parameter14_set_minus_one,0 -[Sampler2],VuMeterR,0 +[Sampler2],vu_meter_right,0 [Auxiliary3],pregain_up_small,0 [EqualizerRack1_[Channel2]_Effect1],parameter8_down,0 [EqualizerRack1_[Channel4]_Effect1],button_parameter14_loaded,0 -[Sampler2],VuMeterL,0 +[Sampler2],vu_meter_left,0 [Channel1],waveform_zoom_down,0 [EqualizerRack1_[Channel3]_Effect1],parameter12_up_small,0 [EffectRack1_EffectUnit3_Effect3],parameter6_set_minus_one,0 @@ -7608,7 +7608,7 @@ [EqualizerRack1_[Master]],loaded,1 [QuickEffectRack1_[Channel3]_Effect1],button_parameter8_type,0 [EffectRack1_EffectUnit3_Effect1],parameter1_type,0 -[Sampler1],VuMeterR,0 +[Sampler1],vu_meter_right,0 [EqualizerRack1_[Master]_Effect1],button_parameter1_loaded,0 [Auxiliary4],pregain_up_small,0 [EffectRack1_EffectUnit3_Effect4],button_parameter9,0 @@ -8095,7 +8095,7 @@ [Channel2],hotcue_14_clear,0 [Sampler1],hotcue_14_position,-1 [EffectRack1_EffectUnit3_Effect3],parameter14_link_type,0 -[Master],VuMeter,0 +[Main],vu_meter,0 [EqualizerRack1_[Channel1]_Effect1],parameter10_link_inverse,0 [EffectRack1_EffectUnit2_Effect4],parameter12_loaded,0 [Sampler4],hotcue_24_position,-1 @@ -8271,7 +8271,7 @@ [Sampler3],beatloop_0.03125_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter14_link_type,0 [EqualizerRack1_[Channel3]_Effect1],parameter16_up,0 -[Auxiliary3],VuMeterL,0 +[Auxiliary3],vu_meter_left,0 [Sampler2],hotcue_10_enabled,0 [Sampler1],bpm_tap,0 [EqualizerRack1_[Channel2]_Effect1],parameter16_link_inverse,0 @@ -8281,9 +8281,9 @@ [Channel4],hotcue_24_clear,0 [Sampler4],beatloop_0.03125_toggle,0 [EffectRack1_EffectUnit1_Effect4],parameter14_link_type,0 -[Auxiliary4],VuMeterR,0 +[Auxiliary4],vu_meter_right,0 [EffectRack1_EffectUnit2_Effect1],parameter16_down_small,0 -[Auxiliary4],VuMeterL,0 +[Auxiliary4],vu_meter_left,0 [EqualizerRack1_[Channel3]_Effect1],parameter13_type,0 [Sampler1],hotcue_10_enabled,0 [EffectRack1_EffectUnit1_Effect3],parameter7_link_type,0 @@ -8297,7 +8297,7 @@ [Channel3],hotcue_14_clear,0 [Sampler4],hotcue_14_position,-1 [EqualizerRack1_[Channel1]_Effect1],parameter14_toggle,0 -[Auxiliary3],VuMeterR,0 +[Auxiliary3],vu_meter_right,0 [EffectRack1_EffectUnit2_Effect2],parameter16_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter7_link_type,0 [EffectRack1_EffectUnit2_Effect3],parameter10_loaded,0 @@ -8349,7 +8349,7 @@ [EqualizerRack1_[Channel1]_Effect1],parameter16_toggle,0 [Sampler1],LoadSelectedTrack,0 [Sampler3],hotcue_18_position,-1 -[Auxiliary1],VuMeterL,0 +[Auxiliary1],vu_meter_left,0 [EffectRack1_EffectUnit3_Effect3],parameter9_down,0 [EffectRack1_EffectUnit1_Effect2],parameter9_set_minus_one,0 [EffectRack1_EffectUnit2_Effect2],parameter1_set_minus_one,0 @@ -8363,9 +8363,9 @@ [EffectRack1_EffectUnit1],group_[Microphone]_enable,0 [EffectRack1_EffectUnit1_Effect2],parameter14_link_type,0 [EffectRack1_EffectUnit3_Effect4],parameter7_link_type,0 -[Auxiliary2],VuMeterR,0 +[Auxiliary2],vu_meter_right,0 [PreviewDeck1],hotcue_37_goto,0 -[Auxiliary2],VuMeterL,0 +[Auxiliary2],vu_meter_left,0 [EffectRack1_EffectUnit1_Effect3],parameter9_set_minus_one,0 [EffectRack1_EffectUnit2_Effect3],parameter1_set_minus_one,0 [QuickEffectRack1_[Channel2]_Effect1],parameter10_down,0 @@ -8379,7 +8379,7 @@ [Sampler1],loop_move,0 [EffectRack1_EffectUnit2],group_[Microphone]_enable,0 [EqualizerRack1_[Channel1]_Effect1],parameter15_toggle,0 -[Auxiliary1],VuMeterR,0 +[Auxiliary1],vu_meter_right,0 [QuickEffectRack1_[Channel4]_Effect1],parameter13_set_minus_one,0 [EffectRack1_EffectUnit1_Effect4],parameter9_set_minus_one,0 [EffectRack1_EffectUnit2_Effect4],parameter1_set_minus_one,0 @@ -9725,7 +9725,7 @@ [QuickEffectRack1_[Channel4]_Effect1],parameter4_link_inverse,0 [EffectRack1_EffectUnit2_Effect1],parameter11_up,0 [PreviewDeck1],hotcue_4_gotoandstop,0 -[Microphone3],PeakIndicator,0 +[Microphone3],peak_indicator,0 [Sampler3],hotcue_9_enabled,0 [EffectRack1_EffectUnit1_Effect3],parameter13_link_inverse,0 [Channel2],playposition_toggle,0 @@ -9735,7 +9735,7 @@ [Sampler1],rate_down_small,0 [EffectRack1_EffectUnit2_Effect2],parameter11_up,0 [Sampler3],beats_translate_curpos,0 -[Microphone4],PeakIndicator,0 +[Microphone4],peak_indicator,0 [EqualizerRack1_[Channel1]_Effect1],parameter1_set_zero,0 [QuickEffectRack1_[Channel1]_Effect1],parameter11_minus_toggle,0 [EffectRack1_EffectUnit1_Effect3],parameter5_down_small,0 @@ -9758,7 +9758,7 @@ [EffectRack1_EffectUnit3_Effect1],parameter16_link_inverse,0 [PreviewDeck1],beatjump_0.5_backward,0 [EffectRack1_EffectUnit1_Effect1],button_parameter15_type,0 -[Microphone2],PeakIndicator,0 +[Microphone2],peak_indicator,0 [EffectRack1_EffectUnit4_Effect1],parameter15_up,0 [Sampler4],rateSearch_set_default,0 [Sampler2],beatloop_64_toggle,0 @@ -10930,7 +10930,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter5_loaded,0 [EffectRack1_EffectUnit2_Effect3],parameter6_loaded,0 [Sampler4],loop_move_0.0625_forward,0 -[Channel3],VuMeter,0 +[Channel3],vu_meter,0 [EffectRack1_EffectUnit4_Effect1],parameter1_toggle,0 [EffectRack1_EffectUnit1_Effect3],button_parameter1_type,0 [Sampler2],waveform_zoom,1 @@ -10954,7 +10954,7 @@ [Sampler2],scratch_position_enable,0 [EffectRack1_EffectUnit2_Effect2],parameter4_loaded,0 [EffectRack1_EffectUnit2_Effect4],parameter7_loaded,0 -[Channel4],VuMeter,0 +[Channel4],vu_meter,0 [EffectRack1_EffectUnit4_Effect2],parameter1_toggle,0 [EffectRack1_EffectUnit1_Effect4],button_parameter1_type,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_down_small,0 @@ -11137,7 +11137,7 @@ [Channel1],beatloop_0.03125_enabled,0 [EffectRack1_EffectUnit4_Effect3],parameter12_up_small,0 [PreviewDeck1],hotcue_7_set,0 -[Channel1],VuMeter,0 +[Channel1],vu_meter,0 [QuickEffectRack1_[Channel3]_Effect1],parameter11_loaded,0 [Sampler4],hotcue_20_gotoandstop,0 [Sampler3],hotcue_18_set,0 @@ -11157,7 +11157,7 @@ [EffectRack1_EffectUnit2_Effect1],parameter12_up_small,0 [EffectRack1_EffectUnit3_Effect1],parameter13_up_small,0 [EqualizerRack1_[Channel3]_Effect1],parameter5_set_zero,0 -[Channel2],VuMeter,0 +[Channel2],vu_meter,0 [Sampler1],hotcue_30_gotoandstop,0 [Sampler3],hotcue_28_gotoandstop,0 [Sampler4],hotcue_18_set,0 @@ -11198,7 +11198,7 @@ [Sampler1],loop_move_0.0625_forward,0 [Sampler1],hotcue_28_gotoandstop,0 [Sampler3],hotcue_30_gotoandstop,0 -[Microphone],PeakIndicator,0 +[Microphone],peak_indicator,0 [EffectRack1_EffectUnit1_Effect4],parameter2_set_minus_one,0 [Sampler4],visual_key_distance_minus_toggle,0 [EqualizerRack1_[Channel3]],mix_set_zero,0 @@ -11918,7 +11918,7 @@ [Channel1],beatjump_8_forward,0 [EqualizerRack1_[Channel3]],next_chain,0 [Sampler3],local_bpm,0 -[Microphone2],VuMeter,0 +[Microphone2],vu_meter,0 [EffectRack1_EffectUnit4_Effect2],button_parameter14_loaded,0 [EffectRack1_EffectUnit4_Effect4],button_parameter13_loaded,0 [Sampler3],duration,0 @@ -11988,7 +11988,7 @@ [EqualizerRack1_[Channel1]_Effect1],parameter7_set_one,0 [EqualizerRack1_[Channel2]_Effect1],parameter9_minus_toggle,0 [QuickEffectRack1_[Channel2]_Effect1],parameter12_link_inverse,0 -[Microphone3],VuMeter,0 +[Microphone3],vu_meter,0 [EffectRack1_EffectUnit4_Effect3],button_parameter15_loaded,0 [PreviewDeck1],beatlooproll_8_activate,0 [Channel1],cue_cdj,0 @@ -12000,7 +12000,7 @@ [PreviewDeck1],loop_move_2_backward,0 [Sampler1],local_bpm,0 [PreviewDeck1],hotcue_6_position,-1 -[Microphone4],VuMeter,0 +[Microphone4],vu_meter,0 [EffectRack1_EffectUnit4_Effect2],button_parameter15_loaded,0 [Sampler1],cue_gotoandstop,0 [EffectRack1_EffectUnit2_Effect1],button_parameter7_type,0 @@ -12186,7 +12186,7 @@ [EffectRack1_EffectUnit2_Effect3],button_parameter7_type,0 [QuickEffectRack1_[Channel3]_Effect1],parameter12_minus_toggle,0 [EqualizerRack1_[Channel3]_Effect1],parameter5_link_type,0 -[Auxiliary1],VuMeter,0 +[Auxiliary1],vu_meter,0 [Auxiliary1],pregain_up,0 [EffectRack1_EffectUnit1_Effect1],num_button_parameters,0 [QuickEffectRack1_[Channel1]],super1_set_default,0 @@ -12202,7 +12202,7 @@ [EffectRack1_EffectUnit4_Effect1],parameter12_type,0 [Master],gain_set_one,0 [EqualizerRack1_[Master]_Effect1],parameter6_set_minus_one,0 -[Auxiliary2],VuMeter,0 +[Auxiliary2],vu_meter,0 [Auxiliary2],pregain_up,0 [PreviewDeck1],hotcue_13_set,0 [EffectRack1_EffectUnit1_Effect4],num_button_parameters,0 @@ -12390,7 +12390,7 @@ [EqualizerRack1_[Channel1]_Effect1],parameter3_minus_toggle,0 [Sampler1],hotcue_37_enabled,0 [Sampler1],hotcue_3_activate,0 -[Auxiliary3],VuMeter,0 +[Auxiliary3],vu_meter,0 [EqualizerRack1_[Channel1]_Effect1],parameter14_down_small,0 [EffectRack1_EffectUnit1_Effect4],parameter1_minus_toggle,0 [PreviewDeck1],visual_key_distance_minus_toggle,0 @@ -12400,7 +12400,7 @@ [Sampler4],hotcue_9_activate,0 [EffectRack1_EffectUnit3_Effect3],parameter1_minus_toggle,0 [Sampler2],hotcue_3_activate,0 -[Auxiliary4],VuMeter,0 +[Auxiliary4],vu_meter,0 [Sampler3],hotcue_7_activate,0 [Sampler3],playposition_set_default,0 [Channel4],hotcue_14_gotoandstop,0 @@ -13671,7 +13671,7 @@ [EffectRack1_EffectUnit2_Effect3],parameter6_up,0 [QuickEffectRack1_[Channel3]_Effect1],parameter8_minus_toggle,0 [Microphone2],volume_minus_toggle,0 -[Channel1],VuMeterL,0 +[Channel1],vu_meter_left,0 [Controls],ShowDurationRemaining,0 [Sampler1],pregain_toggle,0 [Auxiliary2],pregain_down_small,0 @@ -13689,9 +13689,9 @@ [EffectRack1_EffectUnit1_Effect4],parameter4_up,0 [EffectRack1_EffectUnit2_Effect4],parameter6_up,0 [Channel1],hotcue_9_set,0 -[Channel2],VuMeterR,0 +[Channel2],vu_meter_right,0 [Microphone3],volume_minus_toggle,0 -[Channel2],VuMeterL,0 +[Channel2],vu_meter_left,0 [Sampler2],pregain_toggle,0 [EffectRack1_EffectUnit1_Effect2],parameter16_set_zero,0 [EffectRack1_EffectUnit2_Effect2],parameter15_set_zero,0 @@ -13714,9 +13714,9 @@ [EffectRack1_EffectUnit1_Effect1],parameter4_up,0 [EffectRack1_EffectUnit2_Effect1],parameter6_up,0 [Channel2],hotcue_9_set,0 -[Channel1],VuMeterR,0 +[Channel1],vu_meter_right,0 [Microphone4],volume_minus_toggle,0 -[Channel3],VuMeterL,0 +[Channel3],vu_meter_left,0 [Sampler1],beatjump_0.03125_backward,0 [Sampler2],beatloop_32_enabled,0 [EffectRack1_EffectUnit2_Effect4],parameter14_up,0 @@ -13736,9 +13736,9 @@ [EffectRack1_EffectUnit1_Effect2],parameter4_up,0 [EffectRack1_EffectUnit2_Effect2],parameter6_up,0 [EffectRack1_EffectUnit3_Effect3],parameter16_up,0 -[Channel4],VuMeterR,0 +[Channel4],vu_meter_right,0 [QuickEffectRack1_[Channel3]_Effect1],button_parameter15_type,0 -[Channel4],VuMeterL,0 +[Channel4],vu_meter_left,0 [Master],headGain,1 [Sampler1],beatloop_32_enabled,0 [Sampler2],beatjump_0.03125_backward,0 @@ -13760,7 +13760,7 @@ [EffectRack1_EffectUnit3_Effect4],parameter16_up,0 [Sampler3],hotcue_5_gotoandplay,0 [PreviewDeck1],rate_set_default,0 -[Channel3],VuMeterR,0 +[Channel3],vu_meter_right,0 [QuickEffectRack1_[Channel3]_Effect1],parameter9_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter2_set_one,0 [PreviewDeck1],hotcue_8_activate,0 @@ -14058,10 +14058,10 @@ [Sampler1],bpm_set_default,0 [EffectRack1_EffectUnit2_Effect2],parameter15_set_minus_one,0 [EffectRack1_EffectUnit1_Effect1],parameter13_set_default,0 -[Master],VuMeterR,0 +[Main],vu_meter_right,0 [EffectRack1_EffectUnit2_Effect4],parameter15_minus_toggle,0 [QuickEffectRack1_[Channel4]_Effect1],parameter7_toggle,0 -[Master],VuMeterL,0 +[Main],vu_meter_left,0 [EffectRack1_EffectUnit3_Effect4],parameter5_down,0 [EffectRack1_EffectUnit4_Effect1],button_parameter7_loaded,0 [EffectRack1_EffectUnit4_Effect3],button_parameter4_loaded,0 From 759ffa18a5937085594f62daca41f4725d73bd31 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 19:26:23 +0200 Subject: [PATCH 04/13] test(controlobjectaliastest): Add tests for `EngineVuMeter` aliases --- src/test/controlobjectaliastest.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/test/controlobjectaliastest.cpp b/src/test/controlobjectaliastest.cpp index 2b0cb5c96ad..6e1b9be5955 100644 --- a/src/test/controlobjectaliastest.cpp +++ b/src/test/controlobjectaliastest.cpp @@ -17,6 +17,7 @@ namespace { const QString kAppGroup = QStringLiteral("[App]"); +const QString kMainGroup = QStringLiteral("[Main]"); const QString kLegacyGroup = QStringLiteral("[Master]"); const QString kSkinGroup = QStringLiteral("[Skin]"); @@ -82,6 +83,34 @@ TEST_F(ControlObjectAliasTest, EngineMixer) { auto audioLatencyOverloadCountLegacy = ControlProxy(ConfigKey( kLegacyGroup, QStringLiteral("audio_latency_overload_count"))); EXPECT_DOUBLE_EQ(audioLatencyOverloadCount.get(), audioLatencyOverloadCountLegacy.get()); + + auto vuMeter = ControlProxy(ConfigKey(kMainGroup, QStringLiteral("vu_meter"))); + auto vuMeterLegacy = ControlProxy(ConfigKey(kLegacyGroup, QStringLiteral("VuMeter"))); + EXPECT_DOUBLE_EQ(vuMeter.get(), vuMeterLegacy.get()); + + auto vuMeterLeft = ControlProxy(ConfigKey(kMainGroup, QStringLiteral("vu_meter_left"))); + auto vuMeterLeftLegacy = ControlProxy(ConfigKey(kLegacyGroup, QStringLiteral("VuMeterL"))); + EXPECT_DOUBLE_EQ(vuMeterLeft.get(), vuMeterLeftLegacy.get()); + + auto vuMeterRight = ControlProxy(ConfigKey(kMainGroup, QStringLiteral("vu_meter_right"))); + auto vuMeterRightLegacy = ControlProxy(ConfigKey(kLegacyGroup, QStringLiteral("VuMeterR"))); + EXPECT_DOUBLE_EQ(vuMeterRight.get(), vuMeterRightLegacy.get()); + + auto peakIndicator = ControlProxy(ConfigKey(kMainGroup, QStringLiteral("peak_indicator"))); + auto peakIndicatorLegacy = ControlProxy(ConfigKey(kLegacyGroup, QStringLiteral("VuMeter"))); + EXPECT_DOUBLE_EQ(peakIndicator.get(), peakIndicatorLegacy.get()); + + auto peakIndicatorLeft = ControlProxy( + ConfigKey(kMainGroup, QStringLiteral("peak_indicator_left"))); + auto peakIndicatorLeftLegacy = ControlProxy( + ConfigKey(kLegacyGroup, QStringLiteral("PeakIndicatorL"))); + EXPECT_DOUBLE_EQ(peakIndicatorLeft.get(), peakIndicatorLeftLegacy.get()); + + auto peakIndicatorRight = ControlProxy( + ConfigKey(kMainGroup, QStringLiteral("peak_indicator_right"))); + auto peakIndicatorRightLegacy = ControlProxy( + ConfigKey(kLegacyGroup, QStringLiteral("PeakIndicatorR"))); + EXPECT_DOUBLE_EQ(peakIndicatorRight.get(), peakIndicatorRightLegacy.get()); } TEST_F(ControlObjectAliasTest, PlayerManager) { From 35cd17ac9c181b5ee7915100ec280cc5fe097701 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 10:59:39 +0200 Subject: [PATCH 05/13] chore(controllers): Use new `peak_indicator` controls instead of alias --- res/controllers/Denon-MC3000-scripts.js | 2 +- res/controllers/Denon-MC6000MK2.midi.xml | 8 +++---- res/controllers/Denon-MC7000-scripts.js | 4 ++-- .../Hercules DJ Console RMX 2.midi.xml | 4 ++-- .../Hercules-DJ-Console-4-Mx-scripts.js | 2 +- .../MixVibes U-Mix Control Pro 2.midi.xml | 2 +- .../Novation-Launchpad MK2-scripts.js | 2 +- .../Novation-Launchpad Mini MK3-scripts.js | 2 +- res/controllers/Novation-Launchpad-scripts.js | 2 +- .../Numark-Mixtrack-Platinum-scripts.js | 6 ++--- .../Numark-Mixtrack-Pro-scripts.js | 4 ++-- res/controllers/Pioneer-DDJ-SB2-scripts.js | 2 +- res/controllers/Pioneer-DDJ-SB3-scripts.js | 2 +- res/controllers/Pioneer-DDJ-SX-scripts.js | 2 +- res/controllers/Reloop Jockey 3 ME.midi.xml | 8 +++---- res/controllers/Roland_DJ-505-scripts.js | 2 +- res/controllers/Stanton-DJC-4-scripts.js | 6 ++--- res/controllers/Stanton-SCS1m-scripts.js | 6 ++--- .../Traktor-Kontrol-S2-MK1-hid-scripts.js | 4 ++-- .../Traktor-Kontrol-S2-MK2-hid-scripts.js | 8 +++---- .../Traktor-Kontrol-S2-MK3-hid-scripts.js | 8 +++---- .../Traktor-Kontrol-S3-hid-scripts.js | 18 +++++++------- .../Traktor-Kontrol-S4-MK2-hid-scripts.js | 24 +++++++++---------- res/controllers/Traktor-Kontrol-S4-MK3.js | 2 +- res/controllers/Vestax VCI-300.midi.xml | 4 ++-- res/controllers/Vestax-Typhoon-scripts.js | 4 ++-- res/controllers/Yaeltex-MiniMixxx-scripts.js | 4 ++-- 27 files changed, 71 insertions(+), 71 deletions(-) diff --git a/res/controllers/Denon-MC3000-scripts.js b/res/controllers/Denon-MC3000-scripts.js index bf730418370..94f27e7bc0c 100644 --- a/res/controllers/Denon-MC3000-scripts.js +++ b/res/controllers/Denon-MC3000-scripts.js @@ -69,7 +69,7 @@ mc3000.init = function(id) { engine.connectControl("[Channel"+i+"]", "keylock", "mc3000.keylockSetLed"); engine.connectControl("[Channel"+i+"]", "play", "mc3000.playSetLed"); engine.connectControl("[Channel"+i+"]", "playposition", "mc3000.playPositionSetLed"); - engine.connectControl("[Channel"+i+"]", "PeakIndicator", "mc3000.peakIndicatorSetLed"); + engine.connectControl("[Channel"+i+"]", "peak_indicator", "mc3000.peakIndicatorSetLed"); engine.connectControl("[Channel"+i+"]", "VuMeter", "mc3000.vuMeterSetLeds"); engine.connectControl("[Channel"+i+"]", "pfl", "mc3000.pflSetLed"); } diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml index d7d3d6e5d99..6700edd37f5 100644 --- a/res/controllers/Denon-MC6000MK2.midi.xml +++ b/res/controllers/Denon-MC6000MK2.midi.xml @@ -2656,7 +2656,7 @@ [Channel1] - PeakIndicator + peak_indicator 0xB0 0x59 0x01 @@ -2712,7 +2712,7 @@ [Channel3] - PeakIndicator + peak_indicator 0xB1 0x59 0x01 @@ -2768,7 +2768,7 @@ [Channel2] - PeakIndicator + peak_indicator 0xB2 0x59 0x01 @@ -2776,7 +2776,7 @@ [Channel4] - PeakIndicator + peak_indicator 0xB3 0x59 0x01 diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js index cebb2781ba5..587a790453e 100644 --- a/res/controllers/Denon-MC7000-scripts.js +++ b/res/controllers/Denon-MC7000-scripts.js @@ -1027,8 +1027,8 @@ MC7000.sortLibrary = function(channel, control, value) { // VuMeters only for Channel 1-4 / Master is on Hardware MC7000.VuMeter = function(value, group) { const deckIndex = script.deckFromGroup(group) - 1; - // sends either PeakIndicator or scales value (0..1) to (0..117) while truncating to each LED - const vuLevelOutValue = engine.getValue(group, "PeakIndicator") ? MC7000.VuMeterLEDPeakValue : Math.floor(Math.pow(value, 2.5) * 9) * 13; + // sends either peak_indicator or scales value (0..1) to (0..117) while truncating to each LED + const vuLevelOutValue = engine.getValue(group, "peak_indicator") ? MC7000.VuMeterLEDPeakValue : Math.floor(Math.pow(value, 2.5) * 9) * 13; // only send Midi signal when LED value has changed if (MC7000.prevVuLevel[deckIndex] !== vuLevelOutValue) { midi.sendShortMsg(0xB0 + deckIndex, 0x1F, vuLevelOutValue); diff --git a/res/controllers/Hercules DJ Console RMX 2.midi.xml b/res/controllers/Hercules DJ Console RMX 2.midi.xml index 90c125d55f3..df5b2a5cae7 100644 --- a/res/controllers/Hercules DJ Console RMX 2.midi.xml +++ b/res/controllers/Hercules DJ Console RMX 2.midi.xml @@ -1755,7 +1755,7 @@ [Channel1] - PeakIndicator + peak_indicator 0.5 @@ -1827,7 +1827,7 @@ [Channel2] - PeakIndicator + peak_indicator 0.5 diff --git a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js index d9d540fd1e0..4a3d0eb5a03 100644 --- a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js +++ b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js @@ -673,7 +673,7 @@ Hercules4Mx.updateVumeterEvent = function(vumeter, value) { var newval = parseInt(value * 0x80); if (vumeter.lastvalue !== newval) { vumeter.lastvalue = newval; - if (engine.getValue(vumeter.source, "PeakIndicator") > 0) { + if (engine.getValue(vumeter.source, "peak_indicator") > 0) { // IF it clips, we put the top led on and the rest off, which gives a "flash" effect. midi.sendShortMsg(vumeter.midichan, vumeter.clip, 0x7F); newval = 0; diff --git a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml index 5da140ce37a..c9b62423c5d 100644 --- a/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml +++ b/res/controllers/MixVibes U-Mix Control Pro 2.midi.xml @@ -609,7 +609,7 @@ [Master] - PeakIndicator + peak_indicator 0x92 0x3 0x7F diff --git a/res/controllers/Novation-Launchpad MK2-scripts.js b/res/controllers/Novation-Launchpad MK2-scripts.js index daf31522e81..f9a65dd9356 100644 --- a/res/controllers/Novation-Launchpad MK2-scripts.js +++ b/res/controllers/Novation-Launchpad MK2-scripts.js @@ -4144,7 +4144,7 @@ var NLMK2 = (function () { }, PeakIndicator: { group: `[${type}${i}]`, - name: 'PeakIndicator', + name: 'peak_indicator', type: 'binary' }, pfl: { diff --git a/res/controllers/Novation-Launchpad Mini MK3-scripts.js b/res/controllers/Novation-Launchpad Mini MK3-scripts.js index fce0e12df3e..ce1fb372417 100644 --- a/res/controllers/Novation-Launchpad Mini MK3-scripts.js +++ b/res/controllers/Novation-Launchpad Mini MK3-scripts.js @@ -4144,7 +4144,7 @@ var NLMMK3 = (function () { }, PeakIndicator: { group: `[${type}${i}]`, - name: 'PeakIndicator', + name: 'peak_indicator', type: 'binary' }, pfl: { diff --git a/res/controllers/Novation-Launchpad-scripts.js b/res/controllers/Novation-Launchpad-scripts.js index d80fddefe62..bc1d5643634 100644 --- a/res/controllers/Novation-Launchpad-scripts.js +++ b/res/controllers/Novation-Launchpad-scripts.js @@ -4144,7 +4144,7 @@ var NLMK1 = (function () { }, PeakIndicator: { group: `[${type}${i}]`, - name: 'PeakIndicator', + name: 'peak_indicator', type: 'binary' }, pfl: { diff --git a/res/controllers/Numark-Mixtrack-Platinum-scripts.js b/res/controllers/Numark-Mixtrack-Platinum-scripts.js index e9dcba0ed98..e4c9b8db06d 100644 --- a/res/controllers/Numark-Mixtrack-Platinum-scripts.js +++ b/res/controllers/Numark-Mixtrack-Platinum-scripts.js @@ -1393,7 +1393,7 @@ MixtrackPlatinum.vuCallback = function(value, group, control) { || engine.getValue('[Channel3]', 'pfl') || engine.getValue('[Channel4]', 'pfl')) { - if (engine.getValue(group, "PeakIndicator")) { + if (engine.getValue(group, "peak_indicator")) { level = 81; } @@ -1411,13 +1411,13 @@ MixtrackPlatinum.vuCallback = function(value, group, control) { } } else if (group == '[Master]' && control == 'VuMeterL') { - if (engine.getValue(group, "PeakIndicatorL")) { + if (engine.getValue(group, "peak_indicator_left")) { level = 81; } midi.sendShortMsg(0xBF, 0x44, level); } else if (group == '[Master]' && control == 'VuMeterR') { - if (engine.getValue(group, "PeakIndicatorR")) { + if (engine.getValue(group, "peak_indicator_right")) { level = 81; } midi.sendShortMsg(0xBF, 0x45, level); diff --git a/res/controllers/Numark-Mixtrack-Pro-scripts.js b/res/controllers/Numark-Mixtrack-Pro-scripts.js index 63018e5db3a..d1d7df6307c 100644 --- a/res/controllers/Numark-Mixtrack-Pro-scripts.js +++ b/res/controllers/Numark-Mixtrack-Pro-scripts.js @@ -120,8 +120,8 @@ NumarkMixTrackPro.init = function(id) { // called when the MIDI device is opened // Clipping LED - engine.connectControl("[Channel1]","PeakIndicator","NumarkMixTrackPro.Channel1Clip"); - engine.connectControl("[Channel2]","PeakIndicator","NumarkMixTrackPro.Channel2Clip"); + engine.connectControl("[Channel1]","peak_indicator","NumarkMixTrackPro.Channel1Clip"); + engine.connectControl("[Channel2]","peak_indicator","NumarkMixTrackPro.Channel2Clip"); // Stutter beat light engine.connectControl("[Channel1]","beat_active","NumarkMixTrackPro.Stutter1Beat"); diff --git a/res/controllers/Pioneer-DDJ-SB2-scripts.js b/res/controllers/Pioneer-DDJ-SB2-scripts.js index b75e966fee6..5abf142799d 100644 --- a/res/controllers/Pioneer-DDJ-SB2-scripts.js +++ b/res/controllers/Pioneer-DDJ-SB2-scripts.js @@ -916,7 +916,7 @@ PioneerDDJSB2.hotCueLeds = function(value, group, control) { PioneerDDJSB2.VuMeterLeds = function(value, group, control) { // The red LED lights up with MIDI values 119 (0x77) and above. That should only light up when // the track is clipping. - if (engine.getValue(group, "PeakIndicator") === 1) { + if (engine.getValue(group, "peak_indicator") === 1) { value = 119; } else { // 117 was determined experimentally so the yellow LED only lights diff --git a/res/controllers/Pioneer-DDJ-SB3-scripts.js b/res/controllers/Pioneer-DDJ-SB3-scripts.js index a99be329fbd..200c414791c 100755 --- a/res/controllers/Pioneer-DDJ-SB3-scripts.js +++ b/res/controllers/Pioneer-DDJ-SB3-scripts.js @@ -1093,7 +1093,7 @@ PioneerDDJSB3.shiftListeners.push(function(group, isShifted) { PioneerDDJSB3.VuMeterLeds = function(value, group, control) { // The red LED lights up with MIDI values 119 (0x77) and above. That should only light up when // the track is clipping. - if (engine.getValue(group, "PeakIndicator") === 1) { + if (engine.getValue(group, "peak_indicator") === 1) { value = 119; } else { // 117 was determined experimentally so the yellow LED only lights diff --git a/res/controllers/Pioneer-DDJ-SX-scripts.js b/res/controllers/Pioneer-DDJ-SX-scripts.js index 4c2dfdd478a..292ccd9be96 100644 --- a/res/controllers/Pioneer-DDJ-SX-scripts.js +++ b/res/controllers/Pioneer-DDJ-SX-scripts.js @@ -2048,7 +2048,7 @@ PioneerDDJSX.VuMeterLeds = function(value, group, control) { value = parseInt(value * 0x76); //full level indicator: 0x7F - if (engine.getValue(group, "PeakIndicator")) { + if (engine.getValue(group, "peak_indicator")) { value = value + 0x09; } diff --git a/res/controllers/Reloop Jockey 3 ME.midi.xml b/res/controllers/Reloop Jockey 3 ME.midi.xml index 50c52ce8b90..e0a15c226a3 100644 --- a/res/controllers/Reloop Jockey 3 ME.midi.xml +++ b/res/controllers/Reloop Jockey 3 ME.midi.xml @@ -2687,7 +2687,7 @@ [Channel1] - PeakIndicator + peak_indicator 0x90 0x21 0x0A @@ -2796,7 +2796,7 @@ [Channel2] - PeakIndicator + peak_indicator 0x91 0x21 0x0A @@ -2905,7 +2905,7 @@ [Channel3] - PeakIndicator + peak_indicator 0x92 0x21 0x0A @@ -3014,7 +3014,7 @@ [Channel4] - PeakIndicator + peak_indicator 0x93 0x21 0x0A diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js index 5c2a4856f0d..c85c9a0739f 100644 --- a/res/controllers/Roland_DJ-505-scripts.js +++ b/res/controllers/Roland_DJ-505-scripts.js @@ -726,7 +726,7 @@ DJ505.Deck = function(deckNumbers, offset) { // The red LEDs light up with MIDI values greater than 0x24. The // maximum brightness is reached at value 0x28. Red LEDs should // only be illuminated if the track is clipping. - if (engine.getValue(group, "PeakIndicator") === 1) { + if (engine.getValue(group, "peak_indicator") === 1) { value = 0x28; } else { value = Math.round(value * 0x24); diff --git a/res/controllers/Stanton-DJC-4-scripts.js b/res/controllers/Stanton-DJC-4-scripts.js index acb995f6adf..be6b929b648 100644 --- a/res/controllers/Stanton-DJC-4-scripts.js +++ b/res/controllers/Stanton-DJC-4-scripts.js @@ -146,7 +146,7 @@ DJC4.init = function() { output: function(value, group) { // The red LEDs light up with MIDI values greater than 0x60. // The Red LEDs should only be illuminated if the track is clipping. - if (engine.getValue(group, "PeakIndicator") === 1) { + if (engine.getValue(group, "peak_indicator") === 1) { value = 0x60; } else { value = Math.round(value * 0x54); @@ -162,7 +162,7 @@ DJC4.init = function() { output: function(value, group) { // The red LEDs light up with MIDI values greater than 0x60. // The Red LEDs should only be illuminated if the track is clipping. - if (engine.getValue(group, "PeakIndicator") === 1) { + if (engine.getValue(group, "peak_indicator") === 1) { value = 0x60; } else { value = Math.round(value * 0x54); @@ -213,7 +213,7 @@ DJC4.Deck = function(deckNumber) { output: function(value, group) { // The red LEDs light up with MIDI values greater than 0x60. // The Red LEDs should only be illuminated if the track is clipping. - if (engine.getValue(group, "PeakIndicator") === 1) { + if (engine.getValue(group, "peak_indicator") === 1) { value = 0x60; } else { value = Math.round(value * 0x54); diff --git a/res/controllers/Stanton-SCS1m-scripts.js b/res/controllers/Stanton-SCS1m-scripts.js index 6e8b04b16c8..0353331756a 100644 --- a/res/controllers/Stanton-SCS1m-scripts.js +++ b/res/controllers/Stanton-SCS1m-scripts.js @@ -80,9 +80,9 @@ StantonSCS1m.init = function (id) { // called when the MIDI device is opened engine.connectControl("[Channel2]","VuMeter","StantonSCS1m.Channel2Vu"); // Clipping LED - engine.connectControl("[Master]","PeakIndicator","StantonSCS1m.MasterClip"); - engine.connectControl("[Channel1]","PeakIndicator","StantonSCS1m.Channel1Clip"); - engine.connectControl("[Channel2]","PeakIndicator","StantonSCS1m.Channel2Clip"); + engine.connectControl("[Master]","peak_indicator","StantonSCS1m.MasterClip"); + engine.connectControl("[Channel1]","peak_indicator","StantonSCS1m.Channel1Clip"); + engine.connectControl("[Channel2]","peak_indicator","StantonSCS1m.Channel2Clip"); // Pitch displays engine.connectControl("[Channel1]","rate","StantonSCS1m.pitchDisplay1"); diff --git a/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js index b1185937c38..f5e1dd5e6c0 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js @@ -87,7 +87,7 @@ class DeckClass { for (let i = 0; i < 4; i++) { this.registerLed("!VuMeter" + i, {hidReport: config.vuMeter.hidReport, offset: config.vuMeter.offset + i}); } - this.registerLed("PeakIndicator", config.peak); + this.registerLed("peak_indicator", config.peak); this.registerLed("!reset_button", config.reset); this.registerLed("loop_in", config.loopIn); this.registerLed("loop_out", config.loopOut); @@ -109,7 +109,7 @@ class DeckClass { this.linkLed("loop_out", this.outputCallbackLoop); this.linkLed("pfl", this.outputCallback); this.linkLed("track_loaded", this.outputCallback); - this.linkLed("PeakIndicator", this.outputCallback); + this.linkLed("peak_indicator", this.outputCallback); engine.makeConnection(this.channel, "VuMeter", this.onVuMeterChanged.bind(this)).trigger(); engine.makeConnection(this.channel, "loop_enabled", this.onLoopEnabledChanged.bind(this)); } diff --git a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js index 675ac77ad76..cb167f136e2 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js @@ -293,8 +293,8 @@ TraktorS2MK2.registerOutputPackets = function() { } } - OutputTop.addOutput("[Channel1]", "PeakIndicator", 0x05, "B"); - OutputTop.addOutput("[Channel2]", "PeakIndicator", 0x0A, "B"); + OutputTop.addOutput("[Channel1]", "peak_indicator", 0x05, "B"); + OutputTop.addOutput("[Channel2]", "peak_indicator", 0x0A, "B"); OutputTop.addOutput("[Channel1]", "!flux_button", 0x20, "B"); OutputTop.addOutput("[Channel1]", "loop_in", 0x21, "B"); @@ -389,8 +389,8 @@ TraktorS2MK2.registerOutputPackets = function() { TraktorS2MK2.linkChannelOutput("[Channel2]", "pfl", TraktorS2MK2.outputChannelCallback); TraktorS2MK2.linkChannelOutput("[Channel1]", "track_loaded", TraktorS2MK2.outputChannelCallback); TraktorS2MK2.linkChannelOutput("[Channel2]", "track_loaded", TraktorS2MK2.outputChannelCallback); - TraktorS2MK2.linkChannelOutput("[Channel1]", "PeakIndicator", TraktorS2MK2.outputChannelCallbackDark); - TraktorS2MK2.linkChannelOutput("[Channel2]", "PeakIndicator", TraktorS2MK2.outputChannelCallbackDark); + TraktorS2MK2.linkChannelOutput("[Channel1]", "peak_indicator", TraktorS2MK2.outputChannelCallbackDark); + TraktorS2MK2.linkChannelOutput("[Channel2]", "peak_indicator", TraktorS2MK2.outputChannelCallbackDark); TraktorS2MK2.linkChannelOutput("[EffectRack1_EffectUnit1]", "group_[Channel1]_enable", TraktorS2MK2.outputChannelCallback); TraktorS2MK2.linkChannelOutput("[EffectRack1_EffectUnit2]", "group_[Channel1]_enable", TraktorS2MK2.outputChannelCallback); TraktorS2MK2.linkChannelOutput("[EffectRack1_EffectUnit1]", "group_[Channel2]_enable", TraktorS2MK2.outputChannelCallback); diff --git a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js index d03b783a074..1221533256d 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js @@ -763,14 +763,14 @@ TraktorS2MK3.registerOutputPackets = function() { output.addOutput("[Channel1]", "vu-6", 0x1E, "B"); output.addOutput("[Channel1]", "vu0", 0x1F, "B"); output.addOutput("[Channel1]", "vu6", 0x20, "B"); - output.addOutput("[Channel1]", "PeakIndicator", 0x21, "B"); + output.addOutput("[Channel1]", "peak_indicator", 0x21, "B"); output.addOutput("[Channel2]", "vu-18", 0x22, "B"); output.addOutput("[Channel2]", "vu-12", 0x23, "B"); output.addOutput("[Channel2]", "vu-6", 0x24, "B"); output.addOutput("[Channel2]", "vu0", 0x25, "B"); output.addOutput("[Channel2]", "vu6", 0x26, "B"); - output.addOutput("[Channel2]", "PeakIndicator", 0x27, "B"); + output.addOutput("[Channel2]", "peak_indicator", 0x27, "B"); output.addOutput("[ChannelX]", "fxButton1", 0x16, "B"); output.addOutput("[ChannelX]", "fxButton2", 0x17, "B"); @@ -827,8 +827,8 @@ TraktorS2MK3.registerOutputPackets = function() { // VuMeter this.vuLeftConnection = engine.makeUnbufferedConnection("[Channel1]", "VuMeter", this.vuMeterHandler); this.vuRightConnection = engine.makeUnbufferedConnection("[Channel2]", "VuMeter", this.vuMeterHandler); - this.clipLeftConnection = engine.makeConnection("[Channel1]", "PeakIndicator", this.peakOutputHandler); - this.clipRightConnection = engine.makeConnection("[Channel2]", "PeakIndicator", this.peakOutputHandler); + this.clipLeftConnection = engine.makeConnection("[Channel1]", "peak_indicator", this.peakOutputHandler); + this.clipRightConnection = engine.makeConnection("[Channel2]", "peak_indicator", this.peakOutputHandler); // Sampler callbacks for (let i = 1; i <= 16; ++i) { diff --git a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js index 176e97003da..cc32468dc04 100644 --- a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js @@ -509,13 +509,13 @@ TraktorS3.Controller = class { outputB.addOutput("[Master]", "!" + "VuMeterR" + i, MasterVuOffsets.VuMeterR + i, "B"); } - outputB.addOutput("[Master]", "PeakIndicatorL", 0x45, "B"); - outputB.addOutput("[Master]", "PeakIndicatorR", 0x4E, "B"); + outputB.addOutput("[Main]", "peak_indicator_left", 0x45, "B"); + outputB.addOutput("[Main]", "peak_indicator_right", 0x4E, "B"); - outputB.addOutput("[Channel3]", "PeakIndicator", 0x0F, "B"); - outputB.addOutput("[Channel1]", "PeakIndicator", 0x1E, "B"); - outputB.addOutput("[Channel2]", "PeakIndicator", 0x2D, "B"); - outputB.addOutput("[Channel4]", "PeakIndicator", 0x3C, "B"); + outputB.addOutput("[Channel3]", "peak_indicator", 0x0F, "B"); + outputB.addOutput("[Channel1]", "peak_indicator", 0x1E, "B"); + outputB.addOutput("[Channel2]", "peak_indicator", 0x2D, "B"); + outputB.addOutput("[Channel4]", "peak_indicator", 0x3C, "B"); this.hid.registerOutputPacket(outputB); @@ -534,8 +534,8 @@ TraktorS3.Controller = class { // Master VuMeters this.masterVuMeter.VuMeterL.connection = engine.makeConnection("[Master]", "VuMeterL", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this)); this.masterVuMeter.VuMeterR.connection = engine.makeConnection("[Master]", "VuMeterR", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this)); - this.linkChannelOutput("[Master]", "PeakIndicatorL", TraktorS3.Controller.prototype.peakOutput.bind(this)); - this.linkChannelOutput("[Master]", "PeakIndicatorR", TraktorS3.Controller.prototype.peakOutput.bind(this)); + this.linkChannelOutput("[Main]", "peak_indicator_left", TraktorS3.Controller.prototype.peakOutput.bind(this)); + this.linkChannelOutput("[Main]", "peak_indicator_right", TraktorS3.Controller.prototype.peakOutput.bind(this)); this.guiTickConnection = engine.makeConnection("[App]", "gui_tick_50ms_period_s", TraktorS3.Controller.prototype.guiTickHandler.bind(this)); // Sampler callbacks @@ -1692,7 +1692,7 @@ TraktorS3.Channel = class { linkOutputs() { this.vuConnection = engine.makeConnection(this.group, "VuMeter", TraktorS3.Channel.prototype.vuMeterHandler.bind(this)); - this.clipConnection = engine.makeConnection(this.group, "PeakIndicator", TraktorS3.Controller.prototype.peakOutput.bind(this.controller)); + this.clipConnection = engine.makeConnection(this.group, "peak_indicator", TraktorS3.Controller.prototype.peakOutput.bind(this.controller)); this.controller.linkChannelOutput(this.group, "pfl", TraktorS3.Controller.prototype.pflOutput.bind(this.controller)); for (let j = 1; j <= 8; j++) { this.hotcueCallbacks.push(engine.makeConnection(this.group, "hotcue_" + j + "_enabled", diff --git a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js index d4583d77722..8c36f840ee3 100644 --- a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js @@ -373,10 +373,10 @@ TraktorS4MK2.registerOutputPackets = function() { - Output1.addOutput("[Channel1]", "PeakIndicator", 0x0F, "B"); - Output1.addOutput("[Channel2]", "PeakIndicator", 0x17, "B"); - Output1.addOutput("[Channel3]", "PeakIndicator", 0x07, "B"); - Output1.addOutput("[Channel4]", "PeakIndicator", 0x1F, "B"); + Output1.addOutput("[Channel1]", "peak_indicator", 0x0F, "B"); + Output1.addOutput("[Channel2]", "peak_indicator", 0x17, "B"); + Output1.addOutput("[Channel3]", "peak_indicator", 0x07, "B"); + Output1.addOutput("[Channel4]", "peak_indicator", 0x1F, "B"); Output1.addOutput("[Master]", "!usblight", 0x2A, "B"); Output1.addOutput("[Master]", "!quantize", 0x31, "B"); @@ -466,8 +466,8 @@ TraktorS4MK2.registerOutputPackets = function() { Output3.addOutput("[Channel2]", "pfl", 0x19, "B"); Output3.addOutput("[Channel4]", "pfl", 0x1A, "B"); - Output3.addOutput("[Master]", "PeakIndicatorL", 0x3B, "B"); - Output3.addOutput("[Master]", "PeakIndicatorR", 0x3C, "B"); + Output3.addOutput("[Main]", "peak_indicator_left", 0x3B, "B"); + Output3.addOutput("[Main]", "peak_indicator_right", 0x3C, "B"); Output3.addOutput("deck1", "!deckLight", 0x13, "B"); Output3.addOutput("deck1", "LoadSelectedTrack", 0x14, "B"); @@ -525,12 +525,12 @@ TraktorS4MK2.registerOutputPackets = function() { TraktorS4MK2.linkChannelOutput("[Channel2]", "track_samples", TraktorS4MK2.outputChannelCallback); TraktorS4MK2.linkChannelOutput("[Channel3]", "track_samples", TraktorS4MK2.outputChannelCallback); TraktorS4MK2.linkChannelOutput("[Channel4]", "track_samples", TraktorS4MK2.outputChannelCallback); - TraktorS4MK2.linkChannelOutput("[Channel1]", "PeakIndicator", TraktorS4MK2.outputChannelCallbackDark); - TraktorS4MK2.linkChannelOutput("[Channel2]", "PeakIndicator", TraktorS4MK2.outputChannelCallbackDark); - TraktorS4MK2.linkChannelOutput("[Channel3]", "PeakIndicator", TraktorS4MK2.outputChannelCallbackDark); - TraktorS4MK2.linkChannelOutput("[Channel4]", "PeakIndicator", TraktorS4MK2.outputChannelCallbackDark); - TraktorS4MK2.linkChannelOutput("[Master]", "PeakIndicatorL", TraktorS4MK2.outputChannelCallbackDark); - TraktorS4MK2.linkChannelOutput("[Master]", "PeakIndicatorR", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Channel1]", "peak_indicator", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Channel2]", "peak_indicator", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Channel3]", "peak_indicator", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Channel4]", "peak_indicator", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Main]", "peak_indicator_left", TraktorS4MK2.outputChannelCallbackDark); + TraktorS4MK2.linkChannelOutput("[Main]", "peak_indicator_right", TraktorS4MK2.outputChannelCallbackDark); TraktorS4MK2.linkChannelOutput("[EffectRack1_EffectUnit1]", "group_[Channel3]_enable", TraktorS4MK2.outputChannelCallback); TraktorS4MK2.linkChannelOutput("[EffectRack1_EffectUnit2]", "group_[Channel3]_enable", TraktorS4MK2.outputChannelCallback); TraktorS4MK2.linkChannelOutput("[EffectRack1_EffectUnit1]", "group_[Channel1]_enable", TraktorS4MK2.outputChannelCallback); diff --git a/res/controllers/Traktor-Kontrol-S4-MK3.js b/res/controllers/Traktor-Kontrol-S4-MK3.js index 9736a5d7c9e..3f8626252c0 100644 --- a/res/controllers/Traktor-Kontrol-S4-MK3.js +++ b/res/controllers/Traktor-Kontrol-S4-MK3.js @@ -2912,7 +2912,7 @@ class S4MK3 { deckMeters[columnBaseIndex + segmentsToLightFully + 1] = 125; } } - if (engine.getValue(deckGroup, "PeakIndicator")) { + if (engine.getValue(deckGroup, "peak_indicator")) { deckMeters[columnBaseIndex + deckSegments + 1] = 127; } } diff --git a/res/controllers/Vestax VCI-300.midi.xml b/res/controllers/Vestax VCI-300.midi.xml index 491e43f3edc..c08b5eba301 100644 --- a/res/controllers/Vestax VCI-300.midi.xml +++ b/res/controllers/Vestax VCI-300.midi.xml @@ -1179,7 +1179,7 @@ [Channel1] - PeakIndicator + peak_indicator 0x90 0x59 0x7F @@ -1188,7 +1188,7 @@ [Channel2] - PeakIndicator + peak_indicator 0x90 0x65 0x7F diff --git a/res/controllers/Vestax-Typhoon-scripts.js b/res/controllers/Vestax-Typhoon-scripts.js index e96433305b3..33098c8003b 100644 --- a/res/controllers/Vestax-Typhoon-scripts.js +++ b/res/controllers/Vestax-Typhoon-scripts.js @@ -239,7 +239,7 @@ VestaxTyphoon.ch1_vu = function(value){ midi.sendShortMsg(0x90,0x2c,0x00) } - if(engine.getValue("[Channel1]","PeakIndicator")==true){ + if(engine.getValue("[Channel1]","peak_indicator")==true){ midi.sendShortMsg(0x90,0x2d,0x7f) } else { midi.sendShortMsg(0x90,0x2d,0x00) @@ -271,7 +271,7 @@ VestaxTyphoon.ch2_vu = function(value){ midi.sendShortMsg(0x91,0x2c,0x00) } - if(engine.getValue("[Channel2]","PeakIndicator")==true){ + if(engine.getValue("[Channel2]","peak_indicator")==true){ midi.sendShortMsg(0x91,0x2d,0x7f) } else { midi.sendShortMsg(0x91,0x2d,0x00) diff --git a/res/controllers/Yaeltex-MiniMixxx-scripts.js b/res/controllers/Yaeltex-MiniMixxx-scripts.js index 8590c7040db..9ed40258e3a 100644 --- a/res/controllers/Yaeltex-MiniMixxx-scripts.js +++ b/res/controllers/Yaeltex-MiniMixxx-scripts.js @@ -256,7 +256,7 @@ MiniMixxx.EncoderModeGain = class extends MiniMixxx.Mode { engine.makeConnection(this.channel, "pregain", this.pregainIndicator.bind(this)); engine.makeConnection(this.channel, "pfl", this.pflIndicator.bind(this)); engine.makeUnbufferedConnection(this.channel, "VuMeter", this.vuIndicator.bind(this)); - engine.makeConnection(this.channel, "PeakIndicator", this.peakIndicator.bind(this)); + engine.makeConnection(this.channel, "peak_indicator", this.peakIndicator.bind(this)); } handleSpin(velo) { engine.setValue(this.channel, "pregain", engine.getValue(this.channel, "pregain") + velo / 50.0); @@ -278,7 +278,7 @@ MiniMixxx.EncoderModeGain = class extends MiniMixxx.Mode { } let color = MiniMixxx.vuMeterColor(value); - color = engine.getValue(this.channel, "PeakIndicator") > 0 ? MiniMixxx.PeakColor : color; + color = engine.getValue(this.channel, "peak_indicator") > 0 ? MiniMixxx.PeakColor : color; const midiValue = value * 127.0; midi.sendShortMsg(0xBF, this.idx, color); midi.sendShortMsg(0xB0, this.idx, midiValue); From 7cba6d39d88890c54d9787bbacd3caa66f4f76d4 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 11:00:36 +0200 Subject: [PATCH 06/13] chore(skins): Use new `peak_indicator` controls instead of alias --- res/skins/Deere/vumeter_h.xml | 2 +- res/skins/Deere/vumeter_v.xml | 2 +- res/skins/LateNight/mixer/vumeter_main.xml | 4 ++-- res/skins/LateNight/mixer/vumeter_single.xml | 2 +- res/skins/Shade/auxiliary.xml | 2 +- res/skins/Shade/microphone.xml | 2 +- res/skins/Shade/mixer_panel.xml | 8 ++++---- res/skins/Shade/preview_deck.xml | 2 +- res/skins/Shade/sampler.xml | 2 +- res/skins/Tango/mixer/vumeter_mini.xml | 2 +- res/skins/Tango/mixer/vumeter_single.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/res/skins/Deere/vumeter_h.xml b/res/skins/Deere/vumeter_h.xml index 50cc4bf4fe2..e458d67ba6f 100644 --- a/res/skins/Deere/vumeter_h.xml +++ b/res/skins/Deere/vumeter_h.xml @@ -36,7 +36,7 @@ 8,8 vumeter_clip.png - ,PeakIndicator + ,peak_indicator diff --git a/res/skins/Deere/vumeter_v.xml b/res/skins/Deere/vumeter_v.xml index 46a6ed1c101..ef7daab0ac0 100644 --- a/res/skins/Deere/vumeter_v.xml +++ b/res/skins/Deere/vumeter_v.xml @@ -20,7 +20,7 @@ 8f,8f vumeter_clip.png - ,PeakIndicator + ,peak_indicator diff --git a/res/skins/LateNight/mixer/vumeter_main.xml b/res/skins/LateNight/mixer/vumeter_main.xml index d7de850ead6..860eb5022ec 100644 --- a/res/skins/LateNight/mixer/vumeter_main.xml +++ b/res/skins/LateNight/mixer/vumeter_main.xml @@ -28,7 +28,7 @@ skin:../LateNight//style/vu_deck_clipping_bg_.png skin:../LateNight//style/vu_deck_clipping_active.png - [Master],PeakIndicatorL + [Main],peak_indicator_left @@ -57,7 +57,7 @@ skin:../LateNight//style/vu_deck_clipping_bg_.png skin:../LateNight//style/vu_deck_clipping_active.png - [Master],PeakIndicatorR + [Main],peak_indicator_right diff --git a/res/skins/LateNight/mixer/vumeter_single.xml b/res/skins/LateNight/mixer/vumeter_single.xml index 42d6a51fbb1..b29e7c65ead 100644 --- a/res/skins/LateNight/mixer/vumeter_single.xml +++ b/res/skins/LateNight/mixer/vumeter_single.xml @@ -23,7 +23,7 @@ skin:../LateNight//style/vu__clipping_bg_.png skin:../LateNight//style/vu__clipping_active.png - ,PeakIndicator + ,peak_indicator diff --git a/res/skins/Shade/auxiliary.xml b/res/skins/Shade/auxiliary.xml index f93fd72ac48..0d88ede2c88 100644 --- a/res/skins/Shade/auxiliary.xml +++ b/res/skins/Shade/auxiliary.xml @@ -15,7 +15,7 @@ skin:/style/volume_clipping_microphone.png 99,6 - [Auxiliary],PeakIndicator + [Auxiliary],peak_indicator diff --git a/res/skins/Shade/microphone.xml b/res/skins/Shade/microphone.xml index 3a51a598b74..774c1f80116 100644 --- a/res/skins/Shade/microphone.xml +++ b/res/skins/Shade/microphone.xml @@ -16,7 +16,7 @@ skin:/style/volume_clipping_microphone.png 82,6 - [Microphone],PeakIndicator + [Microphone],peak_indicator diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml index facd9eea4c7..dfb31f217e4 100644 --- a/res/skins/Shade/mixer_panel.xml +++ b/res/skins/Shade/mixer_panel.xml @@ -922,7 +922,7 @@ skin:/style/volume_clipping.png 107,57 - [Channel1],PeakIndicator + [Channel1],peak_indicator @@ -931,7 +931,7 @@ skin:/style/volume_clipping.png 143,57 - [Channel2],PeakIndicator + [Channel2],peak_indicator @@ -940,7 +940,7 @@ skin:/style/volume_clipping_main.png 122,57 - [Master],PeakIndicatorL + [Main],peak_indicator_left @@ -949,7 +949,7 @@ skin:/style/volume_clipping_main.png 128,57 - [Master],PeakIndicatorR + [Main],peak_indicator_right diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml index bc94674980d..1da8c75779a 100644 --- a/res/skins/Shade/preview_deck.xml +++ b/res/skins/Shade/preview_deck.xml @@ -212,7 +212,7 @@ skin:/style/volume_clipping_previewdeck_over.png skin:/style/volume_clipping_previewdeck.png - [PreviewDeck1],PeakIndicator + [PreviewDeck1],peak_indicator diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml index 1fcb68feb86..ffe943cee06 100644 --- a/res/skins/Shade/sampler.xml +++ b/res/skins/Shade/sampler.xml @@ -383,7 +383,7 @@ skin:/style/volume_clipping_sampler_over.png skin:/style/volume_clipping_sampler.png - ,PeakIndicator + ,peak_indicator diff --git a/res/skins/Tango/mixer/vumeter_mini.xml b/res/skins/Tango/mixer/vumeter_mini.xml index 789fe8f5390..21a4ead0fbe 100644 --- a/res/skins/Tango/mixer/vumeter_mini.xml +++ b/res/skins/Tango/mixer/vumeter_mini.xml @@ -19,7 +19,7 @@ Refer to https://github.com/mixxxdj/mixxx/issues/9201 skin:../Tango/graphics/vumeter_mini_clipping_over.png skin:../Tango/graphics/vumeter_mini_clipping.png - ,PeakIndicator + ,peak_indicator diff --git a/res/skins/Tango/mixer/vumeter_single.xml b/res/skins/Tango/mixer/vumeter_single.xml index 6c54efe1295..5be55515d68 100644 --- a/res/skins/Tango/mixer/vumeter_single.xml +++ b/res/skins/Tango/mixer/vumeter_single.xml @@ -47,7 +47,7 @@ Refer to https://github.com/mixxxdj/mixxx/issues/9201 - ,PeakIndicator + ,peak_indicator highlight From 8379ed8862b5e243eb1b1fc60a996cd36b4822fc Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 11:02:25 +0200 Subject: [PATCH 07/13] refactor(skins): Change tooltip IDs to match new `peak_indicator` COs --- res/skins/Deere/mixer_column_pfl_levels.xml | 4 ++-- .../Deere/mixer_controls_4decks_left.xml | 6 +++--- .../Deere/mixer_controls_4decks_right.xml | 6 +++--- res/skins/Deere/vumeter_main.xml | 4 ++-- res/skins/LateNight/mixer/vumeter_main.xml | 4 ++-- res/skins/LateNight/mixer/vumeter_single.xml | 2 +- res/skins/Shade/auxiliary.xml | 2 +- res/skins/Shade/microphone.xml | 2 +- res/skins/Shade/mixer_panel.xml | 8 ++++---- res/skins/Shade/preview_deck.xml | 2 +- res/skins/Shade/sampler.xml | 2 +- src/skin/legacy/tooltips.cpp | 20 +++++++++---------- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/res/skins/Deere/mixer_column_pfl_levels.xml b/res/skins/Deere/mixer_column_pfl_levels.xml index 5a0482b1f29..834f8aa73df 100644 --- a/res/skins/Deere/mixer_column_pfl_levels.xml +++ b/res/skins/Deere/mixer_column_pfl_levels.xml @@ -45,13 +45,13 @@ L channel_VuMeterL - channel_PeakIndicatorL + channel_peak_indicator_left diff --git a/res/skins/Deere/mixer_controls_4decks_left.xml b/res/skins/Deere/mixer_controls_4decks_left.xml index 079e6248bea..053434fae25 100644 --- a/res/skins/Deere/mixer_controls_4decks_left.xml +++ b/res/skins/Deere/mixer_controls_4decks_left.xml @@ -60,13 +60,13 @@ L channel_VuMeterL - channel_PeakIndicatorL + channel_peak_indicator_left @@ -173,7 +173,7 @@ diff --git a/res/skins/Deere/mixer_controls_4decks_right.xml b/res/skins/Deere/mixer_controls_4decks_right.xml index 783121f3351..41134ba1eed 100644 --- a/res/skins/Deere/mixer_controls_4decks_right.xml +++ b/res/skins/Deere/mixer_controls_4decks_right.xml @@ -60,13 +60,13 @@ L channel_VuMeterL - channel_PeakIndicatorL + channel_peak_indicator_left @@ -185,7 +185,7 @@ diff --git a/res/skins/Deere/vumeter_main.xml b/res/skins/Deere/vumeter_main.xml index 57f07fd06b0..493b7dc39c9 100644 --- a/res/skins/Deere/vumeter_main.xml +++ b/res/skins/Deere/vumeter_main.xml @@ -18,13 +18,13 @@ [Master] L main_VuMeterL - main_PeakIndicatorL + main_peak_indicator_left diff --git a/res/skins/LateNight/mixer/vumeter_main.xml b/res/skins/LateNight/mixer/vumeter_main.xml index 860eb5022ec..39cc733d2cb 100644 --- a/res/skins/LateNight/mixer/vumeter_main.xml +++ b/res/skins/LateNight/mixer/vumeter_main.xml @@ -24,7 +24,7 @@ min,min - main_PeakIndicatorL + main_peak_indicator_left skin:../LateNight//style/vu_deck_clipping_bg_.png skin:../LateNight//style/vu_deck_clipping_active.png @@ -53,7 +53,7 @@ min,min - main_PeakIndicatorR + main_peak_indicator_right skin:../LateNight//style/vu_deck_clipping_bg_.png skin:../LateNight//style/vu_deck_clipping_active.png diff --git a/res/skins/LateNight/mixer/vumeter_single.xml b/res/skins/LateNight/mixer/vumeter_single.xml index b29e7c65ead..2a623e469bc 100644 --- a/res/skins/LateNight/mixer/vumeter_single.xml +++ b/res/skins/LateNight/mixer/vumeter_single.xml @@ -19,7 +19,7 @@ min,min - _PeakIndicator + _peak_indicator skin:../LateNight//style/vu__clipping_bg_.png skin:../LateNight//style/vu__clipping_active.png diff --git a/res/skins/Shade/auxiliary.xml b/res/skins/Shade/auxiliary.xml index 0d88ede2c88..4c6570ca40e 100644 --- a/res/skins/Shade/auxiliary.xml +++ b/res/skins/Shade/auxiliary.xml @@ -10,7 +10,7 @@ ********************************************** --> - auxiliary_PeakIndicator + auxiliary_peak_indicator skin:/style/volume_clipping_microphone_over.png skin:/style/volume_clipping_microphone.png 99,6 diff --git a/res/skins/Shade/microphone.xml b/res/skins/Shade/microphone.xml index 774c1f80116..746dbae2269 100644 --- a/res/skins/Shade/microphone.xml +++ b/res/skins/Shade/microphone.xml @@ -11,7 +11,7 @@ ********************************************** --> - microphone_PeakIndicator + microphone_peak_indicator skin:/style/volume_clipping_microphone_over.png skin:/style/volume_clipping_microphone.png 82,6 diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml index dfb31f217e4..8c219ee5d33 100644 --- a/res/skins/Shade/mixer_panel.xml +++ b/res/skins/Shade/mixer_panel.xml @@ -917,7 +917,7 @@ ********************************************** --> - channel_PeakIndicator + channel_peak_indicator skin:/style/volume_clipping_over.png skin:/style/volume_clipping.png 107,57 @@ -926,7 +926,7 @@ - channel_PeakIndicator + channel_peak_indicator skin:/style/volume_clipping_over.png skin:/style/volume_clipping.png 143,57 @@ -935,7 +935,7 @@ - main_PeakIndicatorL + main_peak_indicator_left skin:/style/volume_clipping_main_over.png skin:/style/volume_clipping_main.png 122,57 @@ -944,7 +944,7 @@ - main_PeakIndicatorR + main_peak_indicator_right skin:/style/volume_clipping_main_over.png skin:/style/volume_clipping_main.png 128,57 diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml index 1da8c75779a..3e55ffa5ebe 100644 --- a/res/skins/Shade/preview_deck.xml +++ b/res/skins/Shade/preview_deck.xml @@ -208,7 +208,7 @@ horizontal - preview_PeakIndicator + preview_peak_indicator skin:/style/volume_clipping_previewdeck_over.png skin:/style/volume_clipping_previewdeck.png diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml index ffe943cee06..9f7f3959862 100644 --- a/res/skins/Shade/sampler.xml +++ b/res/skins/Shade/sampler.xml @@ -379,7 +379,7 @@ 3,7 - sampler_PeakIndicator + sampler_peak_indicator skin:/style/volume_clipping_sampler_over.png skin:/style/volume_clipping_sampler.png diff --git a/src/skin/legacy/tooltips.cpp b/src/skin/legacy/tooltips.cpp index c1401c170f5..f81bd87456e 100644 --- a/src/skin/legacy/tooltips.cpp +++ b/src/skin/legacy/tooltips.cpp @@ -88,32 +88,32 @@ void Tooltips::addStandardTooltips() { << resetWithRightAndDoubleClick; QString clippingHelp = tr("(too loud for the hardware and is being distorted)."); - add("channel_PeakIndicator") + add("channel_peak_indicator") << tr("Channel Peak Indicator") << tr("Indicates when the signal on the channel is clipping,") << clippingHelp; - add("channel_PeakIndicatorL") + add("channel_peak_indicator_left") << tr("Channel L Peak Indicator") << tr("Indicates when the left signal on the channel is clipping,") << clippingHelp; - add("channel_PeakIndicatorR") + add("channel_peak_indicator_right") << tr("Channel R Peak Indicator") << tr("Indicates when the right signal on the channel is clipping,") << clippingHelp; - add("main_PeakIndicator") + add("main_peak_indicator") << tr("Main Output Peak Indicator") << tr("Indicates when the signal on the main output is clipping,") << clippingHelp; - add("main_PeakIndicatorL") + add("main_peak_indicator_left") << tr("Main Output L Peak Indicator") << tr("Indicates when the left signal on the main output is clipping,") << clippingHelp; - add("main_PeakIndicatorR") + add("main_peak_indicator_right") << tr("Main Output R Peak Indicator") << tr("Indicates when the right signal on the main output is clipping,") << clippingHelp; @@ -134,7 +134,7 @@ void Tooltips::addStandardTooltips() { << tr("Microphone Volume Meter") << tr("Shows the current microphone volume."); - add("microphone_PeakIndicator") + add("microphone_peak_indicator") << tr("Microphone Peak Indicator") << tr("Indicates when the signal on the microphone is clipping,") << clippingHelp; @@ -143,7 +143,7 @@ void Tooltips::addStandardTooltips() { << tr("Auxiliary Volume Meter") << tr("Shows the current auxiliary volume."); - add("auxiliary_PeakIndicator") + add("auxiliary_peak_indicator") << tr("Auxiliary Peak Indicator") << tr("Indicates when the signal on the auxiliary is clipping,") << clippingHelp; @@ -152,7 +152,7 @@ void Tooltips::addStandardTooltips() { << tr("Sampler Volume Meter") << tr("Shows the current sampler volume."); - add("sampler_PeakIndicator") + add("sampler_peak_indicator") << tr("Sampler Peak Indicator") << tr("Indicates when the signal on the sampler is clipping,") << clippingHelp; @@ -161,7 +161,7 @@ void Tooltips::addStandardTooltips() { << tr("Preview Deck Volume Meter") << tr("Shows the current Preview Deck volume."); - add("preview_PeakIndicator") + add("preview_peak_indicator") << tr("Preview Deck Peak Indicator") << tr("Indicates when the signal on the Preview Deck is clipping,") << clippingHelp; From b3bf8ebb8d2f27e50280c7c7a2311a0b61194749 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 14:24:40 +0200 Subject: [PATCH 08/13] chore(skins): Use new `vu_meter` controls instead of alias --- res/skins/Deere/auxiliary.xml | 2 +- res/skins/Deere/microphone.xml | 2 +- res/skins/Deere/mixer_column_pfl_levels.xml | 4 ++-- res/skins/Deere/mixer_controls_4decks_left.xml | 4 ++-- res/skins/Deere/mixer_controls_4decks_right.xml | 4 ++-- res/skins/Deere/preview_deck.xml | 2 +- res/skins/Deere/vumeter_h.xml | 4 ++-- res/skins/Deere/vumeter_main.xml | 4 ++-- res/skins/Deere/vumeter_v.xml | 6 +++--- res/skins/LateNight/mixer/vumeter_main.xml | 4 ++-- res/skins/LateNight/mixer/vumeter_single.xml | 2 +- res/skins/Shade/auxiliary.xml | 2 +- res/skins/Shade/microphone.xml | 2 +- res/skins/Shade/mixer_panel.xml | 8 ++++---- res/skins/Shade/preview_deck.xml | 2 +- res/skins/Shade/sampler.xml | 2 +- res/skins/Tango/mixer/vumeter_mini.xml | 2 +- res/skins/Tango/mixer/vumeter_single.xml | 4 ++-- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/res/skins/Deere/auxiliary.xml b/res/skins/Deere/auxiliary.xml index ce0ce0e6455..622e74832e7 100644 --- a/res/skins/Deere/auxiliary.xml +++ b/res/skins/Deere/auxiliary.xml @@ -78,7 +78,7 @@ diff --git a/res/skins/Deere/microphone.xml b/res/skins/Deere/microphone.xml index 43f18b0a03e..650737252d5 100644 --- a/res/skins/Deere/microphone.xml +++ b/res/skins/Deere/microphone.xml @@ -48,7 +48,7 @@ diff --git a/res/skins/Deere/mixer_column_pfl_levels.xml b/res/skins/Deere/mixer_column_pfl_levels.xml index 834f8aa73df..cba18b2c5e0 100644 --- a/res/skins/Deere/mixer_column_pfl_levels.xml +++ b/res/skins/Deere/mixer_column_pfl_levels.xml @@ -43,13 +43,13 @@ diff --git a/res/skins/Deere/mixer_controls_4decks_left.xml b/res/skins/Deere/mixer_controls_4decks_left.xml index 053434fae25..405203976b0 100644 --- a/res/skins/Deere/mixer_controls_4decks_left.xml +++ b/res/skins/Deere/mixer_controls_4decks_left.xml @@ -58,13 +58,13 @@ diff --git a/res/skins/Deere/mixer_controls_4decks_right.xml b/res/skins/Deere/mixer_controls_4decks_right.xml index 41134ba1eed..bd77b73f520 100644 --- a/res/skins/Deere/mixer_controls_4decks_right.xml +++ b/res/skins/Deere/mixer_controls_4decks_right.xml @@ -58,13 +58,13 @@ diff --git a/res/skins/Deere/preview_deck.xml b/res/skins/Deere/preview_deck.xml index c53ffe9f48e..44cb5143f7a 100644 --- a/res/skins/Deere/preview_deck.xml +++ b/res/skins/Deere/preview_deck.xml @@ -131,7 +131,7 @@ diff --git a/res/skins/Deere/vumeter_h.xml b/res/skins/Deere/vumeter_h.xml index e458d67ba6f..fa4a421ac86 100644 --- a/res/skins/Deere/vumeter_h.xml +++ b/res/skins/Deere/vumeter_h.xml @@ -5,7 +5,7 @@ Variables: group: The group for the controls. control: The control to connect to. - side: The stereo channel to monitor: L or R. + side: The stereo channel to monitor: left or right. tooltip_meter: The tooltip id for the vu-meter. tooltip_clip: The tooltip id for the clip indicator. --> @@ -26,7 +26,7 @@ 20 1 - ,VuMeter + ,vu_meter diff --git a/res/skins/Deere/vumeter_main.xml b/res/skins/Deere/vumeter_main.xml index 493b7dc39c9..702dd715287 100644 --- a/res/skins/Deere/vumeter_main.xml +++ b/res/skins/Deere/vumeter_main.xml @@ -16,13 +16,13 @@ diff --git a/res/skins/Deere/vumeter_v.xml b/res/skins/Deere/vumeter_v.xml index ef7daab0ac0..f3075c272bc 100644 --- a/res/skins/Deere/vumeter_v.xml +++ b/res/skins/Deere/vumeter_v.xml @@ -4,7 +4,7 @@ A VU meter. Variables: group: The group for the controls. - side: The stereo channel to monitor: L or R + side: The stereo channel to monitor: left or right tooltip_meter: The tooltip id for the vu-meter. tooltip_clip: The tooltip id for the clip indicator. --> @@ -44,7 +44,7 @@ 20 1 - ,VuMeter + ,vu_meter @@ -73,7 +73,7 @@ 20 1 - ,VuMeter + ,vu_meter diff --git a/res/skins/LateNight/mixer/vumeter_main.xml b/res/skins/LateNight/mixer/vumeter_main.xml index 39cc733d2cb..aed411b606a 100644 --- a/res/skins/LateNight/mixer/vumeter_main.xml +++ b/res/skins/LateNight/mixer/vumeter_main.xml @@ -41,7 +41,7 @@ 50 2 - [Master],VuMeterL + [Main],vu_meter_left @@ -70,7 +70,7 @@ 50 2 - [Master],VuMeterR + [Main],vu_meter_right diff --git a/res/skins/LateNight/mixer/vumeter_single.xml b/res/skins/LateNight/mixer/vumeter_single.xml index 2a623e469bc..0963015e004 100644 --- a/res/skins/LateNight/mixer/vumeter_single.xml +++ b/res/skins/LateNight/mixer/vumeter_single.xml @@ -36,7 +36,7 @@ 10 2 - ,VuMeter + ,vu_meter diff --git a/res/skins/Shade/auxiliary.xml b/res/skins/Shade/auxiliary.xml index 4c6570ca40e..05fcc33b984 100644 --- a/res/skins/Shade/auxiliary.xml +++ b/res/skins/Shade/auxiliary.xml @@ -38,7 +38,7 @@ 50 2 - [Auxiliary],VuMeter + [Auxiliary],vu_meter diff --git a/res/skins/Shade/microphone.xml b/res/skins/Shade/microphone.xml index 746dbae2269..5ac1d16d4cb 100644 --- a/res/skins/Shade/microphone.xml +++ b/res/skins/Shade/microphone.xml @@ -39,7 +39,7 @@ 50 2 - [Microphone],VuMeter + [Microphone],vu_meter diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml index 8c219ee5d33..9d8cf5c3503 100644 --- a/res/skins/Shade/mixer_panel.xml +++ b/res/skins/Shade/mixer_panel.xml @@ -848,7 +848,7 @@ 2 1 - [Channel1],VuMeter + [Channel1],vu_meter @@ -868,7 +868,7 @@ 50 2 - [Channel2],VuMeter + [Channel2],vu_meter @@ -887,7 +887,7 @@ 50 2 - [Master],VuMeterL + [Main],vu_meter_left @@ -906,7 +906,7 @@ 50 2 - [Master],VuMeterR + [Main],vu_meter_right diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml index 3e55ffa5ebe..2ec2d0294eb 100644 --- a/res/skins/Shade/preview_deck.xml +++ b/res/skins/Shade/preview_deck.xml @@ -232,7 +232,7 @@ 50 2 - [PreviewDeck1],VuMeter + [PreviewDeck1],vu_meter diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml index 9f7f3959862..9b0cdcb5f96 100644 --- a/res/skins/Shade/sampler.xml +++ b/res/skins/Shade/sampler.xml @@ -402,7 +402,7 @@ 50 2 - ,VuMeter + ,vu_meter diff --git a/res/skins/Tango/mixer/vumeter_mini.xml b/res/skins/Tango/mixer/vumeter_mini.xml index 21a4ead0fbe..7bdebb39b5a 100644 --- a/res/skins/Tango/mixer/vumeter_mini.xml +++ b/res/skins/Tango/mixer/vumeter_mini.xml @@ -32,7 +32,7 @@ Refer to https://github.com/mixxxdj/mixxx/issues/9201 50 2 - ,VuMeter + ,vu_meter diff --git a/res/skins/Tango/mixer/vumeter_single.xml b/res/skins/Tango/mixer/vumeter_single.xml index 5be55515d68..6ce23ea1b50 100644 --- a/res/skins/Tango/mixer/vumeter_single.xml +++ b/res/skins/Tango/mixer/vumeter_single.xml @@ -29,7 +29,7 @@ Refer to https://github.com/mixxxdj/mixxx/issues/9201 200 5 - ,VuMeterL + ,vu_meter_left @@ -42,7 +42,7 @@ Refer to https://github.com/mixxxdj/mixxx/issues/9201 200 5 - ,VuMeterR + ,vu_meter_right From 8df2a80157501dbb55d0e15093795e7dcf04ce60 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 14:26:49 +0200 Subject: [PATCH 09/13] chore(qml): Use new `vu_meter` controls instead of alias --- res/qml/AuxiliaryUnit.qml | 2 +- res/qml/MicrophoneUnit.qml | 2 +- res/qml/MixerColumn.qml | 4 ++-- res/qml/Sampler.qml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/qml/AuxiliaryUnit.qml b/res/qml/AuxiliaryUnit.qml index 79fa80f388f..51d7ed3f08c 100644 --- a/res/qml/AuxiliaryUnit.qml +++ b/res/qml/AuxiliaryUnit.qml @@ -14,7 +14,7 @@ Row { id: vuMeter group: root.group - key: "VuMeter" + key: "vu_meter" width: 4 height: parent.height } diff --git a/res/qml/MicrophoneUnit.qml b/res/qml/MicrophoneUnit.qml index 02e0efc8c86..32319fd6862 100644 --- a/res/qml/MicrophoneUnit.qml +++ b/res/qml/MicrophoneUnit.qml @@ -14,7 +14,7 @@ Row { id: vuMeter group: root.group - key: "VuMeter" + key: "vu_meter" width: 4 height: parent.height } diff --git a/res/qml/MixerColumn.qml b/res/qml/MixerColumn.qml index 4565cd77c18..3bd85913a34 100644 --- a/res/qml/MixerColumn.qml +++ b/res/qml/MixerColumn.qml @@ -43,7 +43,7 @@ Item { width: 4 height: parent.height - 40 group: root.group - key: "VuMeterL" + key: "vu_meter_left" } Skin.VuMeter { @@ -52,7 +52,7 @@ Item { width: 4 height: parent.height - 40 group: root.group - key: "VuMeterR" + key: "vu_meter_right" } Skin.ControlSlider { diff --git a/res/qml/Sampler.qml b/res/qml/Sampler.qml index 7e38d471c38..df39c786ed0 100644 --- a/res/qml/Sampler.qml +++ b/res/qml/Sampler.qml @@ -140,7 +140,7 @@ Rectangle { id: vuMeter group: root.group - key: "VuMeter" + key: "vu_meter" width: 4 anchors.margins: 5 anchors.top: parent.top From dacfa4900edb1dbd3149b48e8065631b95b47595 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 24 Sep 2023 14:51:22 +0200 Subject: [PATCH 10/13] chore(controllers): Use new `vu_meter` controls instead of alias --- res/controllers/Behringer-CMD-MM1-scripts.js | 8 +- .../Behringer-CMDStudio4a-scripts.js | 12 +-- res/controllers/DJ-Tech-DJM-101-scripts.js | 8 +- res/controllers/DJ-Tech-Mixer-One-scripts.js | 36 ++++----- res/controllers/Denon-MC3000-scripts.js | 2 +- res/controllers/Denon-MC4000-scripts.js | 4 +- res/controllers/Denon-MC6000MK2.midi.xml | 48 +++++------ res/controllers/Denon-MC7000-scripts.js | 8 +- .../Hercules DJ Console Mk2.midi.xml | 20 ++--- .../Hercules DJ Console RMX 2.midi.xml | 20 ++--- .../Hercules-DJ-Console-4-Mx-scripts.js | 6 +- .../Hercules-DJControl-Inpulse-300-script.js | 16 ++-- .../Hercules-DJControl-Starlight-scripts.js | 8 +- .../Hercules_DJControl_Jogvision-scripts.js | 4 +- res/controllers/KANE_QuNeo_scripts.js | 26 +++--- res/controllers/Midi_for_light-scripts.js | 6 +- res/controllers/Mixman DM2 (OS X).js | 4 +- res/controllers/Numark NS7.midi.xml | 2 +- res/controllers/Numark-Mixtrack-3-scripts.js | 2 +- .../Numark-Mixtrack-Platinum-scripts.js | 12 +-- .../Numark-Mixtrack-Pro-FX-scripts.js | 4 +- res/controllers/Pioneer-DDJ-400-script.js | 4 +- res/controllers/Pioneer-DDJ-FLX4-script.js | 4 +- res/controllers/Pioneer-DDJ-SB2-scripts.js | 18 ++--- res/controllers/Pioneer-DDJ-SB3-scripts.js | 18 ++--- res/controllers/Reloop Jockey 3 ME.midi.xml | 80 +++++++++---------- res/controllers/Reloop-Beatpad-scripts.js | 8 +- res/controllers/Roland_DJ-505-scripts.js | 2 +- res/controllers/Stanton-DJC-4-scripts.js | 6 +- res/controllers/Stanton-SCS1m-scripts.js | 8 +- res/controllers/Stanton-SCS3d-scripts.js | 4 +- res/controllers/Stanton-SCS3m-scripts.js | 4 +- .../Traktor-Kontrol-S2-MK1-hid-scripts.js | 2 +- .../Traktor-Kontrol-S2-MK2-hid-scripts.js | 4 +- .../Traktor-Kontrol-S2-MK3-hid-scripts.js | 4 +- .../Traktor-Kontrol-S3-hid-scripts.js | 6 +- .../Traktor-Kontrol-S4-MK2-hid-scripts.js | 8 +- res/controllers/Traktor-Kontrol-S4-MK3.js | 2 +- res/controllers/Vestax Spin.midi.xml | 20 ++--- .../Vestax Typhoon Enhanced.midi.xml | 20 ++--- res/controllers/Vestax Typhoon.midi.xml | 20 ++--- res/controllers/Vestax VCI-300.midi.xml | 44 +++++----- res/controllers/Vestax-Typhoon-scripts.js | 12 +-- res/controllers/Vestax-VCI-400-scripts.js | 6 +- res/controllers/Wireless-DJ-scripts.js | 18 ++--- res/controllers/Yaeltex-MiniMixxx-scripts.js | 10 +-- res/controllers/common-hid-packet-parser.js | 10 +-- res/controllers/engine-api.d.ts | 4 +- 48 files changed, 301 insertions(+), 301 deletions(-) diff --git a/res/controllers/Behringer-CMD-MM1-scripts.js b/res/controllers/Behringer-CMD-MM1-scripts.js index 2d0cad4f0d6..b2f10861851 100644 --- a/res/controllers/Behringer-CMD-MM1-scripts.js +++ b/res/controllers/Behringer-CMD-MM1-scripts.js @@ -536,10 +536,10 @@ CMDMM.init = function () { this.speed=navEncoderScale; }, }); - CMDMM.VuMeterL = engine.makeUnbufferedConnection("[Master]","VuMeterL",function (value) { + CMDMM.VuMeterL = engine.makeUnbufferedConnection("[Master]","vu_meter_left",function (value) { midi.sendShortMsg(MIDI.CC, 0x50, (value * 15) + 48); }); - CMDMM.VuMeterR = engine.makeUnbufferedConnection("[Master]","VuMeterR",function (value) { + CMDMM.VuMeterR = engine.makeUnbufferedConnection("[Master]","vu_meter_right",function (value) { midi.sendShortMsg(MIDI.CC, 0x51, (value * 15) + 48); }); CMDMM.layer(1); @@ -549,8 +549,8 @@ CMDMM.init = function () { }; CMDMM.shutdown = function () { - engine.setParameter("[Master]","VuMeterL",0); - engine.setParameter("[Master]","VuMeterR",0); + engine.setParameter("[Master]","vu_meter_left",0); + engine.setParameter("[Master]","vu_meter_right",0); for (var i = 0; i<127; i++) { midi.sendShortMsg(MIDI.noteOn, i, 0); // sets the controller to orange (to match the left/right buttons which only light up in orange); diff --git a/res/controllers/Behringer-CMDStudio4a-scripts.js b/res/controllers/Behringer-CMDStudio4a-scripts.js index ab4c726e100..2fc79f1003c 100644 --- a/res/controllers/Behringer-CMDStudio4a-scripts.js +++ b/res/controllers/Behringer-CMDStudio4a-scripts.js @@ -38,10 +38,10 @@ BehringerCMDStudio4a.fxAssignLastGroup = ""; BehringerCMDStudio4a.vuMeterUpdate = function (value, group, control){ value = (value*15)+48; switch(control) { - case "VuMeterL": + case "vu_meter_left": midi.sendShortMsg(0xB0, 0x7E, value); break; - case "VuMeterR": + case "vu_meter_right": midi.sendShortMsg(0xB0, 0x7F, value); break; } @@ -65,8 +65,8 @@ BehringerCMDStudio4a.init = function () { // Initialise anything that might not be in the correct state. BehringerCMDStudio4a.initLEDs(); // Connect the VUMeters - engine.connectControl("[Master]","VuMeterL","BehringerCMDStudio4a.vuMeterUpdate"); - engine.connectControl("[Master]","VuMeterR","BehringerCMDStudio4a.vuMeterUpdate"); + engine.connectControl("[Master]","vu_meter_left","BehringerCMDStudio4a.vuMeterUpdate"); + engine.connectControl("[Master]","vu_meter_right","BehringerCMDStudio4a.vuMeterUpdate"); } BehringerCMDStudio4a.shutdown = function() { @@ -76,8 +76,8 @@ BehringerCMDStudio4a.shutdown = function() { // Disconnect the VUMeters. // Maybe not! It seems you don't have to do this even though the connection // in done in init(), in fact if you try it throws an error. -// engine.connectControl("[Master]","VuMeterL","BehringerCMDStudio4a.vuMeterUpdate",true); -// engine.connectControl("[Master]","VuMeterR","BehringerCMDStudio4a.vuMeterUpdate",true); +// engine.connectControl("[Master]","vu_meter_left","BehringerCMDStudio4a.vuMeterUpdate",true); +// engine.connectControl("[Master]","vu_meter_right","BehringerCMDStudio4a.vuMeterUpdate",true); } diff --git a/res/controllers/DJ-Tech-DJM-101-scripts.js b/res/controllers/DJ-Tech-DJM-101-scripts.js index ddf366f06c5..666a96967ec 100644 --- a/res/controllers/DJ-Tech-DJM-101-scripts.js +++ b/res/controllers/DJ-Tech-DJM-101-scripts.js @@ -11,10 +11,10 @@ DJTechDJM101.vumeter[2] = 0; DJTechDJM101.init = function(id) { DJTechDJM101.vumeter_select(true); - engine.connectControl("[Master]", "VuMeterL", "DJTechDJM101.VuMeterMasterL"); - engine.connectControl("[Master]", "VuMeterR", "DJTechDJM101.VuMeterMasterR"); - engine.connectControl("[Channel1]", "VuMeter", "DJTechDJM101.VuMeterDeck1"); - engine.connectControl("[Channel2]", "VuMeter", "DJTechDJM101.VuMeterDeck2"); + engine.connectControl("[Main]", "vu_meter_left", "DJTechDJM101.VuMeterMasterL"); + engine.connectControl("[Main]", "vu_meter_right", "DJTechDJM101.VuMeterMasterR"); + engine.connectControl("[Channel1]", "vu_meter", "DJTechDJM101.VuMeterDeck1"); + engine.connectControl("[Channel2]", "vu_meter", "DJTechDJM101.VuMeterDeck2"); engine.connectControl("[Channel1]", "pfl", "DJTechDJM101.pfl"); engine.connectControl("[Channel2]", "pfl", "DJTechDJM101.pfl"); } diff --git a/res/controllers/DJ-Tech-Mixer-One-scripts.js b/res/controllers/DJ-Tech-Mixer-One-scripts.js index 87f7e456cc2..2039b868133 100644 --- a/res/controllers/DJ-Tech-Mixer-One-scripts.js +++ b/res/controllers/DJ-Tech-Mixer-One-scripts.js @@ -2,33 +2,33 @@ function MIXER1() {} MIXER1.init = function init(id, debug) { // called when the device is opened & set up //connect VUmeters - engine.connectControl("[Master]", "VuMeterL", "MIXER1.volumeLEDs"); - engine.connectControl("[Master]", "VuMeterR", "MIXER1.volumeLEDs"); - engine.connectControl("[Channel1]", "VuMeter", "MIXER1.volumeLEDs"); - engine.connectControl("[Channel2]", "VuMeter", "MIXER1.volumeLEDs"); - engine.connectControl("[Channel3]", "VuMeter", "MIXER1.volumeLEDs"); - engine.connectControl("[Channel4]", "VuMeter", "MIXER1.volumeLEDs"); + engine.connectControl("[Main]", "vu_meter_left", "MIXER1.volumeLEDs"); + engine.connectControl("[Main]", "vu_meter_right", "MIXER1.volumeLEDs"); + engine.connectControl("[Channel1]", "vu_meter", "MIXER1.volumeLEDs"); + engine.connectControl("[Channel2]", "vu_meter", "MIXER1.volumeLEDs"); + engine.connectControl("[Channel3]", "vu_meter", "MIXER1.volumeLEDs"); + engine.connectControl("[Channel4]", "vu_meter", "MIXER1.volumeLEDs"); }; MIXER1.shutdown = function shutdown() { //disconnect VUmeters - engine.connectControl("[Master]", "VuMeterL", "MIXER1.volumeLEDs", true); - engine.connectControl("[Master]", "VuMeterR", "MIXER1.volumeLEDs", true); - engine.connectControl("[Channel1]", "VuMeter", "MIXER1.volumeLEDs", true); - engine.connectControl("[Channel2]", "VuMeter", "MIXER1.volumeLEDs", true); - engine.connectControl("[Channel3]", "VuMeter", "MIXER1.volumeLEDs", true); - engine.connectControl("[Channel4]", "VuMeter", "MIXER1.volumeLEDs", true); + engine.connectControl("[Main]", "vu_meter_left", "MIXER1.volumeLEDs", true); + engine.connectControl("[Main]", "vu_meter_right", "MIXER1.volumeLEDs", true); + engine.connectControl("[Channel1]", "vu_meter", "MIXER1.volumeLEDs", true); + engine.connectControl("[Channel2]", "vu_meter", "MIXER1.volumeLEDs", true); + engine.connectControl("[Channel3]", "vu_meter", "MIXER1.volumeLEDs", true); + engine.connectControl("[Channel4]", "vu_meter", "MIXER1.volumeLEDs", true); }; MIXER1.volumeLEDs = function volumeLEDs(value, group, control){ value=(value*127); - if (group=="[Master]" && control=="VuMeterL"){ch=0xB5;midino=0x1f;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x1f;midi.sendShortMsg(ch, midino, value);} - if (group=="[Master]" && control=="VuMeterR"){ch=0xB5;midino=0x20;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x20;midi.sendShortMsg(ch, midino, value);} - if (group=="[Channel1]" && control=="VuMeter"){ch=0xB5;midino=0x22;midi.sendShortMsg(ch, midino, value);} - if (group=="[Channel2]" && control=="VuMeter"){ch=0xB6;midino=0x23;midi.sendShortMsg(ch, midino, value);} - if (group=="[Channel3]" && control=="VuMeter"){ch=0xB7;midino=0x22;midi.sendShortMsg(ch, midino, value);} - if (group=="[Channel4]" && control=="VuMeter"){ch=0xB8;midino=0x23;midi.sendShortMsg(ch, midino, value);} + if (group=="[Master]" && control=="vu_meter_left"){ch=0xB5;midino=0x1f;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x1f;midi.sendShortMsg(ch, midino, value);} + if (group=="[Master]" && control=="vu_meter_right"){ch=0xB5;midino=0x20;midi.sendShortMsg(ch, midino, value);ch=0xB7;midino=0x20;midi.sendShortMsg(ch, midino, value);} + if (group=="[Channel1]" && control=="vu_meter"){ch=0xB5;midino=0x22;midi.sendShortMsg(ch, midino, value);} + if (group=="[Channel2]" && control=="vu_meter"){ch=0xB6;midino=0x23;midi.sendShortMsg(ch, midino, value);} + if (group=="[Channel3]" && control=="vu_meter"){ch=0xB7;midino=0x22;midi.sendShortMsg(ch, midino, value);} + if (group=="[Channel4]" && control=="vu_meter"){ch=0xB8;midino=0x23;midi.sendShortMsg(ch, midino, value);} }; MIXER1.clearVolumeLEDs = function clearVolumeLEDs(){ diff --git a/res/controllers/Denon-MC3000-scripts.js b/res/controllers/Denon-MC3000-scripts.js index 94f27e7bc0c..12c2dded95c 100644 --- a/res/controllers/Denon-MC3000-scripts.js +++ b/res/controllers/Denon-MC3000-scripts.js @@ -70,7 +70,7 @@ mc3000.init = function(id) { engine.connectControl("[Channel"+i+"]", "play", "mc3000.playSetLed"); engine.connectControl("[Channel"+i+"]", "playposition", "mc3000.playPositionSetLed"); engine.connectControl("[Channel"+i+"]", "peak_indicator", "mc3000.peakIndicatorSetLed"); - engine.connectControl("[Channel"+i+"]", "VuMeter", "mc3000.vuMeterSetLeds"); + engine.connectControl("[Channel"+i+"]", "vu_meter", "mc3000.vuMeterSetLeds"); engine.connectControl("[Channel"+i+"]", "pfl", "mc3000.pflSetLed"); } diff --git a/res/controllers/Denon-MC4000-scripts.js b/res/controllers/Denon-MC4000-scripts.js index a42f5513654..fd272b2cb07 100644 --- a/res/controllers/Denon-MC4000-scripts.js +++ b/res/controllers/Denon-MC4000-scripts.js @@ -54,8 +54,8 @@ MC4000.init = function () { MC4000.rightDeck = new MC4000.Deck(1); // VU meters // TODO: implement VU meters for the PFL when cue button is on - engine.connectControl("[Master]", "VuMeterL", "MC4000.OnVuMeterChangeL"); - engine.connectControl("[Master]", "VuMeterR", "MC4000.OnVuMeterChangeR"); + engine.connectControl("[Main]", "vu_meter_left", "MC4000.OnVuMeterChangeL"); + engine.connectControl("[Main]", "vu_meter_right", "MC4000.OnVuMeterChangeR"); // Control all sampler levels simultaneously with the single knob on the mixer MC4000.samplerLevel = function (channel, control, value, status, group) { engine.setValue("[Sampler1]", "pregain", script.absoluteNonLin(value, 0, 1.0, 4.0)); diff --git a/res/controllers/Denon-MC6000MK2.midi.xml b/res/controllers/Denon-MC6000MK2.midi.xml index 6700edd37f5..bcc863c0834 100644 --- a/res/controllers/Denon-MC6000MK2.midi.xml +++ b/res/controllers/Denon-MC6000MK2.midi.xml @@ -2560,7 +2560,7 @@ [Channel3] - VuMeter + vu_meter 0xB1 0x53 0x01 @@ -2568,7 +2568,7 @@ [Channel3] - VuMeter + vu_meter 0xB1 0x54 0x01 @@ -2576,7 +2576,7 @@ [Channel3] - VuMeter + vu_meter 0xB1 0x55 0x01 @@ -2584,7 +2584,7 @@ [Channel3] - VuMeter + vu_meter 0xB1 0x56 0x01 @@ -2592,7 +2592,7 @@ [Channel3] - VuMeter + vu_meter 0xB1 0x57 0x01 @@ -2600,7 +2600,7 @@ [Channel3] - VuMeter + vu_meter 0xB1 0x58 0x01 @@ -2608,7 +2608,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x53 0x01 @@ -2616,7 +2616,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x54 0x01 @@ -2624,7 +2624,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x55 0x01 @@ -2632,7 +2632,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x56 0x01 @@ -2640,7 +2640,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x57 0x01 @@ -2648,7 +2648,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x58 0x01 @@ -2664,7 +2664,7 @@ [Channel4] - VuMeter + vu_meter 0xB3 0x53 0x01 @@ -2672,7 +2672,7 @@ [Channel4] - VuMeter + vu_meter 0xB3 0x54 0x01 @@ -2680,7 +2680,7 @@ [Channel4] - VuMeter + vu_meter 0xB3 0x55 0x01 @@ -2688,7 +2688,7 @@ [Channel4] - VuMeter + vu_meter 0xB3 0x56 0x01 @@ -2696,7 +2696,7 @@ [Channel4] - VuMeter + vu_meter 0xB3 0x57 0x01 @@ -2704,7 +2704,7 @@ [Channel4] - VuMeter + vu_meter 0xB3 0x58 0x01 @@ -2720,7 +2720,7 @@ [Channel2] - VuMeter + vu_meter 0xB2 0x53 0x01 @@ -2728,7 +2728,7 @@ [Channel2] - VuMeter + vu_meter 0xB2 0x54 0x01 @@ -2736,7 +2736,7 @@ [Channel2] - VuMeter + vu_meter 0xB2 0x55 0x01 @@ -2744,7 +2744,7 @@ [Channel2] - VuMeter + vu_meter 0xB2 0x56 0x01 @@ -2752,7 +2752,7 @@ [Channel2] - VuMeter + vu_meter 0xB2 0x57 0x01 @@ -2760,7 +2760,7 @@ [Channel2] - VuMeter + vu_meter 0xB2 0x58 0x01 diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js index 587a790453e..e37884220f4 100644 --- a/res/controllers/Denon-MC7000-scripts.js +++ b/res/controllers/Denon-MC7000-scripts.js @@ -204,10 +204,10 @@ MC7000.init = function() { midi.sendSysexMsg(ControllerStatusSysex, ControllerStatusSysex.length); // VU meters - engine.makeUnbufferedConnection("[Channel1]", "VuMeter", MC7000.VuMeter); - engine.makeUnbufferedConnection("[Channel2]", "VuMeter", MC7000.VuMeter); - engine.makeUnbufferedConnection("[Channel3]", "VuMeter", MC7000.VuMeter); - engine.makeUnbufferedConnection("[Channel4]", "VuMeter", MC7000.VuMeter); + engine.makeUnbufferedConnection("[Channel1]", "vu_meter", MC7000.VuMeter); + engine.makeUnbufferedConnection("[Channel2]", "vu_meter", MC7000.VuMeter); + engine.makeUnbufferedConnection("[Channel3]", "vu_meter", MC7000.VuMeter); + engine.makeUnbufferedConnection("[Channel4]", "vu_meter", MC7000.VuMeter); // Switch to active decks midi.sendShortMsg(MC7000.topDeckActive[0] ? 0x90 : 0x92, 0x08, 0x7F); diff --git a/res/controllers/Hercules DJ Console Mk2.midi.xml b/res/controllers/Hercules DJ Console Mk2.midi.xml index 6f82444cca5..9da54e54e89 100644 --- a/res/controllers/Hercules DJ Console Mk2.midi.xml +++ b/res/controllers/Hercules DJ Console Mk2.midi.xml @@ -419,7 +419,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x0A 0.4 @@ -427,7 +427,7 @@ [Channel1] - VuMeter + vu_meter 0xB0 0x16 0.5 @@ -436,21 +436,21 @@ [Channel2] - VuMeter + vu_meter 0xB0 0x04 0.4 [Channel2] - VuMeter + vu_meter 0xB0 0x1A 0.5 @@ -473,21 +473,21 @@ [Channel1] - VuMeter + vu_meter 0x90 0x64 0x7F @@ -979,7 +979,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x70 0x7F @@ -989,7 +989,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x63 0x7F @@ -998,7 +998,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x6F 0x7F @@ -1008,7 +1008,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x62 0x7F @@ -1017,7 +1017,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x6E 0x7F @@ -1027,7 +1027,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x61 0x7F @@ -1036,7 +1036,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x6D 0x7F @@ -1046,7 +1046,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x60 0x7F @@ -1055,7 +1055,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x6C 0x7F @@ -1065,7 +1065,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x5F 0x7F @@ -1074,7 +1074,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x6B 0x7F @@ -1084,7 +1084,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x5E 0x7F @@ -1093,7 +1093,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x6A 0x7F @@ -1103,7 +1103,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x5D 0x7F @@ -1112,7 +1112,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x69 0x7F @@ -1122,7 +1122,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x5C 0x7F @@ -1131,7 +1131,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x68 0x7F @@ -1141,7 +1141,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x5B 0x7F @@ -1150,7 +1150,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x67 0x7F @@ -1160,7 +1160,7 @@ [Channel1] - VuMeter + vu_meter 0x90 0x5A 0x7F @@ -1169,7 +1169,7 @@ [Channel2] - VuMeter + vu_meter 0x90 0x66 0x7F diff --git a/res/controllers/Vestax-Typhoon-scripts.js b/res/controllers/Vestax-Typhoon-scripts.js index 33098c8003b..30d15f28353 100644 --- a/res/controllers/Vestax-Typhoon-scripts.js +++ b/res/controllers/Vestax-Typhoon-scripts.js @@ -82,8 +82,8 @@ VestaxTyphoon.init = function(id){ engine.connectControl("[Channel1]","sync_enabled","VestaxTyphoon.hookMasterSyncCh1"); engine.connectControl("[Channel2]","sync_enabled","VestaxTyphoon.hookMasterSyncCh2"); - engine.connectControl("[Channel1]","VuMeter","VestaxTyphoon.ch1_vu"); - engine.connectControl("[Channel2]","VuMeter","VestaxTyphoon.ch2_vu"); + engine.connectControl("[Channel1]","vu_meter","VestaxTyphoon.ch1_vu"); + engine.connectControl("[Channel2]","vu_meter","VestaxTyphoon.ch2_vu"); engine.connectControl("[Channel1]","play_indicator","VestaxTyphoon.ch1_playing"); engine.connectControl("[Channel2]","play_indicator","VestaxTyphoon.ch2_playing"); @@ -112,14 +112,14 @@ VestaxTyphoon.DeckLoad = function(channel, control, value, status, group){ if(group=="[Channel1]"){ if(value==0x7f){ if(engine.getValue(group,"play")){ - engine.connectControl("[Channel1]","VuMeter","VestaxTyphoon.ch1_vu",true); + engine.connectControl("[Channel1]","vu_meter","VestaxTyphoon.ch1_vu",true); engine.connectControl("[Channel1]","playposition","VestaxTyphoon.ch1_playpos"); } else { engine.setValue(group,"LoadSelectedTrack",true); } }else{ if(engine.getValue(group,"play")){ - engine.connectControl("[Channel1]","VuMeter","VestaxTyphoon.ch1_vu"); + engine.connectControl("[Channel1]","vu_meter","VestaxTyphoon.ch1_vu"); engine.connectControl("[Channel1]","playposition","VestaxTyphoon.ch1_playpos",true); } else { engine.setValue(group,"LoadSelectedTrack",false); @@ -130,14 +130,14 @@ VestaxTyphoon.DeckLoad = function(channel, control, value, status, group){ if(group=="[Channel2]"){ if(value==0x7f){ if(engine.getValue(group,"play")){ - engine.connectControl("[Channel2]","VuMeter","VestaxTyphoon.ch2_vu",true); + engine.connectControl("[Channel2]","vu_meter","VestaxTyphoon.ch2_vu",true); engine.connectControl("[Channel2]","playposition","VestaxTyphoon.ch2_playpos"); } else { engine.setValue(group,"LoadSelectedTrack",true); } }else{ if(engine.getValue(group,"play")){ - engine.connectControl("[Channel2]","VuMeter","VestaxTyphoon.ch2_vu"); + engine.connectControl("[Channel2]","vu_meter","VestaxTyphoon.ch2_vu"); engine.connectControl("[Channel2]","playposition","VestaxTyphoon.ch2_playpos",true); } else { engine.setValue(group,"LoadSelectedTrack",false); diff --git a/res/controllers/Vestax-VCI-400-scripts.js b/res/controllers/Vestax-VCI-400-scripts.js index 72967292e37..804baf6d15a 100644 --- a/res/controllers/Vestax-VCI-400-scripts.js +++ b/res/controllers/Vestax-VCI-400-scripts.js @@ -46,8 +46,8 @@ VestaxVCI400.init = function (id) { //Connect vu meters // No need if using the sound card - engine.connectControl("[Master]","VuMeterL", "VestaxVCI400.onMasterVuMeterLChanged"); - engine.connectControl("[Master]","VuMeterR", "VestaxVCI400.onMasterVuMeterRChanged"); + engine.connectControl("[Master]","vu_meter_left", "VestaxVCI400.onMasterVuMeterLChanged"); + engine.connectControl("[Master]","vu_meter_right", "VestaxVCI400.onMasterVuMeterRChanged"); //Reset VU meters if (VestaxVCI400.enableMasterVu) { @@ -457,7 +457,7 @@ VestaxVCI400.Deck.prototype.clearLights = function() { VestaxVCI400.Deck.prototype.init = function() { this.clearLights(); //Connect controls - engine.connectControl(this.group,"VuMeter", "VestaxVCI400.Decks."+this.deckIdentifier+".onVuMeterChanged"); + engine.connectControl(this.group,"vu_meter", "VestaxVCI400.Decks."+this.deckIdentifier+".onVuMeterChanged"); engine.connectControl(this.group,"hotcue_1_enabled", "VestaxVCI400.Decks."+this.deckIdentifier+".onHotCue1Changed"); engine.connectControl(this.group,"hotcue_2_enabled", "VestaxVCI400.Decks."+this.deckIdentifier+".onHotCue2Changed"); diff --git a/res/controllers/Wireless-DJ-scripts.js b/res/controllers/Wireless-DJ-scripts.js index a070378d6ba..08ac513d49c 100644 --- a/res/controllers/Wireless-DJ-scripts.js +++ b/res/controllers/Wireless-DJ-scripts.js @@ -16,10 +16,10 @@ WirelessDJ.init = function(id) { WirelessDJ.ledTimers = [0,0,0,0]; // LEDs - engine.connectControl("[Channel1]", "VuMeter", "WirelessDJ.meter"); - engine.connectControl("[Channel2]", "VuMeter", "WirelessDJ.meter"); - engine.connectControl("[Master]", "VuMeterL", "WirelessDJ.meter"); - engine.connectControl("[Master]", "VuMeterR", "WirelessDJ.meter"); + engine.connectControl("[Channel1]", "vu_meter", "WirelessDJ.meter"); + engine.connectControl("[Channel2]", "vu_meter", "WirelessDJ.meter"); + engine.connectControl("[Main]", "vu_meter_left", "WirelessDJ.meter"); + engine.connectControl("[Main]", "vu_meter_right", "WirelessDJ.meter"); // sliders feedback engine.connectControl("[Channel1]", "rate", "WirelessDJ.controlFeedback"); @@ -48,10 +48,10 @@ WirelessDJ.init = function(id) { } WirelessDJ.shutdown = function(id) { - engine.connectControl("[Channel1]", "VuMeter", "WirelessDJ.meter", true); - engine.connectControl("[Channel2]", "VuMeter", "WirelessDJ.meter", true); - engine.connectControl("[Master]", "VuMeterL", "WirelessDJ.meter", true); - engine.connectControl("[Master]", "VuMeterR", "WirelessDJ.meter", true); + engine.connectControl("[Channel1]", "vu_meter", "WirelessDJ.meter", true); + engine.connectControl("[Channel2]", "vu_meter", "WirelessDJ.meter", true); + engine.connectControl("[Main]", "vu_meter_left", "WirelessDJ.meter", true); + engine.connectControl("[Main]", "vu_meter_right", "WirelessDJ.meter", true); engine.connectControl("[Channel1]", "rate", "WirelessDJ.controlFeedback", true); engine.connectControl("[Channel1]", "volume", "WirelessDJ.controlFeedback", true); @@ -114,7 +114,7 @@ WirelessDJ.meter = function(value, group, key) { } else if (deck == 1) { WirelessDJ.sendLED(3, val); } else { - if (key == "VuMeterL") { + if (key == "vu_meter_left") { WirelessDJ.sendLED(1, val); } else { WirelessDJ.sendLED(2, val); diff --git a/res/controllers/Yaeltex-MiniMixxx-scripts.js b/res/controllers/Yaeltex-MiniMixxx-scripts.js index 9ed40258e3a..65550567a7e 100644 --- a/res/controllers/Yaeltex-MiniMixxx-scripts.js +++ b/res/controllers/Yaeltex-MiniMixxx-scripts.js @@ -208,7 +208,7 @@ MiniMixxx.EncoderModeJog = class extends MiniMixxx.Mode { let midiColor = this.loopColor; if (engine.getValue(this.channel, "loop_enabled") === 0) { - midiColor = MiniMixxx.vuMeterColor(engine.getValue(this.channel, "VuMeter")); + midiColor = MiniMixxx.vuMeterColor(engine.getValue(this.channel, "vu_meter")); } // Angles between 0 and .4 and .6 and 1.0 are in the indicator so no output. @@ -255,7 +255,7 @@ MiniMixxx.EncoderModeGain = class extends MiniMixxx.Mode { this.showGain = false; engine.makeConnection(this.channel, "pregain", this.pregainIndicator.bind(this)); engine.makeConnection(this.channel, "pfl", this.pflIndicator.bind(this)); - engine.makeUnbufferedConnection(this.channel, "VuMeter", this.vuIndicator.bind(this)); + engine.makeUnbufferedConnection(this.channel, "vu_meter", this.vuIndicator.bind(this)); engine.makeConnection(this.channel, "peak_indicator", this.peakIndicator.bind(this)); } handleSpin(velo) { @@ -287,7 +287,7 @@ MiniMixxx.EncoderModeGain = class extends MiniMixxx.Mode { if (this !== this.parent.activeMode || this.showGain) { return; } - this.vuIndicator(engine.getValue(this.channel, "VuMeter")); + this.vuIndicator(engine.getValue(this.channel, "vu_meter")); } pregainIndicator(value, _group, _control) { if (this !== this.parent.activeMode) { @@ -299,7 +299,7 @@ MiniMixxx.EncoderModeGain = class extends MiniMixxx.Mode { this.showGain = true; this.idleTimer = engine.beginTimer(1000, function() { this.showGain = false; - this.vuIndicator(engine.getValue(this.channel, "VuMeter")); + this.vuIndicator(engine.getValue(this.channel, "vu_meter")); }.bind(this), true); midi.sendShortMsg(0xBF, this.idx, this.color); midi.sendShortMsg(0xB0, this.idx, script.absoluteNonLinInverse(value, 0, 1.0, 4.0)); @@ -312,7 +312,7 @@ MiniMixxx.EncoderModeGain = class extends MiniMixxx.Mode { midi.sendShortMsg(0x90, this.idx, color); } setLights() { - this.vuIndicator(engine.getValue(this.channel, "VuMeter")); + this.vuIndicator(engine.getValue(this.channel, "vu_meter")); this.pflIndicator(engine.getValue(this.channel, "pfl")); } }; diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js index 97e03cf4f9a..7070d3ec4b1 100644 --- a/res/controllers/common-hid-packet-parser.js +++ b/res/controllers/common-hid-packet-parser.js @@ -87,7 +87,7 @@ const createDataView = function(bufferLike) { * @property {string} group * @property {string} name * @property {string} mapped_group Mapped group, must be a valid Mixxx control group name e.g. "[Channel1]" - * @property {string} mapped_name Name of mapped control, must be a valid Mixxx control name "VuMeter" + * @property {string} mapped_name Name of mapped control, must be a valid Mixxx control name "vu_meter" * @property {controlCallback} mapped_callback * @property {string} pack Control packing format for unpack(), one of b/B, h/H, i/I * @property {number} offset Position of the first byte in the packet in bytes (first byte is 0) @@ -759,7 +759,7 @@ class HIDPacket { * It is recommended to define callbacks after packet creation with * setCallback instead of adding it directly here. But you can do it. * @param {string} group Control group name e.g. "[Channel1]" - * @param {string} name Control name "VuMeter" + * @param {string} name Control name "vu_meter" * @param {number} offset The field's offset from the start of the packet in bytes: * - For HID devices which don't use ReportIDs, the data bytes starts at * position 0 @@ -1389,7 +1389,7 @@ class HIDController { /** * Find Output control matching give group and name * @param {string} m_group Mapped group, must be a valid Mixxx control group name e.g. "[Channel1]" - * @param {string} m_name Name of mapped control, must be a valid Mixxx control name "VuMeter" + * @param {string} m_name Name of mapped control, must be a valid Mixxx control name "vu_meter" * @returns {bitObject|packetField} Bit or bytewise field - Returns undefined if output field * can't be found. */ @@ -2162,7 +2162,7 @@ class HIDController { * @param {string} group Control group name * @param {string} name Control name * @param {string} m_group Mapped group, must be a valid Mixxx control group name e.g. "[Channel1]" - * @param {string} m_name Name of mapped control, must be a valid Mixxx control name "VuMeter" + * @param {string} m_name Name of mapped control, must be a valid Mixxx control name "vu_meter" * @param {controlCallback} callback Callback function for the control */ linkOutput(group, name, m_group, m_name, callback) { @@ -2189,7 +2189,7 @@ class HIDController { /** * Unlink a virtual HID Output from mixxx control * @param {string} group Mixxx control group name e.g. "[Channel1]" - * @param {string} name Mixxx control name "VuMeter" + * @param {string} name Mixxx control name "vu_meter" * @param {controlCallback} callback Callback function for the control */ unlinkOutput(group, name, callback) { diff --git a/res/controllers/engine-api.d.ts b/res/controllers/engine-api.d.ts index f74096e480a..4a2b935cd29 100644 --- a/res/controllers/engine-api.d.ts +++ b/res/controllers/engine-api.d.ts @@ -122,7 +122,7 @@ declare namespace engine { * only the last value set for the control is processed. * * @param group Group of the control e.g. "[Channel1]" - * @param name Name of the control e.g. "VuMeter" + * @param name Name of the control e.g. "vu_meter" * @param callback JS function, which will be called every time, the value of the connected control changes. * @returns Returns script connection object on success, otherwise 'undefined'' */ @@ -134,7 +134,7 @@ declare namespace engine { * JavaScript code that evaluates to a function or an actual JavaScript function. * * @param group Group of the control e.g. "[Channel1]" - * @param name Name of the control e.g. "VuMeter" + * @param name Name of the control e.g. "vu_meter" * @param callback JS function, which will be called every time, the value of the connected control changes. * @param disconnect If "true", all connections to the ControlObject are removed. [default = false] * @returns Returns script connection object on success, otherwise 'undefined' or 'false' depending on the error cause. From 8dc6b69a8cfa72543262fdefb7295d44e472129f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 27 Sep 2023 01:46:01 +0200 Subject: [PATCH 11/13] Remove redundant includes --- src/test/ringdelaybuffer_test.cpp | 1 - src/util/ringdelaybuffer.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/test/ringdelaybuffer_test.cpp b/src/test/ringdelaybuffer_test.cpp index 8cbb80bfc56..9f3f5a788b1 100644 --- a/src/test/ringdelaybuffer_test.cpp +++ b/src/test/ringdelaybuffer_test.cpp @@ -6,7 +6,6 @@ #include #include -#include #include "test/mixxxtest.h" #include "util/samplebuffer.h" diff --git a/src/util/ringdelaybuffer.cpp b/src/util/ringdelaybuffer.cpp index 3915c97b4ea..1981647c6c5 100644 --- a/src/util/ringdelaybuffer.cpp +++ b/src/util/ringdelaybuffer.cpp @@ -1,7 +1,5 @@ #include "ringdelaybuffer.h" -#include - #include "util/math.h" #include "util/sample.h" From 10a45a3d1132735e4b6ec9e2e800f15a8a22db0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 27 Sep 2023 01:46:56 +0200 Subject: [PATCH 12/13] Revert "chore: Remove `moc_included_test.cpp`" This reverts commit 2ec66c89d2f58a344102d6c0beabec78945cf16d. --- CMakeLists.txt | 2 ++ src/util/moc_included_test.cpp | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 src/util/moc_included_test.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1acdd627e..9df65580085 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1094,6 +1094,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/util/logger.cpp src/util/logging.cpp src/util/mac.cpp + src/util/moc_included_test.cpp src/util/movinginterquartilemean.cpp src/util/performancetimer.cpp src/util/rangelist.cpp @@ -2092,6 +2093,7 @@ add_executable(mixxx-test src/test/wbatterytest.cpp src/test/wpushbutton_test.cpp src/test/wwidgetstack_test.cpp + src/util/moc_included_test.cpp ) find_package(GTest CONFIG REQUIRED) set_target_properties(mixxx-test PROPERTIES AUTOMOC ON) diff --git a/src/util/moc_included_test.cpp b/src/util/moc_included_test.cpp new file mode 100644 index 00000000000..605693a25e5 --- /dev/null +++ b/src/util/moc_included_test.cpp @@ -0,0 +1,8 @@ +#include "../mocs_compilation.cpp" + +// QT_VERSION will be defined by any moc_.cpp file included from mocs_compilation.cpp +// It is empty in case all moc files are included, a requirement to speed up incremental builds. +// See https://cmake.org/cmake/help/latest/prop_tgt/AUTOMOC.html for details. +#ifdef QT_VERSION +#error mocs_compilation.cpp not empty. Move all #include "moc_.cpp" lines from mocs_compilation.cpp to the cpp files of the related classes. +#endif From 97255f863804a82ba8637629c51f051f1cfa9761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 27 Sep 2023 02:16:13 +0200 Subject: [PATCH 13/13] moc_included_test.cpp requires SKIP_PRECOMPILE_HEADERS ON --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9df65580085..7f3cd60b14f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1477,6 +1477,8 @@ else() endif() endif() +set_source_files_properties(src/util/moc_included_test.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) + set_target_properties(mixxx-lib PROPERTIES AUTOMOC ON AUTOUIC ON CXX_CLANG_TIDY "${CLANG_TIDY}") target_include_directories(mixxx-lib PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/src") if(UNIX AND NOT APPLE)