move ControllableDescriptor from libpbd to libardour; add support for describing...

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

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
index a453716e9523c3986e61bd08c3806ea22ee078a9..c1e59bc0dc1c5cd0088c665a02f6b6d26f22c5d2 100644 (file)
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
@@ -30,11 +30,11 @@
 
 namespace PBD {
        class Controllable;
-       class ControllableDescriptor;
 }
 
 namespace ARDOUR {
        class AsyncMIDIPort;
+       class ControllableDescriptor;
        class MidiPort;
        class Session;
 }
@@ -63,7 +63,7 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
        int set_feedback (bool yn);
        bool get_feedback () const;
 
-        boost::shared_ptr<PBD::Controllable> lookup_controllable (const PBD::ControllableDescriptor&) const;
+        boost::shared_ptr<PBD::Controllable> lookup_controllable (const ARDOUR::ControllableDescriptor&) const;
 
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);