#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>
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
-Pool Click::pool ("click", sizeof (Click), 128);
+Pool Click::pool ("click", sizeof (Click), 1024);
+
+void
+Session::add_click (framepos_t pos, bool emphasis)
+{
+ if (emphasis) {
+ if (click_emphasis_data && Config->get_use_click_emphasis () == true) {
+ clicks.push_back (new Click (pos, click_emphasis_length, click_emphasis_data));
+ } else if (click_data && Config->get_use_click_emphasis () == false) {
+ clicks.push_back (new Click (pos, click_length, click_data));
+ }
+ } else if (click_data) {
+ clicks.push_back (new Click (pos, click_length, click_data));
+ }
+}
void
Session::click (framepos_t start, framecnt_t nframes)
{
- TempoMap::BBTPointList::const_iterator points_begin;
- TempoMap::BBTPointList::const_iterator points_end;
- Sample *buf;
+ vector<TempoMap::BBTPoint> points;
framecnt_t click_distance;
if (_click_io == 0) {
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;
}
+ if (_click_rec_only && !actively_recording()) {
+ return;
+ }
+
start -= _worst_track_latency;
/* start could be negative at this point */
const framepos_t end = start + nframes;
/* correct start, potentially */
start = max (start, (framepos_t) 0);
- 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) {
- clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
- cerr << "click emph @ " << (*i).frame << endl;
- }
+ add_click ((*i).frame, true);
break;
-
default:
- if (click_emphasis_data == 0 || (click_emphasis_data && (*i).beat != 1)) {
- clicks.push_back (new Click ((*i).frame, click_length, click_data));
- cerr << "click norm @ " << (*i).frame << endl;
+ if (click_emphasis_data == 0 || (Config->get_use_click_emphasis () == false) || (click_emphasis_data && (*i).beat != 1)) { // XXX why is this check needed ??
+ add_click ((*i).frame, false);
}
break;
}
}
run_clicks:
+ clickm.release ();
+ run_click (start, nframes);
+}
+
+void
+Session::run_click (framepos_t start, framepos_t nframes)
+{
+ Glib::Threads::RWLock::ReaderLock clickm (click_lock, Glib::Threads::TRY_LOCK);
+
+ if (!clickm.locked() || click_data == 0) {
+ _click_io->silence (nframes);
+ return;
+ }
+
+ Sample *buf;
+ BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1));
+ buf = bufs.get_audio(0).data();
memset (buf, 0, sizeof (Sample) * nframes);
for (list<Click*>::iterator i = clicks.begin(); i != clicks.end(); ) {
}
}
+ _click_gain->run (bufs, 0, 0, 1.0, nframes, false);
_click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
}
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;