diff options
| author | Damien Zammit <damien@zamaudio.com> | 2015-10-08 03:24:21 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2015-10-08 03:24:21 +1100 |
| commit | 912962011dd67ac47ff527fe67eb741d2ce30f6a (patch) | |
| tree | b258baf08871388d304962ce47c1b750de3a73c0 | |
| parent | 38405fa21047e6b7b69aa5a2de0ac95566e6b402 (diff) | |
Added use click emphasis toggle (libs/ardour)
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/session_click.cc | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index eedd619375..0c155e2e10 100644 --- 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 62e13e8fc2..5a19f1d7c9 100644 --- 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; |