projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused variables.
[ardour.git]
/
libs
/
ardour
/
midi_stretch.cc
diff --git
a/libs/ardour/midi_stretch.cc
b/libs/ardour/midi_stretch.cc
index 21b5453da47c89e79cd3fd2cb0ed81287a8f5962..7a4164427a24ba0f7e7a0a530acc9cb41c1ef04c 100644
(file)
--- a/
libs/ardour/midi_stretch.cc
+++ b/
libs/ardour/midi_stretch.cc
@@
-1,6
+1,6
@@
/*
Copyright (C) 2008 Paul Davis
/*
Copyright (C) 2008 Paul Davis
- Author:
Dave
Robillard
+ Author:
David
Robillard
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-20,10
+20,12
@@
#include "pbd/error.h"
#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_stretch.h"
#include "ardour/session.h"
-#include "ardour/
midi_region
.h"
+#include "ardour/
types
.h"
#include "i18n.h"
#include "i18n.h"
@@
-42,7
+44,7
@@
MidiStretch::~MidiStretch ()
}
int
}
int
-MidiStretch::run (boost::shared_ptr<Region> r)
+MidiStretch::run (boost::shared_ptr<Region> r
, Progress*
)
{
SourceList nsrcs;
char suffix[32];
{
SourceList nsrcs;
char suffix[32];
@@
-99,18
+101,18
@@
MidiStretch::run (boost::shared_ptr<Region> r)
// FIXME: double copy
Evoral::Event<MidiModel::TimeType> ev(*i, true);
// FIXME: double copy
Evoral::Event<MidiModel::TimeType> ev(*i, true);
- ev.
time() = new_time
;
- new_model->append(ev);
+ ev.
set_time(new_time)
;
+ new_model->append(ev
, Evoral::next_event_id()
);
}
}
- new_model->end_write
(
);
- new_model->set_edited(true);
+ new_model->end_write
(Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes
);
+ new_model->set_edited
(true);
new_src->copy_interpolation_from (src);
const int ret = finish (region, nsrcs, new_name);
new_src->copy_interpolation_from (src);
const int ret = finish (region, nsrcs, new_name);
- results[0]->set_length((
nframes_t) floor (r->length() * _request.time_fraction), NULL
);
+ results[0]->set_length((
framecnt_t) floor (r->length() * _request.time_fraction)
);
return ret;
}
return ret;
}