add Slavable API for VCA assign/unassign

[ardour.git] / libs / ardour / session_click.cc

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index abfbaecfcd69f03b5da7e9ded5ad2df007722f60..872828e57ecf64df2e481f2f31865508d0dfa9ae 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -42,8 +42,7 @@ Pool Click::pool ("click", sizeof (Click), 1024);
 void
 Session::click (framepos_t start, framecnt_t nframes)
 {
-       TempoMap::BBTPointList::const_iterator points_begin;
-       TempoMap::BBTPointList::const_iterator points_end;
+       vector<TempoMap::BBTPoint> points;
        Sample *buf;
        framecnt_t click_distance;
 
@@ -51,14 +50,14 @@ Session::click (framepos_t start, framecnt_t nframes)
                return;
        }
 
-       Glib::RWLock::WriterLock clickm (click_lock, Glib::TRY_LOCK);
+       Glib::Threads::RWLock::WriterLock clickm (click_lock, Glib::Threads::TRY_LOCK);
 
        /* how far have we moved since the last time the clicks got cleared
         */
 
        click_distance = start - _clicks_cleared;
 
-       if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0 || ((click_distance + nframes) < _worst_track_latency)) {
+       if (!clickm.locked() || !_clicking || click_data == 0 || ((click_distance + nframes) < _worst_track_latency)) {
                _click_io->silence (nframes);
                return;
        }
@@ -72,22 +71,24 @@ Session::click (framepos_t start, framecnt_t nframes)
        BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1));
        buf = bufs.get_audio(0).data();
 
-       _tempo_map->get_grid (points_begin, points_end, start, end);
+       _tempo_map->get_grid (points, start, end);
 
-       if (distance (points_begin, points_end) == 0) {
+       if (distance (points.begin(), points.end()) == 0) {
                goto run_clicks;
        }
 
-       for (TempoMap::BBTPointList::const_iterator i = points_begin; i != points_end; ++i) {
+       for (vector<TempoMap::BBTPoint>::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;
@@ -119,9 +120,9 @@ Session::click (framepos_t start, framecnt_t nframes)
                }
 
                copy = min (clk->duration - clk->offset, nframes - internal_offset);
-               
+
                memcpy (buf + internal_offset, &clk->data[clk->offset], copy * sizeof (Sample));
-               
+
                clk->offset += copy;
 
                if (clk->offset >= clk->duration) {
@@ -225,7 +226,7 @@ Session::setup_click_sounds (int which)
 void
 Session::clear_clicks ()
 {
-       Glib::RWLock::WriterLock lm (click_lock);
+       Glib::Threads::RWLock::WriterLock lm (click_lock);
 
        for (Clicks::iterator i = clicks.begin(); i != clicks.end(); ++i) {
                delete *i;