"Run plugins while recording" -> "Do not run plugins while recording"

git-svn-id: svn://localhost/trunk/ardour2@251 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour-menus.xml b/gtk2_ardour/ardour-menus.xml
index 9e1f7c91bf282dfc87102728b5d3bee5dfd4ee13..8478abe789cc43666d1620b74b20c92ab277c8b6 100644 (file)
--- a/gtk2_ardour/ardour-menus.xml
+++ b/gtk2_ardour/ardour-menus.xml
@@ -187,7 +187,7 @@
                <menuitem action='UseMIDIcontrol'/>
                <separator/>
                <menuitem action='StopPluginsWithTransport'/>
-               <menuitem action='RunPluginsWhileRecording'/>
+               <menuitem action='DoNotRunPluginsWhileRecording'/>
                <separator/>
                <menuitem action='VerifyRemoveLastCapture'/>
                <menuitem action='StopRecordingOnXrun'/>

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 2b6cf1f565e71c312a12f182694596ae5daa0a43..e5f7f4d96e8e124b4bc97f791bed6d8ada18c15e 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -681,7 +681,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void toggle_UseSoftwareMonitoring();
        void toggle_UseExternalMonitoring();
        void toggle_StopPluginsWithTransport();
-       void toggle_RunPluginsWhileRecording();
+       void toggle_DoNotRunPluginsWhileRecording();
        void toggle_VerifyRemoveLastCapture();
        void toggle_StopRecordingOnXrun();
        void toggle_StopTransportAtEndOfSession();

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index e2e24f5bd844b4e2e4482820b45aba8858b78117..d10683ec9ed227607fe355fb54e76d2f41e9ee13 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -378,7 +378,7 @@ ARDOUR_UI::install_actions ()
 
        act = ActionManager::register_toggle_action (option_actions, X_("StopPluginsWithTransport"), _("Stop plugins with transport"), mem_fun (*this, &ARDOUR_UI::toggle_StopPluginsWithTransport));
        ActionManager::session_sensitive_actions.push_back (act);
-       act = ActionManager::register_toggle_action (option_actions, X_("RunPluginsWhileRecording"), _("Run plugins while recording"), mem_fun (*this, &ARDOUR_UI::toggle_RunPluginsWhileRecording));
+       act = ActionManager::register_toggle_action (option_actions, X_("DoNotRunPluginsWhileRecording"), _("Do not run plugins while recording"), mem_fun (*this, &ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording));
        ActionManager::session_sensitive_actions.push_back (act);
        
        act = ActionManager::register_toggle_action (option_actions, X_("VerifyRemoveLastCapture"), _("Verify remove last capture"), mem_fun (*this, &ARDOUR_UI::toggle_VerifyRemoveLastCapture));

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index a45a820c8ec11c74c0b9b8d09578207428780a5a..5a15bd7de3b9b5c8b42a580b7f5e6d97decec036 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -240,9 +240,9 @@ ARDOUR_UI::toggle_StopPluginsWithTransport()
        toggle_config_state ("options", "StopPluginsWithTransport", &Configuration::set_plugins_stop_with_transport);
 }
 void
-ARDOUR_UI::toggle_RunPluginsWhileRecording()
+ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording()
 {
-       toggle_session_state ("options", "RunPluginsWhileRecording", &Session::set_recording_plugins, &Session::get_recording_plugins);
+       toggle_session_state ("options", "DoNotRunPluginsWhileRecording", &Session::set_do_not_record_plugins, &Session::get_do_not_record_plugins);
 }
 
 void
@@ -438,7 +438,7 @@ ARDOUR_UI::session_control_changed (Session::ControlType t)
                break;
 
        case Session::RecordingPlugins:
-               map_some_session_state ("options", "RunPluginsWhileRecording", &Session::get_recording_plugins);
+               map_some_session_state ("options", "DoNotRunPluginsWhileRecording", &Session::get_do_not_record_plugins);
                break;
 
        case Session::CrossFadesActive:

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 775dbc8ea9a25c3b41a02f83aa8a17c1f355a97f..2bdd99c614c208001a4c47c59bbdcf499afa0ffd 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -422,7 +422,7 @@ class Session : public sigc::trackable, public Stateful
        void set_mmc_control (bool yn);
        void set_midi_feedback (bool yn);
        void set_midi_control (bool yn);
-       void set_recording_plugins (bool yn);
+       void set_do_not_record_plugins (bool yn);
        void set_crossfades_active (bool yn);
        void set_seamless_loop (bool yn);
 
@@ -439,7 +439,7 @@ class Session : public sigc::trackable, public Stateful
        bool get_mmc_control () const;
        bool get_midi_feedback () const;
        bool get_midi_control () const;
-       bool get_recording_plugins () const { return recording_plugins; }
+       bool get_do_not_record_plugins () const { return do_not_record_plugins; }
        bool get_crossfades_active () const { return crossfades_active; }
 
        bool get_input_auto_connect () const;
@@ -1092,7 +1092,7 @@ class Session : public sigc::trackable, public Stateful
        MIDI::Port*             _midi_port;
        string                  _path;
        string                  _name;
-       bool                     recording_plugins;
+       bool                     do_not_record_plugins;
 
        /* toggles */
 

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 1a2137ea6f53d8a9ba924b39472bb92184754c56..402ef7bfd9bd5a648c6403b91f8b1359a799d398 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -688,7 +688,7 @@ AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nfram
                        }
                }
 
-               process_output_buffers (bufs, limit, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || _session.get_recording_plugins()), declick, (_meter_point != MeterInput));
+               process_output_buffers (bufs, limit, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || !_session.get_do_not_record_plugins()), declick, (_meter_point != MeterInput));
                
        } else {
                /* problem with the diskstream; just be quiet for a bit */

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 63439bf96918a04101fc35591a1dfa283c9ef55d..bcc7c13bb5302d477c9647a10122a94f99405f1f 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -920,10 +920,10 @@ Session::set_crossfades_active (bool yn)
 }
 
 void
-Session::set_recording_plugins (bool yn)
+Session::set_do_not_record_plugins (bool yn)
 {
-       if (recording_plugins != yn) {
-               recording_plugins = yn; 
+       if (do_not_record_plugins != yn) {
+               do_not_record_plugins = yn; 
                set_dirty ();
                ControlChanged (RecordingPlugins); 
        }

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index f22fc6f5d896dec901070fb772d07a01ce5565bb..d580680f637d077e41a6e99a88b01bf526d5251a 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -230,7 +230,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 
        /* default configuration */
 
-       recording_plugins = false;
+       do_not_record_plugins = false;
        over_length_short = 2;
        over_length_long = 10;
        send_midi_timecode = false;
@@ -971,9 +971,15 @@ Session::load_options (const XMLNode& node)
                        set_midi_feedback (prop->value() == "yes");
                }
        }
+       // Legacy support for <recording-plugins>
        if ((child = find_named_node (node, "recording-plugins")) != 0) {
                if ((prop = child->property ("val")) != 0) {
-                       set_recording_plugins (prop->value() == "yes");
+                       set_do_not_record_plugins (prop->value() == "no");
+               }
+       }
+       if ((child = find_named_node (node, "do-not-record-plugins")) != 0) {
+               if ((prop = child->property ("val")) != 0) {
+                       set_do_not_record_plugins (prop->value() == "yes");
                }
        }
        if ((child = find_named_node (node, "crossfades-active")) != 0) {
@@ -1166,8 +1172,8 @@ Session::get_options () const
        child->add_property ("val", get_midi_control () ? "yes" : "no");
        child = opthead->add_child ("midi-feedback");
        child->add_property ("val", get_midi_feedback () ? "yes" : "no");
-       child = opthead->add_child ("recording-plugins");
-       child->add_property ("val", get_recording_plugins () ? "yes" : "no");
+       child = opthead->add_child ("do-not-record-plugins");
+       child->add_property ("val", get_do_not_record_plugins () ? "yes" : "no");
        child = opthead->add_child ("auto-crossfade");
        child->add_property ("val", get_crossfades_active () ? "yes" : "no");
        child = opthead->add_child ("audible-click");