summaryrefslogtreecommitdiffstats
path: root/src/libs/engine/MidiBuffer.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/engine/MidiBuffer.hpp')
-rw-r--r--src/libs/engine/MidiBuffer.hpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/engine/MidiBuffer.hpp b/src/libs/engine/MidiBuffer.hpp
index a7db7e77..f1948666 100644
--- a/src/libs/engine/MidiBuffer.hpp
+++ b/src/libs/engine/MidiBuffer.hpp
@@ -69,6 +69,7 @@ public:
double get_event(double* timestamp, uint32_t* size, unsigned char** data) const;
bool append(double timestamp, uint32_t size, const unsigned char* data);
+ bool merge(const MidiBuffer& a, const MidiBuffer& b);
private:
double _latest_stamp; ///< Highest timestamp of all events