X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fgeneric_midi%2Fmidicontrollable.h;h=ebae2e9294341134a223aed851b4a52a5dc0f14a;hb=d5127001bb60a8648a277f77e9ae4e8fd5943c9a;hp=571f71edfedf9c60b3d06c1aa32dc781553d51bc;hpb=92469df6ab3417c6d953f0b51766d42d71a230af;p=ardour.git

diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index 571f71edfe..ebae2e9294 100644
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 1998-2006 Paul 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
@@ -30,23 +30,26 @@
 
 #include "ardour/types.h"
 
-namespace PBD {
+namespace ARDOUR {
 	class ControllableDescriptor;
 }
 
 namespace MIDI {
 	class Channel;
-	class Port;
 	class Parser;
 }
 
 class GenericMidiControlProtocol;
 
+namespace ARDOUR {
+	class AsyncMIDIPort;
+}
+
 class MIDIControllable : public PBD::Stateful
 {
   public:
-	MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, PBD::Controllable&, bool momentary);
-	MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, bool momentary = false);
+        MIDIControllable (GenericMidiControlProtocol *, MIDI::Parser&, PBD::Controllable&, bool momentary);
+        MIDIControllable (GenericMidiControlProtocol *, MIDI::Parser&, bool momentary = false);
 	virtual ~MIDIControllable ();
 
 	int init (const std::string&);
@@ -56,8 +59,16 @@ class MIDIControllable : public PBD::Stateful
 	uint32_t rid() const { return _rid; }
 	std::string what() const { return _what; }
 
+	enum Encoder {
+		No_enc,
+		Enc_R,
+		Enc_L,
+		Enc_2,
+		Enc_B,
+	};
+
 	MIDI::byte* write_feedback (MIDI::byte* buf, int32_t& bufsize, bool force = false);
-	
+
 	void midi_rebind (MIDI::channel_t channel=-1);
 	void midi_forget ();
 	void learn_about_external_control ();
@@ -72,12 +83,15 @@ class MIDIControllable : public PBD::Stateful
 
 	bool learned() const { return _learned; }
 
-	MIDI::Port& get_port() const { return _port; }
+	Encoder get_encoder() const { return _encoder; }
+	void set_encoder (Encoder val) { _encoder = val; }
+
+	MIDI::Parser& get_parser() { return _parser; }
 	PBD::Controllable* get_controllable() const { return controllable; }
 	void set_controllable (PBD::Controllable*);
 	const std::string& current_uri() const { return _current_uri; }
 
-	PBD::ControllableDescriptor& descriptor() const { return *_descriptor; }
+	ARDOUR::ControllableDescriptor& descriptor() const { return *_descriptor; }
 
 	std::string control_description() const { return _control_description; }
 
@@ -85,40 +99,51 @@ class MIDIControllable : public PBD::Stateful
 	int set_state (const XMLNode&, int version);
 
 	void bind_midi (MIDI::channel_t, MIDI::eventType, MIDI::byte);
+	void bind_rpn_value (MIDI::channel_t, uint16_t rpn);
+	void bind_nrpn_value (MIDI::channel_t, uint16_t rpn);
+	void bind_rpn_change (MIDI::channel_t, uint16_t rpn);
+	void bind_nrpn_change (MIDI::channel_t, uint16_t rpn);
+
 	MIDI::channel_t get_control_channel () { return control_channel; }
 	MIDI::eventType get_control_type () { return control_type; }
 	MIDI::byte get_control_additional () { return control_additional; }
-	
+
+        int lookup_controllable();
+
   private:
 
 	int max_value_for_type () const;
 
 	GenericMidiControlProtocol* _surface;
 	PBD::Controllable* controllable;
-	PBD::ControllableDescriptor* _descriptor;
-	std::string        _current_uri;
-	MIDI::Port&     _port;
+	ARDOUR::ControllableDescriptor* _descriptor;
+	std::string     _current_uri;
+        MIDI::Parser&   _parser;
 	bool             setting;
 	int              last_value;
 	float            last_controllable_value;
 	bool            _momentary;
 	bool            _is_gain_controller;
 	bool            _learned;
+	Encoder			_encoder;
 	int              midi_msg_id;      /* controller ID or note number */
 	PBD::ScopedConnection midi_sense_connection[2];
 	PBD::ScopedConnection midi_learn_connection;
+        PBD::ScopedConnection controllable_death_connection;
 	/** the type of MIDI message that is used for this control */
 	MIDI::eventType  control_type;
 	MIDI::byte       control_additional;
 	MIDI::channel_t  control_channel;
 	std::string     _control_description;
+	int16_t          control_rpn;
+	int16_t          control_nrpn;
 	bool             feedback;
 	uint32_t        _rid;
 	std::string     _what;
 	bool            _bank_relative;
 
-        int lookup_controllable();
-	
+  void drop_controllable (PBD::Controllable*);
+
 	void midi_receiver (MIDI::Parser &p, MIDI::byte *, size_t);
 	void midi_sense_note (MIDI::Parser &, MIDI::EventTwoBytes *, bool is_on);
 	void midi_sense_note_on (MIDI::Parser &p, MIDI::EventTwoBytes *tb);
@@ -126,6 +151,12 @@ class MIDIControllable : public PBD::Stateful
 	void midi_sense_controller (MIDI::Parser &, MIDI::EventTwoBytes *);
 	void midi_sense_program_change (MIDI::Parser &, MIDI::byte);
 	void midi_sense_pitchbend (MIDI::Parser &, MIDI::pitchbend_t);
+
+	void nrpn_value_change (MIDI::Parser&, uint16_t nrpn, float val);
+	void rpn_value_change (MIDI::Parser&, uint16_t nrpn, float val);
+	void rpn_change (MIDI::Parser&, uint16_t nrpn, int direction);
+	void nrpn_change (MIDI::Parser&, uint16_t nrpn, int direction);
+
 };
 
 #endif // __gm_midicontrollable_h__