summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2018-09-25 17:46:49 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2018-09-27 11:31:13 -0400
commit147d456dbda658f15bd302fe89ec5b4f8780b148 (patch)
treeef3b30408fde93f1b29bf4123a52ef1d1b2d4dff
parent0f7123d33a1ab879191046b86d382318f35fd570 (diff)
change type of MIDI::Parser::position signal to include timestamp
-rw-r--r--libs/midi++2/midi++/parser.h4
-rw-r--r--libs/midi++2/parser.cc2
2 files changed, 3 insertions, 3 deletions
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: