Switch CDFrame grid to use MinSec ruler rather than Sample ruler.

[ardour.git] / gtk2_ardour / editor_pt_import.cc

diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc
index cb3054a62b48e369b9ea00dc059727501a810454..79dfa22f3af6e8933d9fa43896608ef39b01badf 100644 (file)
--- a/gtk2_ardour/editor_pt_import.cc
+++ b/gtk2_ardour/editor_pt_import.cc
@@ -29,8 +29,6 @@
 #include "pbd/shortpath.h"
 #include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/choice.h>
-
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/audioregion.h"
@@ -124,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;
@@ -231,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);
@@ -241,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();
@@ -252,11 +250,11 @@ Editor::do_ptimport (std::string ptpath,
                        for (vector<PTFFormat::midi_ev_t>::iterator
                                        j = a->midi.begin();
                                        j != a->midi.end(); ++j) {
-                               Evoral::Beats start = (Evoral::Beats)(j->pos/960000.);
-                               Evoral::Beats len = (Evoral::Beats)(j->length/960000.);
+                               Temporal::Beats start = (Temporal::Beats)(j->pos/960000.);
+                               Temporal::Beats len = (Temporal::Beats)(j->length/960000.);
                                // PT C-2 = 0, Ardour C-1 = 0, subtract twelve to convert...
-                               midicmd->add(boost::shared_ptr<Evoral::Note<Evoral::Beats> >
-                                       (new Evoral::Note<Evoral::Beats>( (uint8_t)1, start, len, j->note - 12, j->velocity )));
+                               midicmd->add(boost::shared_ptr<Evoral::Note<Temporal::Beats> >
+                                       (new Evoral::Note<Temporal::Beats>( (uint8_t)1, start, len, j->note - 12, j->velocity )));
                        }
                        mm->apply_command (_session, midicmd);
                        boost::shared_ptr<Region> copy (RegionFactory::create (mr, true));