summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorHans Baier <hansfbaier@googlemail.com>2008-12-11 08:06:27 +0000
committerHans Baier <hansfbaier@googlemail.com>2008-12-11 08:06:27 +0000
commite009016b03ea5c5c690d7d4939b264313600fd4b (patch)
tree6de5374502891ad1229fffae5ab5f7d71eed70c2 /libs
parentdfed4965b7cf74f21a9e78689dbda1bc5892cde8 (diff)
* added myself to about.cc
* created ArdourCanvas::CanvasFlag as a base class for flags * removed obsolete cruft from midi_model * made MidiTimeAxisView and MidiRegionView work together to display program changes as names by means of MidiPatchManager git-svn-id: svn://localhost/ardour2/branches/3.0@4307 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/midi_model.cc7
-rw-r--r--libs/midi++2/midi++/midnam_patch.h1
2 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index 539881e51c..c1d53a2553 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -278,13 +278,6 @@ XMLNode& MidiModel::DeltaCommand::get_state()
return *delta_command;
}
-struct EventTimeComparator {
- typedef const Evoral::Event* value_type;
- inline bool operator()(const Evoral::Event& a, const Evoral::Event& b) const {
- return a.time() >= b.time();
- }
-};
-
/** Write the model to a MidiSource (i.e. save the model).
* This is different from manually using read to write to a source in that
* note off events are written regardless of the track mode. This is so the
diff --git a/libs/midi++2/midi++/midnam_patch.h b/libs/midi++2/midi++/midnam_patch.h
index b025268c45..74ab0f701d 100644
--- a/libs/midi++2/midi++/midnam_patch.h
+++ b/libs/midi++2/midi++/midnam_patch.h
@@ -147,6 +147,7 @@ public:
Patch& find_patch(uint8_t msb, uint8_t lsb, uint8_t program_number) {
PatchPrimaryKey key(msb, lsb, program_number);
+ assert(key.is_sane());
return _patch_map[key];
}