diff options
| author | Damien Zammit <damien@zamaudio.com> | 2015-10-08 03:24:21 +1100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-07 19:34:39 +0200 |
| commit | bcbb14f5816ae2abc4008345e67e4ea8ae3be8b4 (patch) | |
| tree | 6fb99a3a7e52e10f3a5c53228a7ccc1c67d9f929 /libs/ardour/session_click.cc | |
| parent | ce9b271a92c8c78c3eace6a0da3438ecdae57107 (diff) | |
Added use click emphasis toggle (libs/ardour)
Diffstat (limited to 'libs/ardour/session_click.cc')
| -rw-r--r-- | libs/ardour/session_click.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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; |