Fixes to bundle manager to make it vaguely usable.

[ardour.git] / libs / ardour / ardour / midi_model.h

diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index 51bddfde44b7f7cb51abb21787493806a033a3f1..fb881ae127f0c825d8a1a4fb05fee21612673f40 100644 (file)
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -39,7 +39,7 @@ namespace ARDOUR {
 
 class Session;
 class MidiSource;
-       
+
 /** This is a higher level (than MidiBuffer) model of MIDI data, with separate
  * representations for notes (instead of just unassociated note on/off events)
  * and controller data.  Controller data is represented as part of the
@@ -47,21 +47,23 @@ class MidiSource;
  * Because of this MIDI controllers and automatable controllers/widgets/etc
  * are easily interchangeable.
  */
-class MidiModel : public Automatable, public Evoral::Sequence {
+class MidiModel : public AutomatableSequence<double> {
 public:
+       typedef double TimeType;
+
        MidiModel(MidiSource* s, size_t size=0);
        
        NoteMode note_mode() const { return (percussive() ? Percussive : Sustained); }
        void set_note_mode(NoteMode mode) { set_percussive(mode == Percussive); };
 
        /** Add/Remove notes.
-        * Technically all operations can be implemented as one of these.
+        * Technically all note operations can be implemented as one of these, but
+        * a custom command can be more efficient.
         */
-       class DeltaCommand : public Command
-       {
+       class DeltaCommand : public Command {
        public:
                DeltaCommand (boost::shared_ptr<MidiModel> m, const std::string& name);
-               DeltaCommand (boost::shared_ptr<MidiModel>,   const XMLNode& node);
+               DeltaCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node);
 
                const std::string& name() const { return _name; }
                
@@ -71,24 +73,24 @@ public:
                int set_state (const XMLNode&);
                XMLNode& get_state ();
 
-               void add(const boost::shared_ptr<Evoral::Note> note);
-               void remove(const boost::shared_ptr<Evoral::Note> note);
+               void add(const boost::shared_ptr< Evoral::Note<TimeType> > note);
+               void remove(const boost::shared_ptr< Evoral::Note<TimeType> > note);
 
        private:
-               XMLNode &marshal_note(const boost::shared_ptr<Evoral::Note> note);
-               boost::shared_ptr<Evoral::Note> unmarshal_note(XMLNode *xml_note);
+               XMLNode &marshal_note(const boost::shared_ptr< Evoral::Note<TimeType> > note);
+               boost::shared_ptr< Evoral::Note<TimeType> > unmarshal_note(XMLNode *xml_note);
                
-               boost::shared_ptr<MidiModel>         _model;
-               const std::string                    _name;
+               boost::shared_ptr<MidiModel> _model;
+               const std::string            _name;
                
-               typedef std::list< boost::shared_ptr<Evoral::Note> > NoteList;
+               typedef std::list< boost::shared_ptr< Evoral::Note<TimeType> > > NoteList;
                
                NoteList _added_notes;
                NoteList _removed_notes;
        };
 
        MidiModel::DeltaCommand* new_delta_command(const std::string name="midi edit");
-       void                     apply_command(Command* cmd);
+       void                     apply_command(Session& session, Command* cmd);
 
        bool write_to(boost::shared_ptr<MidiSource> source);