allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Update well-known ctrl: separate global and per band EQ enum

Browse Source
This commit is contained in:
Robin Gareus
2024-01-15 15:28:30 +01:00
parent f7d022e38c
commit 0fd1edd78e
14 changed files with 94 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/surfaces/console1/c1_operations.cc
View File

@@ -365,8 +365,8 @@ Console1::eq_low_shape (const uint32_t value)
if (!_current_stripable) {
return;
}
if (_current_stripable->mapped_control (EQ_Shape, 0))
session->set_control (_current_stripable->mapped_control (EQ_Shape, 0), value > 0, PBD::Controllable::UseGroup);
if (_current_stripable->mapped_control (EQ_BandShape, 0))
session->set_control (_current_stripable->mapped_control (EQ_BandShape, 0), value > 0, PBD::Controllable::UseGroup);
else
map_eq_low_shape ();
}
@@ -378,8 +378,8 @@ Console1::eq_high_shape (const uint32_t value)
if (!_current_stripable) {
return;
}
if (_current_stripable->mapped_control (EQ_Shape, 3))
session->set_control (_current_stripable->mapped_control (EQ_Shape, 3), value > 0, PBD::Controllable::UseGroup);
if (_current_stripable->mapped_control (EQ_BandShape, 3))
session->set_control (_current_stripable->mapped_control (EQ_BandShape, 3), value > 0, PBD::Controllable::UseGroup);
else
map_eq_high_shape ();
}
@@ -387,10 +387,10 @@ Console1::eq_high_shape (const uint32_t value)
void
Console1::eq_freq (const uint32_t band, uint32_t value)
{
if (!_current_stripable || !_current_stripable->mapped_control (EQ_Freq, band)) {
if (!_current_stripable || !_current_stripable->mapped_control (EQ_BandFreq, band)) {
return;
}
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_Freq, band);
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_BandFreq, band);
double freq = midi_to_control (control, value);
session->set_control (control, freq, PBD::Controllable::UseGroup);
}
@@ -398,10 +398,10 @@ Console1::eq_freq (const uint32_t band, uint32_t value)
void
Console1::eq_gain (const uint32_t band, uint32_t value)
{
if (!_current_stripable || !_current_stripable->mapped_control (EQ_Gain, band)) {
if (!_current_stripable || !_current_stripable->mapped_control (EQ_BandGain, band)) {
return;
}
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_Gain, band);
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_BandGain, band);
double gain = midi_to_control (control, value);
session->set_control (control, gain, PBD::Controllable::UseGroup);
}
@@ -917,7 +917,7 @@ Console1::map_eq_freq (const uint32_t band)
}
ControllerID controllerID = eq_freq_controller_for_band (band);
if (map_encoder (controllerID)) {
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_Freq, band);
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_BandFreq, band);
map_encoder (controllerID, control);
}
}
@@ -930,7 +930,7 @@ Console1::map_eq_gain (const uint32_t band)
}
ControllerID controllerID = eq_gain_controller_for_band (band);
if (map_encoder (controllerID)) {
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_Gain, band);
std::shared_ptr<AutomationControl> control = _current_stripable->mapped_control (EQ_BandGain, band);
map_encoder (controllerID, control);
}
}
@@ -941,8 +941,8 @@ Console1::map_eq_low_shape ()
if (!_current_stripable)
return;
try {
uint32_t led_value = _current_stripable->mapped_control (EQ_Shape, 0)
? _current_stripable->mapped_control (EQ_Shape, 0)->get_value () == 0 ? 0 : 63
uint32_t led_value = _current_stripable->mapped_control (EQ_BandShape, 0)
? _current_stripable->mapped_control (EQ_BandShape, 0)->get_value () == 0 ? 0 : 63
: 0;
get_button (ControllerID::LOW_SHAPE)->set_led_state (led_value);
} catch (ControlNotFoundException const&) {
@@ -956,8 +956,8 @@ Console1::map_eq_high_shape ()
if (!_current_stripable)
return;
try {
uint32_t led_value = _current_stripable->mapped_control (EQ_Shape, 3)
? _current_stripable->mapped_control (EQ_Shape, 3)->get_value () == 0 ? 0 : 63
uint32_t led_value = _current_stripable->mapped_control (EQ_BandShape, 3)
? _current_stripable->mapped_control (EQ_BandShape, 3)->get_value () == 0 ? 0 : 63
: 0;
get_button (ControllerID::HIGH_SHAPE)->set_led_state (led_value);
} catch (ControlNotFoundException const&) {

16
libs/surfaces/console1/console1.cc
View File

@@ -699,23 +699,23 @@ Console1::set_current_stripable (std::shared_ptr<Stripable> r)
}
for (uint32_t i = 0; i < _current_stripable->eq_band_cnt (); ++i) {
if (_current_stripable->mapped_control (EQ_Freq, i)) {
_current_stripable->mapped_control (EQ_Freq, i)->Changed.connect (
if (_current_stripable->mapped_control (EQ_BandFreq, i)) {
_current_stripable->mapped_control (EQ_BandFreq, i)->Changed.connect (
stripable_connections, MISSING_INVALIDATOR, boost::bind (&Console1::map_eq_freq, this, i), this);
}
if (_current_stripable->mapped_control (EQ_Gain, i)) {
_current_stripable->mapped_control (EQ_Gain, i)->Changed.connect (
if (_current_stripable->mapped_control (EQ_BandGain, i)) {
_current_stripable->mapped_control (EQ_BandGain, i)->Changed.connect (
stripable_connections, MISSING_INVALIDATOR, boost::bind (&Console1::map_eq_gain, this, i), this);
}
}
if (_current_stripable->mapped_control (EQ_Shape, 0)) {
_current_stripable->mapped_control (EQ_Shape, 0)->Changed.connect (
if (_current_stripable->mapped_control (EQ_BandShape, 0)) {
_current_stripable->mapped_control (EQ_BandShape, 0)->Changed.connect (
stripable_connections, MISSING_INVALIDATOR, boost::bind (&Console1::map_eq_low_shape, this), this);
}
if (_current_stripable->mapped_control (EQ_Shape, 3)) {
_current_stripable->mapped_control (EQ_Shape, 3)->Changed.connect (
if (_current_stripable->mapped_control (EQ_BandShape, 3)) {
_current_stripable->mapped_control (EQ_BandShape, 3)->Changed.connect (
stripable_connections, MISSING_INVALIDATOR, boost::bind (&Console1::map_eq_high_shape, this), this);
}