comparison main/OSCHandler.cpp @ 437:9de86c1b980e

Merge from debug-output branch

 #include <QFileInfo>
 
 void
 MainWindow::handleOSCMessage(const OSCMessage &message)
 {
-    std::cerr << "MainWindow::handleOSCMessage: thread id = " 
-              << QThread::currentThreadId() << std::endl;
+    DEBUG << "MainWindow::handleOSCMessage: thread id = " 
+              << QThread::currentThreadId() << endl;
 
     // This large function should really be abstracted out.
 
     if (message.getMethod() == "open") {
 
         if (message.getArgCount() == 1 &&
             message.getArg(0).canConvert(QVariant::String)) {
             QString path = message.getArg(0).toString();
             if (open(path, ReplaceMainModel) != FileOpenSucceeded) {
                 std::cerr << "MainWindow::handleOSCMessage: File open failed for path \""
-                          << path.toStdString() << "\"" << std::endl;
+                          << path << "\"" << std::endl;
             }
             //!!! we really need to spin here and not return until the
             // file has been completely decoded...
         }
 

         if (message.getArgCount() == 1 &&
             message.getArg(0).canConvert(QVariant::String)) {
             QString path = message.getArg(0).toString();
             if (open(path, CreateAdditionalModel) != FileOpenSucceeded) {
                 std::cerr << "MainWindow::handleOSCMessage: File open failed for path \""
-                          << path.toStdString() << "\"" << std::endl;
+                          << path << "\"" << std::endl;
             }
         }
 
     } else if (message.getMethod() == "recent" ||
                message.getMethod() == "last") {

         }
         std::vector<QString> recent = m_recentFiles.getRecent();
         if (n >= 0 && n < int(recent.size())) {
             if (open(recent[n], ReplaceMainModel) != FileOpenSucceeded) {
                 std::cerr << "MainWindow::handleOSCMessage: File open failed for path \""
-                          << recent[n].toStdString() << "\"" << std::endl;
+                          << recent[n] << "\"" << std::endl;
             }
         }
 
     } else if (message.getMethod() == "save") {
 
         QString path;
         if (message.getArgCount() == 1 &&
             message.getArg(0).canConvert(QVariant::String)) {
             path = message.getArg(0).toString();
             if (QFileInfo(path).exists()) {
-                std::cerr << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in save" << std::endl;
+                DEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in save" << endl;
             } else {
                 saveSessionFile(path);
             }
         }
 

         if (getMainModel()) {
             if (message.getArgCount() == 1 &&
                 message.getArg(0).canConvert(QVariant::String)) {
                 path = message.getArg(0).toString();
                 if (QFileInfo(path).exists()) {
-                    std::cerr << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in export" << std::endl;
+                    DEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in export" << endl;
                 } else {
                     WavFileWriter writer(path,
                                          getMainModel()->getSampleRate(),
                                          getMainModel()->getChannelCount(),
                                          WavFileWriter::WriteToTemporary);

                 LayerFactory::LayerType type =
                     LayerFactory::getInstance()->getLayerTypeForName(str);
 
                 if (type == LayerFactory::UnknownLayer) {
                     std::cerr << "WARNING: MainWindow::handleOSCMessage: unknown layer "
-                              << "type " << str.toStdString() << std::endl;
+                              << "type " << str << std::endl;
                 } else {
 
                     LayerConfiguration configuration(type,
                                                      getMainModel(),
                                                      channel);

 
                 deleteCurrentLayer();
 
             } else {
                 
-                std::cerr << "WARNING: MainWindow::handleOSCMessage: Unknown delete target " << target.toStdString() << std::endl;
+                std::cerr << "WARNING: MainWindow::handleOSCMessage: Unknown delete target " << target << std::endl;
             }
         }
 
     } else if (message.getMethod() == "zoom") {