diff data/fileio/AudioFileReaderFactory.cpp @ 847:2d53205f70cd tonioni

Merge from default branch

--- a/data/fileio/AudioFileReaderFactory.cpp	Fri Nov 22 10:37:28 2013 +0000
+++ b/data/fileio/AudioFileReaderFactory.cpp	Tue Nov 26 14:37:01 2013 +0000
@@ -80,7 +80,7 @@
     SVDEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\"): Requested rate: " << targetRate << endl;
 
     if (!source.isOK()) {
-        std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << std::endl;
+        cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << endl;
         return 0;
     }
 
@@ -315,20 +315,20 @@
             SVDEBUG << "AudioFileReaderFactory: Reader is OK" << endl;
             return reader;
         }
-        std::cerr << "AudioFileReaderFactory: Preferred reader for "
-                  << "url \"" << source.getLocation().toStdString()
+        cerr << "AudioFileReaderFactory: Preferred reader for "
+                  << "url \"" << source.getLocation()
                   << "\" (content type \""
                   << source.getContentType() << "\") failed";
 
         if (reader->getError() != "") {
-            std::cerr << ": \"" << reader->getError() << "\"";
+            cerr << ": \"" << reader->getError() << "\"";
         }
-        std::cerr << std::endl;
+        cerr << endl;
         delete reader;
         reader = 0;
     }
 
-    std::cerr << "AudioFileReaderFactory: No reader" << std::endl;
+    cerr << "AudioFileReaderFactory: No reader" << endl;
     return reader;
 }