comparison layer/ScrollableImageCache.h @ 1090:c8c747783110 spectrogram-minor-refactor

Cut over to using the renderer (though it's very incomplete) and fix some cache problems and pointer lifetime misunderstandings

  * using the drawImage call.
  */
 class ScrollableImageCache
 {
 public:
-    ScrollableImageCache(const LayerGeometryProvider *v = 0) :
-	m_v(v),
+    ScrollableImageCache() :
 	m_left(0),
 	m_width(0),
 	m_startFrame(0),
 	m_zoomLevel(0)
     {}

     const QImage &getImage() const {
 	return m_image;
     }
 
     /**
-     * Set the new start frame for the cache, if possible also moving
-     * along any existing valid data within the cache so that it
-     * continues to be valid for the new start frame.
+     * Set the new start frame for the cache, according to the
+     * geometry of the supplied LayerGeometryProvider, if possible
+     * also moving along any existing valid data within the cache so
+     * that it continues to be valid for the new start frame.
      */
-    void scrollTo(sv_frame_t newStartFrame);
+    void scrollTo(LayerGeometryProvider *v, sv_frame_t newStartFrame);
 
     /**
      * Take a left coordinate and width describing a region, and
      * adjust them so that they are contiguous with the cache valid
      * region and so that the union of the adjusted region with the

 		   QImage image,
 		   int imageLeft,
 		   int imageWidth);
     
 private:
-    const LayerGeometryProvider *m_v;
     QImage m_image;
     int m_left;  // of valid region
     int m_width; // of valid region
     sv_frame_t m_startFrame;
     int m_zoomLevel;