Mercurial > hg > svcore
diff data/osc/OSCQueue.cpp @ 843:e802e550a1f2
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 13:35:08 +0000 |
parents | 1424aa29ae95 |
children | 59e7fe1b1003 |
line wrap: on
line diff
--- a/data/osc/OSCQueue.cpp Tue Nov 26 11:16:37 2013 +0000 +++ b/data/osc/OSCQueue.cpp Tue Nov 26 13:35:08 2013 +0000 @@ -32,8 +32,8 @@ void OSCQueue::oscError(int num, const char *msg, const char *path) { - std::cerr << "ERROR: OSCQueue::oscError: liblo server error " << num - << " in path " << path << ": " << msg << std::endl; + cerr << "ERROR: OSCQueue::oscError: liblo server error " << num + << " in path " << path << ": " << msg << endl; } int @@ -73,9 +73,9 @@ case 'c': message.addArg(arg->c); break; case 't': message.addArg(arg->i); break; case 's': message.addArg(&arg->s); break; - default: std::cerr << "WARNING: OSCQueue::oscMessageHandler: " + default: cerr << "WARNING: OSCQueue::oscMessageHandler: " << "Unsupported OSC type '" << type << "'" - << std::endl; + << endl; break; } @@ -104,8 +104,8 @@ lo_server_thread_start(m_thread); - std::cout << "OSCQueue::OSCQueue: Base OSC URL is " - << lo_server_thread_get_url(m_thread) << std::endl; + cout << "OSCQueue::OSCQueue: Base OSC URL is " + << lo_server_thread_get_url(m_thread) << endl; #endif } @@ -163,10 +163,10 @@ int count = 0, max = 5; while (m_buffer.getWriteSpace() == 0) { if (count == max) { - std::cerr << "ERROR: OSCQueue::postMessage: OSC message queue is full and not clearing -- abandoning incoming message" << std::endl; + cerr << "ERROR: OSCQueue::postMessage: OSC message queue is full and not clearing -- abandoning incoming message" << endl; return; } - std::cerr << "WARNING: OSCQueue::postMessage: OSC message queue (capacity " << m_buffer.getSize() << " is full!" << std::endl; + cerr << "WARNING: OSCQueue::postMessage: OSC message queue (capacity " << m_buffer.getSize() << " is full!" << endl; SVDEBUG << "Waiting for something to be processed" << endl; #ifdef _WIN32 Sleep(1); @@ -212,10 +212,10 @@ method = path.section('/', i, -1); if (method.contains('/')) { - std::cerr << "ERROR: OSCQueue::parseOSCPath: malformed path \"" + cerr << "ERROR: OSCQueue::parseOSCPath: malformed path \"" << path << "\" (should be target/data/method or " << "target/method or method, where target and data " - << "are numeric)" << std::endl; + << "are numeric)" << endl; return false; }