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

Update for changes to PlayParameters

 #include "rdf/RDFImporter.h"
 #include "rdf/RDFExporter.h"
 
 #include "base/RecentFiles.h"
 
-#include "base/PlayParameterRepository.h"
 #include "base/XmlExportable.h"
 #include "base/Profiler.h"
 #include "base/Preferences.h"
 #include "base/TempWriteFile.h"
 #include "base/Exceptions.h"

     if (mode == ReplaceMainModel) {
 
         ModelId prevMain = getMainModelId();
         if (!prevMain.isNone()) {
             m_playSource->removeModel(prevMain);
-            //!!! shouldn't this stuff be handled by Document?
-            PlayParameterRepository::getInstance()->removePlayable
-                (prevMain.untyped);
-        }
-        PlayParameterRepository::getInstance()->addPlayable(newModel.untyped);
+        }
 
         SVDEBUG << "SV about to call setMainModel(" << newModel << "): prevMain is " << prevMain << endl;
 
         m_document->setMainModel(newModel);
 

 
     QString location = modelPtr->getLocation();
     
     auto modelId = modelPtr->getId();
     ModelById::add(std::shared_ptr<Model>(modelPtr));
-    PlayParameterRepository::getInstance()->addPlayable(modelId.untyped);
 
     if (m_audioRecordMode == RecordReplaceSession || !getMainModel()) {
 
         //!!! duplication with openAudio here
         

             FileOpenStatus tplStatus = openSessionTemplate(templateName);
             if (tplStatus == FileOpenCancelled) {
                 SVCERR << "MainWindowBase::record: Session template open cancelled, stopping and suspending" << endl;
                 m_recordTarget->stopRecording();
                 m_audioIO->suspend();
-                PlayParameterRepository::getInstance()->removePlayable
-                    (modelId.untyped);
                 ModelById::release(modelId);
                 return;
             }
             if (tplStatus != FileOpenFailed) {
                 loadedTemplate = true;

         }
         
         ModelId prevMain = getMainModelId();
         if (!prevMain.isNone()) {
             m_playSource->removeModel(prevMain);
-            PlayParameterRepository::getInstance()->removePlayable
-                (prevMain.untyped);
         }
         
         m_document->setMainModel(modelId);
         setupMenus();
         findTimeRulerLayer();