ardour/livetrax
13
0
Fork 0
Code

MCP: drop need for ScopedConnectionList::empty()

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11825 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-08 14:22:34 +00:00
parent c72287e67d
commit ef484a8a33
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/surfaces/mackie/mackie_port.cc
View File

@ -54,6 +54,7 @@ MackiePort::MackiePort (MackieControlProtocol & mcp, MIDI::Port & input_port, MI
, _port_type (port_type)
, _emulation (none)
, _initialising (true)
, _connected (false)
{
DEBUG_TRACE (DEBUG::MackieControl, "MackiePort::MackiePort\n");
}
@ -104,6 +105,8 @@ void MackiePort::close()
// disconnect signals
sysex_connection.disconnect();
ScopedConnectionList::drop_connections ();
_connected = false;
// TODO emit a "closing" signal?
}
@ -265,7 +268,7 @@ void MackiePort::finalise_init (bool yn)
void MackiePort::connect_to_signals ()
{
if (ScopedConnectionList::empty()) {
if (!_connected) {
MIDI::Parser* p = input_port().parser();
@ -279,8 +282,9 @@ void MackiePort::connect_to_signals ()
p->channel_pitchbend[5].connect_same_thread (*this, boost::bind (&MackiePort::handle_midi_pitchbend_message, this, _1, _2, 5U));
p->channel_pitchbend[6].connect_same_thread (*this, boost::bind (&MackiePort::handle_midi_pitchbend_message, this, _1, _2, 6U));
p->channel_pitchbend[7].connect_same_thread (*this, boost::bind (&MackiePort::handle_midi_pitchbend_message, this, _1, _2, 7U));
}
_connected = true;
}
}
bool MackiePort::wait_for_init()

1
libs/surfaces/mackie/mackie_port.h
View File

@ -112,6 +112,7 @@ private:
emulation_t _emulation;
bool _initialising;
bool _connected;
Glib::Cond init_cond;
Glib::Mutex init_mutex;
};