more vst parameter related stuff

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

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 03892b60238b4a860a411256eb66c31cd0f68d5e..e6e8749aec8c4c34367ec17f8555576e54d27b34 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -20,13 +20,14 @@
 #include <list>
 #include <cerrno>
 
-#include "ardour/ardour.h"
+#include "ardour/amp.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>
 
@@ -50,7 +51,7 @@ 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
         */
@@ -118,9 +119,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) {
@@ -131,6 +132,7 @@ Session::click (framepos_t start, framecnt_t nframes)
                }
        }
 
+       _click_gain->run (bufs, 0, 0, nframes, false);
        _click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
 }
 
@@ -223,7 +225,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;