Move a few declarations to first use.

[ardour.git] / libs / ardour / midi_stretch.cc

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index d9ac1403a9b2ff8d31736cd77bc180a51d43d3b5..83b845bbfcba1521e4684ba7422e28044a4a8e14 100644 (file)
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -20,10 +20,12 @@
 
 #include "pbd/error.h"
 
-#include "ardour/types.h"
+#include "ardour/midi_model.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
 #include "ardour/midi_stretch.h"
 #include "ardour/session.h"
-#include "ardour/midi_region.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
@@ -31,7 +33,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-MidiStretch::MidiStretch (Session& s, TimeFXRequest& req)
+MidiStretch::MidiStretch (Session& s, const TimeFXRequest& req)
        : Filter (s)
        , _request (req)
 {
@@ -42,7 +44,7 @@ MidiStretch::~MidiStretch ()
 }
 
 int
-MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress)
+MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 {
        SourceList nsrcs;
        char suffix[32];
@@ -99,7 +101,7 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress)
 
                // FIXME: double copy
                Evoral::Event<MidiModel::TimeType> ev(*i, true);
-               ev.time() = new_time;
+               ev.set_time(new_time);
                new_model->append(ev, Evoral::next_event_id());
        }