X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fmidi%2B%2B%2Fparser.h;h=7040e9b522a6c613350d27c31f1ca12759117dec;hb=d3b341d5c242755d4fa69463d36c78f861856045;hp=e4126b210bac34db57ae7ee4b8bdcc897679a2b3;hpb=2b9421fd391efcddde0be3397cb66e19b744a155;p=ardour.git

diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h
index e4126b210b..7040e9b522 100644
--- a/libs/midi++2/midi++/parser.h
+++ b/libs/midi++2/midi++/parser.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 1998 Paul Barton-Davis
-    
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -34,10 +34,13 @@ class Port;
 class Parser;
 
 typedef PBD::Signal1<void,Parser&>                   ZeroByteSignal;
+typedef PBD::Signal2<void,Parser&,unsigned short>    BankSignal;
 typedef PBD::Signal2<void,Parser&,framecnt_t>        TimestampedSignal;
 typedef PBD::Signal2<void,Parser&, byte>             OneByteSignal;
 typedef PBD::Signal2<void,Parser &, EventTwoBytes *> TwoByteSignal;
 typedef PBD::Signal2<void,Parser &, pitchbend_t>     PitchBendSignal;
+typedef PBD::Signal3<void,Parser &, uint16_t, int>   RPNSignal;
+typedef PBD::Signal3<void,Parser &, uint16_t, float> RPNValueSignal;
 typedef PBD::Signal3<void,Parser &, byte *, size_t>  Signal;
 
 class LIBMIDIPP_API Parser {
@@ -49,13 +52,13 @@ class LIBMIDIPP_API Parser {
 	   message the next time ::scanner() parses such a message. It should
 	   therefore be set before every byte passed into ::scanner().
 	*/
-	
+
 	framecnt_t get_timestamp() const { return _timestamp; }
-	void set_timestamp (const framecnt_t timestamp) { _timestamp = timestamp; } 
+	void set_timestamp (const framecnt_t timestamp) { _timestamp = timestamp; }
 
 	/* signals that anyone can connect to */
-	
-	OneByteSignal         bank_change;
+
+	BankSignal            bank_change;
 	TwoByteSignal         note_on;
 	TwoByteSignal         note_off;
 	TwoByteSignal         poly_pressure;
@@ -64,7 +67,7 @@ class LIBMIDIPP_API Parser {
 	PitchBendSignal       pitchbend;
 	TwoByteSignal         controller;
 
-	OneByteSignal         channel_bank_change[16];
+	BankSignal            channel_bank_change[16];
 	TwoByteSignal         channel_note_on[16];
 	TwoByteSignal         channel_note_off[16];
 	TwoByteSignal         channel_poly_pressure[16];
@@ -74,6 +77,10 @@ class LIBMIDIPP_API Parser {
 	TwoByteSignal         channel_controller[16];
 	ZeroByteSignal        channel_active_preparse[16];
 	ZeroByteSignal        channel_active_postparse[16];
+	RPNValueSignal        channel_rpn[16];
+	RPNValueSignal        channel_nrpn[16];
+	RPNSignal             channel_rpn_change[16];
+	RPNSignal             channel_nrpn_change[16];
 
 	OneByteSignal         mtc_quarter_frame; /* see below for more useful signals */
 	Signal                mtc;
@@ -123,7 +130,7 @@ class LIBMIDIPP_API Parser {
 	MTC_Status  mtc_running() const { return _mtc_running; }
 	const byte *mtc_current() const { return _mtc_time; }
 	bool        mtc_locked() const  { return _mtc_locked; }
-	
+
 	PBD::Signal3<void, Parser &, int, framecnt_t>      mtc_qtr;
 	PBD::Signal3<void, const byte *, bool, framecnt_t> mtc_time;
 	PBD::Signal1<void, MTC_Status>                     mtc_status;
@@ -134,10 +141,10 @@ class LIBMIDIPP_API Parser {
 	}
 
 	void reset_mtc_state ();
-	
+
   private:
 	/* tracing */
-	
+
 	std::ostream *trace_stream;
 	std::string trace_prefix;
 	void trace_event (Parser &p, byte *msg, size_t len);
@@ -145,7 +152,7 @@ class LIBMIDIPP_API Parser {
 
 	size_t message_counter[256];
 
-	enum ParseState { 
+	enum ParseState {
 		NEEDSTATUS,
 		NEEDONEBYTE,
 		NEEDTWOBYTES,
@@ -170,7 +177,7 @@ class LIBMIDIPP_API Parser {
 	MTC_Status _mtc_running;
 	bool       _mtc_locked;
 	byte last_qtr_frame;
-	
+
 	framecnt_t _timestamp;
 
 	ParseState pre_variable_state;