ControlProtocol doesn't actually need any record of an event loop and doesn't need...

[ardour.git] / libs / surfaces / generic_midi / midicontrollable.h

diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index 7dd0be1d870513aced021c25877ff8556fba497c..bf377b66511eb48c791d03ac06ad2549ceebd964 100644 (file)
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: controllable.h 4 2005-05-13 20:47:18Z taybin $
 */
 
 #ifndef __gm_midicontrollable_h__
@@ -23,28 +22,40 @@
 
 #include <string>
 
-#include <sigc++/sigc++.h>
+#include "midi++/types.h"
 
-#include <midi++/types.h>
-#include <pbd/controllable.h>
-#include <pbd/stateful.h>
-#include <ardour/types.h>
+#include "pbd/controllable.h"
+#include "pbd/signals.h"
+#include "pbd/stateful.h"
 
-namespace MIDI {
+#include "ardour/types.h"
 
-class Channel;
-class Port;
-class Parser;
+namespace PBD {
+       class ControllableDescriptor;
+}
 
+namespace MIDI {
+       class Channel;
+       class Port;
+       class Parser;
 }
 
-class MIDIControllable : public Stateful
+class GenericMidiControlProtocol;
+
+class MIDIControllable : public PBD::Stateful
 {
   public:
-       MIDIControllable (MIDI::Port&, PBD::Controllable&, bool bistate = false);
+       MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, PBD::Controllable&, bool momentary);
+       MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, bool momentary = false);
        virtual ~MIDIControllable ();
 
-       void send_feedback ();
+       int init (const std::string&);
+
+       void rediscover_controllable ();
+       bool bank_relative() const { return _bank_relative; }
+       uint32_t rid() const { return _rid; }
+       std::string what() const { return _what; }
+
        MIDI::byte* write_feedback (MIDI::byte* buf, int32_t& bufsize, bool force = false);
        
        void midi_rebind (MIDI::channel_t channel=-1);
@@ -53,38 +64,59 @@ class MIDIControllable : public Stateful
        void stop_learning ();
        void drop_external_control ();
 
-       sigc::signal<void> learning_started;
-       sigc::signal<void> learning_stopped;
-
        bool get_midi_feedback () { return feedback; }
        void set_midi_feedback (bool val) { feedback = val; }
 
+       int control_to_midi(float val);
+       float midi_to_control(int val);
+
+       bool learned() const { return _learned; }
+
        MIDI::Port& get_port() const { return _port; }
-       PBD::Controllable& get_controllable() const { return controllable; }
+       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; }
 
        std::string control_description() const { return _control_description; }
 
        XMLNode& get_state (void);
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
 
+       void bind_midi (MIDI::channel_t, MIDI::eventType, MIDI::byte);
+       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; }
+       
   private:
-       PBD::Controllable& controllable;
+
+       int max_value_for_type () const;
+
+       GenericMidiControlProtocol* _surface;
+       PBD::Controllable* controllable;
+       PBD::ControllableDescriptor* _descriptor;
+       std::string        _current_uri;
        MIDI::Port&     _port;
        bool             setting;
-       MIDI::byte       last_written;
-       bool             bistate;
+       int              last_value;
+       float            last_controllable_value;
+       bool            _momentary;
+       bool            _is_gain_controller;
+       bool            _learned;
        int              midi_msg_id;      /* controller ID or note number */
-       sigc::connection midi_sense_connection[2];
-       sigc::connection midi_learn_connection;
-       size_t           connections;
+       PBD::ScopedConnection midi_sense_connection[2];
+       PBD::ScopedConnection midi_learn_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;
        bool             feedback;
+       uint32_t        _rid;
+       std::string     _what;
+       bool            _bank_relative;
        
-       static bool _send_feedback;
-
        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);
@@ -92,8 +124,6 @@ class MIDIControllable : public 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 bind_midi (MIDI::channel_t, MIDI::eventType, MIDI::byte);
 };
 
 #endif // __gm_midicontrollable_h__