diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-17 08:05:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-17 08:05:59 -0400 |
| commit | 650964f3203319b013c49a286b5fc5fc203f3bbb (patch) | |
| tree | 60b2f879d4ed634f9420a737886086db5eb31f78 /libs/evoral | |
| parent | 9cbe231b920d92a2e44e08962a3ed6870b962f34 (diff) | |
| parent | 780397d0ccf8df54eeb78c88eebbaab0c2745029 (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'libs/evoral')
| -rw-r--r-- | libs/evoral/evoral/PatchChange.hpp | 2 | ||||
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libs/evoral/evoral/PatchChange.hpp b/libs/evoral/evoral/PatchChange.hpp index b1a42c6f2e..53b50a3383 100644 --- a/libs/evoral/evoral/PatchChange.hpp +++ b/libs/evoral/evoral/PatchChange.hpp @@ -123,7 +123,7 @@ public: return time() < o.time(); } - if (bank != o.bank()) { + if (bank() != o.bank()) { return bank() < o.bank(); } diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index b56c234d75..204ef58f33 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -24,6 +24,10 @@ #include <stdint.h> #include <cstdio> +#if __clang__ +#include "evoral/Note.hpp" +#endif + #include "pbd/compose.h" #include "pbd/error.h" |