diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-05-23 19:54:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-05-23 19:54:52 +0000 |
| commit | 2fba6d0925307abd11be9d8f7a8d2722a2b6ccbd (patch) | |
| tree | 485eed909963636b010d5f1e24527a6a4b377a42 /libs/surfaces/generic_midi | |
| parent | a222c19737fa2d3fce3971350c1a18906635e29a (diff) | |
breakout control protocol code into LGPL library; fix panner buttons even more than nick did, plus some other bits and pieces
git-svn-id: svn://localhost/trunk/ardour2@522 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/generic_midi')
| -rw-r--r-- | libs/surfaces/generic_midi/SConscript | 15 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.h | 3 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/interface.cc | 9 |
3 files changed, 18 insertions, 9 deletions
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript index b97a568dc6..9edb76327a 100644 --- a/libs/surfaces/generic_midi/SConscript +++ b/libs/surfaces/generic_midi/SConscript @@ -31,13 +31,14 @@ genericmidi.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"") genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") genericmidi.Merge ([ - libraries['ardour'], - libraries['midi++2'], - libraries['pbd3'], - libraries['sigc2'], - libraries['usb'], - libraries['xml'] - ]) + libraries['ardour'], + libraries['ardour_cp'], + libraries['midi++2'], + libraries['pbd3'], + libraries['sigc2'], + libraries['usb'], + libraries['xml'] + ]) libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files) diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h index ec789815f1..77a4dca805 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h @@ -1,7 +1,7 @@ #ifndef ardour_generic_midi_control_protocol_h #define ardour_generic_midi_control_protocol_h -#include <ardour/control_protocol.h> +#include "control_protocol.h" namespace MIDI { class Port; @@ -15,6 +15,7 @@ class GenericMidiControlProtocol : public ControlProtocol { virtual ~GenericMidiControlProtocol(); int set_active (bool yn); + static bool probe() { return true; } void set_port (MIDI::Port*); MIDI::Port* port () const { return _port; } diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc index 4dc7e236ca..625ac65273 100644 --- a/libs/surfaces/generic_midi/interface.cc +++ b/libs/surfaces/generic_midi/interface.cc @@ -1,4 +1,4 @@ -#include <ardour/control_protocol.h> +#include "control_protocol.h" #include "generic_midi_control_protocol.h" @@ -23,12 +23,19 @@ delete_generic_midi_protocol (ControlProtocolDescriptor* descriptor, ControlProt delete cp; } +bool +probe_generic_midi_protocol (ControlProtocolDescriptor* descriptor) +{ + return GenericMidiControlProtocol::probe (); +} + static ControlProtocolDescriptor generic_midi_descriptor = { name : "Generic MIDI", id : "uri://ardour.org/surfaces/generic_midi:0", ptr : 0, module : 0, mandatory : 0, + probe : probe_generic_midi_protocol, initialize : new_generic_midi_protocol, destroy : delete_generic_midi_protocol }; |