projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use new action map API instead of ActionManager::get_action
[ardour.git] / gtk2_ardour / ardour_ui_options.cc
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 3fec8c0be42df16da9ee40f062d4d56466ff536f..625605447ce846270983f518efaf84762402e0ea 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -27,6 +27,7 @@
 
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
+#include "ardour/transport_master_manager.h"
 
 #include "gtkmm2ext/utils.h"
 #include "waveview/wave_view.h"
@@ -50,14 +51,10 @@ void
 ARDOUR_UI::toggle_external_sync()
 {
        if (_session) {
-               if (_session->config.get_video_pullup() != 0.0f) {
-                       if (Config->get_sync_source() == Engine) {
-                               MessageDialog msg (
-                                       _("It is not possible to use JACK as the the sync source\n\
-when the pull up/down setting is non-zero."));
-                               msg.run ();
-                               return;
-                       }
+               if (_session->config.get_video_pullup() != 0.0f && (TransportMasterManager::instance().current()->type() == Engine)) {
+                       MessageDialog msg (_("It is not possible to use JACK as the the sync source\n when the pull up/down setting is non-zero."));
+                       msg.run ();
+                       return;
                }
 
                ActionManager::toggle_config_state_foo ("Transport", "ToggleExternalSync", sigc::mem_fun (_session->config, &SessionConfiguration::set_external_sync), sigc::mem_fun (_session->config, &SessionConfiguration::get_external_sync));
@@ -132,7 +129,7 @@ ARDOUR_UI::toggle_click ()
 void
 ARDOUR_UI::toggle_session_monitoring_in ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("SessionMonitorIn"));
+       Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("SessionMonitorIn"));
        if (!act) {
                return;
        }
@@ -158,7 +155,7 @@ ARDOUR_UI::toggle_session_monitoring_in ()
 void
 ARDOUR_UI::toggle_session_monitoring_disk ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("SessionMonitorDisk"));
+       Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("SessionMonitorDisk"));
        if (!act) {
                return;
        }
@@ -183,7 +180,7 @@ ARDOUR_UI::toggle_session_monitoring_disk ()
 void
 ARDOUR_UI::unset_dual_punch ()
 {
-       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
+       Glib::RefPtr<Action> action = global_actions.find_action ("Transport", "TogglePunch");
 
        if (action) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
@@ -202,7 +199,7 @@ ARDOUR_UI::toggle_punch ()
                return;
        }
 
-       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
+       Glib::RefPtr<Action> action = global_actions.find_action ("Transport", "TogglePunch");
 
        if (action) {
 
@@ -214,8 +211,8 @@ ARDOUR_UI::toggle_punch ()
 
                /* drive the other two actions from this one */
 
-               Glib::RefPtr<Action> in_action = ActionManager::get_action ("Transport", "TogglePunchIn");
-               Glib::RefPtr<Action> out_action = ActionManager::get_action ("Transport", "TogglePunchOut");
+               Glib::RefPtr<Action> in_action = global_actions.find_action ("Transport", "TogglePunchIn");
+               Glib::RefPtr<Action> out_action = global_actions.find_action ("Transport", "TogglePunchOut");
 
                if (in_action && out_action) {
                        Glib::RefPtr<ToggleAction> tiact = Glib::RefPtr<ToggleAction>::cast_dynamic(in_action);
@@ -229,7 +226,7 @@ ARDOUR_UI::toggle_punch ()
 void
 ARDOUR_UI::toggle_punch_in ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchIn"));
+       Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("TogglePunchIn"));
        if (!act) {
                return;
        }
@@ -255,7 +252,7 @@ ARDOUR_UI::toggle_punch_in ()
 void
 ARDOUR_UI::toggle_punch_out ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("TogglePunchOut"));
+       Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("TogglePunchOut"));
        if (!act) {
                return;
        }
@@ -281,7 +278,7 @@ ARDOUR_UI::toggle_punch_out ()
 void
 ARDOUR_UI::show_loop_punch_ruler_and_disallow_hide ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler");
+       Glib::RefPtr<Action> act = editor->find_action (X_("Rulers"), "toggle-loop-punch-ruler");
        if (!act) {
                return;
        }
@@ -304,7 +301,7 @@ ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate ()
 {
        if (!_session->config.get_punch_in() && !_session->config.get_punch_out()) {
                /* if punch in/out are now both off, reallow hiding of the loop/punch ruler */
-               Glib::RefPtr<Action> act = ActionManager::get_action (X_("Rulers"), "toggle-loop-punch-ruler");
+               Glib::RefPtr<Action> act = editor->find_action (X_("Rulers"), "toggle-loop-punch-ruler");
                if (act) {
                        act->set_sensitive (true);
                }
@@ -314,7 +311,7 @@ ARDOUR_UI::reenable_hide_loop_punch_ruler_if_appropriate ()
 void
 ARDOUR_UI::toggle_video_sync()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action ("Transport", "ToggleVideoSync");
+       Glib::RefPtr<Action> act = global_actions.find_action ("Transport", "ToggleVideoSync");
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
                _session->config.set_use_video_sync (tact->get_active());
@@ -324,7 +321,7 @@ ARDOUR_UI::toggle_video_sync()
 void
 ARDOUR_UI::toggle_editing_space()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMaximalEditor");
+       Glib::RefPtr<Action> act = global_actions.find_action ("Common", "ToggleMaximalEditor");
 
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -355,14 +352,14 @@ ARDOUR_UI::parameter_changed (std::string p)
 
                if (!_session->config.get_external_sync()) {
                        sync_button.set_text (S_("SyncSource|Int."));
-                       ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
-                       ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
-                       ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (true);
+                       global_actions.find_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
+                       global_actions.find_action ("Transport", "ToggleAutoReturn")->set_sensitive (true);
+                       global_actions.find_action ("Transport", "ToggleFollowEdits")->set_sensitive (true);
                } else {
                        /* XXX we need to make sure that auto-play is off as well as insensitive */
-                       ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
-                       ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
-                       ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
+                       global_actions.find_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
+                       global_actions.find_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
+                       global_actions.find_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
                }
 
        } else if (p == "sync-source") {
@@ -373,11 +370,11 @@ ARDOUR_UI::parameter_changed (std::string p)
                        if (!_session->config.get_external_sync()) {
                                sync_button.set_text (S_("SyncSource|Int."));
                        } else {
-                               sync_button.set_text (sync_source_to_string (Config->get_sync_source(), true));
+                               sync_button.set_text (TransportMasterManager::instance().current()->display_name());
                        }
                } else {
                        /* changing sync source without a session is unlikely/impossible , except during startup */
-                       sync_button.set_text (sync_source_to_string (Config->get_sync_source(), true));
+                       sync_button.set_text (TransportMasterManager::instance().current()->display_name());
                }
 
        } else if (p == "follow-edits") {
@@ -401,8 +398,8 @@ ARDOUR_UI::parameter_changed (std::string p)
        } else if (p == "auto-input") {
                ActionManager::map_some_state ("Transport", "ToggleAutoInput", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_input));
        } else if (p == "session-monitoring") {
-               Glib::RefPtr<Action> iact = ActionManager::get_action (X_("Transport"), X_("SessionMonitorIn"));
-               Glib::RefPtr<Action> dact = ActionManager::get_action (X_("Transport"), X_("SessionMonitorDisk"));
+               Glib::RefPtr<Action> iact = global_actions.find_action (X_("Transport"), X_("SessionMonitorIn"));
+               Glib::RefPtr<Action> dact = global_actions.find_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);
@@ -510,7 +507,7 @@ ARDOUR_UI::parameter_changed (std::string p)
                VisibilityTracker::set_use_window_manager_visibility (UIConfiguration::instance().get_use_wm_visibility());
        } else if (p == "action-table-columns") {
                const uint32_t cols = UIConfiguration::instance().get_action_table_columns ();
-               for (int i = 0; i < 9; ++i) {
+               for (int i = 0; i < MAX_LUA_ACTION_SCRIPTS; ++i) {
                        const int col = i / 2;
                        if (cols & (1<<col)) {
                                action_script_call_btn[i].show();
@@ -527,6 +524,13 @@ ARDOUR_UI::parameter_changed (std::string p)
                        /* force a redraw */
                        gtk_rc_reset_styles (gtk_settings_get_default());
                }
+       } else if (p == "boxy-buttons") {
+               bool boxy = UIConfiguration::instance().get_boxy_buttons();
+               if (ArdourButton::boxy_buttons () != boxy) {
+                       ArdourButton::set_boxy_buttons (boxy);
+                       /* force a redraw */
+                       gtk_rc_reset_styles (gtk_settings_get_default());
+               }
        } else if ( (p == "snap-to-region-sync") || (p == "snap-to-region-start") || (p == "snap-to-region-end") ) {
                if (editor) editor->mark_region_boundary_cache_dirty();
        }
@@ -573,7 +577,7 @@ ARDOUR_UI::reset_main_clocks ()
 void
 ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
+       Glib::RefPtr<Action> act = global_actions.find_action (X_("Transport"), X_("ToggleExternalSync"));
 
        if (!act) {
                return;
@@ -588,7 +592,7 @@ ARDOUR_UI::synchronize_sync_source_and_video_pullup ()
                act->set_sensitive (true);
        } else {
                /* can't sync to JACK if video pullup != 0.0 */
-               if (Config->get_sync_source() == Engine) {
+               if (TransportMasterManager::instance().current()->type() == Engine) {
                        act->set_sensitive (false);
                } else {
                        act->set_sensitive (true);
Unnamed repository; edit this file 'description' to name the repository.