comparison framework/Document.cpp @ 686:610fa108fbcc by-id

Update for changes to PlayParameters

         SVDEBUG << "Document::setMainModel: auto-alignment is off" << endl;
     }
 
     emit mainModelChanged(m_mainModel);
 
+    // Remove the playable explicitly - the main model's dtor will do
+    // this, but just in case something is still hanging onto a
+    // shared_ptr to the old main model so it doesn't get deleted yet
+    PlayParameterRepository::getInstance()->removePlayable
+        (oldMainModel.untyped);
+    
     ModelById::release(oldMainModel);
 }
 
 void
 Document::addAlreadyDerivedModel(const Transform &transform,

             writePlaceholderMainModel(out, indent + "  ");
         } else {
             mainModel->toXml(out, indent + "  ", "mainModel=\"true\"");
         }
 
-        PlayParameters *playParameters =
+        auto playParameters =
             PlayParameterRepository::getInstance()->getPlayParameters
             (m_mainModel.untyped);
         if (playParameters) {
             playParameters->toXml
                 (out, indent + "  ",

             if (haveDerivation) {
                 writeBackwardCompatibleDerivation(out, indent + "  ",
                                                   modelId, rec.second);
             }
 
-            //!!! We should probably own the PlayParameterRepository
-            PlayParameters *playParameters =
+            auto playParameters =
                 PlayParameterRepository::getInstance()->getPlayParameters
                 (modelId.untyped);
             if (playParameters) {
                 playParameters->toXml
                     (out, indent + "  ",