diff options
author | Carl Hetherington <carl@carlh.net> | 2010-07-08 22:55:20 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-07-08 22:55:20 +0000 |
commit | 648a169d8ff9987ba727e9ba50af4f33da6db165 (patch) | |
tree | d8e250205004633a9f5c94e15e8f3826fac183b6 /libs/midi++2/mmc.cc | |
parent | 3549189f87813b8c9f01f2f6484b34cf923a65ad (diff) |
Move MIDI control port ownership into the MIDI Manager, since control port state should be Ardour-wide, not per-session. Fix up port connection state management.
git-svn-id: svn://localhost/ardour2/branches/3.0@7394 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/mmc.cc')
-rw-r--r-- | libs/midi++2/mmc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc index 69bdabf1e5..930666a027 100644 --- a/libs/midi++2/mmc.cc +++ b/libs/midi++2/mmc.cc @@ -195,15 +195,15 @@ static void build_mmc_cmd_map () } -MachineControl::MachineControl (jack_client_t* jack) +MachineControl::MachineControl (Manager* m, jack_client_t* jack) { build_mmc_cmd_map (); _receive_device_id = 0; _send_device_id = 0x7f; - _input_port = Manager::instance()->add_port (new Port ("MMC in", Port::IsInput, jack)); - _output_port = Manager::instance()->add_port (new Port ("MMC out", Port::IsOutput, jack)); + _input_port = m->add_port (new Port ("MMC in", Port::IsInput, jack)); + _output_port = m->add_port (new Port ("MMC out", Port::IsOutput, jack)); _input_port->parser()->mmc.connect_same_thread (port_connections, boost::bind (&MachineControl::process_mmc_message, this, _1, _2, _3)); _input_port->parser()->start.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_start, this, _1, _2)); |