summaryrefslogtreecommitdiff
path: root/libs/ardour/session_click.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
committerDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
commitbb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch)
treee52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/ardour/session_click.cc
parent8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff)
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_click.cc')
-rw-r--r--libs/ardour/session_click.cc38
1 files changed, 19 insertions, 19 deletions
diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index caff7dd1a7..2e7e077ce7 100644
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 20002 Paul Davis
+ Copyright (C) 20002 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -48,11 +48,11 @@ Session::click (nframes_t start, nframes_t nframes)
}
Glib::RWLock::WriterLock clickm (click_lock, Glib::TRY_LOCK);
-
+
if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0) {
_click_io->silence (nframes);
return;
- }
+ }
const nframes_t end = start + nframes;
@@ -80,11 +80,11 @@ Session::click (nframes_t start, nframes_t nframes)
case TempoMap::Bar:
if (click_emphasis_data) {
clicks.push_back (new Click ((*i).frame, click_emphasis_length, click_emphasis_data));
- }
+ }
break;
}
}
-
+
run_clicks:
memset (buf, 0, sizeof (Sample) * nframes);
@@ -98,7 +98,7 @@ Session::click (nframes_t start, nframes_t nframes)
clk = *i;
next = i;
++next;
-
+
if (clk->start < start) {
internal_offset = 0;
} else {
@@ -106,7 +106,7 @@ Session::click (nframes_t start, nframes_t nframes)
}
if (nframes < internal_offset) {
- /* we've just located or something..
+ /* we've just located or something..
effectively going backwards.
lets get the flock out of here */
break;
@@ -126,7 +126,7 @@ Session::click (nframes_t start, nframes_t nframes)
i = next;
}
-
+
_click_io->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
}
@@ -139,7 +139,7 @@ Session::setup_click_sounds (int which)
clear_clicks();
if ((which == 0 || which == 1)) {
-
+
if (click_data != default_click) {
delete [] click_data;
click_data = 0;
@@ -162,22 +162,22 @@ Session::setup_click_sounds (int which)
_clicking = false;
return;
}
-
+
click_data = new Sample[info.frames];
click_length = info.frames;
-
+
if (sf_read_float (sndfile, click_data, info.frames) != info.frames) {
- warning << _("cannot read data from click soundfile") << endmsg;
+ warning << _("cannot read data from click soundfile") << endmsg;
delete click_data;
click_data = 0;
_clicking = false;
}
-
+
sf_close (sndfile);
}
}
-
+
if ((which == 0 || which == -1)) {
if (click_emphasis_data != default_click_emphasis) {
@@ -198,20 +198,20 @@ Session::setup_click_sounds (int which)
warning << string_compose (_("cannot open click emphasis soundfile %1 (%2)"), path, errbuf) << endmsg;
return;
}
-
+
click_emphasis_data = new Sample[info.frames];
click_emphasis_length = info.frames;
-
+
if (sf_read_float (sndfile, click_emphasis_data, info.frames) != info.frames) {
- warning << _("cannot read data from click emphasis soundfile") << endmsg;
+ warning << _("cannot read data from click emphasis soundfile") << endmsg;
delete click_emphasis_data;
click_emphasis_data = 0;
}
-
+
sf_close (sndfile);
}
}
-}
+}
void
Session::clear_clicks ()