Fix crash when NullAutomation is created (which shouldn't be happening, but hey...).

[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 75d33d941608ce67b5fb28ddca1b5bec9c6128a2..1d03fd158e71b63c8a4bb4b49466cfa3db4401a0 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -62,15 +62,15 @@ ARDOUR_UI::toggle_send_mmc ()
 }
 
 void
-ARDOUR_UI::toggle_use_mmc ()
+ARDOUR_UI::toggle_send_midi_clock ()
 {
-       ActionManager::toggle_config_state ("options", "UseMMC", &Configuration::set_mmc_control, &Configuration::get_mmc_control);
+       ActionManager::toggle_config_state ("options", "SendMidiClock", &Configuration::set_send_midi_clock, &Configuration::get_send_midi_clock);
 }
 
 void
-ARDOUR_UI::toggle_use_midi_clock ()
+ARDOUR_UI::toggle_use_mmc ()
 {
-       ActionManager::toggle_config_state ("options", "UseMIDIClock", &Configuration::set_midi_clock_control, &Configuration::get_midi_clock_control);
+       ActionManager::toggle_config_state ("options", "UseMMC", &Configuration::set_mmc_control, &Configuration::get_mmc_control);
 }
 
 void
@@ -479,6 +479,12 @@ ARDOUR_UI::toggle_editing_space()
        }
 }
 
+void
+ARDOUR_UI::toggle_new_plugins_active ()
+{
+       ActionManager::toggle_config_state ("options", "NewPluginsActive", &Configuration::set_new_plugins_active, &Configuration::get_new_plugins_active);
+}
+
 void
 ARDOUR_UI::toggle_StopPluginsWithTransport()
 {
@@ -557,6 +563,12 @@ ARDOUR_UI::toggle_ShowSoloMutes()
        ActionManager::toggle_config_state ("options", "ShowSoloMutes", &Configuration::set_show_solo_mutes, &Configuration::get_show_solo_mutes);
 }
 
+void
+ARDOUR_UI::toggle_SoloMuteOverride()
+{
+       ActionManager::toggle_config_state ("options", "SoloMuteOverride", &Configuration::set_solo_mute_override, &Configuration::get_solo_mute_override);
+}
+
 void
 ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor()
 {
@@ -587,6 +599,12 @@ ARDOUR_UI::toggle_use_narrow_ms()
        ActionManager::toggle_config_state ("options", "DefaultNarrowMS", &Configuration::set_default_narrow_ms, &Configuration::get_default_narrow_ms);
 }
 
+void
+ARDOUR_UI::toggle_NameNewMarkers()
+{
+       ActionManager::toggle_config_state ("options", "NameNewMarkers", &Configuration::set_name_new_markers, &Configuration::get_name_new_markers);
+}
+
 void
 ARDOUR_UI::toggle_rubberbanding_snaps_to_grid ()
 {
@@ -1102,8 +1120,6 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
 
        } else if (PARAM_IS ("mmc-control")) {
                ActionManager::map_some_state ("options", "UseMMC", &Configuration::get_mmc_control);
-       } else if (PARAM_IS ("midi-clock-control")) {
-               ActionManager::map_some_state ("options", "UseMIDIClock", &Configuration::get_midi_clock_control);
        } else if (PARAM_IS ("midi-feedback")) {
                ActionManager::map_some_state ("options", "SendMIDIfeedback", &Configuration::get_midi_feedback);
        } else if (PARAM_IS ("do-not-record-plugins")) {
@@ -1114,6 +1130,8 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                ActionManager::map_some_state ("options", "LatchedSolo", &Configuration::get_solo_latched);
        } else if (PARAM_IS ("show-solo-mutes")) {
                ActionManager::map_some_state ("options", "ShowSoloMutes", &Configuration::get_show_solo_mutes);
+       } else if (PARAM_IS ("solo-mute-override")) {
+               ActionManager::map_some_state ("options", "SoloMuteOverride", &Configuration::get_solo_mute_override);
        } else if (PARAM_IS ("solo-model")) {
                map_solo_model ();
        } else if (PARAM_IS ("auto-play")) {
@@ -1140,6 +1158,8 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                ActionManager::map_some_state ("Transport",  "ToggleTimeMaster", &Configuration::get_jack_time_master);
        } else if (PARAM_IS ("plugins-stop-with-transport")) {
                ActionManager::map_some_state ("options",  "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport);
+       } else if (PARAM_IS ("new-plugins-active")) {
+               ActionManager::map_some_state ("options",  "NewPluginsActive", &Configuration::get_new_plugins_active);
        } else if (PARAM_IS ("latched-record-enable")) {
                ActionManager::map_some_state ("options", "LatchedRecordEnable", &Configuration::get_latched_record_enable);
        } else if (PARAM_IS ("verify-remove-last-capture")) {