projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add mutex to prevent concurrent session state saves.
[ardour.git]
/
libs
/
ardour
/
midi_track.cc
diff --git
a/libs/ardour/midi_track.cc
b/libs/ardour/midi_track.cc
index 7dff7ac639768ae1bfc13292ecbe2c1d4fce356c..638ed057063a56b08b0e2f034fa4d6cc1d336260 100644
(file)
--- a/
libs/ardour/midi_track.cc
+++ b/
libs/ardour/midi_track.cc
@@
-17,8
+17,7
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <strings.h> // for ffs(3)
-
+#include "pbd/ffs.h"
#include "pbd/enumwriter.h"
#include "pbd/convert.h"
#include "evoral/midi_util.h"
#include "pbd/enumwriter.h"
#include "pbd/convert.h"
#include "evoral/midi_util.h"
@@
-81,13
+80,7
@@
MidiTrack::init ()
boost::shared_ptr<Diskstream>
MidiTrack::create_diskstream ()
{
boost::shared_ptr<Diskstream>
MidiTrack::create_diskstream ()
{
- MidiDiskstream::Flag dflags = MidiDiskstream::Flag (0);
-
- if (_flags & Auditioner) {
- dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Hidden);
- } else {
- dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Recordable);
- }
+ MidiDiskstream::Flag dflags = MidiDiskstream::Flag (MidiDiskstream::Recordable);
assert(_mode != Destructive);
assert(_mode != Destructive);
@@
-321,7
+314,7
@@
MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
if (!lm.locked()) {
boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
if (!lm.locked()) {
boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
- if (can_internal_playback_seek(
std::
llabs(playback_distance))) {
+ if (can_internal_playback_seek(llabs(playback_distance))) {
/* TODO should declick, and/or note-off */
internal_playback_seek(playback_distance);
}
/* TODO should declick, and/or note-off */
internal_playback_seek(playback_distance);
}
@@
-513,7
+506,7
@@
MidiTrack::filter_channels (BufferSet& bufs, ChannelMode mode, uint32_t mask)
}
break;
case ForceChannel:
}
break;
case ForceChannel:
- ev.set_channel (ffs (mask) - 1);
+ ev.set_channel (
PBD::
ffs (mask) - 1);
++e;
break;
case AllChannels:
++e;
break;
case AllChannels:
@@
-554,7
+547,7
@@
MidiTrack::write_out_of_band_data (BufferSet& bufs, framepos_t /*start*/, framep
int
MidiTrack::export_stuff (BufferSet& /*bufs*/, framepos_t /*start_frame*/, framecnt_t /*nframes*/,
int
MidiTrack::export_stuff (BufferSet& /*bufs*/, framepos_t /*start_frame*/, framecnt_t /*nframes*/,
- boost::shared_ptr<Processor> /*endpoint*/, bool /*include_endpoint*/, bool /*for
export
*/)
+ boost::shared_ptr<Processor> /*endpoint*/, bool /*include_endpoint*/, bool /*for
_export*/, bool /*for_freeze
*/)
{
return -1;
}
{
return -1;
}
@@
-633,9
+626,9
@@
void
MidiTrack::MidiControl::set_value(double val)
{
bool valid = false;
MidiTrack::MidiControl::set_value(double val)
{
bool valid = false;
- if (
std::
isinf(val)) {
+ if (isinf(val)) {
cerr << "MIDIControl value is infinity" << endl;
cerr << "MIDIControl value is infinity" << endl;
- } else if (
std::
isnan(val)) {
+ } else if (isnan(val)) {
cerr << "MIDIControl value is NaN" << endl;
} else if (val < _list->parameter().min()) {
cerr << "MIDIControl value is < " << _list->parameter().min() << endl;
cerr << "MIDIControl value is NaN" << endl;
} else if (val < _list->parameter().min()) {
cerr << "MIDIControl value is < " << _list->parameter().min() << endl;