diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/session_click.cc | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index afa74325c0..869414a4be 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, click_emphasis_toggle, "click_emphasis_toggle", true) /* transport control and related */ diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index e6e8749aec..b8b0ed81da 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -81,13 +81,16 @@ 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_click_emphasis_toggle () == true) { clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data)); } + if (click_data && Config->get_click_emphasis_toggle () == 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_click_emphasis_toggle () == false) || (click_emphasis_data && (*i).beat != 1)) { clicks.push_back (new Click ((*i).frame, click_length, click_data)); } break; |