# HG changeset patch
# User Chris Cannam
# Date 1154354722 0
# Node ID 33929e0c3c6bf9c3f502a8236373063ba682ed42
# Parent  89c625dda204b77d384fd7e2d998817511d87e52
* Reorganising code base.  This revision probably should compile once more.

diff -r 89c625dda204 -r 33929e0c3c6b layer/Colour3DPlotLayer.cpp
--- a/layer/Colour3DPlotLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/Colour3DPlotLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,7 +15,7 @@
 
 #include "Colour3DPlotLayer.h"
 
-#include "base/View.h"
+#include "view/View.h"
 #include "base/Profiler.h"
 
 #include <QPainter>
diff -r 89c625dda204 -r 33929e0c3c6b layer/Colour3DPlotLayer.h
--- a/layer/Colour3DPlotLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/Colour3DPlotLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,9 +16,9 @@
 #ifndef _COLOUR_3D_PLOT_H_
 #define _COLOUR_3D_PLOT_H_
 
-#include "base/Layer.h"
+#include "Layer.h"
 
-#include "model/DenseThreeDimensionalModel.h"
+#include "data/model/DenseThreeDimensionalModel.h"
 
 class View;
 class QPainter;
diff -r 89c625dda204 -r 33929e0c3c6b layer/Layer.cpp
--- a/layer/Layer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/Layer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -14,13 +14,13 @@
 */
 
 #include "Layer.h"
-#include "View.h"
-#include "Model.h"
+#include "view/View.h"
+#include "data/model/Model.h"
 
 #include <iostream>
 
-#include "layer/LayerFactory.h" //!!! shouldn't be including this here -- does that suggest we need to move this into layer/ ?
-#include "PlayParameterRepository.h"
+#include "LayerFactory.h" //!!! shouldn't be including this here -- does that suggest we need to move this into layer/ ?
+#include "base/PlayParameterRepository.h"
 
 Layer::Layer()
 {
diff -r 89c625dda204 -r 33929e0c3c6b layer/Layer.h
--- a/layer/Layer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/Layer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -17,9 +17,9 @@
 #ifndef _LAYER_H_
 #define _LAYER_H_
 
-#include "PropertyContainer.h"
-#include "XmlExportable.h"
-#include "Selection.h"
+#include "base/PropertyContainer.h"
+#include "base/XmlExportable.h"
+#include "base/Selection.h"
 
 #include <QObject>
 #include <QRect>
diff -r 89c625dda204 -r 33929e0c3c6b layer/LayerFactory.cpp
--- a/layer/LayerFactory.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/LayerFactory.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -24,13 +24,13 @@
 #include "TextLayer.h"
 #include "Colour3DPlotLayer.h"
 
-#include "model/RangeSummarisableTimeValueModel.h"
-#include "model/DenseTimeValueModel.h"
-#include "model/SparseOneDimensionalModel.h"
-#include "model/SparseTimeValueModel.h"
-#include "model/NoteModel.h"
-#include "model/TextModel.h"
-#include "model/DenseThreeDimensionalModel.h"
+#include "data/model/RangeSummarisableTimeValueModel.h"
+#include "data/model/DenseTimeValueModel.h"
+#include "data/model/SparseOneDimensionalModel.h"
+#include "data/model/SparseTimeValueModel.h"
+#include "data/model/NoteModel.h"
+#include "data/model/TextModel.h"
+#include "data/model/DenseThreeDimensionalModel.h"
 
 LayerFactory *
 LayerFactory::m_instance = new LayerFactory;
diff -r 89c625dda204 -r 33929e0c3c6b layer/NoteLayer.cpp
--- a/layer/NoteLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/NoteLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,13 +15,13 @@
 
 #include "NoteLayer.h"
 
-#include "base/Model.h"
+#include "data/model/Model.h"
 #include "base/RealTime.h"
 #include "base/Profiler.h"
 #include "base/Pitch.h"
-#include "base/View.h"
+#include "view/View.h"
 
-#include "model/NoteModel.h"
+#include "data/model/NoteModel.h"
 
 #include "widgets/ItemEditDialog.h"
 
diff -r 89c625dda204 -r 33929e0c3c6b layer/NoteLayer.h
--- a/layer/NoteLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/NoteLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,8 +16,8 @@
 #ifndef _NOTE_LAYER_H_
 #define _NOTE_LAYER_H_
 
-#include "base/Layer.h"
-#include "model/NoteModel.h"
+#include "Layer.h"
+#include "data/model/NoteModel.h"
 
 #include <QObject>
 #include <QColor>
diff -r 89c625dda204 -r 33929e0c3c6b layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/SpectrogramLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,13 +15,13 @@
 
 #include "SpectrogramLayer.h"
 
-#include "base/View.h"
+#include "view/View.h"
 #include "base/Profiler.h"
 #include "base/AudioLevel.h"
 #include "base/Window.h"
 #include "base/Pitch.h"
 #include "base/Preferences.h"
-#include "fileio/FFTDataServer.h"
+#include "data/fft/FFTDataServer.h"
 
 #include <QPainter>
 #include <QImage>
diff -r 89c625dda204 -r 33929e0c3c6b layer/SpectrogramLayer.h
--- a/layer/SpectrogramLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/SpectrogramLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,15 +16,15 @@
 #ifndef _SPECTROGRAM_LAYER_H_
 #define _SPECTROGRAM_LAYER_H_
 
-#include "base/Layer.h"
+#include "Layer.h"
 #include "base/Window.h"
 #include "base/RealTime.h"
 #include "base/Thread.h"
 #include "base/PropertyContainer.h"
-#include "model/PowerOfSqrtTwoZoomConstraint.h"
-#include "model/DenseTimeValueModel.h"
+#include "data/model/PowerOfSqrtTwoZoomConstraint.h"
+#include "data/model/DenseTimeValueModel.h"
 
-#include "fileio/FFTFuzzyAdapter.h"
+#include "data/fft/FFTFuzzyAdapter.h"
 
 #include <QMutex>
 #include <QWaitCondition>
diff -r 89c625dda204 -r 33929e0c3c6b layer/TextLayer.cpp
--- a/layer/TextLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TextLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,12 +15,12 @@
 
 #include "TextLayer.h"
 
-#include "base/Model.h"
+#include "data/model/Model.h"
 #include "base/RealTime.h"
 #include "base/Profiler.h"
-#include "base/View.h"
+#include "view/View.h"
 
-#include "model/TextModel.h"
+#include "data/model/TextModel.h"
 
 #include <QPainter>
 #include <QMouseEvent>
diff -r 89c625dda204 -r 33929e0c3c6b layer/TextLayer.h
--- a/layer/TextLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TextLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,8 +16,8 @@
 #ifndef _TEXT_LAYER_H_
 #define _TEXT_LAYER_H_
 
-#include "base/Layer.h"
-#include "model/TextModel.h"
+#include "Layer.h"
+#include "data/model/TextModel.h"
 
 #include <QObject>
 #include <QColor>
diff -r 89c625dda204 -r 33929e0c3c6b layer/TimeInstantLayer.cpp
--- a/layer/TimeInstantLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TimeInstantLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,13 +15,13 @@
 
 #include "TimeInstantLayer.h"
 
-#include "base/Model.h"
+#include "data/model/Model.h"
 #include "base/RealTime.h"
-#include "base/View.h"
+#include "view/View.h"
 #include "base/Profiler.h"
 #include "base/Clipboard.h"
 
-#include "model/SparseOneDimensionalModel.h"
+#include "data/model/SparseOneDimensionalModel.h"
 
 #include "widgets/ItemEditDialog.h"
 
diff -r 89c625dda204 -r 33929e0c3c6b layer/TimeInstantLayer.h
--- a/layer/TimeInstantLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TimeInstantLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,8 +16,8 @@
 #ifndef _TIME_INSTANT_LAYER_H_
 #define _TIME_INSTANT_LAYER_H_
 
-#include "base/Layer.h"
-#include "model/SparseOneDimensionalModel.h"
+#include "Layer.h"
+#include "data/model/SparseOneDimensionalModel.h"
 
 #include <QObject>
 #include <QColor>
diff -r 89c625dda204 -r 33929e0c3c6b layer/TimeRulerLayer.cpp
--- a/layer/TimeRulerLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TimeRulerLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,9 +15,9 @@
 
 #include "TimeRulerLayer.h"
 
-#include "base/Model.h"
+#include "data/model/Model.h"
 #include "base/RealTime.h"
-#include "base/View.h"
+#include "view/View.h"
 
 #include <QPainter>
 
diff -r 89c625dda204 -r 33929e0c3c6b layer/TimeRulerLayer.h
--- a/layer/TimeRulerLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TimeRulerLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,7 +16,7 @@
 #ifndef _TIME_RULER_H_
 #define _TIME_RULER_H_
 
-#include "base/Layer.h"
+#include "Layer.h"
 
 #include <QRect>
 #include <QColor>
diff -r 89c625dda204 -r 33929e0c3c6b layer/TimeValueLayer.cpp
--- a/layer/TimeValueLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TimeValueLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,12 +15,12 @@
 
 #include "TimeValueLayer.h"
 
-#include "base/Model.h"
+#include "data/model/Model.h"
 #include "base/RealTime.h"
 #include "base/Profiler.h"
-#include "base/View.h"
+#include "view/View.h"
 
-#include "model/SparseTimeValueModel.h"
+#include "data/model/SparseTimeValueModel.h"
 
 #include "widgets/ItemEditDialog.h"
 #include "widgets/ListInputDialog.h"
diff -r 89c625dda204 -r 33929e0c3c6b layer/TimeValueLayer.h
--- a/layer/TimeValueLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/TimeValueLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,8 +16,8 @@
 #ifndef _TIME_VALUE_LAYER_H_
 #define _TIME_VALUE_LAYER_H_
 
-#include "base/Layer.h"
-#include "model/SparseTimeValueModel.h"
+#include "Layer.h"
+#include "data/model/SparseTimeValueModel.h"
 
 #include <QObject>
 #include <QColor>
diff -r 89c625dda204 -r 33929e0c3c6b layer/WaveformLayer.cpp
--- a/layer/WaveformLayer.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/WaveformLayer.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -16,7 +16,7 @@
 #include "WaveformLayer.h"
 
 #include "base/AudioLevel.h"
-#include "base/View.h"
+#include "view/View.h"
 #include "base/Profiler.h"
 
 #include <QPainter>
diff -r 89c625dda204 -r 33929e0c3c6b layer/WaveformLayer.h
--- a/layer/WaveformLayer.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/layer/WaveformLayer.h	Mon Jul 31 14:05:22 2006 +0000
@@ -19,9 +19,9 @@
 #include <QRect>
 #include <QColor>
 
-#include "base/Layer.h"
+#include "Layer.h"
 
-#include "model/RangeSummarisableTimeValueModel.h"
+#include "data/model/RangeSummarisableTimeValueModel.h"
 
 class View;
 class QPainter;
diff -r 89c625dda204 -r 33929e0c3c6b layer/layer.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/layer/layer.pro	Mon Jul 31 14:05:22 2006 +0000
@@ -0,0 +1,36 @@
+TEMPLATE = lib
+
+SV_UNIT_PACKAGES = 
+load(../sv.prf)
+
+CONFIG += sv staticlib qt thread warn_on stl rtti exceptions
+QT += xml
+
+TARGET = svlayer
+
+DEPENDPATH += . ..
+INCLUDEPATH += . ..
+OBJECTS_DIR = tmp_obj
+MOC_DIR = tmp_moc
+
+# Input
+HEADERS += Colour3DPlotLayer.h \
+           Layer.h \
+           LayerFactory.h \
+           NoteLayer.h \
+           SpectrogramLayer.h \
+           TextLayer.h \
+           TimeInstantLayer.h \
+           TimeRulerLayer.h \
+           TimeValueLayer.h \
+           WaveformLayer.h
+SOURCES += Colour3DPlotLayer.cpp \
+           Layer.cpp \
+           LayerFactory.cpp \
+           NoteLayer.cpp \
+           SpectrogramLayer.cpp \
+           TextLayer.cpp \
+           TimeInstantLayer.cpp \
+           TimeRulerLayer.cpp \
+           TimeValueLayer.cpp \
+           WaveformLayer.cpp
diff -r 89c625dda204 -r 33929e0c3c6b view/Pane.cpp
--- a/view/Pane.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/Pane.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -13,13 +13,13 @@
     COPYING included with this distribution for more information.
 */
 
-#include "widgets/Pane.h"
-#include "base/Layer.h"
-#include "base/Model.h"
+#include "Pane.h"
+#include "layer/Layer.h"
+#include "data/model/Model.h"
 #include "base/ZoomConstraint.h"
 #include "base/RealTime.h"
 #include "base/Profiler.h"
-#include "base/ViewManager.h"
+#include "ViewManager.h"
 #include "base/CommandHistory.h"
 #include "layer/WaveformLayer.h"
 
diff -r 89c625dda204 -r 33929e0c3c6b view/Pane.h
--- a/view/Pane.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/Pane.h	Mon Jul 31 14:05:22 2006 +0000
@@ -21,7 +21,7 @@
 #include <QPoint>
 
 #include "base/ZoomConstraint.h"
-#include "base/View.h"
+#include "View.h"
 #include "base/Selection.h"
 
 class QWidget;
diff -r 89c625dda204 -r 33929e0c3c6b view/PaneStack.cpp
--- a/view/PaneStack.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/PaneStack.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -16,10 +16,10 @@
 
 #include "PaneStack.h"
 
-#include "widgets/Pane.h"
+#include "Pane.h"
 #include "widgets/PropertyStack.h"
-#include "base/Layer.h"
-#include "base/ViewManager.h"
+#include "layer/Layer.h"
+#include "ViewManager.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
diff -r 89c625dda204 -r 33929e0c3c6b view/Panner.cpp
--- a/view/Panner.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/Panner.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -14,8 +14,8 @@
 */
 
 #include "Panner.h"
-#include "base/Layer.h"
-#include "base/Model.h"
+#include "layer/Layer.h"
+#include "data/model/Model.h"
 #include "base/ZoomConstraint.h"
 
 #include <QPaintEvent>
diff -r 89c625dda204 -r 33929e0c3c6b view/Panner.h
--- a/view/Panner.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/Panner.h	Mon Jul 31 14:05:22 2006 +0000
@@ -16,7 +16,7 @@
 #ifndef _PAN_WIDGET_H_
 #define _PAN_WIDGET_H_
 
-#include "base/View.h"
+#include "View.h"
 
 #include <QPoint>
 
diff -r 89c625dda204 -r 33929e0c3c6b view/View.cpp
--- a/view/View.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/View.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -13,14 +13,14 @@
     COPYING included with this distribution for more information.
 */
 
-#include "base/View.h"
-#include "base/Layer.h"
-#include "base/Model.h"
+#include "View.h"
+#include "layer/Layer.h"
+#include "data/model/Model.h"
 #include "base/ZoomConstraint.h"
 #include "base/Profiler.h"
 
 #include "layer/TimeRulerLayer.h" //!!! damn, shouldn't be including that here
-#include "model/PowerOfSqrtTwoZoomConstraint.h" //!!! likewise
+#include "data/model/PowerOfSqrtTwoZoomConstraint.h" //!!! likewise
 
 #include <QPainter>
 #include <QPaintEvent>
diff -r 89c625dda204 -r 33929e0c3c6b view/View.h
--- a/view/View.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/View.h	Mon Jul 31 14:05:22 2006 +0000
@@ -21,7 +21,7 @@
 
 #include "base/ZoomConstraint.h"
 #include "base/PropertyContainer.h"
-#include "base/ViewManager.h"
+#include "ViewManager.h"
 #include "base/XmlExportable.h"
 
 // #define DEBUG_VIEW_WIDGET_PAINT 1
diff -r 89c625dda204 -r 33929e0c3c6b view/ViewManager.cpp
--- a/view/ViewManager.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/ViewManager.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -14,9 +14,9 @@
 */
 
 #include "ViewManager.h"
-#include "AudioPlaySource.h"
-#include "Model.h"
-#include "CommandHistory.h"
+#include "base/AudioPlaySource.h"
+#include "data/model/Model.h"
+#include "base/CommandHistory.h"
 
 #include <iostream>
 
diff -r 89c625dda204 -r 33929e0c3c6b view/ViewManager.h
--- a/view/ViewManager.h	Mon Jul 31 11:44:37 2006 +0000
+++ b/view/ViewManager.h	Mon Jul 31 14:05:22 2006 +0000
@@ -21,9 +21,9 @@
 
 #include <map>
 
-#include "Selection.h"
-#include "Command.h"
-#include "Clipboard.h"
+#include "base/Selection.h"
+#include "base/Command.h"
+#include "base/Clipboard.h"
 
 class AudioPlaySource;
 class Model;
diff -r 89c625dda204 -r 33929e0c3c6b view/view.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/view/view.pro	Mon Jul 31 14:05:22 2006 +0000
@@ -0,0 +1,18 @@
+TEMPLATE = lib
+
+SV_UNIT_PACKAGES =
+load(../sv.prf)
+
+CONFIG += sv staticlib qt thread warn_on stl rtti exceptions
+QT += xml
+
+TARGET = svview
+
+DEPENDPATH += . ..
+INCLUDEPATH += . ..
+OBJECTS_DIR = tmp_obj
+MOC_DIR = tmp_moc
+
+# Input
+HEADERS += Pane.h PaneStack.h Panner.h View.h ViewManager.h
+SOURCES += Pane.cpp PaneStack.cpp Panner.cpp View.cpp ViewManager.cpp
diff -r 89c625dda204 -r 33929e0c3c6b widgets/LayerTree.cpp
--- a/widgets/LayerTree.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/widgets/LayerTree.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -15,11 +15,11 @@
 */
 
 #include "LayerTree.h"
-#include "PaneStack.h"
+#include "view/PaneStack.h"
 
-#include "widgets/Pane.h"
-#include "base/Layer.h"
-#include "base/Model.h"
+#include "view/Pane.h"
+#include "layer/Layer.h"
+#include "data/model/Model.h"
 
 #include <iostream>
 
diff -r 89c625dda204 -r 33929e0c3c6b widgets/PropertyBox.cpp
--- a/widgets/PropertyBox.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/widgets/PropertyBox.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -18,7 +18,7 @@
 
 #include "base/PropertyContainer.h"
 #include "base/PlayParameters.h"
-#include "base/Layer.h"
+#include "layer/Layer.h"
 #include "base/UnitDatabase.h"
 
 #include "plugin/RealTimePluginFactory.h"
diff -r 89c625dda204 -r 33929e0c3c6b widgets/PropertyStack.cpp
--- a/widgets/PropertyStack.cpp	Mon Jul 31 11:44:37 2006 +0000
+++ b/widgets/PropertyStack.cpp	Mon Jul 31 14:05:22 2006 +0000
@@ -16,8 +16,8 @@
 #include "PropertyStack.h"
 #include "PropertyBox.h"
 #include "base/PropertyContainer.h"
-#include "base/View.h"
-#include "base/Layer.h"
+#include "view/View.h"
+#include "layer/Layer.h"
 
 #include <QIcon>
 #include <QTabWidget>
diff -r 89c625dda204 -r 33929e0c3c6b widgets/widgets.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/widgets/widgets.pro	Mon Jul 31 14:05:22 2006 +0000
@@ -0,0 +1,36 @@
+TEMPLATE = lib
+
+SV_UNIT_PACKAGES =
+load(../sv.prf)
+
+CONFIG += sv staticlib qt thread warn_on stl rtti exceptions
+QT += xml
+
+TARGET = svwidgets
+
+DEPENDPATH += . ..
+INCLUDEPATH += . ..
+OBJECTS_DIR = tmp_obj
+MOC_DIR = tmp_moc
+
+# Input
+HEADERS += AudioDial.h \
+           Fader.h \
+           ItemEditDialog.h \
+           LayerTree.h \
+           LEDButton.h \
+           ListInputDialog.h \
+           PluginParameterBox.h \
+           PluginParameterDialog.h \
+           PropertyBox.h \
+           PropertyStack.h
+SOURCES += AudioDial.cpp \
+           Fader.cpp \
+           ItemEditDialog.cpp \
+           LayerTree.cpp \
+           LEDButton.cpp \
+           ListInputDialog.cpp \
+           PluginParameterBox.cpp \
+           PluginParameterDialog.cpp \
+           PropertyBox.cpp \
+           PropertyStack.cpp