summaryrefslogtreecommitdiff
path: root/libs/ardour/note_fixer.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
commit30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch)
tree620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/note_fixer.cc
parentcb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff)
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
Diffstat (limited to 'libs/ardour/note_fixer.cc')
-rw-r--r--libs/ardour/note_fixer.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/note_fixer.cc b/libs/ardour/note_fixer.cc
index 749d873779..a2d943f775 100644
--- a/libs/ardour/note_fixer.cc
+++ b/libs/ardour/note_fixer.cc
@@ -19,7 +19,7 @@
#include "evoral/EventList.hpp"
-#include "ardour/beats_frames_converter.h"
+#include "ardour/beats_samples_converter.h"
#include "ardour/midi_state_tracker.h"
#include "ardour/note_fixer.h"
#include "ardour/tempo.h"
@@ -42,13 +42,13 @@ NoteFixer::clear()
void
NoteFixer::prepare(TempoMap& tempo_map,
const MidiModel::NoteDiffCommand* cmd,
- const framepos_t origin,
- const framepos_t pos,
+ const samplepos_t origin,
+ const samplepos_t pos,
std::set< boost::weak_ptr<Note> >& active_notes)
{
typedef MidiModel::NoteDiffCommand Command;
- BeatsFramesConverter converter(tempo_map, origin);
+ BeatsSamplesConverter converter(tempo_map, origin);
for (Command::NoteList::const_iterator i = cmd->removed_notes().begin();
i != cmd->removed_notes().end(); ++i) {
@@ -113,8 +113,8 @@ NoteFixer::prepare(TempoMap& tempo_map,
}
void
-NoteFixer::emit(Evoral::EventSink<framepos_t>& dst,
- framepos_t pos,
+NoteFixer::emit(Evoral::EventSink<samplepos_t>& dst,
+ samplepos_t pos,
MidiStateTracker& tracker)
{
for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
@@ -126,18 +126,18 @@ NoteFixer::emit(Evoral::EventSink<framepos_t>& dst,
}
NoteFixer::Event*
-NoteFixer::copy_event(framepos_t time, const Evoral::Event<Evoral::Beats>& ev)
+NoteFixer::copy_event(samplepos_t time, const Evoral::Event<Evoral::Beats>& ev)
{
return new Event(ev.event_type(), time, ev.size(), ev.buffer());
}
bool
-NoteFixer::note_is_active(const BeatsFramesConverter& converter,
+NoteFixer::note_is_active(const BeatsSamplesConverter& converter,
boost::shared_ptr<Note> note,
- framepos_t pos)
+ samplepos_t pos)
{
- const framepos_t start_time = converter.to(note->time());
- const framepos_t end_time = converter.to(note->end_time());
+ const samplepos_t start_time = converter.to(note->time());
+ const samplepos_t end_time = converter.to(note->end_time());
return (start_time < pos && end_time >= pos);
}