diff layer/SliceableLayer.h @ 1486:ac0a8addabcf

Merge from branch by-id

--- a/layer/SliceableLayer.h	Thu Jun 13 15:35:01 2019 +0100
+++ b/layer/SliceableLayer.h	Wed Jul 17 14:25:16 2019 +0100
@@ -34,14 +34,15 @@
     // spectrogram that was constructed from a DenseTimeValueModel).
     // The SliceableLayer retains ownership of the model, and will
     // emit sliceableModelReplaced if it is about to become invalid.
-    virtual const Model *getSliceableModel() const = 0;
-
+    virtual ModelId getSliceableModel() const = 0;
+/*!!!
 signals:
     // Emitted when a model that was obtained through
     // getSliceableModel is about to be deleted.  If replacement is
     // non-NULL, it may be used instead.
     void sliceableModelReplaced(const Model *modelToBeReplaced,
                                 const Model *replacement);
+*/
 };
 
 #endif