smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Consolidate ToggleAction cast, use new API

Browse source 
Furthermore we can assume that all Actions are registered and
Unregistered actions will ::abort() execution.
This commit is contained in:
Robin Gareus 2019-02-28 23:54:42 +01:00
parent 00934aec0d
commit 8244026533
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
9 changed files with 91 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/ardour_ui.cc
View file

@ -5996,9 +5996,8 @@ ARDOUR_UI::monitor_dim_all ()
} }
boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control (); boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
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");
assert (act); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); _monitor->set_dim_all (tact->get_active());
assert (tact); _monitor->set_dim_all (tact->get_active());
} }
void void
@ -6010,9 +6009,8 @@ ARDOUR_UI::monitor_cut_all ()
} }
boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control (); boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
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");
assert (act); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); _monitor->set_cut_all (tact->get_active());
assert (tact); _monitor->set_cut_all (tact->get_active());
} }
void void
@ -6024,7 +6022,6 @@ ARDOUR_UI::monitor_mono ()
} }
boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control (); boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor = mon->monitor_control ();
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-mono");
assert (act); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); _monitor->set_mono (tact->get_active());
assert (tact);_monitor->set_mono (tact->get_active());
} }

12
gtk2_ardour/ardour_ui2.cc
View file

@ -594,9 +594,8 @@ ARDOUR_UI::error_alert_press (GdkEventButton* ev)
if (ev->button == 1) { if (ev->button == 1) {
if (_log_not_acknowledged == LogLevelError) { if (_log_not_acknowledged == LogLevelError) {
// just acknowledge the error, don't hide the log if it's already visible // just acknowledge the error, don't hide the log if it's already visible
RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window")); RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("toggle-log-window"));
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act); if (tact->get_active()) {
if (tact && tact->get_active()) {
do_toggle = false; do_toggle = false;
} }
} }
@ -781,12 +780,7 @@ ARDOUR_UI::sync_button_clicked (GdkEventButton* ev)
void void
ARDOUR_UI::toggle_follow_edits () ARDOUR_UI::toggle_follow_edits ()
{ {
RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Transport"), X_("ToggleFollowEdits"));
assert (act);
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
assert (tact);
UIConfiguration::instance().set_follow_edits (tact->get_active ()); UIConfiguration::instance().set_follow_edits (tact->get_active ());
} }

6
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -941,14 +941,10 @@ ARDOUR_UI::editor_meter_peak_button_release (GdkEventButton* ev)
void void
ARDOUR_UI::toggle_mixer_space() ARDOUR_UI::toggle_mixer_space()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMaximalMixer"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Common", "ToggleMaximalMixer");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
if (tact->get_active()) { if (tact->get_active()) {
mixer->maximise_mixer_space (); mixer->maximise_mixer_space ();
} else { } else {
mixer->restore_mixer_space (); mixer->restore_mixer_space ();
} }
}
} }

101
gtk2_ardour/ardour_ui_options.cc
View file

@ -129,14 +129,7 @@ ARDOUR_UI::toggle_click ()
void void
ARDOUR_UI::toggle_session_monitoring_in () ARDOUR_UI::toggle_session_monitoring_in ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("SessionMonitorIn")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorIn"));
if (!act) {
return;
}
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (!tact) {
return;
}
if (tact->get_active() && _session->config.get_session_monitoring () == MonitorInput) { if (tact->get_active() && _session->config.get_session_monitoring () == MonitorInput) {
return; return;
@ -155,14 +148,7 @@ ARDOUR_UI::toggle_session_monitoring_in ()
void void
ARDOUR_UI::toggle_session_monitoring_disk () ARDOUR_UI::toggle_session_monitoring_disk ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("SessionMonitorDisk")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorDisk"));
if (!act) {
return;
}
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (!tact) {
return;
}
if (tact->get_active() && _session->config.get_session_monitoring () == MonitorDisk) { if (tact->get_active() && _session->config.get_session_monitoring () == MonitorDisk) {
return; return;
} }
@ -180,16 +166,12 @@ ARDOUR_UI::toggle_session_monitoring_disk ()
void void
ARDOUR_UI::unset_dual_punch () ARDOUR_UI::unset_dual_punch ()
{ {
Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Transport", "TogglePunch");
if (action) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
if (tact) { if (tact) {
ignore_dual_punch = true; ignore_dual_punch = true;
tact->set_active (false); tact->set_active (false);
ignore_dual_punch = false; ignore_dual_punch = false;
} }
}
} }
void void
@ -199,42 +181,20 @@ ARDOUR_UI::toggle_punch ()
return; return;
} }
Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Transport", "TogglePunch");
if (action) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
if (!tact) {
return;
}
/* drive the other two actions from this one */ /* drive the other two actions from this one */
Glib::RefPtr<ToggleAction> in_action = ActionManager::get_toggle_action ("Transport", "TogglePunchIn");
Glib::RefPtr<ToggleAction> out_action = ActionManager::get_toggle_action ("Transport", "TogglePunchOut");
Glib::RefPtr<Action> in_action = ActionManager::get_action ("Transport", "TogglePunchIn"); in_action->set_active (tact->get_active());
Glib::RefPtr<Action> out_action = ActionManager::get_action ("Transport", "TogglePunchOut"); out_action->set_active (tact->get_active());
if (in_action && out_action) {
Glib::RefPtr<ToggleAction> tiact = Glib::RefPtr<ToggleAction>::cast_dynamic(in_action);
Glib::RefPtr<ToggleAction> toact = Glib::RefPtr<ToggleAction>::cast_dynamic(out_action);
tiact->set_active (tact->get_active());
toact->set_active (tact->get_active());
}
}
} }
void void
ARDOUR_UI::toggle_punch_in () ARDOUR_UI::toggle_punch_in ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchIn")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Transport"), X_("TogglePunchIn"));
if (!act) {
return;
}
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (!tact) {
return;
}
if (tact->get_active() != _session->config.get_punch_in()) { if (tact->get_active() != _session->config.get_punch_in()) {
_session->config.set_punch_in (tact->get_active ()); _session->config.set_punch_in (tact->get_active ());
@ -252,15 +212,7 @@ ARDOUR_UI::toggle_punch_in ()
void void
ARDOUR_UI::toggle_punch_out () ARDOUR_UI::toggle_punch_out ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchOut")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Transport"), X_("TogglePunchOut"));
if (!act) {
return;
}
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (!tact) {
return;
}
if (tact->get_active() != _session->config.get_punch_out()) { if (tact->get_active() != _session->config.get_punch_out()) {
_session->config.set_punch_out (tact->get_active ()); _session->config.set_punch_out (tact->get_active ());
@ -278,17 +230,9 @@ ARDOUR_UI::toggle_punch_out ()
void void
ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide () ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Rulers"), "toggle-loop-punch-ruler");
if (!act) {
return;
}
act->set_sensitive (false); tact->set_sensitive (false);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (!tact) {
return;
}
if (!tact->get_active()) { if (!tact->get_active()) {
tact->set_active (); tact->set_active ();
@ -311,26 +255,19 @@ ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate ()
void void
ARDOUR_UI::toggle_video_sync() ARDOUR_UI::toggle_video_sync()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action ("Transport", "ToggleVideoSync"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Transport", "ToggleVideoSync");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
_session->config.set_use_video_sync (tact->get_active()); _session->config.set_use_video_sync (tact->get_active());
}
} }
void void
ARDOUR_UI::toggle_editing_space() ARDOUR_UI::toggle_editing_space()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMaximalEditor"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Common", "ToggleMaximalEditor");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
if (tact->get_active()) { if (tact->get_active()) {
maximise_editing_space (); maximise_editing_space ();
} else { } else {
restore_editing_space (); restore_editing_space ();
} }
}
} }
void void
@ -398,12 +335,8 @@ ARDOUR_UI::parameter_changed (std::string p)
} else if (p == "auto-input") { } else if (p == "auto-input") {
ActionManager::map_some_state ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input)); ActionManager::map_some_state ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input));
} else if (p == "session-monitoring") { } else if (p == "session-monitoring") {
Glib::RefPtr<Action> iact = ActionManager::get_action (X_("Transport"), X_("SessionMonitorIn")); Glib::RefPtr<ToggleAction> tiact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorIn"));
Glib::RefPtr<Action> dact = ActionManager::get_action (X_("Transport"), X_("SessionMonitorDisk")); Glib::RefPtr<ToggleAction> tdact = ActionManager::get_toggle_action (X_("Transport"), X_("SessionMonitorDisk"));
if (iact && dact) {
Glib::RefPtr<ToggleAction> tdact = Glib::RefPtr<ToggleAction>::cast_dynamic(dact);
Glib::RefPtr<ToggleAction> tiact = Glib::RefPtr<ToggleAction>::cast_dynamic(iact);
if (tdact && tiact) {
switch (_session->config.get_session_monitoring ()) { switch (_session->config.get_session_monitoring ()) {
case MonitorDisk: case MonitorDisk:
tdact->set_active (true); tdact->set_active (true);
@ -418,8 +351,6 @@ ARDOUR_UI::parameter_changed (std::string p)
tiact->set_active (false); tiact->set_active (false);
break; break;
} }
}
}
} else if (p == "punch-out") { } else if (p == "punch-out") {
ActionManager::map_some_state ("Transport", "TogglePunchOut", sigc::mem_fun (_session->config, &SessionConfiguration::get_punch_out)); ActionManager::map_some_state ("Transport", "TogglePunchOut", sigc::mem_fun (_session->config, &SessionConfiguration::get_punch_out));
if (!_session->config.get_punch_out()) { if (!_session->config.get_punch_out()) {

62
gtk2_ardour/editor_actions.cc
View file

@ -801,15 +801,11 @@ Editor::load_bindings ()
void void
Editor::toggle_skip_playback () Editor::toggle_skip_playback ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), "toggle-skip-playback"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), "toggle-skip-playback");
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
bool s = Config->get_skip_playback (); bool s = Config->get_skip_playback ();
if (tact->get_active() != s) { if (tact->get_active() != s) {
Config->set_skip_playback (tact->get_active()); Config->set_skip_playback (tact->get_active());
} }
}
} }
void void
@ -857,42 +853,29 @@ Editor::toggle_ruler_visibility (RulerType rt)
break; break;
} }
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), action);
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
update_ruler_visibility (); update_ruler_visibility ();
store_ruler_visibility (); store_ruler_visibility ();
}
} }
void void
Editor::set_summary () Editor::set_summary ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleSummary")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("ToggleSummary"));
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
_session->config.set_show_summary (tact->get_active ()); _session->config.set_show_summary (tact->get_active ());
}
} }
void void
Editor::set_group_tabs () Editor::set_group_tabs ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleGroupTabs")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("ToggleGroupTabs"));
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
_session->config.set_show_group_tabs (tact->get_active ()); _session->config.set_show_group_tabs (tact->get_active ());
}
} }
void void
Editor::set_close_video_sensitive (bool onoff) Editor::set_close_video_sensitive (bool onoff)
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("CloseVideo")); Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("CloseVideo"));
if (act) {
act->set_sensitive (onoff); act->set_sensitive (onoff);
}
} }
void void
@ -1364,30 +1347,17 @@ Editor::zoom_focus_action (ZoomFocus focus)
abort(); /*NOTREACHED*/ abort(); /*NOTREACHED*/
} }
act = ActionManager::get_action (X_("Zoom"), action); return ActionManager::get_radio_action (X_("Zoom"), action);
if (act) {
RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
return ract;
} else {
error << string_compose (_("programming error: %1: %2"), "Editor::zoom_focus_action could not find action to match focus.", action) << endmsg;
}
return RefPtr<RadioAction> ();
} }
void void
Editor::toggle_sound_midi_notes () Editor::toggle_sound_midi_notes ()
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("sound-midi-notes"));
if (act) {
bool s = UIConfiguration::instance().get_sound_midi_notes(); bool s = UIConfiguration::instance().get_sound_midi_notes();
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact->get_active () != s) { if (tact->get_active () != s) {
UIConfiguration::instance().set_sound_midi_notes (tact->get_active()); UIConfiguration::instance().set_sound_midi_notes (tact->get_active());
} }
}
} }
void void
@ -1436,13 +1406,10 @@ Editor::parameter_changed (std::string p)
_summary_hbox.hide (); _summary_hbox.hide ();
} }
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleSummary")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("ToggleSummary"));
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact->get_active () != s) { if (tact->get_active () != s) {
tact->set_active (s); tact->set_active (s);
} }
}
} else if (p == "show-group-tabs") { } else if (p == "show-group-tabs") {
bool const s = _session->config.get_show_group_tabs (); bool const s = _session->config.get_show_group_tabs ();
@ -1454,38 +1421,27 @@ Editor::parameter_changed (std::string p)
reset_controls_layout_width (); reset_controls_layout_width ();
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleGroupTabs")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("ToggleGroupTabs"));
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact->get_active () != s) { if (tact->get_active () != s) {
tact->set_active (s); tact->set_active (s);
} }
}
} else if (p == "timecode-offset" || p == "timecode-offset-negative") { } else if (p == "timecode-offset" || p == "timecode-offset-negative") {
update_just_timecode (); update_just_timecode ();
} else if (p == "sound-midi-notes") { } else if (p == "sound-midi-notes") {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("sound-midi-notes"));
if (act) {
bool s = UIConfiguration::instance().get_sound_midi_notes(); bool s = UIConfiguration::instance().get_sound_midi_notes();
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact->get_active () != s) { if (tact->get_active () != s) {
tact->set_active (s); tact->set_active (s);
} }
}
} else if (p == "show-region-gain") { } else if (p == "show-region-gain") {
set_gain_envelope_visibility (); set_gain_envelope_visibility ();
} else if (p == "skip-playback") { } else if (p == "skip-playback") {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback")); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("toggle-skip-playback"));
if (act) {
bool s = Config->get_skip_playback (); bool s = Config->get_skip_playback ();
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact->get_active () != s) { if (tact->get_active () != s) {
tact->set_active (s); tact->set_active (s);
} }
} }
}
} }
void void

9
gtk2_ardour/editor_mouse.cc
View file

@ -208,14 +208,7 @@ Editor::set_current_movable (boost::shared_ptr<Movable> m)
void void
Editor::mouse_mode_object_range_toggled() Editor::mouse_mode_object_range_toggled()
{ {
MouseMode m = mouse_mode; set_mouse_mode (mouse_mode, true); /* updates set-mouse-mode-range */
Glib::RefPtr<Action> act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
assert (tact);
set_mouse_mode (m, true); // call this so the button styles can get updated
} }
bool bool

9
gtk2_ardour/editor_regions.cc
View file

@ -1682,7 +1682,6 @@ RefPtr<Action>
EditorRegions::hide_action () const EditorRegions::hide_action () const
{ {
return ActionManager::get_action (X_("RegionList"), X_("rlHide")); return ActionManager::get_action (X_("RegionList"), X_("rlHide"));
} }
RefPtr<Action> RefPtr<Action>
@ -1700,15 +1699,11 @@ EditorRegions::remove_unused_regions_action () const
RefPtr<ToggleAction> RefPtr<ToggleAction>
EditorRegions::toggle_full_action () const EditorRegions::toggle_full_action () const
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("rlShowAll")); return ActionManager::get_toggle_action (X_("RegionList"), X_("rlShowAll"));
assert (act);
return Glib::RefPtr<ToggleAction>::cast_dynamic (act);
} }
RefPtr<ToggleAction> RefPtr<ToggleAction>
EditorRegions::toggle_show_auto_regions_action () const EditorRegions::toggle_show_auto_regions_action () const
{ {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), X_("rlShowAuto")); return ActionManager::get_toggle_action (X_("RegionList"), X_("rlShowAuto"));
assert (act);
return Glib::RefPtr<ToggleAction>::cast_dynamic (act);
} }

3
gtk2_ardour/step_entry.cc
View file

@ -550,8 +550,7 @@ StepEntry::note_length ()
{ {
double base_time = 4.0 / (double) length_divisor_adjustment.get_value(); double base_time = 4.0 / (double) length_divisor_adjustment.get_value();
RefPtr<Action> act = ActionManager::get_action ("StepEditing/toggle-triplet"); RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("StepEditing/toggle-triplet");
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
bool triplets = tact->get_active (); bool triplets = tact->get_active ();
if (triplets) { if (triplets) {

11
gtk2_ardour/time_info_box.cc
View file

@ -265,10 +265,8 @@ TimeInfoBox::selection_changed ()
case Editing::MouseObject: case Editing::MouseObject:
if (selection.regions.empty()) { if (selection.regions.empty()) {
if (selection.points.empty()) { if (selection.points.empty()) {
Glib::RefPtr<Action> act = ActionManager::get_action ("MouseMode", "set-mouse-mode-object-range"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("MouseMode", "set-mouse-mode-object-range");
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act); if (tact->get_active() && !selection.time.empty()) {
if (tact && tact->get_active() && !selection.time.empty()) {
/* show selected range */ /* show selected range */
selection_start->set_off (false); selection_start->set_off (false);
selection_end->set_off (false); selection_end->set_off (false);
@ -315,10 +313,9 @@ TimeInfoBox::selection_changed ()
case Editing::MouseRange: case Editing::MouseRange:
if (selection.time.empty()) { if (selection.time.empty()) {
Glib::RefPtr<Action> act = ActionManager::get_action ("MouseMode", "set-mouse-mode-object-range"); Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("MouseMode", "set-mouse-mode-object-range");
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
if (tact && tact->get_active() && !selection.regions.empty()) { if (tact->get_active() && !selection.regions.empty()) {
/* show selected regions */ /* show selected regions */
s = selection.regions.start(); s = selection.regions.start();
e = selection.regions.end_sample(); e = selection.regions.end_sample();