Mercurial > hg > easaier-soundaccess

changeset 40:bdb5daea9a33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change the "about"
author lbajardsilogic
date Tue, 15 May 2007 10:22:57 +0000
parents 74260b8609dd
children 079b8c0d68f1
files sv/main/MainWindow.cpp sv/sound_access.vcproj version.h
diffstat 3 files changed, 59 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/sv/main/MainWindow.cpp	Tue May 15 09:12:47 2007 +0000
+++ b/sv/main/MainWindow.cpp	Tue May 15 10:22:57 2007 +0000
@@ -4849,11 +4849,11 @@
 #ifdef BUILD_DEBUG
     debug = true;
 #endif
-#ifdef SV_VERSION
+#ifdef SA_VERSION
 #ifdef SVNREV
-    version = tr("Release %1 : Revision %2").arg(SV_VERSION).arg(SVNREV);
+    version = tr("Release %1 : Revision %2").arg(SA_VERSION).arg(SVNREV);
 #else
-    version = tr("Release %1").arg(SV_VERSION);
+    version = tr("Release %1").arg(SA_VERSION);
 #endif
 #else
 #ifdef SVNREV
@@ -4863,12 +4863,16 @@
 
     QString aboutText;
 
-    aboutText += tr("<h3>About Sonic Visualiser</h3>");
-    aboutText += tr("<p>Sonic Visualiser is a program for viewing and exploring audio data for<br>semantic music analysis and annotation.</p>");
-    aboutText += tr("<p>%1 : %2 configuration</p>")
-        .arg(version)
-        .arg(debug ? tr("Debug") : tr("Release"));
-
+    aboutText += tr("<h3>About Sound Access</h3>");
+    aboutText += tr("<p>Sound Access is a program for viewing and exploring multimedia archives for semantic multimedia analysis and retrieval.</p>");
+    aboutText += tr("<p>EASAIER (EU-FP6-IST-033902) frontend client</p>");
+
+	aboutText += tr("<p>%1 : %2 build</p>")
+        .arg(version)
+        .arg(debug ? tr("Debug") : tr("Release"));
+
+	aboutText += tr("<p>Based on Sonic Visualizer Copyright &copy; 2005 - 2006 Chris Cannam (Version %1)</p>").arg(SV_VERSION);
+	
 #ifndef BUILD_STATIC
     aboutText += tr("<br>Using Qt v%1 &copy; Trolltech AS").arg(QT_VERSION_STR);
 #else
@@ -4877,84 +4881,82 @@
 #endif
 #endif
 
-#ifdef BUILD_STATIC
-    aboutText += tr("<p>Statically linked");
+//#ifdef BUILD_STATIC
+    aboutText += tr("<p>Linked with");
 #ifndef QT_SHARED
-    aboutText += tr("<br>With Qt (v%1) &copy; Trolltech AS").arg(QT_VERSION_STR);
+    aboutText += tr("<br>Qt (v%1) &copy; Trolltech AS").arg(QT_VERSION_STR);
 #endif
 #ifdef HAVE_JACK
 #ifdef JACK_VERSION
-    aboutText += tr("<br>With JACK audio output (v%1) &copy; Paul Davis and Jack O'Quin").arg(JACK_VERSION);
+    aboutText += tr("<br>JACK audio output (v%1) &copy; Paul Davis and Jack O'Quin").arg(JACK_VERSION);
 #else
-    aboutText += tr("<br>With JACK audio output &copy; Paul Davis and Jack O'Quin");
+    aboutText += tr("<br>JACK audio output &copy; Paul Davis and Jack O'Quin");
 #endif
 #endif
 #ifdef HAVE_PORTAUDIO
-    aboutText += tr("<br>With PortAudio audio output &copy; Ross Bencina and Phil Burk");
+    aboutText += tr("<br>PortAudio audio output &copy; Ross Bencina and Phil Burk");
 #endif
 #ifdef HAVE_OGGZ
 #ifdef OGGZ_VERSION
-    aboutText += tr("<br>With Ogg file decoder (oggz v%1, fishsound v%2) &copy; CSIRO Australia").arg(OGGZ_VERSION).arg(FISHSOUND_VERSION);
+    aboutText += tr("<br>Ogg file decoder (oggz v%1, fishsound v%2) &copy; CSIRO Australia").arg(OGGZ_VERSION).arg(FISHSOUND_VERSION);
 #else
-    aboutText += tr("<br>With Ogg file decoder &copy; CSIRO Australia");
+    aboutText += tr("<br>Ogg file decoder &copy; CSIRO Australia");
 #endif
 #endif
 #ifdef HAVE_MAD
 #ifdef MAD_VERSION
-    aboutText += tr("<br>With MAD mp3 decoder (v%1) &copy; Underbit Technologies Inc").arg(MAD_VERSION);
+    aboutText += tr("<br>MAD mp3 decoder (v%1) &copy; Underbit Technologies Inc").arg(MAD_VERSION);
 #else
-    aboutText += tr("<br>With MAD mp3 decoder &copy; Underbit Technologies Inc");
+    aboutText += tr("<br>MAD mp3 decoder &copy; Underbit Technologies Inc");
 #endif
 #endif
 #ifdef HAVE_SAMPLERATE
 #ifdef SAMPLERATE_VERSION
-    aboutText += tr("<br>With libsamplerate (v%1) &copy; Erik de Castro Lopo").arg(SAMPLERATE_VERSION);
+    aboutText += tr("<br>libsamplerate (v%1) &copy; Erik de Castro Lopo").arg(SAMPLERATE_VERSION);
 #else
-    aboutText += tr("<br>With libsamplerate &copy; Erik de Castro Lopo");
+    aboutText += tr("<br>libsamplerate &copy; Erik de Castro Lopo");
 #endif
 #endif
 #ifdef HAVE_SNDFILE
 #ifdef SNDFILE_VERSION
-    aboutText += tr("<br>With libsndfile (v%1) &copy; Erik de Castro Lopo").arg(SNDFILE_VERSION);
+    aboutText += tr("<br>libsndfile (v%1) &copy; Erik de Castro Lopo").arg(SNDFILE_VERSION);
 #else
-    aboutText += tr("<br>With libsndfile &copy; Erik de Castro Lopo");
+    aboutText += tr("<br>libsndfile &copy; Erik de Castro Lopo");
 #endif
 #endif
 #ifdef HAVE_FFTW3F
 #ifdef FFTW3_VERSION
-    aboutText += tr("<br>With FFTW3 (v%1) &copy; Matteo Frigo and MIT").arg(FFTW3_VERSION);
+    aboutText += tr("<br>FFTW3 (v%1) &copy; Matteo Frigo and MIT").arg(FFTW3_VERSION);
 #else
-    aboutText += tr("<br>With FFTW3 &copy; Matteo Frigo and MIT");
+    aboutText += tr("<br>FFTW3 &copy; Matteo Frigo and MIT");
 #endif
 #endif
 #ifdef HAVE_VAMP
-    aboutText += tr("<br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION);
+    aboutText += tr("<br>Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION);
 #endif
-    aboutText += tr("<br>With LADSPA plugin support (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld").arg(LADSPA_VERSION);
-    aboutText += tr("<br>With DSSI plugin support (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton").arg(DSSI_VERSION);
+    aboutText += tr("<br>LADSPA plugin support (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld").arg(LADSPA_VERSION);
+    aboutText += tr("<br>DSSI plugin support (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton").arg(DSSI_VERSION);
 #ifdef HAVE_LIBLO
 #ifdef LIBLO_VERSION
-    aboutText += tr("<br>With liblo Lite OSC library (v%1) &copy; Steve Harris").arg(LIBLO_VERSION);
+    aboutText += tr("<br>liblo Lite OSC library (v%1) &copy; Steve Harris").arg(LIBLO_VERSION);
 #else
-    aboutText += tr("<br>With liblo Lite OSC library &copy; Steve Harris").arg(LIBLO_VERSION);
+    aboutText += tr("<br>liblo Lite OSC library &copy; Steve Harris").arg(LIBLO_VERSION);
 #endif
     if (m_oscQueue && m_oscQueue->isOK()) {
         aboutText += tr("<p>The OSC URL for this instance is: \"%1\"").arg(m_oscQueue->getOSCURL());
     }
 #endif
     aboutText += "</p>";
-#endif
-
-    aboutText += 
-        "<p>Sonic Visualiser Copyright &copy; 2005 - 2007 Chris Cannam and<br>"
-        "Queen Mary, University of London.</p>"
-        "<p>This program is free software; you can redistribute it and/or<br>"
-        "modify it under the terms of the GNU General Public License as<br>"
-        "published by the Free Software Foundation; either version 2 of the<br>"
-        "License, or (at your option) any later version.<br>See the file "
-        "COPYING included with this distribution for more information.</p>";
-    
-    QMessageBox::about(this, tr("About Sonic Visualiser"), aboutText);
+//#endif
+
+    aboutText += 
+		tr("<p>This program is free software; you can redistribute it and/or<br>"
+        "modify it under the terms of the GNU General Public License as<br>"
+        "published by the Free Software Foundation; either version 2 of the<br>"
+        "License, or (at your option) any later version.<br>See the file "
+        "COPYING included with this distribution for more information.</p>");
+    
+    QMessageBox::about(this, tr("About Sound Access"), aboutText);
 }
 
 void MainWindow::connectionSettings()
--- a/sv/sound_access.vcproj	Tue May 15 09:12:47 2007 +0000
+++ b/sv/sound_access.vcproj	Tue May 15 10:22:57 2007 +0000
@@ -337,6 +337,10 @@
 				RelativePath="transform\Transform.h"
 				>
 			</File>
+			<File
+				RelativePath="..\version.h"
+				>
+			</File>
 			<Filter
 				Name="Moc"
 				>
--- a/version.h	Tue May 15 09:12:47 2007 +0000
+++ b/version.h	Tue May 15 10:22:57 2007 +0000
@@ -1,1 +1,11 @@
-#define SV_VERSION "1.0"
+#define SV_VERSION "1.0rc1"
+
+#define SA_VERSION "Alpha2.1"
+
+#ifdef USE_VC
+#define OGGZ_VERSION "0.9.5"
+#define FISHSOUND_VERSION "0.7.0"
+#define SAMPLERATE_VERSION "0.1.2"
+#define SNDFILE_VERSION "1.0.16"
+#define FFTW3_VERSION "3.1.2"
+#endif
\ No newline at end of file