comparison src/Analyser.h @ 572:3f0b44418a19 by-id

Toward using ModelById logic (incomplete)

 #include <vector>
 
 #include "framework/Document.h"
 #include "base/Selection.h"
 #include "base/Clipboard.h"
-
-class WaveFileModel;
+#include "data/model/WaveFileModel.h"
+
 class Pane;
 class PaneStack;
 class Layer;
 class TimeValueLayer;
 class Layer;

 
 public:
     Analyser();
     virtual ~Analyser();
 
-    // Process new main model, add derived layers; return "" on success or error string on failure
-    QString newFileLoaded(Document *newDocument, WaveFileModel *model,
-                          PaneStack *paneStack, Pane *pane);
-
-    // Remove any derived layers, process the main model, add derived layers; return "" on success or error string on failure
+    // Process new main model, add derived layers; return "" on
+    // success or error string on failure
+    QString newFileLoaded(Document *newDocument,
+                          ModelId model,
+                          PaneStack *paneStack,
+                          Pane *pane);
+
+    // Remove any derived layers, process the main model, add derived
+    // layers; return "" on success or error string on failure
     QString analyseExistingFile();
 
     // Discard any layers etc associated with the current document
     void fileClosed();
 		       

             setVisible(c, true);
             setAudible(c, false);
         }
     }
 
-    WaveFileModel *getMainModel() const {
+    ModelId getMainModelId() const {
         return m_fileModel;
+    }
+    std::shared_ptr<WaveFileModel> getMainModel() const {
+        return ModelById::getAs<WaveFileModel>(m_fileModel);
     }
 
     float getGain(Component c) const;
     void setGain(Component c, float gain);
 

     void reAnalyseRegion(sv_frame_t, sv_frame_t, float, float);
     void materialiseReAnalysis();
 
 protected:
     Document *m_document;
-    WaveFileModel *m_fileModel;
+    ModelId m_fileModel;
     PaneStack *m_paneStack;
     Pane *m_pane;
 
     mutable std::map<Component, Layer *> m_layers;