ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove explicit use of ::cast_dynamic() from Gtk::Action to Gtk::ToggleAction

Browse Source
This commit is contained in:
Paul Davis 2018-12-11 23:43:22 -05:00
parent 20c55065ab
commit 961870142d
1 changed files with 32 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
gtk2_ardour/mixer_ui.cc
View File

@ -1526,14 +1526,11 @@ Mixer_UI::redisplay_track_list ()
//show/hide the channelstrip VCA assign buttons on channelstrips: //show/hide the channelstrip VCA assign buttons on channelstrips:
UIConfiguration::instance().set_mixer_strip_visibility (VisibilityGroup::add_element (UIConfiguration::instance().get_mixer_strip_visibility(), X_("VCA"))); UIConfiguration::instance().set_mixer_strip_visibility (VisibilityGroup::add_element (UIConfiguration::instance().get_mixer_strip_visibility(), X_("VCA")));
Glib::RefPtr<Action> act = ActionManager::get_action ("Mixer", "ToggleVCAPane"); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action ("Mixer", "ToggleVCAPane");
assert (act);
act->set_sensitive (true); act->set_sensitive (true);
//if we were showing VCAs before, show them now: //if we were showing VCAs before, show them now:
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); showhide_vcas (act->get_active ());
assert (tact);
showhide_vcas ( tact->get_active () );
} }
_group_tabs->set_dirty (); _group_tabs->set_dirty ();
@ -1926,11 +1923,8 @@ Mixer_UI::route_group_property_changed (RouteGroup* group, const PropertyChange&
void void
Mixer_UI::toggle_mixer_list () Mixer_UI::toggle_mixer_list ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action ("Mixer", "ToggleMixerList"); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action ("Mixer", "ToggleMixerList");
if (act) { showhide_mixer_list (act->get_active());
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
showhide_mixer_list (tact->get_active());
}
} }
void void
@ -1946,11 +1940,8 @@ Mixer_UI::showhide_mixer_list (bool yn)
void void
Mixer_UI::toggle_monitor_section () Mixer_UI::toggle_monitor_section ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action ("Mixer", "ToggleMonitorSection"); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action ("Mixer", "ToggleMonitorSection");
if (act) { showhide_monitor_section (act->get_active());
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
showhide_monitor_section (tact->get_active());
}
} }
@ -1971,11 +1962,8 @@ Mixer_UI::showhide_monitor_section (bool yn)
void void
Mixer_UI::toggle_vcas () Mixer_UI::toggle_vcas ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action ("Mixer", "ToggleVCAPane"); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action ("Mixer", "ToggleVCAPane");
if (act) { showhide_vcas (act->get_active());
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
showhide_vcas (tact->get_active());
}
} }
void void
@ -1992,11 +1980,8 @@ Mixer_UI::showhide_vcas (bool yn)
void void
Mixer_UI::toggle_mixbuses () Mixer_UI::toggle_mixbuses ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action ("Mixer", "ToggleMixbusPane"); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action ("Mixer", "ToggleMixbusPane");
if (act) { showhide_mixbuses (act->get_active());
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
showhide_mixbuses (tact->get_active());
}
} }
void void
@ -2208,58 +2193,41 @@ Mixer_UI::set_state (const XMLNode& node, int version)
node.get_property ("show-mixer", _visible); node.get_property ("show-mixer", _visible);
if (node.get_property ("maximised", yn)) { if (node.get_property ("maximised", yn)) {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer")); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action (X_("Common"), X_("ToggleMaximalMixer"));
assert (act); bool fs = act && act->get_active();
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
bool fs = tact && tact->get_active();
if (yn ^ fs) { if (yn ^ fs) {
ActionManager::do_action ("Common", "ToggleMaximalMixer"); ActionManager::do_action ("Common", "ToggleMaximalMixer");
} }
} }
if (node.get_property ("show-mixer-list", yn)) { if (node.get_property ("show-mixer-list", yn)) {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Mixer"), X_("ToggleMixerList")); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action (X_("Mixer"), X_("ToggleMixerList"));
assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
assert (tact);
/* do it twice to force the change */ /* do it twice to force the change */
tact->set_active (!yn); act->set_active (!yn);
tact->set_active (yn); act->set_active (yn);
} }
if (node.get_property ("monitor-section-visible", yn)) { if (node.get_property ("monitor-section-visible", yn)) {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Mixer"), X_("ToggleMonitorSection")); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action (X_("Mixer"), X_("ToggleMonitorSection"));
assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
assert (tact);
/* do it twice to force the change */ /* do it twice to force the change */
tact->set_active (!yn); act->set_active (!yn);
tact->set_active (yn); act->set_active (yn);
} }
if (node.get_property ("show-vca-pane", yn)) { if (node.get_property ("show-vca-pane", yn)) {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Mixer"), X_("ToggleVCAPane")); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action (X_("Mixer"), X_("ToggleVCAPane"));
assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
assert (tact);
/* do it twice to force the change */ /* do it twice to force the change */
tact->set_active (!yn); act->set_active (!yn);
tact->set_active (yn); act->set_active (yn);
} }
#ifdef MIXBUS #ifdef MIXBUS
if (node.get_property ("show-mixbus-pane", yn)) { if (node.get_property ("show-mixbus-pane", yn)) {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Mixer"), X_("ToggleMixbusPane")); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action (X_("Mixer"), X_("ToggleMixbusPane"));
assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
assert (tact);
/* do it twice to force the change */ /* do it twice to force the change */
tact->set_active (!yn); act->set_active (!yn);
tact->set_active (yn); act->set_active (yn);
} }
#endif #endif
@ -2352,22 +2320,18 @@ Mixer_UI::get_state ()
node->set_property ("show-mixer", _visible); node->set_property ("show-mixer", _visible);
node->set_property ("maximised", _maximised); node->set_property ("maximised", _maximised);
Glib::RefPtr<Action> act = ActionManager::get_action ("Mixer", "ToggleMixerList"); Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action ("Mixer", "ToggleMixerList");
assert (act); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); node->set_property ("show-mixer-list", act->get_active ());
assert (tact); node->set_property ("show-mixer-list", tact->get_active ());
act = ActionManager::get_action ("Mixer", "ToggleMonitorSection"); act = ActionManager::get_toggle_action ("Mixer", "ToggleMonitorSection");
assert (act); tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); node->set_property ("monitor-section-visible", act->get_active ());
assert (tact); node->set_property ("monitor-section-visible", tact->get_active ());
act = ActionManager::get_action ("Mixer", "ToggleVCAPane"); act = ActionManager::get_toggle_action ("Mixer", "ToggleVCAPane");
assert (act); tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); node->set_property ("show-vca-pane", act->get_active ());
assert (tact); node->set_property ("show-vca-pane", tact->get_active ());
#ifdef MIXBUS #ifdef MIXBUS
act = ActionManager::get_action ("Mixer", "ToggleMixbusPane"); act = ActionManager::get_toggle_action ("Mixer", "ToggleMixbusPane");
assert (act); tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); node->set_property ("show-mixbus-pane", act->get_active ());
assert (tact); node->set_property ("show-mixbus-pane", tact->get_active ());
#endif #endif
return *node; return *node;