merge 3.0 from 2.0-ongoing@3243

git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-04-11 14:06:50 +00:00
parent 9aa8af5a28
commit cb41314642
100 changed files with 17534 additions and 4036 deletions

View file

@ -44,6 +44,7 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
ARDOUR::microseconds_t last_feedback_time;
bool do_feedback;
bool auto_binding;
void _send_feedback ();
void send_feedback ();
@ -59,6 +60,13 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
void stop_learning (PBD::Controllable*);
void learning_stopped (MIDIControllable*);
void create_binding (PBD::Controllable*, int, int);
void delete_binding (PBD::Controllable*);
void auto_binding_on();
void auto_binding_off();
};
#endif /* ardour_generic_midi_control_protocol_h */