ardour/livetrax
13
0
Fork 0
Code

more changes flowing from a persistent MonitorSection object

Browse Source
This commit is contained in:
Paul Davis 2018-12-11 12:25:31 -05:00
parent fbab611a73
commit 20c55065ab
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk2_ardour/monitor_section.cc
View File

@ -87,6 +87,11 @@ MonitorSection::MonitorSection ()
, _rr_selection () , _rr_selection ()
, _ui_initialized (false) , _ui_initialized (false)
{ {
/* note that although this a RouteUI, we never called ::set_route() so
* we do not need to worry about self-destructing when the Route (the
* monitor out) is destroyed.
*/
using namespace Menu_Helpers; using namespace Menu_Helpers;
Glib::RefPtr<Action> act; Glib::RefPtr<Action> act;
@ -601,6 +606,8 @@ MonitorSection::set_session (Session* s)
insert_box->set_route (_route); insert_box->set_route (_route);
_route->processors_changed.connect (*this, invalidator (*this), boost::bind (&MonitorSection::processors_changed, this, _1), gui_context()); _route->processors_changed.connect (*this, invalidator (*this), boost::bind (&MonitorSection::processors_changed, this, _1), gui_context());
_route->output()->PortCountChanged.connect (output_changed_connections, invalidator (*this), boost::bind (&MonitorSection::populate_buttons, this), gui_context()); _route->output()->PortCountChanged.connect (output_changed_connections, invalidator (*this), boost::bind (&MonitorSection::populate_buttons, this), gui_context());
_route->DropReferences.connect (*this, invalidator (*this), boost::bind (&MonitorSection::drop_route, this), gui_context());
if (_ui_initialized) { if (_ui_initialized) {
update_processor_box (); update_processor_box ();
} }
@ -617,9 +624,14 @@ MonitorSection::set_session (Session* s)
_output_selector = 0; _output_selector = 0;
ActionManager::set_sensitive (monitor_actions, false); ActionManager::set_sensitive (monitor_actions, false);
/* this action needs to always be true in this * scenaro, so that we can turn it back on*/
ActionManager::get_toggle_action (X_("Monitor"), X_("UseMonitorSection"))->set_sensitive (true);
ActionManager::set_sensitive (solo_actions, true); ActionManager::set_sensitive (solo_actions, true);
} }
/* make sure the state of this action reflects reality */
ActionManager::get_toggle_action (X_("Monitor"), X_("UseMonitorSection"))->set_active (_route != 0);
populate_buttons (); populate_buttons ();
@ -627,15 +639,7 @@ MonitorSection::set_session (Session* s)
/* no session */ /* no session */
output_changed_connections.drop_connections(); drop_route ();
_monitor.reset ();
_route.reset ();
control_connections.drop_connections ();
rude_iso_button.unset_active_state ();
rude_solo_button.unset_active_state ();
delete _output_selector;
_output_selector = 0;
assign_controllables (); assign_controllables ();
ActionManager::set_sensitive (monitor_actions, false); ActionManager::set_sensitive (monitor_actions, false);
@ -643,6 +647,19 @@ MonitorSection::set_session (Session* s)
} }
} }
void
MonitorSection::drop_route ()
{
output_changed_connections.drop_connections();
_monitor.reset ();
_route.reset ();
control_connections.drop_connections ();
rude_iso_button.unset_active_state ();
rude_solo_button.unset_active_state ();
delete _output_selector;
_output_selector = 0;
}
MonitorSection::ChannelButtonSet::ChannelButtonSet () MonitorSection::ChannelButtonSet::ChannelButtonSet ()
{ {
cut.set_name (X_("mute button")); cut.set_name (X_("mute button"));
@ -1253,6 +1270,8 @@ MonitorSection::parameter_changed (std::string name)
SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Solo"), "toggle-mute-overrides-solo"), Config->get_solo_mute_override ()); SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Solo"), "toggle-mute-overrides-solo"), Config->get_solo_mute_override ());
} else if (name == "exclusive-solo") { } else if (name == "exclusive-solo") {
SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Solo"), "toggle-exclusive-solo"), Config->get_exclusive_solo ()); SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Solo"), "toggle-exclusive-solo"), Config->get_exclusive_solo ());
} else if (name == "use-monitor-bus") {
SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Monitor"), "UseMonitorSection"), Config->get_use_monitor_bus ());
} }
} }
@ -1683,13 +1702,5 @@ MonitorSection::toggle_use_monitor_section ()
return; return;
} }
bool yn = ActionManager::get_toggle_action (X_("Monitor"), "UseMonitorSection")->get_active(); Config->set_use_monitor_bus (ActionManager::get_toggle_action (X_("Monitor"), "UseMonitorSection")->get_active());
if (yn) {
_session->add_monitor_section ();
} else {
_session->remove_monitor_section ();
}
Config->set_use_monitor_bus (yn);
} }

2
gtk2_ardour/monitor_section.h
View File

@ -111,7 +111,6 @@ private:
void map_state (); void map_state ();
boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor; boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor;
boost::shared_ptr<ARDOUR::Route> _route;
Glib::RefPtr<Gtk::ActionGroup> monitor_actions; Glib::RefPtr<Gtk::ActionGroup> monitor_actions;
Glib::RefPtr<Gtk::ActionGroup> solo_actions; Glib::RefPtr<Gtk::ActionGroup> solo_actions;
@ -193,6 +192,7 @@ private:
bool leave_handler (GdkEventCrossing*); bool leave_handler (GdkEventCrossing*);
void toggle_use_monitor_section (); void toggle_use_monitor_section ();
void drop_route ();
}; };
#endif /* __gtk2_ardour_monitor_section_h__ */ #endif /* __gtk2_ardour_monitor_section_h__ */