change type of MIDI::Parser::position signal to include timestamp

diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h
index 0ccef6e66f8a51b23f8eb8912d20e9712461dce0..443189283ec9144adf9b6ff6fcc8a57f152b71f8 100644 (file)
--- 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 599f8764f15d8835012bc5b83f084db4d88b77c6..5193e136eb9790376016f938d62b7e6bc1b496c8 100644 (file)
--- 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: