comparison layer/SpectrogramLayer.cpp @ 1481:e540aa5d89cd by-id

Update for removal of (public) getId from Model

     if (newModel) {
         recreateFFTModel();
 
         connectSignals(m_model);
 
-        connect(newModel.get(), SIGNAL(modelChanged()),
-                this, SLOT(cacheInvalid()));
-        connect(newModel.get(), SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)),
-                this, SLOT(cacheInvalid(sv_frame_t, sv_frame_t)));
+        connect(newModel.get(),
+                SIGNAL(modelChanged(ModelId)),
+                this, SLOT(cacheInvalid(ModelId)));
+        connect(newModel.get(),
+                SIGNAL(modelChangedWithin(ModelId, sv_frame_t, sv_frame_t)),
+                this, SLOT(cacheInvalid(ModelId, sv_frame_t, sv_frame_t)));
     }
     
     emit modelReplaced();
 }
 

     // us and we just fill in
     return false;
 }
 
 void
-SpectrogramLayer::cacheInvalid()
+SpectrogramLayer::cacheInvalid(ModelId)
 {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     cerr << "SpectrogramLayer::cacheInvalid()" << endl;
 #endif
 

     invalidateMagnitudes();
 }
 
 void
 SpectrogramLayer::cacheInvalid(
+    ModelId,
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     sv_frame_t from, sv_frame_t to
 #else 
     sv_frame_t     , sv_frame_t
 #endif

              tr("Failed to create the FFT model for this spectrogram.\n"
                 "There may be insufficient memory or disc space to continue."));
         return;
     }
 
-    ModelById::add(newFFTModel);
-    m_fftModel = newFFTModel->getId();
+    m_fftModel = ModelById::add(newFFTModel);
 
     bool createWholeCache = false;
     checkCacheSpace(&m_peakCacheDivisor, &createWholeCache);
     
     if (createWholeCache) {
 
         auto whole = std::make_shared<Dense3DModelPeakCache>(m_fftModel, 1);
-        ModelById::add(whole);
-        m_wholeCache = whole->getId();
+        m_wholeCache = ModelById::add(whole);
 
         auto peaks = std::make_shared<Dense3DModelPeakCache>(m_wholeCache,
                                                              m_peakCacheDivisor);
-        ModelById::add(peaks);
-        m_peakCache = peaks->getId();
+        m_peakCache = ModelById::add(peaks);
 
     } else {
 
         auto peaks = std::make_shared<Dense3DModelPeakCache>(m_fftModel,
                                                              m_peakCacheDivisor);
-        ModelById::add(peaks);
-        m_peakCache = peaks->getId();
+        m_peakCache = ModelById::add(peaks);
     }
 }
 
 void
 SpectrogramLayer::checkCacheSpace(int *suggestedPeakDivisor,