# HG changeset patch # User lbajardsilogic # Date 1179224577 0 # Node ID bdb5daea9a330341c9e3abf176bcb0282b741e28 # Parent 74260b8609dd1672e07aeb6469880980fc22f4b2 change the "about" diff -r 74260b8609dd -r bdb5daea9a33 sv/main/MainWindow.cpp --- 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("

About Sonic Visualiser

"); - aboutText += tr("

Sonic Visualiser is a program for viewing and exploring audio data for
semantic music analysis and annotation.

"); - aboutText += tr("

%1 : %2 configuration

") - .arg(version) - .arg(debug ? tr("Debug") : tr("Release")); - + aboutText += tr("

About Sound Access

"); + aboutText += tr("

Sound Access is a program for viewing and exploring multimedia archives for semantic multimedia analysis and retrieval.

"); + aboutText += tr("

EASAIER (EU-FP6-IST-033902) frontend client

"); + + aboutText += tr("

%1 : %2 build

") + .arg(version) + .arg(debug ? tr("Debug") : tr("Release")); + + aboutText += tr("

Based on Sonic Visualizer Copyright © 2005 - 2006 Chris Cannam (Version %1)

").arg(SV_VERSION); + #ifndef BUILD_STATIC aboutText += tr("
Using Qt v%1 © Trolltech AS").arg(QT_VERSION_STR); #else @@ -4877,84 +4881,82 @@ #endif #endif -#ifdef BUILD_STATIC - aboutText += tr("

Statically linked"); +//#ifdef BUILD_STATIC + aboutText += tr("

Linked with"); #ifndef QT_SHARED - aboutText += tr("
With Qt (v%1) © Trolltech AS").arg(QT_VERSION_STR); + aboutText += tr("
Qt (v%1) © Trolltech AS").arg(QT_VERSION_STR); #endif #ifdef HAVE_JACK #ifdef JACK_VERSION - aboutText += tr("
With JACK audio output (v%1) © Paul Davis and Jack O'Quin").arg(JACK_VERSION); + aboutText += tr("
JACK audio output (v%1) © Paul Davis and Jack O'Quin").arg(JACK_VERSION); #else - aboutText += tr("
With JACK audio output © Paul Davis and Jack O'Quin"); + aboutText += tr("
JACK audio output © Paul Davis and Jack O'Quin"); #endif #endif #ifdef HAVE_PORTAUDIO - aboutText += tr("
With PortAudio audio output © Ross Bencina and Phil Burk"); + aboutText += tr("
PortAudio audio output © Ross Bencina and Phil Burk"); #endif #ifdef HAVE_OGGZ #ifdef OGGZ_VERSION - aboutText += tr("
With Ogg file decoder (oggz v%1, fishsound v%2) © CSIRO Australia").arg(OGGZ_VERSION).arg(FISHSOUND_VERSION); + aboutText += tr("
Ogg file decoder (oggz v%1, fishsound v%2) © CSIRO Australia").arg(OGGZ_VERSION).arg(FISHSOUND_VERSION); #else - aboutText += tr("
With Ogg file decoder © CSIRO Australia"); + aboutText += tr("
Ogg file decoder © CSIRO Australia"); #endif #endif #ifdef HAVE_MAD #ifdef MAD_VERSION - aboutText += tr("
With MAD mp3 decoder (v%1) © Underbit Technologies Inc").arg(MAD_VERSION); + aboutText += tr("
MAD mp3 decoder (v%1) © Underbit Technologies Inc").arg(MAD_VERSION); #else - aboutText += tr("
With MAD mp3 decoder © Underbit Technologies Inc"); + aboutText += tr("
MAD mp3 decoder © Underbit Technologies Inc"); #endif #endif #ifdef HAVE_SAMPLERATE #ifdef SAMPLERATE_VERSION - aboutText += tr("
With libsamplerate (v%1) © Erik de Castro Lopo").arg(SAMPLERATE_VERSION); + aboutText += tr("
libsamplerate (v%1) © Erik de Castro Lopo").arg(SAMPLERATE_VERSION); #else - aboutText += tr("
With libsamplerate © Erik de Castro Lopo"); + aboutText += tr("
libsamplerate © Erik de Castro Lopo"); #endif #endif #ifdef HAVE_SNDFILE #ifdef SNDFILE_VERSION - aboutText += tr("
With libsndfile (v%1) © Erik de Castro Lopo").arg(SNDFILE_VERSION); + aboutText += tr("
libsndfile (v%1) © Erik de Castro Lopo").arg(SNDFILE_VERSION); #else - aboutText += tr("
With libsndfile © Erik de Castro Lopo"); + aboutText += tr("
libsndfile © Erik de Castro Lopo"); #endif #endif #ifdef HAVE_FFTW3F #ifdef FFTW3_VERSION - aboutText += tr("
With FFTW3 (v%1) © Matteo Frigo and MIT").arg(FFTW3_VERSION); + aboutText += tr("
FFTW3 (v%1) © Matteo Frigo and MIT").arg(FFTW3_VERSION); #else - aboutText += tr("
With FFTW3 © Matteo Frigo and MIT"); + aboutText += tr("
FFTW3 © Matteo Frigo and MIT"); #endif #endif #ifdef HAVE_VAMP - aboutText += tr("
With Vamp plugin support (API v%1, host SDK v%2) © Chris Cannam").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION); + aboutText += tr("
Vamp plugin support (API v%1, host SDK v%2) © Chris Cannam").arg(VAMP_API_VERSION).arg(VAMP_SDK_VERSION); #endif - aboutText += tr("
With LADSPA plugin support (API v%1) © Richard Furse, Paul Davis, Stefan Westerfeld").arg(LADSPA_VERSION); - aboutText += tr("
With DSSI plugin support (API v%1) © Chris Cannam, Steve Harris, Sean Bolton").arg(DSSI_VERSION); + aboutText += tr("
LADSPA plugin support (API v%1) © Richard Furse, Paul Davis, Stefan Westerfeld").arg(LADSPA_VERSION); + aboutText += tr("
DSSI plugin support (API v%1) © Chris Cannam, Steve Harris, Sean Bolton").arg(DSSI_VERSION); #ifdef HAVE_LIBLO #ifdef LIBLO_VERSION - aboutText += tr("
With liblo Lite OSC library (v%1) © Steve Harris").arg(LIBLO_VERSION); + aboutText += tr("
liblo Lite OSC library (v%1) © Steve Harris").arg(LIBLO_VERSION); #else - aboutText += tr("
With liblo Lite OSC library © Steve Harris").arg(LIBLO_VERSION); + aboutText += tr("
liblo Lite OSC library © Steve Harris").arg(LIBLO_VERSION); #endif if (m_oscQueue && m_oscQueue->isOK()) { aboutText += tr("

The OSC URL for this instance is: \"%1\"").arg(m_oscQueue->getOSCURL()); } #endif aboutText += "

"; -#endif - - aboutText += - "

Sonic Visualiser Copyright © 2005 - 2007 Chris Cannam and
" - "Queen Mary, University of London.

" - "

This program is free software; you can redistribute it and/or
" - "modify it under the terms of the GNU General Public License as
" - "published by the Free Software Foundation; either version 2 of the
" - "License, or (at your option) any later version.
See the file " - "COPYING included with this distribution for more information.

"; - - QMessageBox::about(this, tr("About Sonic Visualiser"), aboutText); +//#endif + + aboutText += + tr("

This program is free software; you can redistribute it and/or
" + "modify it under the terms of the GNU General Public License as
" + "published by the Free Software Foundation; either version 2 of the
" + "License, or (at your option) any later version.
See the file " + "COPYING included with this distribution for more information.

"); + + QMessageBox::about(this, tr("About Sound Access"), aboutText); } void MainWindow::connectionSettings() diff -r 74260b8609dd -r bdb5daea9a33 sv/sound_access.vcproj --- 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" > + + diff -r 74260b8609dd -r bdb5daea9a33 version.h --- 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