diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-24 02:28:51 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-24 02:28:51 +0000 |
| commit | 33140f32671576a285d62f529447f941f96313fc (patch) | |
| tree | 44faee5b21e3181077d0c22180895fb072432a53 /libs/midi++2/manager.cc | |
| parent | 10d37fecc1b54487a5fb0f3652bfb45a5224ef8b (diff) | |
add support for IP MIDI (multicast MIDI over IP UDP sockets) to ardour and use it if requested inside MCP code. required renaming the pre-existing MIDI::Port as MIDI:JackMIDIPort - MIDI::Port becomes the base type for both JackMIDIPort and IPMIDIPort
git-svn-id: svn://localhost/ardour2/branches/3.0@12069 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/manager.cc')
| -rw-r--r-- | libs/midi++2/manager.cc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/libs/midi++2/manager.cc b/libs/midi++2/manager.cc index 61d4c4c363..822c74e125 100644 --- a/libs/midi++2/manager.cc +++ b/libs/midi++2/manager.cc @@ -27,6 +27,7 @@ #include "midi++/manager.h" #include "midi++/channel.h" #include "midi++/port.h" +#include "midi++/jack_midi_port.h" #include "midi++/mmc.h" using namespace std; @@ -40,12 +41,12 @@ Manager::Manager (jack_client_t* jack) { _mmc = new MachineControl (this, jack); - _mtc_input_port = add_port (new MIDI::Port ("MTC in", Port::IsInput, jack)); - _mtc_output_port = add_port (new MIDI::Port ("MTC out", Port::IsOutput, jack)); - _midi_input_port = add_port (new MIDI::Port ("MIDI control in", Port::IsInput, jack)); - _midi_output_port = add_port (new MIDI::Port ("MIDI control out", Port::IsOutput, jack)); - _midi_clock_input_port = add_port (new MIDI::Port ("MIDI clock in", Port::IsInput, jack)); - _midi_clock_output_port = add_port (new MIDI::Port ("MIDI clock out", Port::IsOutput, jack)); + _mtc_input_port = add_port (new MIDI::JackMIDIPort ("MTC in", Port::IsInput, jack)); + _mtc_output_port = add_port (new MIDI::JackMIDIPort ("MTC out", Port::IsOutput, jack)); + _midi_input_port = add_port (new MIDI::JackMIDIPort ("MIDI control in", Port::IsInput, jack)); + _midi_output_port = add_port (new MIDI::JackMIDIPort ("MIDI control out", Port::IsOutput, jack)); + _midi_clock_input_port = add_port (new MIDI::JackMIDIPort ("MIDI clock in", Port::IsInput, jack)); + _midi_clock_output_port = add_port (new MIDI::JackMIDIPort ("MIDI clock out", Port::IsOutput, jack)); } Manager::~Manager () @@ -117,7 +118,10 @@ Manager::reestablish (jack_client_t* jack) boost::shared_ptr<PortList> pr = _ports.reader (); for (PortList::const_iterator p = pr->begin(); p != pr->end(); ++p) { - (*p)->reestablish (jack); + JackMIDIPort* pp = dynamic_cast<JackMIDIPort*> (*p); + if (pp) { + pp->reestablish (jack); + } } } @@ -128,7 +132,10 @@ Manager::reconnect () boost::shared_ptr<PortList> pr = _ports.reader (); for (PortList::const_iterator p = pr->begin(); p != pr->end(); ++p) { - (*p)->reconnect (); + JackMIDIPort* pp = dynamic_cast<JackMIDIPort*> (*p); + if (pp) { + pp->reconnect (); + } } } |