comparison data/osc/OSCQueue.cpp @ 847:2d53205f70cd tonioni

Merge from default branch

 #ifdef HAVE_LIBLO
 
 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
 OSCQueue::oscMessageHandler(const char *path, const char *types, lo_arg **argv,
                             int argc, lo_message, void *user_data)

         case 'f': message.addArg(arg->f); break;
         case 'd': message.addArg(arg->d); break;
         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;
         }
 
 	++i;
     }

     lo_server_thread_add_method(m_thread, NULL, NULL,
                                 oscMessageHandler, this);
 
     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
 }
 
 OSCQueue::~OSCQueue()
 {

 OSCQueue::postMessage(OSCMessage message)
 {
     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);
 #else
         sleep(1);

     }
 
     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;
     }
 
     SVDEBUG << "OSCQueue::parseOSCPath: good path \"" << path              << "\"" << endl;