projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now that notify_length_changed() just calls
[ardour.git]
/
libs
/
ardour
/
ardour
/
midi_region.h
diff --git
a/libs/ardour/ardour/midi_region.h
b/libs/ardour/ardour/midi_region.h
index 50352cc7601cce19c108475441d2c6062df869cd..9868d1408fe3acceb957a991dc69d37fe65bd18d 100644
(file)
--- a/
libs/ardour/ardour/midi_region.h
+++ b/
libs/ardour/ardour/midi_region.h
@@
-23,14
+23,7
@@
#include <vector>
#include <vector>
-#include "pbd/fastlog.h"
-#include "pbd/undo.h"
-
#include "ardour/ardour.h"
#include "ardour/ardour.h"
-#include "ardour/gain.h"
-#include "ardour/logcurve.h"
-#include "ardour/midi_model.h"
-#include "ardour/midi_source.h"
#include "ardour/region.h"
class XMLNode;
#include "ardour/region.h"
class XMLNode;
@@
-42,16
+35,22
@@
namespace ARDOUR {
MidiModel used by the MidiRegion
*/
extern PBD::PropertyDescriptor<void*> midi_data;
MidiModel used by the MidiRegion
*/
extern PBD::PropertyDescriptor<void*> midi_data;
+ extern PBD::PropertyDescriptor<Evoral::MusicalTime> start_beats;
extern PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
}
}
extern PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
}
}
+namespace Evoral {
+template<typename Time> class EventSink;
+}
+
namespace ARDOUR {
class Route;
class Playlist;
class Session;
class MidiFilter;
namespace ARDOUR {
class Route;
class Playlist;
class Session;
class MidiFilter;
+class MidiModel;
class MidiSource;
class MidiStateTracker;
template<typename T> class MidiRingBuffer;
class MidiSource;
class MidiStateTracker;
template<typename T> class MidiRingBuffer;
@@
-91,22
+90,14
@@
class MidiRegion : public Region
/* automation */
/* automation */
- boost::shared_ptr<Evoral::Control>
- control(const Evoral::Parameter& id, bool create=false) {
- return model()->control(id, create);
- }
+ boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false);
- virtual boost::shared_ptr<const Evoral::Control>
- control(const Evoral::Parameter& id) const {
- return model()->control(id);
- }
+ virtual boost::shared_ptr<const Evoral::Control> control(const Evoral::Parameter& id) const;
/* export */
/* export */
- int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
-
- boost::shared_ptr<MidiModel> model() { return midi_source()->model(); }
- boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); }
+ boost::shared_ptr<MidiModel> model();
+ boost::shared_ptr<const MidiModel> model() const;
void fix_negative_start ();
void transpose (int);
void fix_negative_start ();
void transpose (int);
@@
-119,6
+110,7
@@
class MidiRegion : public Region
private:
friend class RegionFactory;
private:
friend class RegionFactory;
+ PBD::Property<Evoral::MusicalTime> _start_beats;
PBD::Property<Evoral::MusicalTime> _length_beats;
MidiRegion (const SourceList&);
PBD::Property<Evoral::MusicalTime> _length_beats;
MidiRegion (const SourceList&);
@@
-146,6
+138,9
@@
class MidiRegion : public Region
void model_automation_state_changed (Evoral::Parameter const &);
void model_contents_changed ();
void model_automation_state_changed (Evoral::Parameter const &);
void model_contents_changed ();
+ void set_start_beats_from_start_frames ();
+ void update_after_tempo_map_change ();
+
std::set<Evoral::Parameter> _filtered_parameters; ///< parameters that we ask our source not to return when reading
PBD::ScopedConnection _model_connection;
PBD::ScopedConnection _source_connection;
std::set<Evoral::Parameter> _filtered_parameters; ///< parameters that we ask our source not to return when reading
PBD::ScopedConnection _model_connection;
PBD::ScopedConnection _source_connection;