diff framework/MainWindowBase.h @ 696:155008f1bf10

Merge from branch by-id

--- a/framework/MainWindowBase.h	Fri Jun 14 17:19:37 2019 +0100
+++ b/framework/MainWindowBase.h	Wed Jul 17 14:25:41 2019 +0100
@@ -35,6 +35,8 @@
 #include "data/fileio/FileSource.h"
 #include "data/osc/OSCQueue.h"
 #include "data/osc/OSCMessageCallback.h"
+#include "data/model/Model.h"
+
 #include <map>
 
 class Document;
@@ -302,9 +304,8 @@
     virtual void layerAboutToBeDeleted(Layer *);
     virtual void layerInAView(Layer *, bool);
 
-    virtual void mainModelChanged(WaveFileModel *);
-    virtual void modelAdded(Model *);
-    virtual void modelAboutToBeDeleted(Model *);
+    virtual void mainModelChanged(ModelId);
+    virtual void modelAdded(ModelId);
 
     virtual void updateMenuStates();
     virtual void updateDescriptionLabel() = 0;
@@ -315,7 +316,7 @@
     virtual void modelRegenerationFailed(QString, QString, QString) = 0;
     virtual void modelRegenerationWarning(QString, QString, QString) = 0;
 
-    virtual void alignmentComplete(AlignmentModel *);
+    virtual void alignmentComplete(ModelId);
     virtual void alignmentFailed(QString) = 0;
 
     virtual void rightButtonMenuRequested(Pane *, QPoint point) = 0;
@@ -418,12 +419,12 @@
     mutable QLabel *m_statusLabel;
     QLabel *getStatusLabel() const;
 
-    WaveFileModel *getMainModel();
-    const WaveFileModel *getMainModel() const;
+    ModelId getMainModelId() const;
+    std::shared_ptr<WaveFileModel> getMainModel() const;
     void createDocument();
 
     FileOpenStatus addOpenedAudioModel(FileSource source,
-                                       WaveFileModel *model,
+                                       ModelId model,
                                        AudioFileOpenMode mode,
                                        QString templateName,
                                        bool registerSource);