comparison data/model/AggregateWaveModel.cpp @ 1688:901f37d32060

Model deletion issues - the AlignmentModel doesn't actually need to know about the input aggregate model; the document should own it instead

     }
 }
 
 AggregateWaveModel::~AggregateWaveModel()
 {
+    SVDEBUG << "AggregateWaveModel::~AggregateWaveModel" << endl;
 }
 
 void
 AggregateWaveModel::componentModelAboutToBeDeleted()
 {

 }
 
 bool
 AggregateWaveModel::isOK() const
 {
-    if (m_invalidated) {
+    if (m_invalidated || m_components.empty()) {
         return false;
     }
     for (ChannelSpecList::const_iterator i = m_components.begin();
          i != m_components.end(); ++i) {
         if (!i->model->isOK()) {

 }
 
 sv_samplerate_t
 AggregateWaveModel::getSampleRate() const
 {
-    if (m_components.empty()) return 0;
+    if (m_invalidated || m_components.empty()) return 0;
     return m_components.begin()->model->getSampleRate();
 }
 
 floatvec_t
 AggregateWaveModel::getData(int channel, sv_frame_t start, sv_frame_t count) const
 {
+    if (m_invalidated || m_components.empty()) return {};
+    
     int ch0 = channel, ch1 = channel;
     if (channel == -1) {
         ch0 = 0;
         ch1 = getChannelCount()-1;
     }