First stage of options rework.
[ardour.git] / gtk2_ardour / ardour_ui_options.cc
index c7db8f4ec60c1927b87712b570ab846b4366258d..d5ad849a9c886f37d0bf9347a90a62a0eb25e8da 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2005 Paul Davis 
+    Copyright (C) 2005 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
-#include <pbd/convert.h>
-#include <pbd/stacktrace.h>
+#include "pbd/convert.h"
+#include "pbd/stacktrace.h"
 
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <ardour/osc.h>
-#include <ardour/audioengine.h>
+#include "ardour/configuration.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
+
+#ifdef HAVE_LIBLO
+#include "ardour/osc.h"
+#endif
 
 #include "ardour_ui.h"
 #include "actions.h"
 #include "gui_thread.h"
+#include "public_editor.h"
 
 #include "i18n.h"
 
@@ -42,45 +46,58 @@ using namespace sigc;
 void
 ARDOUR_UI::toggle_time_master ()
 {
-       ActionManager::toggle_config_state ("Transport", "ToggleTimeMaster", &Configuration::set_jack_time_master, &Configuration::get_jack_time_master);
+       ActionManager::toggle_config_state ("Transport", "ToggleTimeMaster", &RCConfiguration::set_jack_time_master, &RCConfiguration::get_jack_time_master);
 }
 
 void
 ARDOUR_UI::toggle_send_mtc ()
 {
-       ActionManager::toggle_config_state ("options", "SendMTC", &Configuration::set_send_mtc, &Configuration::get_send_mtc);
+       ActionManager::toggle_config_state ("options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc);
 }
 
 void
 ARDOUR_UI::toggle_send_mmc ()
 {
-       ActionManager::toggle_config_state ("options", "SendMMC", &Configuration::set_send_mmc, &Configuration::get_send_mmc);
+       ActionManager::toggle_config_state ("options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc);
+}
+
+void
+ARDOUR_UI::toggle_send_midi_clock ()
+{
+       ActionManager::toggle_config_state ("options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock);
 }
 
 void
 ARDOUR_UI::toggle_use_mmc ()
 {
-       ActionManager::toggle_config_state ("options", "UseMMC", &Configuration::set_mmc_control, &Configuration::get_mmc_control);
+       ActionManager::toggle_config_state ("options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
 }
 
 void
 ARDOUR_UI::toggle_use_osc ()
 {
-       ActionManager::toggle_config_state ("options", "UseOSC", &Configuration::set_use_osc, &Configuration::get_use_osc);
+       ActionManager::toggle_config_state ("options", "UseOSC", &RCConfiguration::set_use_osc, &RCConfiguration::get_use_osc);
 }
 
 void
-ARDOUR_UI::toggle_use_midi_control ()
+ARDOUR_UI::toggle_send_midi_feedback ()
 {
-       ActionManager::toggle_config_state ("options", "UseMIDIcontrol", &Configuration::set_midi_control, &Configuration::get_midi_control);
+       ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback);
 }
 
 void
-ARDOUR_UI::toggle_send_midi_feedback ()
+ARDOUR_UI::toggle_denormal_protection ()
 {
-       ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &Configuration::set_midi_feedback, &Configuration::get_midi_feedback);
+       ActionManager::toggle_config_state ("options", "DenormalProtection", &RCConfiguration::set_denormal_protection, &RCConfiguration::get_denormal_protection);
 }
 
+void
+ARDOUR_UI::toggle_only_copy_imported_files ()
+{
+       ActionManager::toggle_config_state ("options", "OnlyCopyImportedFiles", &RCConfiguration::set_only_copy_imported_files, &RCConfiguration::get_only_copy_imported_files);
+}
+
+
 void
 ARDOUR_UI::set_native_file_header_format (HeaderFormat hf)
 {
@@ -110,15 +127,15 @@ ARDOUR_UI::set_native_file_header_format (HeaderFormat hf)
                break;
        default:
                fatal << string_compose (_("programming error: %1"), "illegal file header format in ::set_native_file_header_format") << endmsg;
-               /*NOTREACHED*/  
+               /*NOTREACHED*/
        }
 
        Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
 
        if (act) {
                Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-               if (ract && ract->get_active() && Config->get_native_file_header_format() != hf) {
-                       Config->set_native_file_header_format (hf);
+               if (ract && ract->get_active() && session->config.get_native_file_header_format() != hf) {
+                       session->config.set_native_file_header_format (hf);
                }
        }
 }
@@ -135,6 +152,9 @@ ARDOUR_UI::set_native_file_data_format (SampleFormat sf)
        case FormatInt24:
                action = X_("FileDataFormat24bit");
                break;
+       case FormatInt16:
+               action = X_("FileDataFormat16bit");
+               break;
        default:
                fatal << string_compose (_("programming error: %1"), "illegal file data format in ::set_native_file_data_format") << endmsg;
                /*NOTREACHED*/
@@ -144,8 +164,8 @@ ARDOUR_UI::set_native_file_data_format (SampleFormat sf)
 
        if (act) {
                Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-               if (ract && ract->get_active() && Config->get_native_file_data_format() != sf) {
-                       Config->set_native_file_data_format (sf);
+               if (ract && ract->get_active() && session->config.get_native_file_data_format() != sf) {
+                       session->config.set_native_file_data_format (sf);
                }
        }
 }
@@ -154,7 +174,7 @@ void
 ARDOUR_UI::set_input_auto_connect (AutoConnectOption option)
 {
        const char* action;
-       
+
        switch (option) {
        case AutoConnectPhysical:
                action = X_("InputAutoConnectPhysical");
@@ -178,7 +198,7 @@ void
 ARDOUR_UI::set_output_auto_connect (AutoConnectOption option)
 {
        const char* action;
-       
+
        switch (option) {
        case AutoConnectPhysical:
                action = X_("OutputAutoConnectPhysical");
@@ -210,7 +230,7 @@ ARDOUR_UI::set_solo_model (SoloModel model)
        case SoloBus:
                action = X_("SoloViaBus");
                break;
-               
+
        case InverseMute:
                action = X_("SoloInPlace");
                break;
@@ -273,7 +293,7 @@ ARDOUR_UI::set_monitor_model (MonitorModel model)
        case HardwareMonitoring:
                action = X_("UseHardwareMonitoring");
                break;
-               
+
        case SoftwareMonitoring:
                action = X_("UseSoftwareMonitoring");
                break;
@@ -298,28 +318,67 @@ ARDOUR_UI::set_monitor_model (MonitorModel model)
 
 }
 
+void
+ARDOUR_UI::set_denormal_model (DenormalModel model)
+{
+       const char* action = 0;
+
+       switch (model) {
+       case DenormalNone:
+               action = X_("DenormalNone");
+               break;
+
+       case DenormalFTZ:
+               action = X_("DenormalFTZ");
+               break;
+
+       case DenormalDAZ:
+               action = X_("DenormalDAZ");
+               break;
+
+       case DenormalFTZDAZ:
+               action = X_("DenormalFTZDAZ");
+               break;
+
+       default:
+               fatal << string_compose (_("programming error: unknown denormal model in ARDOUR_UI::set_denormal_model: %1"), model) << endmsg;
+               /*NOTREACHED*/
+       }
+
+       Glib::RefPtr<Action> act = ActionManager::get_action ("options", action);
+
+       if (act) {
+               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
+
+               if (ract && ract->get_active() && Config->get_denormal_model() != model) {
+                       Config->set_denormal_model (model);
+               }
+       }
+
+}
+
 void
 ARDOUR_UI::toggle_auto_input ()
 {
-       ActionManager::toggle_config_state ("Transport", "ToggleAutoInput", &Configuration::set_auto_input, &Configuration::get_auto_input);
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::set_auto_input), mem_fun (session->config, &SessionConfiguration::get_auto_input));
 }
 
 void
 ARDOUR_UI::toggle_auto_play ()
 {
-       ActionManager::toggle_config_state ("Transport", "ToggleAutoPlay", &Configuration::set_auto_play, &Configuration::get_auto_play);
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoPlay", mem_fun (session->config, &SessionConfiguration::set_auto_play), mem_fun (session->config, &SessionConfiguration::get_auto_play));
 }
 
 void
 ARDOUR_UI::toggle_auto_return ()
 {
-       ActionManager::toggle_config_state ("Transport", "ToggleAutoReturn", &Configuration::set_auto_return, &Configuration::get_auto_return);
+       ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoReturn", mem_fun (session->config, &SessionConfiguration::set_auto_return), mem_fun (session->config, &SessionConfiguration::get_auto_return));
 }
 
 void
 ARDOUR_UI::toggle_click ()
 {
-       ActionManager::toggle_config_state ("Transport", "ToggleClick", &Configuration::set_clicking, &Configuration::get_clicking);
+       ActionManager::toggle_config_state ("Transport", "ToggleClick", &RCConfiguration::set_clicking, &RCConfiguration::get_clicking);
 }
 
 void
@@ -338,16 +397,62 @@ ARDOUR_UI::toggle_session_auto_loop ()
        }
 }
 
+void
+ARDOUR_UI::unset_dual_punch ()
+{
+       Glib::RefPtr<Action> action = ActionManager::get_action ("Transport", "TogglePunch");
+
+       if (action) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action);
+               if (tact) {
+                       ignore_dual_punch = true;
+                       tact->set_active (false);
+                       ignore_dual_punch = false;
+               }
+       }
+}
+
+void
+ARDOUR_UI::toggle_punch ()
+{
+       if (ignore_dual_punch) {
+               return;
+       }
+
+       Glib::RefPtr<Action> action = ActionManager::get_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 */
+
+               Glib::RefPtr<Action> in_action = ActionManager::get_action ("Transport", "TogglePunchIn");
+               Glib::RefPtr<Action> out_action = ActionManager::get_action ("Transport", "TogglePunchOut");
+
+               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
 ARDOUR_UI::toggle_punch_in ()
 {
-       ActionManager::toggle_config_state ("Transport", "TogglePunchIn", &Configuration::set_punch_in, &Configuration::get_punch_in);
+       ActionManager::toggle_config_state_foo ("Transport", "TogglePunchIn", mem_fun (session->config, &SessionConfiguration::set_punch_in), mem_fun (session->config, &SessionConfiguration::get_punch_in));
 }
 
 void
 ARDOUR_UI::toggle_punch_out ()
 {
-       ActionManager::toggle_config_state ("Transport", "TogglePunchOut", &Configuration::set_punch_out, &Configuration::get_punch_out);
+       ActionManager::toggle_config_state_foo ("Transport", "TogglePunchOut", mem_fun (session->config, &SessionConfiguration::set_punch_out), mem_fun (session->config, &SessionConfiguration::get_punch_out));
 }
 
 void
@@ -374,70 +479,149 @@ ARDOUR_UI::toggle_editing_space()
        }
 }
 
+void
+ARDOUR_UI::toggle_new_plugins_active ()
+{
+       ActionManager::toggle_config_state ("options", "NewPluginsActive", &RCConfiguration::set_new_plugins_active, &RCConfiguration::get_new_plugins_active);
+}
+
 void
 ARDOUR_UI::toggle_StopPluginsWithTransport()
 {
-       ActionManager::toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport, &Configuration::get_plugins_stop_with_transport);
+       ActionManager::toggle_config_state ("options", "StopPluginsWithTransport", &RCConfiguration::set_plugins_stop_with_transport, &RCConfiguration::get_plugins_stop_with_transport);
 }
 
 void
 ARDOUR_UI::toggle_LatchedRecordEnable()
 {
-       ActionManager::toggle_config_state ("options", "LatchedRecordEnable", &Configuration::set_latched_record_enable, &Configuration::get_latched_record_enable);
+       ActionManager::toggle_config_state ("options", "LatchedRecordEnable", &RCConfiguration::set_latched_record_enable, &RCConfiguration::get_latched_record_enable);
 }
 
 void
 ARDOUR_UI::toggle_RegionEquivalentsOverlap()
 {
-       ActionManager::toggle_config_state ("options", "RegionEquivalentsOverlap", &Configuration::set_use_overlap_equivalency, &Configuration::get_use_overlap_equivalency);
+       ActionManager::toggle_config_state ("options", "RegionEquivalentsOverlap", &RCConfiguration::set_use_overlap_equivalency, &RCConfiguration::get_use_overlap_equivalency);
 }
 
 void
 ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording()
 {
-       ActionManager::toggle_config_state ("options", "DoNotRunPluginsWhileRecording", &Configuration::set_do_not_record_plugins, &Configuration::get_do_not_record_plugins);
+       ActionManager::toggle_config_state ("options", "DoNotRunPluginsWhileRecording", &RCConfiguration::set_do_not_record_plugins, &RCConfiguration::get_do_not_record_plugins);
 }
 
 void
 ARDOUR_UI::toggle_VerifyRemoveLastCapture()
 {
-       ActionManager::toggle_config_state ("options", "VerifyRemoveLastCapture", &Configuration::set_verify_remove_last_capture, &Configuration::get_verify_remove_last_capture);
+       ActionManager::toggle_config_state ("options", "VerifyRemoveLastCapture", &RCConfiguration::set_verify_remove_last_capture, &RCConfiguration::get_verify_remove_last_capture);
+}
+
+void
+ARDOUR_UI::toggle_PeriodicSafetyBackups()
+{
+       ActionManager::toggle_config_state ("options", "PeriodicSafetyBackups", &RCConfiguration::set_periodic_safety_backups, &RCConfiguration::get_periodic_safety_backups);
 }
 
 void
 ARDOUR_UI::toggle_StopRecordingOnXrun()
 {
-       ActionManager::toggle_config_state ("options", "StopRecordingOnXrun", &Configuration::set_stop_recording_on_xrun, &Configuration::get_stop_recording_on_xrun);
+       ActionManager::toggle_config_state ("options", "StopRecordingOnXrun", &RCConfiguration::set_stop_recording_on_xrun, &RCConfiguration::get_stop_recording_on_xrun);
+}
+
+void
+ARDOUR_UI::toggle_CreateXrunMarker()
+{
+       ActionManager::toggle_config_state ("options", "CreateXrunMarker", &RCConfiguration::set_create_xrun_marker, &RCConfiguration::get_create_xrun_marker);
+}
+
+void
+ARDOUR_UI::toggle_sync_order_keys ()
+{
+       ActionManager::toggle_config_state ("options", "SyncEditorAndMixerTrackOrder", &RCConfiguration::set_sync_all_route_ordering, &RCConfiguration::get_sync_all_route_ordering);
 }
 
 void
 ARDOUR_UI::toggle_StopTransportAtEndOfSession()
 {
-       ActionManager::toggle_config_state ("options", "StopTransportAtEndOfSession", &Configuration::set_stop_at_session_end, &Configuration::get_stop_at_session_end);
+       ActionManager::toggle_config_state ("options", "StopTransportAtEndOfSession", &RCConfiguration::set_stop_at_session_end, &RCConfiguration::get_stop_at_session_end);
 }
 
 void
 ARDOUR_UI::toggle_GainReduceFastTransport()
 {
-       ActionManager::toggle_config_state ("options", "GainReduceFastTransport", &Configuration::set_quieten_at_speed, &Configuration::get_quieten_at_speed);
+       ActionManager::toggle_config_state ("options", "GainReduceFastTransport", &RCConfiguration::set_quieten_at_speed, &RCConfiguration::get_quieten_at_speed);
 }
 
 void
 ARDOUR_UI::toggle_LatchedSolo()
 {
-       ActionManager::toggle_config_state ("options", "LatchedSolo", &Configuration::set_solo_latched, &Configuration::get_solo_latched);
+       ActionManager::toggle_config_state ("options", "LatchedSolo", &RCConfiguration::set_solo_latched, &RCConfiguration::get_solo_latched);
 }
 
 void
 ARDOUR_UI::toggle_ShowSoloMutes()
 {
-       ActionManager::toggle_config_state ("options", "ShowSoloMutes", &Configuration::set_show_solo_mutes, &Configuration::get_show_solo_mutes);
+       ActionManager::toggle_config_state ("options", "ShowSoloMutes", &RCConfiguration::set_show_solo_mutes, &RCConfiguration::get_show_solo_mutes);
+}
+
+void
+ARDOUR_UI::toggle_SoloMuteOverride()
+{
+       ActionManager::toggle_config_state ("options", "SoloMuteOverride", &RCConfiguration::set_solo_mute_override, &RCConfiguration::get_solo_mute_override);
+}
+
+void
+ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor()
+{
+       ActionManager::toggle_config_state ("options", "PrimaryClockDeltaEditCursor", &RCConfiguration::set_primary_clock_delta_edit_cursor, &RCConfiguration::get_primary_clock_delta_edit_cursor);
+}
+
+void
+ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor()
+{
+       ActionManager::toggle_config_state ("options", "SecondaryClockDeltaEditCursor", &RCConfiguration::set_secondary_clock_delta_edit_cursor, &RCConfiguration::get_secondary_clock_delta_edit_cursor);
+}
+
+void
+ARDOUR_UI::toggle_ShowTrackMeters()
+{
+       ActionManager::toggle_config_state ("options", "ShowTrackMeters", &RCConfiguration::set_show_track_meters, &RCConfiguration::get_show_track_meters);
+}
+
+void
+ARDOUR_UI::toggle_TapeMachineMode ()
+{
+       ActionManager::toggle_config_state ("options", "ToggleTapeMachineMode", &RCConfiguration::set_tape_machine_mode, &RCConfiguration::get_tape_machine_mode);
+}
+
+void
+ARDOUR_UI::toggle_use_narrow_ms()
+{
+       ActionManager::toggle_config_state ("options", "DefaultNarrowMS", &RCConfiguration::set_default_narrow_ms, &RCConfiguration::get_default_narrow_ms);
+}
+
+void
+ARDOUR_UI::toggle_NameNewMarkers()
+{
+       ActionManager::toggle_config_state ("options", "NameNewMarkers", &RCConfiguration::set_name_new_markers, &RCConfiguration::get_name_new_markers);
+}
+
+void
+ARDOUR_UI::toggle_rubberbanding_snaps_to_grid ()
+{
+       ActionManager::toggle_config_state ("options", "RubberbandingSnapsToGrid", &RCConfiguration::set_rubberbanding_snaps_to_grid, &RCConfiguration::get_rubberbanding_snaps_to_grid);
+}
+
+void
+ARDOUR_UI::toggle_auto_analyse_audio ()
+{
+       ActionManager::toggle_config_state ("options", "AutoAnalyseAudio", &RCConfiguration::set_auto_analyse_audio, &RCConfiguration::get_auto_analyse_audio);
 }
 
 void
 ARDOUR_UI::mtc_port_changed ()
 {
        bool have_mtc;
+       bool have_midi_clock;
 
        if (session) {
                if (session->mtc_port()) {
@@ -445,8 +629,14 @@ ARDOUR_UI::mtc_port_changed ()
                } else {
                        have_mtc = false;
                }
+               if (session->midi_clock_port()) {
+                       have_midi_clock = true;
+               } else {
+                       have_midi_clock = false;
+               }
        } else {
                have_mtc = false;
+               have_midi_clock = false;
        }
 
        positional_sync_strings.clear ();
@@ -454,8 +644,11 @@ ARDOUR_UI::mtc_port_changed ()
        if (have_mtc) {
                positional_sync_strings.push_back (slave_source_to_string (MTC));
        }
+       if (have_midi_clock) {
+               positional_sync_strings.push_back (slave_source_to_string (MIDIClock));
+       }
        positional_sync_strings.push_back (slave_source_to_string (JACK));
-       
+
        set_popdown_strings (sync_option_combo, positional_sync_strings);
 }
 
@@ -516,6 +709,49 @@ ARDOUR_UI::map_monitor_model ()
        }
 }
 
+void
+ARDOUR_UI::map_denormal_protection ()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action ("options", X_("DenormalProtection"));
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+
+               if (tact && !tact->get_active()) {
+                       tact->set_active (Config->get_denormal_protection());
+               }
+       }
+}
+
+void
+ARDOUR_UI::map_denormal_model ()
+{
+       const char* on = 0;
+
+       switch (Config->get_denormal_model()) {
+       case DenormalNone:
+               on = X_("DenormalNone");
+               break;
+       case DenormalFTZ:
+               on = X_("DenormalFTZ");
+               break;
+       case DenormalDAZ:
+               on = X_("DenormalDAZ");
+               break;
+       case DenormalFTZDAZ:
+               on = X_("DenormalFTZDAZ");
+               break;
+       }
+
+       Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+
+               if (tact && !tact->get_active()) {
+                       tact->set_active (true);
+               }
+       }
+}
+
 void
 ARDOUR_UI::map_remote_model ()
 {
@@ -548,7 +784,7 @@ ARDOUR_UI::map_file_header_format ()
 {
        const char* action = 0;
 
-       switch (Config->get_native_file_header_format()) {
+       switch (session->config.get_native_file_header_format()) {
        case BWF:
                action = X_("FileHeaderFormatBWF");
                break;
@@ -574,8 +810,8 @@ ARDOUR_UI::map_file_header_format ()
                break;
 
        default:
-               fatal << string_compose (_("programming error: unknown file header format passed to ARDOUR_UI::map_file_data_format: %1"), 
-                                        Config->get_native_file_header_format()) << endmsg;
+               fatal << string_compose (_("programming error: unknown file header format passed to ARDOUR_UI::map_file_data_format: %1"),
+                                        session->config.get_native_file_header_format()) << endmsg;
                /*NOTREACHED*/
        }
 
@@ -596,7 +832,7 @@ ARDOUR_UI::map_file_data_format ()
 {
        const char* action = 0;
 
-       switch (Config->get_native_file_data_format()) {
+       switch (session->config.get_native_file_data_format()) {
        case FormatFloat:
                action = X_("FileDataFormatFloat");
                break;
@@ -605,9 +841,13 @@ ARDOUR_UI::map_file_data_format ()
                action = X_("FileDataFormat24bit");
                break;
 
+       case FormatInt16:
+               action = X_("FileDataFormat16bit");
+               break;
+
        default:
-               fatal << string_compose (_("programming error: unknown file data format passed to ARDOUR_UI::map_file_data_format: %1"), 
-                                        Config->get_native_file_data_format()) << endmsg;
+               fatal << string_compose (_("programming error: unknown file data format passed to ARDOUR_UI::map_file_data_format: %1"),
+                                        session->config.get_native_file_data_format()) << endmsg;
                /*NOTREACHED*/
        }
 
@@ -660,13 +900,28 @@ ARDOUR_UI::map_output_auto_connect ()
        Glib::RefPtr<Action> act = ActionManager::get_action ("options", on);
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               
+
                if (tact && !tact->get_active()) {
                        tact->set_active (true);
                }
        }
 }
 
+void
+ARDOUR_UI::map_only_copy_imported_files ()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action ("options", X_("OnlyCopyImportedFiles"));
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+
+               if (tact && !tact->get_active()) {
+                       tact->set_active (Config->get_only_copy_imported_files());
+               }
+       }
+
+}
+
+
 void
 ARDOUR_UI::map_meter_falloff ()
 {
@@ -744,7 +999,7 @@ ARDOUR_UI::map_meter_hold ()
        }
 }
 
-void 
+void
 ARDOUR_UI::set_meter_hold (MeterHold val)
 {
        const char* action = 0;
@@ -768,7 +1023,7 @@ ARDOUR_UI::set_meter_hold (MeterHold val)
        }
 
        Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action);
-       
+
        if (act) {
                Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
                if (ract && ract->get_active() && Config->get_meter_hold() != fval) {
@@ -825,11 +1080,11 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
        ENSURE_GUI_THREAD (bind (mem_fun (*this, &ARDOUR_UI::parameter_changed), parameter_name));
 
 #define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-       
+
        if (PARAM_IS ("slave-source")) {
 
                sync_option_combo.set_active_text (slave_source_to_string (Config->get_slave_source()));
-               
+
                switch (Config->get_slave_source()) {
                case None:
                        ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (true);
@@ -845,11 +1100,11 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
 
        } else if (PARAM_IS ("send-mtc")) {
 
-               ActionManager::map_some_state ("options", "SendMTC", &Configuration::get_send_mtc);
+               ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc);
 
        } else if (PARAM_IS ("send-mmc")) {
 
-               ActionManager::map_some_state ("options", "SendMMC", &Configuration::get_send_mmc);
+               ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc);
 
        } else if (PARAM_IS ("use-osc")) {
 
@@ -861,56 +1116,76 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                }
 #endif
 
-               ActionManager::map_some_state ("options", "UseOSC", &Configuration::get_use_osc);
-               
+               ActionManager::map_some_state ("options", "UseOSC", &RCConfiguration::get_use_osc);
+
        } else if (PARAM_IS ("mmc-control")) {
-               ActionManager::map_some_state ("options", "UseMMC", &Configuration::get_mmc_control);
+               ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control);
        } else if (PARAM_IS ("midi-feedback")) {
-               ActionManager::map_some_state ("options", "SendMIDIfeedback", &Configuration::get_midi_feedback);
-       } else if (PARAM_IS ("midi-control")) {
-               ActionManager::map_some_state ("options", "UseMIDIcontrol", &Configuration::get_midi_control);
+               ActionManager::map_some_state ("options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback);
        } else if (PARAM_IS ("do-not-record-plugins")) {
-               ActionManager::map_some_state ("options", "DoNotRunPluginsWhileRecording", &Configuration::get_do_not_record_plugins);
+               ActionManager::map_some_state ("options", "DoNotRunPluginsWhileRecording", &RCConfiguration::get_do_not_record_plugins);
        } else if (PARAM_IS ("latched-record-enable")) {
-               ActionManager::map_some_state ("options", "LatchedRecordEnable", &Configuration::get_latched_record_enable);
+               ActionManager::map_some_state ("options", "LatchedRecordEnable", &RCConfiguration::get_latched_record_enable);
        } else if (PARAM_IS ("solo-latched")) {
-               ActionManager::map_some_state ("options", "LatchedSolo", &Configuration::get_solo_latched);
+               ActionManager::map_some_state ("options", "LatchedSolo", &RCConfiguration::get_solo_latched);
        } else if (PARAM_IS ("show-solo-mutes")) {
-               ActionManager::map_some_state ("options", "ShowSoloMutes", &Configuration::get_show_solo_mutes);
+               ActionManager::map_some_state ("options", "ShowSoloMutes", &RCConfiguration::get_show_solo_mutes);
+       } else if (PARAM_IS ("solo-mute-override")) {
+               ActionManager::map_some_state ("options", "SoloMuteOverride", &RCConfiguration::get_solo_mute_override);
        } else if (PARAM_IS ("solo-model")) {
                map_solo_model ();
        } else if (PARAM_IS ("auto-play")) {
-               ActionManager::map_some_state ("Transport", "ToggleAutoPlay", &Configuration::get_auto_play);
+               ActionManager::map_some_state ("Transport", "ToggleAutoPlay", mem_fun (session->config, &SessionConfiguration::get_auto_play));
        } else if (PARAM_IS ("auto-return")) {
-               ActionManager::map_some_state ("Transport", "ToggleAutoReturn", &Configuration::get_auto_return);
+               ActionManager::map_some_state ("Transport", "ToggleAutoReturn", mem_fun (session->config, &SessionConfiguration::get_auto_return));
        } else if (PARAM_IS ("auto-input")) {
-               ActionManager::map_some_state ("Transport", "ToggleAutoInput", &Configuration::get_auto_input);
+               ActionManager::map_some_state ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::get_auto_input));
+       } else if (PARAM_IS ("tape-machine-mode")) {
+               ActionManager::map_some_state ("options", "ToggleTapeMachineMode", &RCConfiguration::get_tape_machine_mode);
        } else if (PARAM_IS ("punch-out")) {
-               ActionManager::map_some_state ("Transport", "TogglePunchOut", &Configuration::get_punch_out);
+               ActionManager::map_some_state ("Transport", "TogglePunchOut", mem_fun (session->config, &SessionConfiguration::get_punch_out));
+               if (!session->config.get_punch_out()) {
+                       unset_dual_punch ();
+               }
        } else if (PARAM_IS ("punch-in")) {
-               ActionManager::map_some_state ("Transport", "TogglePunchIn", &Configuration::get_punch_in);
+               ActionManager::map_some_state ("Transport", "TogglePunchIn", mem_fun (session->config, &SessionConfiguration::get_punch_in));
+               if (!session->config.get_punch_in()) {
+                       unset_dual_punch ();
+               }
        } else if (PARAM_IS ("clicking")) {
-               ActionManager::map_some_state ("Transport", "ToggleClick", &Configuration::get_clicking);
+               ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking);
        } else if (PARAM_IS ("jack-time-master")) {
-               ActionManager::map_some_state ("Transport",  "ToggleTimeMaster", &Configuration::get_jack_time_master);
+               ActionManager::map_some_state ("Transport",  "ToggleTimeMaster", &RCConfiguration::get_jack_time_master);
        } else if (PARAM_IS ("plugins-stop-with-transport")) {
-               ActionManager::map_some_state ("options",  "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport);
+               ActionManager::map_some_state ("options",  "StopPluginsWithTransport", &RCConfiguration::get_plugins_stop_with_transport);
+       } else if (PARAM_IS ("new-plugins-active")) {
+               ActionManager::map_some_state ("options",  "NewPluginsActive", &RCConfiguration::get_new_plugins_active);
        } else if (PARAM_IS ("latched-record-enable")) {
-               ActionManager::map_some_state ("options", "LatchedRecordEnable", &Configuration::get_latched_record_enable);
+               ActionManager::map_some_state ("options", "LatchedRecordEnable", &RCConfiguration::get_latched_record_enable);
        } else if (PARAM_IS ("verify-remove-last-capture")) {
-               ActionManager::map_some_state ("options",  "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture);
+               ActionManager::map_some_state ("options",  "VerifyRemoveLastCapture", &RCConfiguration::get_verify_remove_last_capture);
+       } else if (PARAM_IS ("periodic-safety-backups")) {
+               ActionManager::map_some_state ("options",  "PeriodicSafetyBackups", &RCConfiguration::get_periodic_safety_backups);
        } else if (PARAM_IS ("stop-recording-on-xrun")) {
-               ActionManager::map_some_state ("options",  "StopRecordingOnXrun", &Configuration::get_stop_recording_on_xrun);
+               ActionManager::map_some_state ("options",  "StopRecordingOnXrun", &RCConfiguration::get_stop_recording_on_xrun);
+       } else if (PARAM_IS ("create-xrun-marker")) {
+               ActionManager::map_some_state ("options",  "CreateXrunMarker", &RCConfiguration::get_create_xrun_marker);
+       } else if (PARAM_IS ("sync-all-route-ordering")) {
+               ActionManager::map_some_state ("options",  "SyncEditorAndMixerTrackOrder", &RCConfiguration::get_sync_all_route_ordering);
        } else if (PARAM_IS ("stop-at-session-end")) {
-               ActionManager::map_some_state ("options",  "StopTransportAtEndOfSession", &Configuration::get_stop_at_session_end);
+               ActionManager::map_some_state ("options",  "StopTransportAtEndOfSession", &RCConfiguration::get_stop_at_session_end);
        } else if (PARAM_IS ("monitoring-model")) {
                map_monitor_model ();
+       } else if (PARAM_IS ("denormal-model")) {
+               map_denormal_model ();
+       } else if (PARAM_IS ("denormal-protection")) {
+               map_denormal_protection ();
        } else if (PARAM_IS ("remote-model")) {
                map_remote_model ();
        } else if (PARAM_IS ("use-video-sync")) {
-               ActionManager::map_some_state ("Transport",  "ToggleVideoSync", &Configuration::get_use_video_sync);
+               ActionManager::map_some_state ("Transport",  "ToggleVideoSync", &RCConfiguration::get_use_video_sync);
        } else if (PARAM_IS ("quieten-at-speed")) {
-               ActionManager::map_some_state ("options",  "GainReduceFastTransport", &Configuration::get_quieten_at_speed);
+               ActionManager::map_some_state ("options",  "GainReduceFastTransport", &RCConfiguration::get_quieten_at_speed);
        } else if (PARAM_IS ("shuttle-behaviour")) {
 
                switch (Config->get_shuttle_behaviour ()) {
@@ -931,7 +1206,7 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                }
 
        } else if (PARAM_IS ("shuttle-units")) {
-               
+
                switch (Config->get_shuttle_units()) {
                case Percentage:
                        shuttle_units_button.set_label("% ");
@@ -952,8 +1227,6 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                map_meter_hold ();
        } else if (PARAM_IS ("meter-falloff")) {
                map_meter_falloff ();
-       } else if (PARAM_IS ("verify-remove-last-capture")) {
-               ActionManager::map_some_state ("options", "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture);
        } else if (PARAM_IS ("video-pullup") || PARAM_IS ("smpte-format")) {
                if (session) {
                        primary_clock.set (session->audible_frame(), true);
@@ -963,9 +1236,23 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
                        secondary_clock.set (0, true);
                }
        } else if (PARAM_IS ("use-overlap-equivalency")) {
-               ActionManager::map_some_state ("options", "RegionEquivalentsOverlap", &Configuration::get_use_overlap_equivalency);
+               ActionManager::map_some_state ("options", "RegionEquivalentsOverlap", &RCConfiguration::get_use_overlap_equivalency);
+       } else if (PARAM_IS ("primary-clock-delta-edit-cursor")) {
+               ActionManager::map_some_state ("options",  "PrimaryClockDeltaEditCursor", &RCConfiguration::get_primary_clock_delta_edit_cursor);
+       } else if (PARAM_IS ("secondary-clock-delta-edit-cursor")) {
+               ActionManager::map_some_state ("options",  "SecondaryClockDeltaEditCursor", &RCConfiguration::get_secondary_clock_delta_edit_cursor);
+       } else if (PARAM_IS ("only-copy-imported-files")) {
+               map_only_copy_imported_files ();
+       } else if (PARAM_IS ("show-track-meters")) {
+               ActionManager::map_some_state ("options",  "ShowTrackMeters", &RCConfiguration::get_show_track_meters);
+               editor->toggle_meter_updating();
+       } else if (PARAM_IS ("default-narrow_ms")) {
+               ActionManager::map_some_state ("options",  "DefaultNarrowMS", &RCConfiguration::get_default_narrow_ms);
+       } else if (PARAM_IS ("rubberbanding-snaps-to-grid")) {
+               ActionManager::map_some_state ("options", "RubberbandingSnapsToGrid", &RCConfiguration::get_rubberbanding_snaps_to_grid);
        }
-                          
+
+
 
 #undef PARAM_IS
 }