From 147d456dbda658f15bd302fe89ec5b4f8780b148 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 25 Sep 2018 17:46:49 -0400
Subject: change type of MIDI::Parser::position signal to include timestamp

---
 libs/midi++2/midi++/parser.h | 4 ++--
 libs/midi++2/parser.cc       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libs')

diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h
index 0ccef6e66f..443189283e 100644
--- a/libs/midi++2/midi++/parser.h
+++ b/libs/midi++2/midi++/parser.h
@@ -35,7 +35,7 @@ class Parser;
 
 typedef PBD::Signal1<void,Parser&>                   ZeroByteSignal;
 typedef PBD::Signal2<void,Parser&,unsigned short>    BankSignal;
-typedef PBD::Signal2<void,Parser&,samplecnt_t>        TimestampedSignal;
+typedef PBD::Signal2<void,Parser&,samplecnt_t>       TimestampedSignal;
 typedef PBD::Signal2<void,Parser&, byte>             OneByteSignal;
 typedef PBD::Signal2<void,Parser &, EventTwoBytes *> TwoByteSignal;
 typedef PBD::Signal2<void,Parser &, pitchbend_t>     PitchBendSignal;
@@ -90,7 +90,7 @@ class LIBMIDIPP_API Parser {
 	AnySignal             any;
 	Signal                sysex;
 	Signal                mmc;
-	Signal                position;
+	AnySignal             position;
 	Signal                song;
 
 	ZeroByteSignal        all_notes_off;
diff --git a/libs/midi++2/parser.cc b/libs/midi++2/parser.cc
index 599f8764f1..5193e136eb 100644
--- a/libs/midi++2/parser.cc
+++ b/libs/midi++2/parser.cc
@@ -749,7 +749,7 @@ Parser::signal (MIDI::byte *msg, size_t len)
 		break;
 
 	case MIDI::position:
-		position (*this, msg, len);
+		position (*this, msg, len, _timestamp);
 		break;
 
 	case MIDI::song:
-- 
cgit v1.2.3