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/ardour/ticker.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/ardour/ticker.cc')
| -rw-r--r-- | libs/ardour/ticker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index f1792e3ffd..98f0632c45 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -19,6 +19,7 @@ */ #include "midi++/port.h" +#include "midi++/manager.h" #include "evoral/midi_events.h" #include "ardour/ticker.h" #include "ardour/session.h" @@ -45,7 +46,6 @@ void MidiClockTicker::set_session (Session* s) Ticker::set_session (s); if (_session) { - _session->MIDIClock_PortChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::update_midi_clock_port, this)); _session->TransportStateChange.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this)); _session->PositionChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::position_changed, this, _1)); _session->TransportLooped.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_looped, this)); @@ -62,7 +62,7 @@ MidiClockTicker::session_going_away () void MidiClockTicker::update_midi_clock_port() { - _midi_port = _session->midi_clock_output_port(); + _midi_port = MIDI::Manager::instance()->midi_clock_output_port(); } void MidiClockTicker::transport_state_changed() |