r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600

Trunk merge conflicts resolved


git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Fugal 2006-08-04 02:18:45 +00:00
parent b0b7234458
commit 79986643c0
372 changed files with 20759 additions and 10250 deletions

View file

@ -1,34 +1,58 @@
#ifndef ardour_generic_midi_control_protocol_h
#define ardour_generic_midi_control_protocol_h
#include <set>
#include <glibmm/thread.h>
#include <ardour/types.h>
#include <control_protocol/control_protocol.h>
namespace MIDI {
class Port;
}
namespace ARDOUR {
namespace PBD {
class Controllable;
}
class GenericMidiControlProtocol : public ControlProtocol {
namespace ARDOUR {
class Session;
}
class MIDIControllable;
class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
public:
GenericMidiControlProtocol (Session&);
GenericMidiControlProtocol (ARDOUR::Session&);
virtual ~GenericMidiControlProtocol();
int set_active (bool yn);
static bool probe() { return true; }
void set_port (MIDI::Port*);
MIDI::Port* port () const { return _port; }
void set_feedback_interval (ARDOUR::microseconds_t);
XMLNode& get_state ();
int set_state (const XMLNode&);
void send_route_feedback (std::list<Route*>&);
private:
void route_feedback (ARDOUR::Route&, bool);
MIDI::Port* _port;
ARDOUR::microseconds_t _feedback_interval;
ARDOUR::microseconds_t last_feedback_time;
void port_change ();
void _send_feedback ();
void send_feedback ();
typedef std::set<MIDIControllable*> MIDIControllables;
MIDIControllables controllables;
MIDIControllables pending_controllables;
Glib::Mutex controllables_lock;
Glib::Mutex pending_lock;
bool start_learning (PBD::Controllable*);
void stop_learning (PBD::Controllable*);
void learning_stopped (MIDIControllable*);
};
}
#endif // ardour_generic_midi_control_protocol_h
#endif /* ardour_generic_midi_control_protocol_h */