allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

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

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@251 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sampo Savolainen
2006-01-09 17:40:00 +00:00
parent b5e4144156
commit cf70254127
8 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour-menus.xml
View File

@@ -187,7 +187,7 @@
<menuitem action='UseMIDIcontrol'/>
<separator/>
<menuitem action='StopPluginsWithTransport'/>
<menuitem action='RunPluginsWhileRecording'/>
<menuitem action='DoNotRunPluginsWhileRecording'/>
<separator/>
<menuitem action='VerifyRemoveLastCapture'/>
<menuitem action='StopRecordingOnXrun'/>

2
gtk2_ardour/ardour_ui.h
View File

@@ -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();

2
gtk2_ardour/ardour_ui_ed.cc
View File

@@ -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));

6
gtk2_ardour/ardour_ui_options.cc
View File

@@ -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:

6
libs/ardour/ardour/session.h
View File

@@ -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 */

2
libs/ardour/audio_track.cc
View File

@@ -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 */

6
libs/ardour/session.cc
View File

@@ -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);
}

14
libs/ardour/session_state.cc
View File

@@ -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");