ardour/livetrax
13
0
Fork 0
Code

Option to hide send if aux is hidden

Browse Source
This commit is contained in:
Len Ovens 2018-10-17 15:58:08 -07:00
parent d2aa57af3b
commit 5e21b6633d
7 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/rc_option_editor.cc
View File

@ -2697,6 +2697,15 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner)
));
add_option (_("Mixer"), new OptionEditorHeading (_("Send Controls")));
add_option (_("Mixer"),
new BoolOption (
"hiding-aux-hides-connected-sends",
_("When Aux Bus is hidden the sends in the prosessor box that feed it will be hidden"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_hiding_aux_hides_connected_sends),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_hiding_aux_hides_connected_sends)
));
}
/* Signal Flow */

1
libs/ardour/ardour/internal_send.h
View File

@ -76,6 +76,7 @@ private:
void send_from_going_away ();
void send_to_going_away ();
void send_to_property_changed (const PBD::PropertyChange&);
void send_to_pi_change (const PBD::PropertyChange&);
int connect_when_legal ();
void init_gain ();
int use_target (boost::shared_ptr<Route>);

2
libs/ardour/ardour/rc_configuration_vars.h
View File

@ -142,6 +142,8 @@ CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true)
CONFIG_VARIABLE (bool, link_send_and_route_panner, "link-send-and-route-panner", true)
CONFIG_VARIABLE (std::string, midi_audition_synth_uri, "midi-audition-synth-uri", "@default@")
CONFIG_VARIABLE (bool, hiding_aux_hides_connected_sends, "hiding-aux-hides-connected-sends", false)
/* click */
CONFIG_VARIABLE (bool, clicking, "clicking", false)

17
libs/ardour/internal_send.cc
View File

@ -112,6 +112,9 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto)
_send_to->DropReferences.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_going_away, this));
_send_to->PropertyChanged.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_property_changed, this, _1));
_send_to->io_changed.connect_same_thread (target_connections, boost::bind (&InternalSend::target_io_changed, this));
boost::shared_ptr<Stripable> st_to = boost::dynamic_pointer_cast<Stripable> (_send_to);
st_to->presentation_info().PropertyChanged.connect_same_thread (target_connections, boost::bind (&InternalSend::send_to_pi_change, this, _1));
send_to_pi_change (Properties::hidden);
return 0;
}
@ -426,6 +429,20 @@ InternalSend::send_to_property_changed (const PropertyChange& what_changed)
}
}
void
InternalSend::send_to_pi_change (const PBD::PropertyChange& what_changed)
{
if (what_changed.contains (Properties::hidden)) {
boost::shared_ptr<Stripable> st_to = boost::dynamic_pointer_cast<Stripable> (_send_to);
if (Config->get_hiding_aux_hides_connected_sends()) {
set_display_to_user (!st_to->is_hidden ());
} else {
set_display_to_user (true);
}
_send_from->processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
}
}
void
InternalSend::set_can_pan (bool yn)
{

4
libs/surfaces/osc/osc.cc
View File

@ -6549,10 +6549,6 @@ OSC::cue_new_send (string rt_name, lo_message msg)
boost::shared_ptr<Processor> loc = rt_send->before_processor_for_placement (PreFader);
rt_send->add_aux_send (aux, loc);
boost::shared_ptr<Send> snd = rt_send->internal_send_for (aux);
if (snd->gain_control() && aux->is_hidden ()) {
snd->set_display_to_user (false);
rt_send->processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
}
session->dirty ();
return 0;
} else {

18
libs/surfaces/osc/osc_cue_observer.cc
View File

@ -100,7 +100,6 @@ OSCCueObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip, S
send_gain_message (0, _strip->gain_control(), true);
send_init ();
hidden_changed ();
tick_enable = true;
tick ();
@ -205,9 +204,6 @@ OSCCueObserver::send_restart ()
void
OSCCueObserver::name_changed (const PBD::PropertyChange& what_changed, uint32_t id)
{
if (_hidden != _strip->is_hidden ()) {
hidden_changed ();
}
if (!what_changed.contains (ARDOUR::Properties::name)) {
return;
}
@ -222,20 +218,6 @@ OSCCueObserver::name_changed (const PBD::PropertyChange& what_changed, uint32_t
}
}
void
OSCCueObserver::hidden_changed ()
{
_hidden = _strip->is_hidden ();
for (uint32_t i = 0; i < sends.size(); i++) {
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (sends[i]);
boost::shared_ptr<Send> send = r->internal_send_for (boost::dynamic_pointer_cast<Route> (_strip));
if (_hidden == send->display_to_user ()) {
send->set_display_to_user (!_hidden);
r->processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
}
}
}
void
OSCCueObserver::send_change_message (string path, uint32_t id, boost::shared_ptr<Controllable> controllable)
{

1
libs/surfaces/osc/osc_cue_observer.h
View File

@ -63,7 +63,6 @@ class OSCCueObserver
std::vector<float> _last_gain;
void name_changed (const PBD::PropertyChange& what_changed, uint32_t id);
void hidden_changed (void);
void send_change_message (std::string path, uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
void send_gain_message (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable, bool force);
void send_enabled_message (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc);