projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repeat INSENSITIVE colors instead of relying on inheritance
[ardour.git]
/
libs
/
ardour
/
session_click.cc
diff --git
a/libs/ardour/session_click.cc
b/libs/ardour/session_click.cc
index 5a19f1d7c953f00bbf8544661a91bf310be31254..9c67ebef869c99d6d8b22101815d58f7e102b832 100644
(file)
--- a/
libs/ardour/session_click.cc
+++ b/
libs/ardour/session_click.cc
@@
-31,7
+31,7
@@
#include <sndfile.h>
#include <sndfile.h>
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-42,8
+42,7
@@
Pool Click::pool ("click", sizeof (Click), 1024);
void
Session::click (framepos_t start, framecnt_t nframes)
{
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;
Sample *buf;
framecnt_t click_distance;
@@
-58,7
+57,7
@@
Session::click (framepos_t start, framecnt_t nframes)
click_distance = start - _clicks_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;
}
_click_io->silence (nframes);
return;
}
@@
-72,13
+71,13
@@
Session::click (framepos_t start, framecnt_t nframes)
BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1));
buf = bufs.get_audio(0).data();
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;
}
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 && Config->get_use_click_emphasis () == true) {
switch ((*i).beat) {
case 1:
if (click_emphasis_data && Config->get_use_click_emphasis () == true) {
@@
-134,7
+133,7
@@
Session::click (framepos_t start, framecnt_t nframes)
}
}
}
}
- _click_gain->run (bufs, 0, 0, nframes, false);
+ _click_gain->run (bufs, 0, 0,
1.0,
nframes, false);
_click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
}
_click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
}