summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorJohn Anderson <ardour@semiosix.com>2007-08-08 18:34:50 +0000
committerJohn Anderson <ardour@semiosix.com>2007-08-08 18:34:50 +0000
commite0b3caa00d4fd4f78fced2efa4b9b92b60d25bab (patch)
tree514c64dd17a1a3ad5fad300b48ce8f515fd35974 /libs/surfaces
parentc02991ca5d19956607f70a9c997e7c8207fb8acc (diff)
mo betta debugging outout
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2273 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/mackie/mackie_port.cc19
1 files changed, 10 insertions, 9 deletions
diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc
index c5f855975a..080478d199 100644
--- a/libs/surfaces/mackie/mackie_port.cc
+++ b/libs/surfaces/mackie/mackie_port.cc
@@ -191,13 +191,11 @@ MidiByteArray MackiePort::host_connection_confirmation( const MidiByteArray & by
void MackiePort::probe_emulation( const MidiByteArray & bytes )
{
-#ifdef PORT_DEBUG
+#if 0
cout << "MackiePort::probe_emulation: " << bytes.size() << ", " << bytes << endl;
-#endif
-
- string version_string;
- for ( int i = 6; i < 11; ++i ) version_string.append( 1, (char)bytes[i] );
-#ifdef PORT_DEBUG
+
+ MidiByteArray version_string;
+ for ( int i = 6; i < 11; ++i ) version_string << bytes[i];
cout << "version_string: " << version_string << endl;
#endif
@@ -206,7 +204,7 @@ void MackiePort::probe_emulation( const MidiByteArray & bytes )
// sometimes.
if (!_initialising)
{
- cout << "MackiePort::probe_emulation out of sequence." << endl;
+ //cout << "MackiePort::probe_emulation out of sequence." << endl;
return;
}
@@ -222,7 +220,7 @@ void MackiePort::init()
_initialising = true;
#ifdef PORT_DEBUG
- cout << "MackiePort::lock acquired" << endl;
+ cout << "MackiePort::init lock acquired" << endl;
#endif
// emit pre-init signal
init_event();
@@ -282,12 +280,15 @@ void MackiePort::finalise_init( bool yn )
_initialising = false;
init_cond.signal();
init_mutex.unlock();
+#ifdef PORT_DEBUG
+ cout << "MackiePort::finalise_init lock released" << endl;
+#endif
}
void MackiePort::connect_any()
{
/*
- Doesn't work because there isn't and == operator for slots
+ Doesn't work because there isn't an == operator for slots
MIDI::Signal::slot_list_type slots = port().input()->any.slots();
if ( find( slots.begin(), slots.end(), mem_fun( *this, &MackiePort::handle_midi_any ) ) == slots.end() )