use new action map API instead of ActionManager::get_action

[ardour.git] / gtk2_ardour / midi_time_axis.cc

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 91cf2b954446a179b663cf836a1315e891e6372a..f64caaf2717b16e793f05d096fbccba978d83d6d 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -1418,7 +1418,7 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note)
 }
 
 void
-MidiTimeAxisView::get_per_region_note_selection (list<pair<PBD::ID, set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >& selection)
+MidiTimeAxisView::get_per_region_note_selection (list<pair<PBD::ID, set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > >& selection)
 {
        _view->foreach_regionview (
                sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::get_per_region_note_selection_region_view), sigc::ref(selection)));
@@ -1449,14 +1449,14 @@ MidiTimeAxisView::toggle_note_selection_region_view (RegionView* rv, uint8_t not
 }
 
 void
-MidiTimeAxisView::get_per_region_note_selection_region_view (RegionView* rv, list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > > &selection)
+MidiTimeAxisView::get_per_region_note_selection_region_view (RegionView* rv, list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > > &selection)
 {
-       Evoral::Sequence<Evoral::Beats>::Notes selected;
+       Evoral::Sequence<Temporal::Beats>::Notes selected;
        dynamic_cast<MidiRegionView*>(rv)->selection_as_notelist (selected, false);
 
-       std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > notes;
+       std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > notes;
 
-       Evoral::Sequence<Evoral::Beats>::Notes::iterator sel_it;
+       Evoral::Sequence<Temporal::Beats>::Notes::iterator sel_it;
        for (sel_it = selected.begin(); sel_it != selected.end(); ++sel_it) {
                notes.insert (*sel_it);
        }
@@ -1535,10 +1535,10 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param)
 }
 
 boost::shared_ptr<MidiRegion>
-MidiTimeAxisView::add_region (framepos_t f, framecnt_t length, bool commit)
+MidiTimeAxisView::add_region (samplepos_t f, samplecnt_t length, bool commit)
 {
        Editor* real_editor = dynamic_cast<Editor*> (&_editor);
-       MusicFrame pos (f, 0);
+       MusicSample pos (f, 0);
 
        if (commit) {
                real_editor->begin_reversible_command (Operations::create_region);
@@ -1556,8 +1556,8 @@ MidiTimeAxisView::add_region (framepos_t f, framecnt_t length, bool commit)
 
        boost::shared_ptr<Region> region = (RegionFactory::create (src, plist));
        /* sets beat position */
-       region->set_position (pos.frame, pos.division);
-       playlist()->add_region (region, pos.frame, 1.0, false, pos.division);
+       region->set_position (pos.sample, pos.division);
+       playlist()->add_region (region, pos.sample, 1.0, false, pos.division);
        _session->add_command (new StatefulDiffCommand (playlist()));
 
        if (commit) {
@@ -1632,7 +1632,7 @@ MidiTimeAxisView::contents_height_changed ()
 }
 
 bool
-MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
+MidiTimeAxisView::paste (samplepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
 {
        if (!_editor.internal_editing()) {
                // Non-internal paste, paste regions like any other route