ardour/livetrax
13
0
Fork 0
Code

Fix broken whitespace.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9304 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-04-06 16:35:20 +00:00
parent d591a64bac
commit 67d970529a
1 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libs/ardour/ardour/midi_model.h
View File

@ -58,7 +58,7 @@ public:
class DiffCommand : public Command { class DiffCommand : public Command {
public: public:
DiffCommand (boost::shared_ptr<MidiModel> m, const std::string& name); DiffCommand (boost::shared_ptr<MidiModel> m, const std::string& name);
const std::string& name () const { return _name; } const std::string& name () const { return _name; }
@ -69,7 +69,7 @@ public:
virtual int set_state (const XMLNode&, int version) = 0; virtual int set_state (const XMLNode&, int version) = 0;
virtual XMLNode & get_state () = 0; virtual XMLNode & get_state () = 0;
boost::shared_ptr<MidiModel> model() const { return _model; } boost::shared_ptr<MidiModel> model() const { return _model; }
protected: protected:
boost::shared_ptr<MidiModel> _model; boost::shared_ptr<MidiModel> _model;
@ -82,7 +82,7 @@ public:
NoteDiffCommand (boost::shared_ptr<MidiModel> m, const std::string& name) : DiffCommand (m, name) {} NoteDiffCommand (boost::shared_ptr<MidiModel> m, const std::string& name) : DiffCommand (m, name) {}
NoteDiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node); NoteDiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node);
enum Property { enum Property {
NoteNumber, NoteNumber,
Velocity, Velocity,
@ -96,21 +96,21 @@ public:
int set_state (const XMLNode&, int version); int set_state (const XMLNode&, int version);
XMLNode & get_state (); XMLNode & get_state ();
void add (const NotePtr note); void add (const NotePtr note);
void remove (const NotePtr note); void remove (const NotePtr note);
void side_effect_remove (const NotePtr note); void side_effect_remove (const NotePtr note);
void change (const NotePtr note, Property prop, uint8_t new_value); void change (const NotePtr note, Property prop, uint8_t new_value);
void change (const NotePtr note, Property prop, TimeType new_time); void change (const NotePtr note, Property prop, TimeType new_time);
bool adds_or_removes() const { bool adds_or_removes() const {
return !_added_notes.empty() || !_removed_notes.empty(); return !_added_notes.empty() || !_removed_notes.empty();
} }
NoteDiffCommand& operator+= (const NoteDiffCommand& other); NoteDiffCommand& operator+= (const NoteDiffCommand& other);
private: private:
struct NoteChange { struct NoteChange {
NoteDiffCommand::Property property; NoteDiffCommand::Property property;
NotePtr note; NotePtr note;
@ -131,7 +131,7 @@ public:
NoteList _added_notes; NoteList _added_notes;
NoteList _removed_notes; NoteList _removed_notes;
std::set<NotePtr> side_effect_removals; std::set<NotePtr> side_effect_removals;
XMLNode &marshal_change(const NoteChange&); XMLNode &marshal_change(const NoteChange&);
NoteChange unmarshal_change(XMLNode *xml_note); NoteChange unmarshal_change(XMLNode *xml_note);
@ -144,7 +144,7 @@ public:
class SysExDiffCommand : public DiffCommand { class SysExDiffCommand : public DiffCommand {
public: public:
SysExDiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node); SysExDiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node);
enum Property { enum Property {
Time, Time,
}; };
@ -154,7 +154,7 @@ public:
void operator() (); void operator() ();
void undo (); void undo ();
void change (boost::shared_ptr<Evoral::Event<TimeType> >, TimeType); void change (boost::shared_ptr<Evoral::Event<TimeType> >, TimeType);
private: private:
@ -164,7 +164,7 @@ public:
TimeType old_time; TimeType old_time;
TimeType new_time; TimeType new_time;
}; };
typedef std::list<Change> ChangeList; typedef std::list<Change> ChangeList;
ChangeList _changes; ChangeList _changes;
@ -196,29 +196,28 @@ public:
Program, Program,
Bank Bank
}; };
private: private:
struct Change { struct Change {
PatchChangePtr patch; PatchChangePtr patch;
Property property; Property property;
union { union {
TimeType old_time; TimeType old_time;
uint8_t old_channel; uint8_t old_channel;
int old_bank; int old_bank;
uint8_t old_program; uint8_t old_program;
}; };
union { union {
uint8_t new_channel; uint8_t new_channel;
TimeType new_time; TimeType new_time;
uint8_t new_program; uint8_t new_program;
int new_bank; int new_bank;
}; };
}; };
typedef std::list<Change> ChangeList; typedef std::list<Change> ChangeList;
ChangeList _changes; ChangeList _changes;
std::list<PatchChangePtr> _added; std::list<PatchChangePtr> _added;
std::list<PatchChangePtr> _removed; std::list<PatchChangePtr> _removed;
@ -238,7 +237,7 @@ public:
bool sync_to_source (); bool sync_to_source ();
bool write_to(boost::shared_ptr<MidiSource> source); bool write_to(boost::shared_ptr<MidiSource> source);
bool write_section_to (boost::shared_ptr<MidiSource> source, Evoral::MusicalTime begin = Evoral::MinMusicalTime, bool write_section_to (boost::shared_ptr<MidiSource> source, Evoral::MusicalTime begin = Evoral::MinMusicalTime,
Evoral::MusicalTime end = Evoral::MaxMusicalTime); Evoral::MusicalTime end = Evoral::MaxMusicalTime);
// MidiModel doesn't use the normal AutomationList serialisation code // MidiModel doesn't use the normal AutomationList serialisation code
// since controller data is stored in the .mid // since controller data is stored in the .mid
@ -255,8 +254,8 @@ public:
boost::shared_ptr<Evoral::Note<TimeType> > find_note (gint note_id); boost::shared_ptr<Evoral::Note<TimeType> > find_note (gint note_id);
boost::shared_ptr<Evoral::Event<TimeType> > find_sysex (gint); boost::shared_ptr<Evoral::Event<TimeType> > find_sysex (gint);
InsertMergePolicy insert_merge_policy () const; InsertMergePolicy insert_merge_policy () const;
void set_insert_merge_policy (InsertMergePolicy); void set_insert_merge_policy (InsertMergePolicy);
boost::shared_ptr<Evoral::Control> control_factory(const Evoral::Parameter& id); boost::shared_ptr<Evoral::Control> control_factory(const Evoral::Parameter& id);
@ -264,7 +263,7 @@ public:
void transpose (TimeType, TimeType, int); void transpose (TimeType, TimeType, int);
protected: protected:
int resolve_overlaps_unlocked (const NotePtr, void* arg = 0); int resolve_overlaps_unlocked (const NotePtr, void* arg = 0);
private: private:
struct WriteLockImpl : public AutomatableSequence<TimeType>::WriteLockImpl { struct WriteLockImpl : public AutomatableSequence<TimeType>::WriteLockImpl {
@ -289,15 +288,17 @@ private:
void source_automation_state_changed (Evoral::Parameter, AutoState); void source_automation_state_changed (Evoral::Parameter, AutoState);
void control_list_interpolation_changed (Evoral::Parameter, Evoral::ControlList::InterpolationStyle); void control_list_interpolation_changed (Evoral::Parameter, Evoral::ControlList::InterpolationStyle);
void automation_list_automation_state_changed (Evoral::Parameter, AutoState); void automation_list_automation_state_changed (Evoral::Parameter, AutoState);
PBD::ScopedConnectionList _midi_source_connections; PBD::ScopedConnectionList _midi_source_connections;
// We cannot use a boost::shared_ptr here to avoid a retain cycle // We cannot use a boost::shared_ptr here to avoid a retain cycle
boost::weak_ptr<MidiSource> _midi_source; boost::weak_ptr<MidiSource> _midi_source;
InsertMergePolicy _insert_merge_policy; InsertMergePolicy _insert_merge_policy;
}; };
} /* namespace ARDOUR */ } /* namespace ARDOUR */
/* This is a very long comment and stuff oh my god it's so long what are we going to do oh no oh no*/
#endif /* __ardour_midi_model_h__ */ #endif /* __ardour_midi_model_h__ */