#include <ardour/midi_ring_buffer.h>
#include <ardour/automatable.h>
#include <ardour/note.h>
+#include <ardour/types.h>
namespace ARDOUR {
class Session;
class MidiSource;
-// x , y
-typedef std::pair<boost::shared_ptr<const AutomationList>, std::pair<double,double> >
- MidiControlIterator;
+/**
+ * This class keeps track of the current x and y for a control
+ */
+class MidiControlIterator {
+public:
+ boost::shared_ptr<const AutomationList> automation_list;
+ double x;
+ double y;
+
+ MidiControlIterator(boost::shared_ptr<const AutomationList> a_list,
+ double a_x,
+ double a_y)
+ : automation_list(a_list)
+ , x(a_x)
+ , y(a_y)
+ {}
+};
-/** This is a slightly higher level (than MidiBuffer) model of MIDI note data.
- * Currently it only represents note data, which is represented as complete
- * note events (ie with a start time and a duration) rather than separate
- * note on and off events (controller data is not here since it's represented
- * as an AutomationList)
+/** 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
+ * Automatable base (i.e. in a map of AutomationList, keyed by Parameter).
*/
class MidiModel : public boost::noncopyable, public Automatable {
public:
- MidiModel(Session& s, size_t size=0);
+ MidiModel(MidiSource* s, size_t size=0);
- // This is crap.
- void write_lock() { _lock.writer_lock(); _automation_lock.lock(); }
- void write_unlock() { _lock.writer_unlock(); _automation_lock.unlock(); }
- void read_lock() const { _lock.reader_lock(); /*_automation_lock.lock();*/ }
- void read_unlock() const { _lock.reader_unlock(); /*_automation_lock.unlock();*/ }
+ void write_lock();
+ void write_unlock();
- void clear() { _notes.clear(); }
+ void read_lock() const;
+ void read_unlock() const;
+
+ void clear();
NoteMode note_mode() const { return _note_mode; }
void set_note_mode(NoteMode mode) { _note_mode = mode; }
bool writing() const { return _writing; }
void end_write(bool delete_stuck=false);
- size_t read (MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset) const;
+ size_t read (MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframes_t stamp_offset, nframes_t negative_stamp_offset) const;
/** Resizes vector if necessary (NOT realtime safe) */
- void append(const MidiEvent& ev);
+ void append(const MIDI::Event& ev);
inline const boost::shared_ptr<const Note> note_at(unsigned i) const { return _notes[i]; }
inline const boost::shared_ptr<Note> note_at(unsigned i) { return _notes[i]; }
inline size_t n_notes() const { return _notes.size(); }
inline bool empty() const { return _notes.size() == 0 && _controls.size() == 0; }
- /* FIXME: use better data structure */
- typedef std::vector< boost::shared_ptr<Note> > Notes;
-
inline static bool note_time_comparator (const boost::shared_ptr<const Note> a,
const boost::shared_ptr<const Note> b) {
return a->time() < b->time();
}
};
+ typedef std::vector< boost::shared_ptr<Note> > Notes;
inline Notes& notes() { return _notes; }
inline const Notes& notes() const { return _notes; }
-
+
/** Add/Remove notes.
* Technically all operations can be implemented as one of these.
*/
class DeltaCommand : public Command
{
public:
- DeltaCommand (MidiModel& m, const std::string& name)
- : Command(name), _model(m), _name(name) {}
- //DeltaCommand (MidiModel&, const XMLNode& node);
+ DeltaCommand (boost::shared_ptr<MidiModel> m, const std::string& name);
+ DeltaCommand (boost::shared_ptr<MidiModel>, const XMLNode& node);
const std::string& name() const { return _name; }
void operator()();
void undo();
- /*int set_state (const XMLNode&);
- XMLNode& get_state ();*/
+ int set_state (const XMLNode&);
+ XMLNode& get_state ();
void add(const boost::shared_ptr<Note> note);
void remove(const boost::shared_ptr<Note> note);
private:
- MidiModel& _model;
+ XMLNode &marshal_note(const boost::shared_ptr<Note> note);
+ boost::shared_ptr<Note> unmarshal_note(XMLNode *xml_note);
+
+ boost::shared_ptr<MidiModel> _model;
const std::string _name;
- std::list< boost::shared_ptr<Note> > _added_notes;
- std::list< boost::shared_ptr<Note> > _removed_notes;
+
+ typedef std::list< boost::shared_ptr<Note> > NoteList;
+
+ NoteList _added_notes;
+ NoteList _removed_notes;
};
MidiModel::DeltaCommand* new_delta_command(const std::string name="midi edit");
void set_edited(bool yn) { _edited = yn; }
bool write_to(boost::shared_ptr<MidiSource> source);
- // MidiModel doesn't use the normal AutomationList serialisation code, as CC data is in the .mid
+ // MidiModel doesn't use the normal AutomationList serialisation code
+ // since controller data is stored in the .mid
XMLNode& get_state();
int set_state(const XMLNode&) { return 0; }
inline bool locked() const { return _locked; }
- const MidiEvent& operator*() const { return _event; }
- const MidiEvent* operator->() const { return &_event; }
+ const MIDI::Event& operator*() const { return *_event; }
+ const boost::shared_ptr<MIDI::Event> operator->() const { return _event; }
+ const boost::shared_ptr<MIDI::Event> get_event_pointer() { return _event; }
const const_iterator& operator++(); // prefix only
bool operator==(const const_iterator& other) const;
private:
friend class MidiModel;
- const MidiModel* _model;
- MidiEvent _event;
+ const MidiModel* _model;
+ boost::shared_ptr<MIDI::Event> _event;
typedef std::priority_queue<
boost::shared_ptr<Note>, std::deque< boost::shared_ptr<Note> >,
const_iterator begin() const { return const_iterator(*this, 0); }
const const_iterator& end() const { return _end_iter; }
+ const MidiSource* midi_source() const { return _midi_source; }
+ void set_midi_source(MidiSource* source) { _midi_source = source; }
+ bool control_to_midi_event(boost::shared_ptr<MIDI::Event>& ev, const MidiControlIterator& iter) const;
+
private:
friend class DeltaCommand;
void add_note_unlocked(const boost::shared_ptr<Note> note);
void remove_note_unlocked(const boost::shared_ptr<const Note> note);
friend class const_iterator;
- bool control_to_midi_event(MidiEvent& ev, const MidiControlIterator& iter) const;
#ifndef NDEBUG
bool is_sorted() const;
#endif
- void append_note_on_unlocked(double time, uint8_t note, uint8_t velocity);
- void append_note_off_unlocked(double time, uint8_t note);
- void append_cc_unlocked(double time, uint8_t number, uint8_t value);
+ void append_note_on_unlocked(uint8_t chan, double time, uint8_t note, uint8_t velocity);
+ void append_note_off_unlocked(uint8_t chan, double time, uint8_t note);
+ void append_automation_event_unlocked(AutomationType type, uint8_t chan, double time, uint8_t first_byte, uint8_t second_byte);
+ void append_pgm_change_unlocked(uint8_t chan, double time, uint8_t number);
mutable Glib::RWLock _lock;
- Notes _notes;
+ Notes _notes;
+
NoteMode _note_mode;
typedef std::vector<size_t> WriteNotes;
- WriteNotes _write_notes;
+ WriteNotes _write_notes[16];
bool _writing;
bool _edited;
+
+ typedef std::vector< boost::shared_ptr<const ARDOUR::AutomationList> > AutomationLists;
+ AutomationLists _dirty_automations;
const const_iterator _end_iter;
boost::shared_ptr<Note>, std::deque< boost::shared_ptr<Note> >,
LaterNoteEndComparator>
ActiveNotes;
+
+ // We cannot use a boost::shared_ptr here to avoid a retain cycle
+ MidiSource* _midi_source;
};
} /* namespace ARDOUR */
projects / ardour.git / blobdiff