summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-04-25 15:30:14 +0000
committerCarl Hetherington <carl@carlh.net>2010-04-25 15:30:14 +0000
commit990f3391ad292e5135020d3916094acfa8c2056b (patch)
tree799aa2fab83c62cbe4dca6983a219e64d5521050
parentf29c96c1888692cbd35299cdfd77302b0c4ea0a8 (diff)
Make attenutation during fast forward/rewind configurable again. Fixes #3089.
git-svn-id: svn://localhost/ardour2/branches/3.0@6985 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/rc_option_editor.cc8
-rw-r--r--libs/ardour/ardour/rc_configuration_vars.h1
-rw-r--r--libs/ardour/panner.cc2
3 files changed, 10 insertions, 1 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 76111e60b0..bbfb578731 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1079,6 +1079,14 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
));
+ add_option (_("Transport"),
+ new BoolOption (
+ "quieten_at_speed",
+ _("Reduce output volume when transport is moving quickly"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
+ ));
+
/* EDITOR */
add_option (_("Editor"),
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 1cc7c9490c..6fa16df3ed 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -90,6 +90,7 @@ CONFIG_VARIABLE (bool, solo_mute_override, "solo-mute-override", false)
CONFIG_VARIABLE (bool, tape_machine_mode, "tape-machine-mode", false)
CONFIG_VARIABLE (gain_t, solo_mute_gain, "solo-mute-gain", 0.0)
CONFIG_VARIABLE (std::string, monitor_bus_preferred_bundle, "monitor-bus-preferred-bundle", "")
+CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true)
/* click */
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 3f4aee0cf7..30931ef0a1 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -1504,7 +1504,7 @@ Panner::run (BufferSet& inbufs, BufferSet& outbufs, sframes_t start_frame, sfram
// Speed quietning
gain_t gain_coeff = 1.0;
- if (fabsf(_session.transport_speed()) > 1.5f) {
+ if (fabsf(_session.transport_speed()) > 1.5f && Config->get_quieten_at_speed ()) {
gain_coeff = speed_quietning;
}