diff main/OSCHandler.cpp @ 2300:eb7f4579e5cc by-id

Updates throughout for ModelById logic
author Chris Cannam
date Thu, 04 Jul 2019 14:32:08 +0100
parents e9c77a4c865e
children 1e77e4ee27f5
line wrap: on
line diff
--- a/main/OSCHandler.cpp	Mon Jun 24 16:58:10 2019 +0100
+++ b/main/OSCHandler.cpp	Thu Jul 04 14:32:08 2019 +0100
@@ -110,9 +110,10 @@
                                          WavFileWriter::WriteToTemporary);
                     MultiSelection ms = m_viewManager->getSelection();
                     if (!ms.getSelections().empty()) {
-                        writer.writeModel(getMainModel(), &ms);
+                        //!!! todo: update WavFileWriter!
+                        writer.writeModel(getMainModel().get(), &ms);
                     } else {
-                        writer.writeModel(getMainModel());
+                        writer.writeModel(getMainModel().get());
                     }
                 }
             }
@@ -352,7 +353,7 @@
                 } else {
 
                     LayerConfiguration configuration(type,
-                                                     getMainModel(),
+                                                     getMainModelId(),
                                                      channel);
                     
                     addPane(configuration,
@@ -611,7 +612,7 @@
                 getDefaultTransformFor(transformId);
             
             Layer *newLayer = m_document->createDerivedLayer
-                (transform, getMainModel());
+                (transform, getMainModelId());
 
             if (newLayer) {
                 m_document->addLayerToView(pane, newLayer);