Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio...

[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 a19e3a1a28ce005a0398e44a772475da108b7068..ebae2e9294341134a223aed851b4a52a5dc0f14a 100644 (file)
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -30,7 +30,7 @@
 
 #include "ardour/types.h"
 
-namespace PBD {
+namespace ARDOUR {
        class ControllableDescriptor;
 }
 
@@ -91,7 +91,7 @@ class MIDIControllable : public PBD::Stateful
        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; }
 
@@ -116,7 +116,7 @@ class MIDIControllable : public PBD::Stateful
 
        GenericMidiControlProtocol* _surface;
        PBD::Controllable* controllable;
-       PBD::ControllableDescriptor* _descriptor;
+       ARDOUR::ControllableDescriptor* _descriptor;
        std::string     _current_uri;
         MIDI::Parser&   _parser;
        bool             setting;
@@ -142,7 +142,7 @@ class MIDIControllable : public PBD::Stateful
        std::string     _what;
        bool            _bank_relative;
 
-        void drop_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);