Mercurial > hg > sonic-visualiser
diff main/main.cpp @ 437:9de86c1b980e
Merge from debug-output branch
author | Chris Cannam |
---|---|
date | Tue, 14 Jun 2011 14:50:08 +0100 |
parents | ae68fc09bf16 |
children | 868f73825b37 |
line wrap: on
line diff
--- a/main/main.cpp Wed May 11 11:05:10 2011 +0100 +++ b/main/main.cpp Tue Jun 14 14:50:08 2011 +0100 @@ -245,7 +245,7 @@ if (args.contains("--help") || args.contains("-h") || args.contains("-?")) { std::cerr << QApplication::tr( - "\nSonic Visualiser is a program for viewing and exploring audio data\nfor semantic music analysis and annotation.\n\nUsage:\n\n %1 [--no-audio] [--no-osc] [<file> ...]\n\n --no-audio: Do not attempt to open an audio output device\n --no-osc: Do not provide an Open Sound Control port for remote control\n <file>: One or more Sonic Visualiser (.sv) and audio files may be provided.\n").arg(argv[0]).toStdString() << std::endl; + "\nSonic Visualiser is a program for viewing and exploring audio data\nfor semantic music analysis and annotation.\n\nUsage:\n\n %1 [--no-audio] [--no-osc] [<file> ...]\n\n --no-audio: Do not attempt to open an audio output device\n --no-osc: Do not provide an Open Sound Control port for remote control\n <file>: One or more Sonic Visualiser (.sv) and audio files may be provided.\n").arg(argv[0]) << std::endl; exit(2); } @@ -297,7 +297,7 @@ QTranslator qtTranslator; QString qtTrName = QString("qt_%1").arg(language); - std::cerr << "Loading " << qtTrName.toStdString() << "... "; + DEBUG << "Loading " << qtTrName << "... "; bool success = false; if (!(success = qtTranslator.load(qtTrName))) { QString qtDir = getenv("QTDIR"); @@ -307,7 +307,7 @@ } } if (!success) { - std::cerr << "Failed\nFailed to load Qt translation for locale" << std::endl; + DEBUG << "Failed\nFailed to load Qt translation for locale" << endl; } else { std::cerr << "Done" << std::endl; } @@ -315,9 +315,9 @@ QTranslator svTranslator; QString svTrName = QString("sonic-visualiser_%1").arg(language); - std::cerr << "Loading " << svTrName.toStdString() << "... "; + DEBUG << "Loading " << svTrName << "... "; svTranslator.load(svTrName, ":i18n"); - std::cerr << "Done" << std::endl; + DEBUG << "Done" << endl; application.installTranslator(&svTranslator); StoreStartupLocale(); @@ -462,7 +462,7 @@ haveMainModel = true; } } else { - std::cerr << "WARNING: Ignoring additional session file argument \"" << path.toStdString() << "\"" << std::endl; + std::cerr << "WARNING: Ignoring additional session file argument \"" << path << "\"" << std::endl; status = MainWindow::FileOpenSucceeded; } }