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

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

4 files changed, 17 insertions, 11 deletions

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 775dbc8ea9..2bdd99c614 100644
--- 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 1a2137ea6f..402ef7bfd9 100644
--- 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 63439bf969..bcc7c13bb5 100644
--- 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 f22fc6f5d8..d580680f63 100644
--- 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");