From df8b8d7ba640096fb9a1e690601b8deeff118c30 Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Sun, 17 Feb 2008 15:32:29 +0000 Subject: [PATCH] Fix for last commit where rec enable state was not considered. Change adat option name to Tape Machine Mode and make it default to off. git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3077 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour.menus | 2 +- gtk2_ardour/ardour_ui.h | 2 +- gtk2_ardour/ardour_ui_ed.cc | 2 +- gtk2_ardour/ardour_ui_options.cc | 8 ++++---- libs/ardour/ardour/configuration_vars.h | 2 +- libs/ardour/audio_track.cc | 4 ++-- manual/xml/setting_up_to_record.xml | 23 ++++++++++++----------- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index 136e870e33..04038cf095 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -370,7 +370,7 @@ - + diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index f25088bca6..6b076e2712 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -720,7 +720,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI void toggle_ShowTrackMeters (); void toggle_use_narrow_ms(); void toggle_rubberbanding_snaps_to_grid (); - void toggle_AdatMonitorMode(); + void toggle_TapeMachineMode(); void mtc_port_changed (); void map_solo_model (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index f388fa3681..1a26d962e4 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -414,7 +414,7 @@ ARDOUR_UI::install_actions () #ifndef HAVE_LIBLO act->set_sensitive (false); #endif - act = ActionManager::register_toggle_action (option_actions, X_("ToggleAdatMonitorMode"), _("ADAT Monitor mode"), mem_fun (*this, &ARDOUR_UI::toggle_AdatMonitorMode)); + act = ActionManager::register_toggle_action (option_actions, X_("ToggleTapeMachineMode"), _("Tape Machine mode"), mem_fun (*this, &ARDOUR_UI::toggle_TapeMachineMode)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::register_toggle_action (option_actions, X_("SyncEditorAndMixerTrackOrder"), _("Sync Editor and Mixer track order"), mem_fun (*this, &ARDOUR_UI::toggle_sync_order_keys)); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 55cb920e87..4cd01152b2 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -520,9 +520,9 @@ ARDOUR_UI::toggle_ShowTrackMeters() } void -ARDOUR_UI::toggle_AdatMonitorMode () +ARDOUR_UI::toggle_TapeMachineMode () { - ActionManager::toggle_config_state ("options", "ToggleAdatMonitorMode", &Configuration::set_adat_monitor_mode, &Configuration::get_adat_monitor_mode); + ActionManager::toggle_config_state ("options", "ToggleTapeMachineMode", &Configuration::set_tape_machine_mode, &Configuration::get_tape_machine_mode); } void @@ -1047,8 +1047,8 @@ ARDOUR_UI::parameter_changed (const char* parameter_name) ActionManager::map_some_state ("Transport", "ToggleAutoReturn", &Configuration::get_auto_return); } else if (PARAM_IS ("auto-input")) { ActionManager::map_some_state ("Transport", "ToggleAutoInput", &Configuration::get_auto_input); - } else if (PARAM_IS ("adat-monitor-mode")) { - ActionManager::map_some_state ("options", "ToggleAdatMonitorMode", &Configuration::get_adat_monitor_mode); + } else if (PARAM_IS ("tape-machine-mode")) { + ActionManager::map_some_state ("options", "ToggleTapeMachineMode", &Configuration::get_tape_machine_mode); } else if (PARAM_IS ("punch-out")) { ActionManager::map_some_state ("Transport", "TogglePunchOut", &Configuration::get_punch_out); } else if (PARAM_IS ("punch-in")) { diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index 3d00a1f9b8..0ca7036270 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -88,7 +88,7 @@ CONFIG_VARIABLE (bool, solo_latched, "solo-latched", true) CONFIG_VARIABLE (bool, latched_record_enable, "latched-record-enable", false) CONFIG_VARIABLE (bool, all_safe, "all-safe", false) CONFIG_VARIABLE (bool, show_solo_mutes, "show-solo-mutes", false) -CONFIG_VARIABLE (bool, adat_monitor_mode, "adat-monitor-mode", true) +CONFIG_VARIABLE (bool, tape_machine_mode, "tape-machine-mode", false) /* click */ diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index e5a67bcb1f..2b4f38c070 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -477,12 +477,12 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra send_silence = true; } else { - if (Config->get_adat_monitor_mode()) { + if (!Config->get_tape_machine_mode()) { /* ADATs work in a strange way.. they monitor input always when stopped.and auto-input is engaged. */ - if (Config->get_monitoring_model() == SoftwareMonitoring && Config->get_auto_input()) { + if ((Config->get_monitoring_model() == SoftwareMonitoring) && (Config->get_auto_input () || _diskstream->record_enabled())) { send_silence = false; } else { send_silence = true; diff --git a/manual/xml/setting_up_to_record.xml b/manual/xml/setting_up_to_record.xml index aac7cd2818..5891ef2b71 100644 --- a/manual/xml/setting_up_to_record.xml +++ b/manual/xml/setting_up_to_record.xml @@ -90,21 +90,22 @@
- ADAT Monitor Mode + Tape Machine Mode Nearly all traditional tape recorders use the same monitoring model. Normally only tracks that are record-enabled will monitor input with the transport stopped. - ADAT machines switch all tracks to input on stop when auto-input is enabled, - regardless of record-enable state.. - ADAT monitor mode emulates this behaviour. - Be warned that many tracks sharing the same input (in software monitoring mode) - will sum that input through the master buss (potentially including several plugins) - whenever the transport is stopped. Since setting up a sound - usually involves listening to the input with the transport stopped, you might not be - hearing the sound you are about to record! - Using this mode can also lead to surprising acoustic feedback. - ADAT Monitor Mode is on by default. + Tape machine mode emulates this behaviour. + Some simpler machines (like a famous product by Alesis) switch all tracks to + input on stop when auto-input is enabled, regardless of record-enable state. + Disabling Tape Machine Mode switches to a behaviour that mimics this type of recorder. + Be warned that if you disable Tape Machine Mode, many tracks sharing the same input + (in software monitoring mode) will sum that input through the master buss + (potentially including several plugins) whenever the transport is stopped. + Since setting up a sound usually involves listening to the input with the transport + stopped, you might not be hearing the sound you are about to record! + Disabling this mode can also lead to surprising acoustic feedback. + Tape Machine Mode is off by default.
-- 2.30.2