comparison main/MainWindow.cpp @ 1620:33d32b3190bf

Store aggregate models in the document and release them when they are invalidated (because their components have been released). They're no longer leaked, but we still don't save them in the session file.

         }
 
         if (defaultInputModel) break;
     }
 
+    AggregateWaveModel *aggregate = 0;
+    
     if (candidateInputModels.size() > 1) {
         // Add an aggregate model as another option
         AggregateWaveModel::ChannelSpecList sl;
         foreach (Model *m, candidateInputModels) {
             RangeSummarisableTimeValueModel *r =

             if (r) {
                 sl.push_back(AggregateWaveModel::ModelChannelSpec(r, -1));
             }
         }
         if (!sl.empty()) {
-            AggregateWaveModel *aggregate = new AggregateWaveModel(sl);
+            aggregate = new AggregateWaveModel(sl);
             aggregate->setObjectName(tr("Multiplex all of the above"));
             candidateInputModels.push_back(aggregate);
-            //!!! but it leaks
         }
     }
     
     sv_frame_t startFrame = 0, duration = 0;
     sv_frame_t endFrame = 0;

          m_playSource,
          startFrame,
          duration,
          &configurator);
 
+    if (input.getModel() == aggregate) {
+        m_document->addAggregateModel(aggregate);
+    } else {
+        aggregate->aboutToDelete();
+        delete aggregate;
+    }
+    
     if (!input.getModel()) return;
 
 //    SVDEBUG << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << endl << "transform:" << endl << transform.toXmlString() << endl;
 
     try {