comparison data/model/SparseModel.h @ 1466:f68911282993

Restore m_extendTo, which is needed for Tony

     // 10 sample frames later.
     virtual int getResolution() const {
         return m_resolution ? m_resolution : 1;
     }
     virtual void setResolution(int resolution);
-    
+
+    // Extend the end of the model. If this is set to something beyond
+    // the end of the final point in the model, then getEndFrame()
+    // will return this value. Otherwise getEndFrame() will return the
+    // end of the final point. (This is used by the Tony application)
+    virtual void extendEndFrame(sv_frame_t to) { m_extendTo = to; }
+
     typedef PointType Point;
     typedef std::multiset<PointType,
                           typename PointType::OrderComparator> PointList;
     typedef typename PointList::iterator PointListIterator;
     typedef typename PointList::const_iterator PointListConstIterator;

     }
             
 protected:
     sv_samplerate_t m_sampleRate;
     int m_resolution;
+    sv_frame_t m_extendTo;
     bool m_notifyOnAdd;
     sv_frame_t m_sinceLastNotifyMin;
     sv_frame_t m_sinceLastNotifyMax;
     bool m_hasTextLabels;
 

 SparseModel<PointType>::SparseModel(sv_samplerate_t sampleRate,
                                     int resolution,
                                     bool notifyOnAdd) :
     m_sampleRate(sampleRate),
     m_resolution(resolution),
+    m_extendTo(0),
     m_notifyOnAdd(notifyOnAdd),
     m_sinceLastNotifyMin(-1),
     m_sinceLastNotifyMax(-1),
     m_hasTextLabels(false),
     m_pointCount(0),

     sv_frame_t f = 0;
     if (!m_points.empty()) {
         PointListConstIterator i(m_points.end());
         f = (--i)->frame + 1;
     }
-    return f;
+    if (m_extendTo > f) {
+        return m_extendTo;
+    } else {
+        return f;
+    }
 }
 
 template <typename PointType>
 bool
 SparseModel<PointType>::isEmpty() const