# HG changeset patch # User Chris Cannam # Date 1205344937 0 # Node ID 9d772bee2095a5b2add78346d67e4f04d4e01aa6 # Parent 842745edded863dea14a42972c6eb0bc947cfe42 * Move plugin/transform to plain transform. This way transform can depend on model and GUI classes, but plugin doesn't have to. diff -r 842745edded8 -r 9d772bee2095 main/MainWindow.cpp --- a/main/MainWindow.cpp Wed Mar 12 17:42:56 2008 +0000 +++ b/main/MainWindow.cpp Wed Mar 12 18:02:17 2008 +0000 @@ -61,8 +61,8 @@ #include "data/fileio/FileSource.h" #include "data/fft/FFTDataServer.h" #include "base/RecentFiles.h" -#include "plugin/transform/TransformFactory.h" -#include "plugin/transform/ModelTransformerFactory.h" +#include "transform/TransformFactory.h" +#include "transform/ModelTransformerFactory.h" #include "base/PlayParameterRepository.h" #include "base/XmlExportable.h" #include "widgets/CommandHistory.h" diff -r 842745edded8 -r 9d772bee2095 main/MainWindow.h --- a/main/MainWindow.h Wed Mar 12 17:42:56 2008 +0000 +++ b/main/MainWindow.h Wed Mar 12 18:02:17 2008 +0000 @@ -27,7 +27,7 @@ #include "base/PropertyContainer.h" #include "base/RecentFiles.h" #include "layer/LayerFactory.h" -#include "plugin/transform/Transform.h" +#include "transform/Transform.h" #include "framework/SVFileReader.h" #include "data/fileio/FileFinder.h" #include "data/fileio/FileSource.h" diff -r 842745edded8 -r 9d772bee2095 main/OSCHandler.cpp --- a/main/OSCHandler.cpp Wed Mar 12 17:42:56 2008 +0000 +++ b/main/OSCHandler.cpp Wed Mar 12 18:02:17 2008 +0000 @@ -26,7 +26,7 @@ #include "audioio/AudioCallbackPlayTarget.h" #include "framework/Document.h" #include "data/fileio/WavFileWriter.h" -#include "plugin/transform/TransformFactory.h" +#include "transform/TransformFactory.h" #include "widgets/Fader.h" #include "widgets/AudioDial.h" diff -r 842745edded8 -r 9d772bee2095 sv.pro --- a/sv.pro Wed Mar 12 17:42:56 2008 +0000 +++ b/sv.pro Wed Mar 12 18:02:17 2008 +0000 @@ -13,11 +13,11 @@ DEPENDPATH += . .. i18n main transform INCLUDEPATH += . .. transform main -LIBPATH = ../view ../layer ../data ../widgets ../plugin ../base ../system ../framework ../audioio $$LIBPATH +LIBPATH = ../view ../layer ../data ../widgets ../transform ../plugin ../base ../system ../framework ../audioio $$LIBPATH contains(DEFINES, BUILD_STATIC):LIBS -= -ljack -LIBS = -lsvframework -lsvaudioio -lsvview -lsvlayer -lsvdata -lsvwidgets -lsvplugin -lsvbase -lsvsystem $$LIBS +LIBS = -lsvframework -lsvaudioio -lsvview -lsvlayer -lsvdata -lsvtransform -lsvwidgets -lsvplugin -lsvbase -lsvsystem $$LIBS PRE_TARGETDEPS += ../view/libsvview.a \ ../layer/libsvlayer.a \