ardour/livetrax
13
0
Fork 0
Code

replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls

Browse Source
This commit is contained in:
Paul Davis 2018-12-12 11:12:40 -05:00
parent 360261f110
commit 69777d600f
2 changed files with 61 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
gtk2_ardour/monitor_section.cc
View File

@ -184,7 +184,7 @@ MonitorSection::MonitorSection ()
toggle_processorbox_button.set_name (X_("monitor section processors toggle")); toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors")); set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors"));
proctoggle = ActionManager::get_action (X_("Monitor"), X_("toggle-monitor-processor-box")); proctoggle = ActionManager::get_toggle_action (X_("Monitor"), X_("toggle-monitor-processor-box"));
toggle_processorbox_button.set_related_action (proctoggle); toggle_processorbox_button.set_related_action (proctoggle);
/* Knobs */ /* Knobs */
@ -551,7 +551,7 @@ MonitorSection::leave_handler (GdkEventCrossing* ev)
void void
MonitorSection::update_processor_box () MonitorSection::update_processor_box ()
{ {
bool show_processor_box = Glib::RefPtr<ToggleAction>::cast_dynamic (proctoggle)->get_active (); bool show_processor_box = proctoggle->get_active ();
if (count_processors () > 0 && !show_processor_box) { if (count_processors () > 0 && !show_processor_box) {
toggle_processorbox_button.set_name (X_("monitor section processors present")); toggle_processorbox_button.set_name (X_("monitor section processors present"));
@ -814,11 +814,8 @@ MonitorSection::toggle_mute_overrides_solo ()
return; return;
} }
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), "toggle-mute-overrides-solo"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Solo"), "toggle-mute-overrides-solo");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
Config->set_solo_mute_override (tact->get_active()); Config->set_solo_mute_override (tact->get_active());
}
} }
void void
@ -828,12 +825,8 @@ MonitorSection::dim_all ()
return; return;
} }
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-dim-all");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_monitor->set_dim_all (tact->get_active()); _monitor->set_dim_all (tact->get_active());
}
} }
void void
@ -843,11 +836,8 @@ MonitorSection::cut_all ()
return; return;
} }
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-cut-all");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_monitor->set_cut_all (tact->get_active()); _monitor->set_cut_all (tact->get_active());
}
} }
void void
@ -857,11 +847,8 @@ MonitorSection::mono ()
return; return;
} }
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-mono");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_monitor->set_mono (tact->get_active()); _monitor->set_mono (tact->get_active());
}
} }
void void
@ -874,11 +861,8 @@ MonitorSection::cut_channel (uint32_t chn)
char buf[64]; char buf[64];
snprintf (buf, sizeof (buf), "monitor-cut-%u", chn); snprintf (buf, sizeof (buf), "monitor-cut-%u", chn);
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_monitor->set_cut (chn, tact->get_active()); _monitor->set_cut (chn, tact->get_active());
}
} }
void void
@ -891,12 +875,8 @@ MonitorSection::dim_channel (uint32_t chn)
char buf[64]; char buf[64];
snprintf (buf, sizeof (buf), "monitor-dim-%u", chn); snprintf (buf, sizeof (buf), "monitor-dim-%u", chn);
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_monitor->set_dim (chn, tact->get_active()); _monitor->set_dim (chn, tact->get_active());
}
} }
void void
@ -909,11 +889,8 @@ MonitorSection::solo_channel (uint32_t chn)
char buf[64]; char buf[64];
snprintf (buf, sizeof (buf), "monitor-solo-%u", chn); snprintf (buf, sizeof (buf), "monitor-solo-%u", chn);
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_monitor->set_solo (chn, tact->get_active()); _monitor->set_solo (chn, tact->get_active());
}
} }
@ -927,11 +904,8 @@ MonitorSection::invert_channel (uint32_t chn)
char buf[64]; char buf[64];
snprintf (buf, sizeof (buf), "monitor-invert-%u", chn); snprintf (buf, sizeof (buf), "monitor-invert-%u", chn);
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_monitor->set_polarity (chn, tact->get_active()); _monitor->set_polarity (chn, tact->get_active());
}
} }
void void
@ -1003,11 +977,7 @@ MonitorSection::solo_use_in_place ()
active. active.
*/ */
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), X_("solo-use-in-place")); Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("Solo"), X_("solo-use-in-place"));
if (act) {
Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
if (ract) {
if (!ract->get_active ()) { if (!ract->get_active ()) {
/* We are turning SiP off, which means that AFL or PFL will be turned on /* We are turning SiP off, which means that AFL or PFL will be turned on
shortly; don't update the solo model in the mean time, as if the currently shortly; don't update the solo model in the mean time, as if the currently
@ -1018,8 +988,6 @@ MonitorSection::solo_use_in_place ()
} }
Config->set_solo_control_is_listen_control (!ract->get_active()); Config->set_solo_control_is_listen_control (!ract->get_active());
_inhibit_solo_model_update = false; _inhibit_solo_model_update = false;
}
}
} }
void void
@ -1030,16 +998,11 @@ MonitorSection::solo_use_afl ()
active. active.
*/ */
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), X_("solo-use-afl")); Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("Solo"), X_("solo-use-afl"));
if (act) {
Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
if (ract) {
if (ract->get_active()) { if (ract->get_active()) {
Config->set_solo_control_is_listen_control (true); Config->set_solo_control_is_listen_control (true);
Config->set_listen_position (AfterFaderListen); Config->set_listen_position (AfterFaderListen);
} }
}
}
} }
void void
@ -1050,16 +1013,11 @@ MonitorSection::solo_use_pfl ()
active. active.
*/ */
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), X_("solo-use-pfl")); Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("Solo"), X_("solo-use-pfl"));
if (act) {
Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
if (ract) {
if (ract->get_active()) { if (ract->get_active()) {
Config->set_solo_control_is_listen_control (true); Config->set_solo_control_is_listen_control (true);
Config->set_listen_position (PreFaderListen); Config->set_listen_position (PreFaderListen);
} }
}
}
} }
void void
@ -1070,7 +1028,7 @@ MonitorSection::update_solo_model ()
} }
const char* action_name = 0; const char* action_name = 0;
Glib::RefPtr<Action> act; Glib::RefPtr<RadioAction> ract;
if (Config->get_solo_control_is_listen_control()) { if (Config->get_solo_control_is_listen_control()) {
switch (Config->get_listen_position()) { switch (Config->get_listen_position()) {
@ -1085,22 +1043,18 @@ MonitorSection::update_solo_model ()
action_name = X_("solo-use-in-place"); action_name = X_("solo-use-in-place");
} }
act = ActionManager::get_action (X_("Solo"), action_name); ract = ActionManager::get_radio_action (X_("Solo"), action_name);
if (act) {
Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
if (ract) {
/* because these are radio buttons, one of them will be /* because these are radio buttons, one of them will be
active no matter what. to trigger a change in the active no matter what. to trigger a change in the
action so that the view picks it up, toggle it. action so that the view picks it up, toggle it.
*/ */
if (ract->get_active()) { if (ract->get_active()) {
ract->set_active (false); ract->set_active (false);
} }
ract->set_active (true);
}
} ract->set_active (true);
} }
void void
@ -1115,29 +1069,14 @@ MonitorSection::map_state ()
Glib::RefPtr<Action> act; Glib::RefPtr<Action> act;
Glib::RefPtr<ToggleAction> tact; Glib::RefPtr<ToggleAction> tact;
act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all"); tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-cut-all");
if (act) {
tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact) {
tact->set_active (_monitor->cut_all()); tact->set_active (_monitor->cut_all());
}
}
act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all"); tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-dim-all");
if (act) {
tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact) {
tact->set_active (_monitor->dim_all()); tact->set_active (_monitor->dim_all());
}
}
act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-mono");
if (act) {
tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact) {
tact->set_active (_monitor->mono()); tact->set_active (_monitor->mono());
}
}
uint32_t nchans = _monitor->output_streams().n_audio(); uint32_t nchans = _monitor->output_streams().n_audio();
@ -1148,41 +1087,21 @@ MonitorSection::map_state ()
char action_name[32]; char action_name[32];
snprintf (action_name, sizeof (action_name), "monitor-cut-%u", n); snprintf (action_name, sizeof (action_name), "monitor-cut-%u", n);
act = ActionManager::get_action (X_("Monitor"), action_name); tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact) {
tact->set_active (_monitor->cut (n)); tact->set_active (_monitor->cut (n));
}
}
snprintf (action_name, sizeof (action_name), "monitor-dim-%u", n); snprintf (action_name, sizeof (action_name), "monitor-dim-%u", n);
act = ActionManager::get_action (X_("Monitor"), action_name); tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact) {
tact->set_active (_monitor->dimmed (n)); tact->set_active (_monitor->dimmed (n));
}
}
snprintf (action_name, sizeof (action_name), "monitor-solo-%u", n); snprintf (action_name, sizeof (action_name), "monitor-solo-%u", n);
act = ActionManager::get_action (X_("Monitor"), action_name); tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact) {
tact->set_active (_monitor->soloed (n)); tact->set_active (_monitor->soloed (n));
}
}
snprintf (action_name, sizeof (action_name), "monitor-invert-%u", n); snprintf (action_name, sizeof (action_name), "monitor-invert-%u", n);
act = ActionManager::get_action (X_("Monitor"), action_name); tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact) {
tact->set_active (_monitor->inverted (n)); tact->set_active (_monitor->inverted (n));
} }
}
}
} }
void void

2
gtk2_ardour/monitor_section.h
View File

@ -182,7 +182,7 @@ private:
uint32_t count_processors (); uint32_t count_processors ();
void processors_changed (ARDOUR::RouteProcessorChange); void processors_changed (ARDOUR::RouteProcessorChange);
Glib::RefPtr<Gtk::Action> proctoggle; Glib::RefPtr<Gtk::ToggleAction> proctoggle;
bool _ui_initialized; bool _ui_initialized;
Gtkmm2ext::Bindings* bindings; Gtkmm2ext::Bindings* bindings;