changeset 532:227291052aa9 piper

Merge from branch project-file-rework

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/files.pri	Fri Oct 28 15:19:11 2016 +0100
@@ -0,0 +1,28 @@
+
+SVAPP_HEADERS += \
+           audio/AudioCallbackPlaySource.h \
+           audio/AudioRecordTarget.h \
+           audio/AudioGenerator.h \
+           audio/ClipMixer.h \
+           audio/ContinuousSynth.h \
+           audio/PlaySpeedRangeMapper.h \
+           framework/Align.h \
+	   framework/Document.h \
+           framework/MainWindowBase.h \
+           framework/SVFileReader.h \
+           framework/TransformUserConfigurator.h \
+           framework/VersionTester.h
+
+SVAPP_SOURCES += \
+           audio/AudioCallbackPlaySource.cpp \
+           audio/AudioRecordTarget.cpp \
+           audio/AudioGenerator.cpp \
+           audio/ClipMixer.cpp \
+           audio/ContinuousSynth.cpp \
+           audio/PlaySpeedRangeMapper.cpp \
+	   framework/Align.cpp \
+	   framework/Document.cpp \
+           framework/MainWindowBase.cpp \
+           framework/SVFileReader.cpp \
+           framework/TransformUserConfigurator.cpp \
+           framework/VersionTester.cpp

--- a/framework/TransformUserConfigurator.cpp	Thu Oct 20 11:19:34 2016 +0100
+++ b/framework/TransformUserConfigurator.cpp	Fri Oct 28 15:19:11 2016 +0100
@@ -80,28 +80,7 @@
 
     if (!plugin) return false;
 
-    if (FeatureExtractionPluginFactory::instanceFor(id)) {
-
-        Vamp::Plugin *vp = static_cast<Vamp::Plugin *>(plugin);
-
-	frequency = (vp->getInputDomain() == Vamp::Plugin::FrequencyDomain);
-
-	std::vector<Vamp::Plugin::OutputDescriptor> od =
-	    vp->getOutputDescriptors();
-
-	cerr << "configure: looking for output: " << output << endl;
-
-	if (od.size() > 1) {
-	    for (size_t i = 0; i < od.size(); ++i) {
-		if (od[i].identifier == output.toStdString()) {
-		    outputLabel = od[i].name.c_str();
-		    outputDescription = od[i].description.c_str();
-		    break;
-		}
-	    }
-        }
-
-    } else if (RealTimePluginFactory::instanceFor(id)) {
+    if (RealTimePluginFactory::instanceFor(id)) {
 
         RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id);
         const RealTimePluginDescriptor *desc = factory->getPluginDescriptor(id);
@@ -130,8 +109,29 @@
 	    SVDEBUG << "Setting auditioning effect" << endl;
             source->setAuditioningEffect(rtp);
         }
+
+    } else {
+
+        Vamp::Plugin *vp = static_cast<Vamp::Plugin *>(plugin);
+
+	frequency = (vp->getInputDomain() == Vamp::Plugin::FrequencyDomain);
+
+	std::vector<Vamp::Plugin::OutputDescriptor> od =
+	    vp->getOutputDescriptors();
+
+	cerr << "configure: looking for output: " << output << endl;
+
+	if (od.size() > 1) {
+	    for (size_t i = 0; i < od.size(); ++i) {
+		if (od[i].identifier == output.toStdString()) {
+		    outputLabel = od[i].name.c_str();
+		    outputDescription = od[i].description.c_str();
+		    break;
+		}
+	    }
+        }
     }
-
+    
     int sourceChannels = 1;
     if (dynamic_cast<DenseTimeValueModel *>(inputModel)) {
 	sourceChannels = dynamic_cast<DenseTimeValueModel *>(inputModel)

--- a/svapp.pro	Thu Oct 20 11:19:34 2016 +0100
+++ b/svapp.pro	Fri Oct 28 15:19:11 2016 +0100
@@ -2,43 +2,10 @@
 TEMPLATE = lib
 
 INCLUDEPATH += ../vamp-plugin-sdk
-DEFINES += HAVE_VAMP HAVE_VAMPHOSTSDK
 
 exists(config.pri) {
     include(config.pri)
 }
-!exists(config.pri) {
-
-    CONFIG += release
-    DEFINES += NDEBUG BUILD_RELEASE
-    DEFINES += NO_TIMING
-
-    win32-g++ {
-        INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
-        LIBS += -L../sv-dependency-builds/win32-mingw/lib
-    }
-    win32-msvc* {
-        # We actually expect MSVC to be used only for 64-bit builds,
-        # though the qmake spec is still called win32-msvc*
-        INCLUDEPATH += ../sv-dependency-builds/win64-msvc/include
-        LIBS += -L../sv-dependency-builds/win64-msvc/lib
-    }
-    macx* {
-        INCLUDEPATH += ../sv-dependency-builds/osx/include
-        LIBS += -L../sv-dependency-builds/osx/lib
-    }
-
-    win* {
-        DEFINES += HAVE_PORTAUDIO
-    }
-    macx* {
-        DEFINES += HAVE_COREAUDIO HAVE_PORTAUDIO
-    }
-    win32-msvc* {
-        DEFINES += NOMINMAX _USE_MATH_DEFINES
-        DEFINES -= HAVE_LIBLO
-    }
-}
 
 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11
 QT += network xml gui widgets
@@ -50,31 +17,8 @@
 OBJECTS_DIR = o
 MOC_DIR = o
 
-HEADERS += audio/AudioCallbackPlaySource.h \
-           audio/AudioRecordTarget.h \
-           audio/AudioGenerator.h \
-           audio/ClipMixer.h \
-           audio/ContinuousSynth.h \
-           audio/PlaySpeedRangeMapper.h
+include(files.pri)
 
-SOURCES += audio/AudioCallbackPlaySource.cpp \
-           audio/AudioRecordTarget.cpp \
-           audio/AudioGenerator.cpp \
-           audio/ClipMixer.cpp \
-           audio/ContinuousSynth.cpp \
-           audio/PlaySpeedRangeMapper.cpp
+HEADERS = $$(SVAPP_HEADERS)
+SOURCES = $$(SVAPP_SOURCES)
 
-HEADERS += framework/Align.h \
-	   framework/Document.h \
-           framework/MainWindowBase.h \
-           framework/SVFileReader.h \
-           framework/TransformUserConfigurator.h \
-           framework/VersionTester.h
-
-SOURCES += framework/Align.cpp \
-	   framework/Document.cpp \
-           framework/MainWindowBase.cpp \
-           framework/SVFileReader.cpp \
-           framework/TransformUserConfigurator.cpp \
-           framework/VersionTester.cpp
-