expose more info from plugin-strip (for GUI display)

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

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index e36c871faef8e323b102dac923d416d2756223ce..4cb556c8a60d8c9b34aab882df92884cde02aea7 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -21,13 +21,13 @@
 #include <cerrno>
 
 #include "ardour/amp.h"
-#include "ardour/ardour.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/buffer_set.h"
 #include "ardour/click.h"
 #include "ardour/io.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
+#include "ardour/types.h"
 
 #include <sndfile.h>
 
@@ -51,14 +51,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;
        }
@@ -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;
@@ -119,9 +121,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 +227,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;