diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
| commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
| tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /gtk2_ardour/editor_pt_import.cc | |
| parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (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 'gtk2_ardour/editor_pt_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_pt_import.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc index 55c3b0b43c..3f6a337569 100644 --- a/gtk2_ardour/editor_pt_import.cc +++ b/gtk2_ardour/editor_pt_import.cc @@ -122,12 +122,12 @@ Editor::do_ptimport (std::string ptpath, bool ok = false; bool onefailed = false; PTFFormat ptf; - framepos_t pos = -1; + samplepos_t pos = -1; vector<ptflookup_t> ptfwavpair; vector<ptflookup_t> ptfregpair; - if (ptf.load(ptpath, _session->frame_rate()) == -1) { + if (ptf.load(ptpath, _session->sample_rate()) == -1) { MessageDialog msg (_("Doesn't seem to be a valid PT session file")); msg.run (); return; @@ -229,9 +229,9 @@ Editor::do_ptimport (std::string ptpath, /* Empty wave - assume MIDI region */ boost::shared_ptr<MidiTrack> midi_track = mt.back(); boost::shared_ptr<Playlist> playlist = midi_track->playlist(); - framepos_t f = (framepos_t)a->startpos; - framecnt_t length = (framecnt_t)a->length; - MusicFrame pos (f, 0); + samplepos_t f = (samplepos_t)a->startpos; + samplecnt_t length = (samplecnt_t)a->length; + MusicSample pos (f, 0); boost::shared_ptr<Source> src = _session->create_midi_source_by_stealing_name (midi_track); PropertyList plist; plist.add (ARDOUR::Properties::start, 0); @@ -239,8 +239,8 @@ Editor::do_ptimport (std::string ptpath, plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix(src->name())); boost::shared_ptr<Region> region = (RegionFactory::create (src, plist)); /* sets beat position */ - region->set_position (pos.frame, pos.division); - midi_track->playlist()->add_region (region, pos.frame, 1.0, false, pos.division); + region->set_position (pos.sample, pos.division); + midi_track->playlist()->add_region (region, pos.sample, 1.0, false, pos.division); boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region); boost::shared_ptr<MidiModel> mm = mr->midi_source(0)->model(); |