Mercurial > hg > sonic-segmenter

changeset 1:f78d846bf880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* well, we build now... even though what we build is just vect with a different name at the moment
author Chris Cannam
date Fri, 27 Mar 2009 17:28:49 +0000
parents abed8a293168
children 965b71bb2d0f
files main/MainWindow.cpp main/MainWindow.h main/main.cpp main/main.pro sonic-segmenter.qrc vect.pro vect.qrc version.h
diffstat 8 files changed, 146 insertions(+), 146 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Fri Mar 27 12:41:49 2009 +0000
+++ b/main/MainWindow.cpp	Fri Mar 27 17:28:49 2009 +0000
@@ -130,7 +130,7 @@
     m_keyReference(new KeyReference()),
     m_displayMode(WaveformMode)
 {
-    setWindowTitle(tr("Vect"));
+    setWindowTitle(QApplication::applicationName());
 
     StorageAdviser::setFixedRecommendation
         (StorageAdviser::Recommendation(StorageAdviser::UseDisc |
@@ -420,7 +420,7 @@
     menu->addSeparator();
     action = new QAction(il.load("exit"), tr("&Quit"), this);
     action->setShortcut(tr("Ctrl+Q"));
-    action->setStatusTip(tr("Exit Vect"));
+    action->setStatusTip(tr("Exit %1").arg(QApplication::applicationName()));
     connect(action, SIGNAL(triggered()), this, SLOT(close()));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
@@ -982,7 +982,7 @@
     m_timeRulerLayer = 0; // document owned this
 
     m_sessionFile = "";
-    setWindowTitle(tr("Vect"));
+    setWindowTitle(QApplication::applicationName());
 
     CommandHistory::getInstance()->clear();
     CommandHistory::getInstance()->documentSaved();
--- a/main/MainWindow.h	Fri Mar 27 12:41:49 2009 +0000
+++ b/main/MainWindow.h	Fri Mar 27 17:28:49 2009 +0000
@@ -30,7 +30,7 @@
 #include "layer/LayerFactory.h"
 #include "transform/Transform.h"
 #include "framework/SVFileReader.h"
-#include "widgets/FileFinder.h"
+#include "data/fileio/FileFinder.h"
 #include <map>
 
 class Document;
--- a/main/main.cpp	Fri Mar 27 12:41:49 2009 +0000
+++ b/main/main.cpp	Fri Mar 27 17:28:49 2009 +0000
@@ -105,7 +105,7 @@
 
     QApplication::setOrganizationName("sonic-visualiser");
     QApplication::setOrganizationDomain("sonicvisualiser.org");
-    QApplication::setApplicationName("Vect");
+    QApplication::setApplicationName("Sonic Segmenter");
 
     QIcon icon;
     int sizes[] = { 16, 22, 24, 32, 48, 64, 128 };
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/main.pro	Fri Mar 27 17:28:49 2009 +0000
@@ -0,0 +1,48 @@
+
+TEMPLATE = app
+
+SV_UNIT_PACKAGES = vamp vamp-hostsdk fftw3f samplerate libpulse jack portaudio-2.0 mad id3tag oggz fishsound lrdf raptor rasqal redland sndfile liblo rubberband fftw3
+load(../prf/sv.prf)
+
+CONFIG += release sv qt thread warn_on stl rtti exceptions
+QT += xml network
+
+linux-g++:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING -O3 -march=pentium-m -msse -msse2 -msse3 -mmmx
+
+TARGET = sonic-segmenter
+
+ICON = icons/sv-macicon.icns
+
+DEPENDPATH += . .. i18n main
+INCLUDEPATH += . .. main
+LIBPATH = ../framework ../audioio ../view ../layer ../data ../widgets ../plugin ../transform ../rdf ../base ../system $$LIBPATH
+
+contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
+
+LIBS = -lsvframework -lsvaudioio -lsvview -lsvlayer -lsvwidgets -lsvdata -lsvtransform -lsvrdf -lsvtransform -lsvdata -lsvplugin -lsvbase -lsvsystem $$LIBS
+
+PRE_TARGETDEPS += ../framework/libsvframework.a \
+                  ../audioio/libsvaudioio.a \
+                  ../view/libsvview.a \
+                  ../layer/libsvlayer.a \
+                  ../rdf/libsvrdf.a \
+                  ../data/libsvdata.a \
+                  ../widgets/libsvwidgets.a \
+                  ../transform/libsvtransform.a \
+                  ../plugin/libsvplugin.a \
+                  ../base/libsvbase.a \
+                  ../system/libsvsystem.a
+
+OBJECTS_DIR = tmp_obj
+MOC_DIR = tmp_moc
+
+# Input
+HEADERS += MainWindow.h \
+           PreferencesDialog.h
+SOURCES += main.cpp \
+           MainWindow.cpp \
+           PreferencesDialog.cpp
+
+RESOURCES += ../sonic-segmenter.qrc
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sonic-segmenter.qrc	Fri Mar 27 17:28:49 2009 +0000
@@ -0,0 +1,92 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>icons/waveform.png</file>
+    <file>icons/spectrum.png</file>
+    <file>icons/spectrogram.png</file>
+    <file>icons/melodogram.png</file>
+    <file>icons/timeruler.png</file>
+    <file>icons/pane.png</file>
+    <file>icons/instants.png</file>
+    <file>icons/notes.png</file>
+    <file>icons/values.png</file>
+    <file>icons/colour3d.png</file>
+    <file>icons/playpause.png</file>
+    <file>icons/ffwd.png</file>
+    <file>icons/ffwd-end.png</file>
+    <file>icons/rewind.png</file>
+    <file>icons/rewind-start.png</file>
+    <file>icons/playselection.png</file>
+    <file>icons/playloop.png</file>
+    <file>icons/solo.png</file>
+    <file>icons/fader_background.png</file>
+    <file>icons/fader_knob.png</file>
+    <file>icons/fader_knob_red.png</file>
+    <file>icons/fader_leds.png</file>
+    <file>icons/faders.png</file>
+    <file>icons/select.png</file>
+    <file>icons/text.png</file>
+    <file>icons/draw.png</file>
+    <file>icons/draw-curve.png</file>
+    <file>icons/measure.png</file>
+    <file>icons/measure1cursor.xbm</file>
+    <file>icons/measure1mask.xbm</file>
+    <file>icons/measure2cursor.xbm</file>
+    <file>icons/measure2mask.xbm</file>
+    <file>icons/move.png</file>
+    <file>icons/navigate.png</file>
+    <file>icons/zoom.png</file>
+    <file>icons/zoom-in.png</file>
+    <file>icons/zoom-out.png</file>
+    <file>icons/zoom-fit.png</file>
+    <file>icons/undo.png</file>
+    <file>icons/redo.png</file>
+    <file>icons/new.png</file>
+    <file>icons/exit.png</file>
+    <file>icons/speaker.png</file>
+    <file>icons/annotation.png</file>
+    <file>icons/fileopen.png</file>
+    <file>icons/fileopensession.png</file>
+    <file>icons/fileopenaudio.png</file>
+    <file>icons/fileopen-22.png</file>
+    <file>icons/fileclose.png</file>
+    <file>icons/filenew.png</file>
+    <file>icons/filenew-22.png</file>
+    <file>icons/filesave.png</file>
+    <file>icons/filesave-22.png</file>
+    <file>icons/filesaveas.png</file>
+    <file>icons/filesaveas-22.png</file>
+    <file>icons/editdelete.png</file>
+    <file>icons/editcut.png</file>
+    <file>icons/editcopy.png</file>
+    <file>icons/editpaste.png</file>
+    <file>icons/mono.png</file>
+    <file>icons/stereo.png</file>
+    <file>icons/sharpen.png</file>
+    <file>icons/help.png</file>
+    <file>icons/cross.png</file>
+    <file>icons/sv-16x16.png</file>
+    <file>icons/sv-22x22.png</file>
+    <file>icons/sv-24x24.png</file>
+    <file>icons/sv-32x32.png</file>
+    <file>icons/sv-48x48.png</file>
+    <file>icons/sv-64x64.png</file>
+    <file>icons/sv-128x128.png</file>
+    <file>samples/bass.wav</file>
+    <file>samples/beep.wav</file>
+    <file>samples/bounce.wav</file>
+    <file>samples/clap.wav</file>
+    <file>samples/click.wav</file>
+    <file>samples/cowbell.wav</file>
+    <file>samples/hihat.wav</file>
+    <file>samples/kick.wav</file>
+    <file>samples/organ.wav</file>
+    <file>samples/piano.wav</file>
+    <file>samples/snare.wav</file>
+    <file>samples/stick.wav</file>
+    <file>samples/strike.wav</file>
+    <file>samples/tap.wav</file>
+    <file>i18n/sonic-visualiser_ru.qm</file>
+    <file>i18n/sonic-visualiser_en_GB.qm</file>
+    <file>i18n/tips_en.xml</file>
+</qresource>
+</RCC>
--- a/vect.pro	Fri Mar 27 12:41:49 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-
-TEMPLATE = app
-
-SV_UNIT_PACKAGES = vamp vamp-hostsdk fftw3f samplerate libpulse jack portaudio-2.0 mad id3tag oggz fishsound lrdf raptor rasqal redland sndfile liblo rubberband fftw3
-load(../sonic-visualiser/sv.prf)
-
-CONFIG += release sv qt thread warn_on stl rtti exceptions
-QT += xml network
-
-linux-g++:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING -O3 -march=pentium-m -msse -msse2 -msse3 -mmmx
-
-TARGET = vect
-
-ICON = icons/sv-macicon.icns
-
-DEPENDPATH += . ../sonic-visualiser i18n main
-INCLUDEPATH += . ../sonic-visualiser main
-LIBPATH = ../sonic-visualiser/framework ../sonic-visualiser/audioio ../sonic-visualiser/view ../sonic-visualiser/layer ../sonic-visualiser/data ../sonic-visualiser/widgets ../sonic-visualiser/plugin ../sonic-visualiser/transform ../sonic-visualiser/rdf ../sonic-visualiser/base ../sonic-visualiser/system $$LIBPATH
-
-contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
-
-LIBS = -lsvframework -lsvaudioio -lsvview -lsvlayer -lsvwidgets -lsvdata -lsvtransform -lsvrdf -lsvtransform -lsvdata -lsvplugin -lsvbase -lsvsystem $$LIBS
-
-PRE_TARGETDEPS += ../sonic-visualiser/framework/libsvframework.a \
-                  ../sonic-visualiser/audioio/libsvaudioio.a \
-                  ../sonic-visualiser/view/libsvview.a \
-                  ../sonic-visualiser/layer/libsvlayer.a \
-                  ../sonic-visualiser/rdf/libsvrdf.a \
-                  ../sonic-visualiser/data/libsvdata.a \
-                  ../sonic-visualiser/widgets/libsvwidgets.a \
-                  ../sonic-visualiser/transform/libsvtransform.a \
-                  ../sonic-visualiser/plugin/libsvplugin.a \
-                  ../sonic-visualiser/base/libsvbase.a \
-                  ../sonic-visualiser/system/libsvsystem.a
-
-OBJECTS_DIR = tmp_obj
-MOC_DIR = tmp_moc
-
-# Input
-HEADERS += main/MainWindow.h \
-           main/PreferencesDialog.h
-SOURCES += main/main.cpp \
-           main/MainWindow.cpp \
-           main/PreferencesDialog.cpp
-
-RESOURCES += vect.qrc
-
-
--- a/vect.qrc	Fri Mar 27 12:41:49 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>icons/waveform.png</file>
-    <file>icons/spectrum.png</file>
-    <file>icons/spectrogram.png</file>
-    <file>icons/melodogram.png</file>
-    <file>icons/timeruler.png</file>
-    <file>icons/pane.png</file>
-    <file>icons/instants.png</file>
-    <file>icons/notes.png</file>
-    <file>icons/values.png</file>
-    <file>icons/colour3d.png</file>
-    <file>icons/playpause.png</file>
-    <file>icons/ffwd.png</file>
-    <file>icons/ffwd-end.png</file>
-    <file>icons/rewind.png</file>
-    <file>icons/rewind-start.png</file>
-    <file>icons/playselection.png</file>
-    <file>icons/playloop.png</file>
-    <file>icons/solo.png</file>
-    <file>icons/fader_background.png</file>
-    <file>icons/fader_knob.png</file>
-    <file>icons/fader_knob_red.png</file>
-    <file>icons/fader_leds.png</file>
-    <file>icons/faders.png</file>
-    <file>icons/select.png</file>
-    <file>icons/text.png</file>
-    <file>icons/draw.png</file>
-    <file>icons/draw-curve.png</file>
-    <file>icons/measure.png</file>
-    <file>icons/measure1cursor.xbm</file>
-    <file>icons/measure1mask.xbm</file>
-    <file>icons/measure2cursor.xbm</file>
-    <file>icons/measure2mask.xbm</file>
-    <file>icons/move.png</file>
-    <file>icons/navigate.png</file>
-    <file>icons/zoom.png</file>
-    <file>icons/zoom-in.png</file>
-    <file>icons/zoom-out.png</file>
-    <file>icons/zoom-fit.png</file>
-    <file>icons/undo.png</file>
-    <file>icons/redo.png</file>
-    <file>icons/new.png</file>
-    <file>icons/exit.png</file>
-    <file>icons/speaker.png</file>
-    <file>icons/annotation.png</file>
-    <file>icons/fileopen.png</file>
-    <file>icons/fileopensession.png</file>
-    <file>icons/fileopenaudio.png</file>
-    <file>icons/fileopen-22.png</file>
-    <file>icons/fileclose.png</file>
-    <file>icons/filenew.png</file>
-    <file>icons/filenew-22.png</file>
-    <file>icons/filesave.png</file>
-    <file>icons/filesave-22.png</file>
-    <file>icons/filesaveas.png</file>
-    <file>icons/filesaveas-22.png</file>
-    <file>icons/editdelete.png</file>
-    <file>icons/editcut.png</file>
-    <file>icons/editcopy.png</file>
-    <file>icons/editpaste.png</file>
-    <file>icons/mono.png</file>
-    <file>icons/stereo.png</file>
-    <file>icons/sharpen.png</file>
-    <file>icons/help.png</file>
-    <file>icons/cross.png</file>
-    <file>icons/sv-16x16.png</file>
-    <file>icons/sv-22x22.png</file>
-    <file>icons/sv-24x24.png</file>
-    <file>icons/sv-32x32.png</file>
-    <file>icons/sv-48x48.png</file>
-    <file>icons/sv-64x64.png</file>
-    <file>icons/sv-128x128.png</file>
-    <file>samples/bass.wav</file>
-    <file>samples/beep.wav</file>
-    <file>samples/bounce.wav</file>
-    <file>samples/clap.wav</file>
-    <file>samples/click.wav</file>
-    <file>samples/cowbell.wav</file>
-    <file>samples/hihat.wav</file>
-    <file>samples/kick.wav</file>
-    <file>samples/organ.wav</file>
-    <file>samples/piano.wav</file>
-    <file>samples/snare.wav</file>
-    <file>samples/stick.wav</file>
-    <file>samples/strike.wav</file>
-    <file>samples/tap.wav</file>
-    <file>i18n/sonic-visualiser_ru.qm</file>
-    <file>i18n/sonic-visualiser_en_GB.qm</file>
-    <file>i18n/tips_en.xml</file>
-</qresource>
-</RCC>
--- a/version.h	Fri Mar 27 12:41:49 2009 +0000
+++ b/version.h	Fri Mar 27 17:28:49 2009 +0000
@@ -1,1 +1,1 @@
-#define VECT_VERSION "[vect] 0.1"
+#define VERSION "[segmenter] 0.1"