comparison layer/LayerFactory.cpp @ 156:b32282fefccd

* Tidy up inheritance hierarchy of model classes -- remove ZoomConstraint as
  a base class (make it a member instead) and remove virtual inheritances of
  QObject (no longer necessary).

 #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"
+#include "data/model/WaveFileModel.h"
+#include "data/model/WritableWaveFileModel.h"
 
 LayerFactory *
 LayerFactory::m_instance = new LayerFactory;
 
 LayerFactory *

 }
 
 void
 LayerFactory::setModel(Layer *layer, Model *model)
 {
-    if (trySetModel<WaveformLayer, RangeSummarisableTimeValueModel>(layer, model))
+//    if (trySetModel<WaveformLayer, RangeSummarisableTimeValueModel>(layer, model))
+//	return;
+
+    if (trySetModel<WaveformLayer, WaveFileModel>(layer, model))
+	return;
+
+    if (trySetModel<WaveformLayer, WritableWaveFileModel>(layer, model))
 	return;
 
     if (trySetModel<SpectrogramLayer, DenseTimeValueModel>(layer, model))
 	return;