From 30b087ab3d28f1585987fa3f6ae006562ae192e3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 18 Sep 2017 12:39:17 -0400 Subject: 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 --- libs/ardour/midi_scene_changer.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/ardour/midi_scene_changer.cc') diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc index ce2559180f..11805b6d13 100644 --- a/libs/ardour/midi_scene_changer.cc +++ b/libs/ardour/midi_scene_changer.cc @@ -94,7 +94,7 @@ MIDISceneChanger::gather (const Locations::LocationList& locations) } void -MIDISceneChanger::rt_deliver (MidiBuffer& mbuf, framepos_t when, boost::shared_ptr msc) +MIDISceneChanger::rt_deliver (MidiBuffer& mbuf, samplepos_t when, boost::shared_ptr msc) { if (!msc->active()) { return; @@ -157,7 +157,7 @@ MIDISceneChanger::non_rt_deliver (boost::shared_ptr msc) } void -MIDISceneChanger::run (framepos_t start, framepos_t end) +MIDISceneChanger::run (samplepos_t start, samplepos_t end) { if (!output_port || recording() || !_session.transport_rolling()) { return; @@ -187,7 +187,7 @@ MIDISceneChanger::run (framepos_t start, framepos_t end) } void -MIDISceneChanger::locate (framepos_t pos) +MIDISceneChanger::locate (samplepos_t pos) { boost::shared_ptr msc; @@ -279,7 +279,7 @@ void void MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program, int channel) { - framecnt_t time = parser.get_timestamp (); + samplecnt_t time = parser.get_timestamp (); last_program_message_time = time; @@ -302,7 +302,7 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program /* check for marker at current location */ - loc = locations->mark_at (time, Config->get_inter_scene_gap_frames()); + loc = locations->mark_at (time, Config->get_inter_scene_gap_samples()); if (!loc) { /* create a new marker at the desired position */ @@ -356,7 +356,7 @@ MIDISceneChanger::jump_to (int bank, int program) { const Locations::LocationList& locations (_session.locations()->list()); boost::shared_ptr sc; - framepos_t where = max_framepos; + samplepos_t where = max_samplepos; for (Locations::LocationList::const_iterator l = locations.begin(); l != locations.end(); ++l) { @@ -370,7 +370,7 @@ MIDISceneChanger::jump_to (int bank, int program) } } - if (where != max_framepos) { + if (where != max_samplepos) { _session.request_locate (where); } } -- cgit v1.2.3