Added use click emphasis toggle (libs/ardour)

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index eedd6193756a7daf8caa69748b2a43ac012d2d10..0c155e2e10a34c11ae367d4d74042fcca423fd34 100644 (file)
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -148,6 +148,7 @@ CONFIG_VARIABLE (bool, clicking, "clicking", false)
 CONFIG_VARIABLE (std::string, click_sound, "click-sound", "")
 CONFIG_VARIABLE (std::string, click_emphasis_sound, "click-emphasis-sound", "")
 CONFIG_VARIABLE (gain_t, click_gain, "click-gain", 1.0)
+CONFIG_VARIABLE (bool, use_click_emphasis, "use-click-emphasis", true)
 
 /* transport control and related */
 

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 62e13e8fc230fabd251ce8633d2a255fe423ac0d..5a19f1d7c953f00bbf8544661a91bf310be31254 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -81,13 +81,15 @@ Session::click (framepos_t start, framecnt_t nframes)
        for (TempoMap::BBTPointList::const_iterator i = points_begin; i != points_end; ++i) {
                switch ((*i).beat) {
                case 1:
-                       if (click_emphasis_data) {
+                       if (click_emphasis_data && Config->get_use_click_emphasis () == true) {
                                clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
+                       } else if (click_data && Config->get_use_click_emphasis () == false) {
+                               clicks.push_back (new Click ((*i).frame, click_length, click_data));
                        }
                        break;
 
                default:
-                       if (click_emphasis_data == 0 || (click_emphasis_data && (*i).beat != 1)) {
+                       if (click_emphasis_data == 0 || (Config->get_use_click_emphasis () == false) || (click_emphasis_data && (*i).beat != 1)) {
                                clicks.push_back (new Click ((*i).frame, click_length, click_data));
                        }
                        break;