diff options
| author | Sampo Savolainen <v2@iki.fi> | 2006-10-08 19:27:33 +0000 |
|---|---|---|
| committer | Sampo Savolainen <v2@iki.fi> | 2006-10-08 19:27:33 +0000 |
| commit | af441a832e5c338348cd0e7917b7e4b1dc26eb7b (patch) | |
| tree | ceecf2f244e6d0fd5dba0cfe334d94aec519a03f | |
| parent | f24e8e9e5608480b1447aec16c0140bd15f72bf3 (diff) | |
Fix speed quietning to respect the current setting.
git-svn-id: svn://localhost/ardour2/trunk@957 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 12 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 64f4dcfc85..3674998189 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -367,15 +367,7 @@ ARDOUR_UI::toggle_StopTransportAtEndOfSession() void ARDOUR_UI::toggle_GainReduceFastTransport() { - Glib::RefPtr<Action> act = ActionManager::get_action ("options", "GainReduceFastTransport"); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - if (tact->get_active()) { - Config->set_quieten_at_speed (0.251189); // -12dB reduction for ffwd or rewind - } else { - Config->set_quieten_at_speed (1.0); /* no change */ - } - } + ActionManager::toggle_config_state ("options", "GainReduceFastTransport", &Configuration::set_quieten_at_speed, &Configuration::get_quieten_at_speed); } void @@ -748,7 +740,7 @@ void ARDOUR_UI::parameter_changed (const char* 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())); diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 70a5d586a0..15b148ffb3 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -627,7 +627,9 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs, } else { - if (_session.transport_speed() > 1.5f || _session.transport_speed() < -1.5f) { + if ((_session.transport_speed() > 1.5f || + _session.transport_speed() < -1.5f) && + Config->get_quieten_at_speed()) { pan (bufs, nbufs, nframes, offset, speed_quietning); } else { // cerr << _name << " panner state = " << _panner->automation_state() << endl; |