# HG changeset patch
# User lbajardsilogic
# Date 1179231913 0
# Node ID 079b8c0d68f1181b8d52ec2bf235f94cb2fd44f1
# Parent bdb5daea9a330341c9e3abf176bcb0282b741e28
remove Sonic Visualiser trace
diff -r bdb5daea9a33 -r 079b8c0d68f1 base/TempDirectory.cpp
--- a/base/TempDirectory.cpp Tue May 15 10:22:57 2007 +0000
+++ b/base/TempDirectory.cpp Tue May 15 12:25:13 2007 +0000
@@ -254,7 +254,7 @@
if (GetProcessStatus(pid) == ProcessNotRunning) {
std::cerr << "INFO: Found abandoned temporary directory from "
- << "an old Sonic Visualiser process\n(pid=" << pid
+ << "an old Sound Access process\n(pid=" << pid
<< ", directory=\""
<< dir.filePath(dir[i]).toStdString()
<< "\"). Removing it..." << std::endl;
diff -r bdb5daea9a33 -r 079b8c0d68f1 base/svbase.vcproj
--- a/base/svbase.vcproj Tue May 15 10:22:57 2007 +0000
+++ b/base/svbase.vcproj Tue May 15 12:25:13 2007 +0000
@@ -351,7 +351,7 @@
@@ -362,7 +362,7 @@
@@ -377,7 +377,7 @@
@@ -388,7 +388,7 @@
@@ -403,7 +403,7 @@
@@ -414,7 +414,7 @@
@@ -429,7 +429,7 @@
@@ -440,7 +440,7 @@
@@ -455,7 +455,7 @@
@@ -466,7 +466,7 @@
@@ -481,7 +481,7 @@
@@ -492,7 +492,7 @@
@@ -507,7 +507,7 @@
@@ -518,7 +518,7 @@
@@ -533,7 +533,7 @@
@@ -544,7 +544,7 @@
diff -r bdb5daea9a33 -r 079b8c0d68f1 sv/main/MainWindow.cpp
--- a/sv/main/MainWindow.cpp Tue May 15 10:22:57 2007 +0000
+++ b/sv/main/MainWindow.cpp Tue May 15 12:25:13 2007 +0000
@@ -146,7 +146,7 @@
{
m_instance = this;
- setWindowTitle(tr("Sonic Visualiser"));
+ setWindowTitle(tr("Sound Access"));
UnitDatabase::getInstance()->registerUnit("Hz");
UnitDatabase::getInstance()->registerUnit("dB");
@@ -1482,8 +1482,8 @@
connect(action, SIGNAL(triggered()), this, SLOT(website()));
menu->addAction(action);
- action = new QAction(tr("&About Sonic Visualiser"), this);
- action->setStatusTip(tr("Show information about Sonic Visualiser"));
+ action = new QAction(tr("&About Sound Access"), this);
+ action->setStatusTip(tr("Show information about Sound Access"));
connect(action, SIGNAL(triggered()), this, SLOT(about()));
menu->addAction(action);
}
@@ -2588,13 +2588,13 @@
setupMenus();
if (m_sessionFile == "") {
- setWindowTitle(tr("Sonic Visualiser: %1")
+ setWindowTitle(tr("Sound Access: %1")
.arg(QFileInfo(location).fileName()));
CommandHistory::getInstance()->clear();
CommandHistory::getInstance()->documentSaved();
m_documentModified = false;
} else {
- setWindowTitle(tr("Sonic Visualiser: %1 [%2]")
+ setWindowTitle(tr("Sound Access: %1 [%2]")
.arg(QFileInfo(m_sessionFile).fileName())
.arg(QFileInfo(location).fileName()));
if (m_documentModified) {
@@ -2790,7 +2790,7 @@
m_timeRulerLayer = 0; // document owned this
m_sessionFile = "";
- setWindowTitle(tr("Sonic Visualiser"));
+ setWindowTitle(tr("Sound Access"));
CommandHistory::getInstance()->clear();
CommandHistory::getInstance()->documentSaved();
@@ -3025,7 +3025,7 @@
if (ok) {
- setWindowTitle(tr("Sonic Visualiser: %1")
+ setWindowTitle(tr("Sound Access: %1")
.arg(QFileInfo(location).fileName()));
if (realFile) m_sessionFile = path;
@@ -3043,7 +3043,7 @@
}
} else {
- setWindowTitle(tr("Sonic Visualiser"));
+ setWindowTitle(tr("Sound Access"));
}
return ok ? FileOpenSucceeded : FileOpenFailed;
@@ -3180,7 +3180,7 @@
QMessageBox::critical(this, tr("Failed to save file"),
tr("Session file \"%1\" could not be saved.").arg(path));
} else {
- setWindowTitle(tr("Sonic Visualiser: %1")
+ setWindowTitle(tr("Sound Access: %1")
.arg(QFileInfo(path).fileName()));
m_sessionFile = path;
CommandHistory::getInstance()->documentSaved();
@@ -3258,7 +3258,6 @@
QString indent(" ");
s += "\n";
-// s += "\n";
s += "\n";
s += "\n";
diff -r bdb5daea9a33 -r 079b8c0d68f1 sv/main/main.cpp
--- a/sv/main/main.cpp Tue May 15 10:22:57 2007 +0000
+++ b/sv/main/main.cpp Tue May 15 12:25:13 2007 +0000
@@ -214,16 +214,16 @@
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] [ ...]\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 : One or more Sonic Visualiser (.sv) and audio files may be provided.\n").arg(argv[0]).toStdString() << std::endl;
+ "\nSound Access is a program for viewing and exploring multimedia archives for semantic multimedia analysis and retrieval.\n").arg(argv[0]).toStdString() << std::endl;
exit(2);
}
if (args.contains("--no-audio")) audioOutput = false;
if (args.contains("--no-osc")) oscSupport = false;
- QApplication::setOrganizationName("sonic-visualiser");
- QApplication::setOrganizationDomain("sonicvisualiser.org");
- QApplication::setApplicationName("sonic-visualiser");
+ QApplication::setOrganizationName("sound-access");
+ QApplication::setOrganizationDomain("easaier.org");
+ QApplication::setApplicationName("sound-access");
QApplication::setWindowIcon(QIcon(":icons/svicon16.png"));
QApplication::setStyle(new QPlastiqueStyle);
@@ -236,7 +236,7 @@
application.installTranslator(&qtTranslator);
QTranslator svTranslator;
- QString svTrName = QString("sonic-visualiser_%1").arg(language);
+ QString svTrName = QString("sound-access_%1").arg(language);
std::cerr << "Loading " << svTrName.toStdString() << "..." << std::endl;
svTranslator.load(svTrName, ":i18n");
application.installTranslator(&svTranslator);
diff -r bdb5daea9a33 -r 079b8c0d68f1 system/Init.cpp
--- a/system/Init.cpp Tue May 15 10:22:57 2007 +0000
+++ b/system/Init.cpp Tue May 15 12:25:13 2007 +0000
@@ -31,7 +31,7 @@
char errstr[256];
XGetErrorText(dpy, err->error_code, errstr, 256);
if (err->error_code != BadWindow) {
- std::cerr << "Sonic Visualiser: X Error: "
+ std::cerr << "Sound Access: X Error: "
<< errstr << " " << int(err->error_code)
<< "\nin major opcode: "
<< int(err->request_code) << std::endl;
diff -r bdb5daea9a33 -r 079b8c0d68f1 update-i18n.sh
--- a/update-i18n.sh Tue May 15 10:22:57 2007 +0000
+++ b/update-i18n.sh Tue May 15 12:25:13 2007 +0000
@@ -7,10 +7,10 @@
for LANG in $LANGUAGES; do
$LUPDATE */*.h */*/*.h */*.cpp */*/*.cpp \
- -ts sv/i18n/sonic-visualiser_$LANG.ts
+ -ts sv/i18n/sound-access_$LANG.ts
done
for LANG in $LANGUAGES; do
- $LRELEASE sv/i18n/sonic-visualiser_$LANG.ts
+ $LRELEASE sv/i18n/sound-access_$LANG.ts
done