comparison layer/WaveformLayer.h @ 944:78c152e4db95

Merge from branch tonioni

      * effectively no space at the very top of the layer; 1.0 would
      * indicate that the waveform occupies no space at the very
      * bottom; the default value of 0.5 indicates that it occupies the
      * whole layer, centred at the middle.
      */
-    void setMiddleLineHeight(float height);
-    float getMiddleLineHeight() const { return m_middleLineHeight; }
+    void setMiddleLineHeight(double);
+    double getMiddleLineHeight() const { return m_middleLineHeight; }
 
     /**
      * Enable or disable aggressive pixmap cacheing.  If enabled,
      * waveforms will be rendered to an off-screen pixmap and
      * refreshed from there instead of being redrawn from the peak

 
     virtual bool isLayerScrollable(const View *) const;
 
     virtual int getCompletion(View *) const;
 
-    virtual bool getValueExtents(float &min, float &max,
+    virtual bool getValueExtents(double &min, double &max,
                                  bool &log, QString &unit) const;
 
     virtual bool getYScaleValue(const View *v, int y,
-                                float &value, QString &unit) const;
+                                double &value, QString &unit) const;
     
     virtual bool getYScaleDifference(const View *v, int y0, int y1,
-                                     float &diff, QString &unit) const;
+                                     double &diff, QString &unit) const;
 
     virtual void toXml(QTextStream &stream, QString indent = "",
                        QString extraAttributes = "") const;
 
     virtual void setProperties(const QXmlAttributes &attributes);

     virtual int getVerticalZoomSteps(int &defaultStep) const;
     virtual int getCurrentVerticalZoomStep() const;
     virtual void setVerticalZoomStep(int);
 
 protected:
-    int dBscale(float sample, int m) const;
+    int dBscale(double sample, int m) const;
 
     const RangeSummarisableTimeValueModel *m_model; // I do not own this
 
     /// Return value is number of channels displayed
     int getChannelArrangement(int &min, int &max,
                                  bool &merging, bool &mixing) const;
 
-    int getYForValue(const View *v, float value, int channel) const;
-
-    float getValueForY(const View *v, int y, int &channel) const;
+    int getYForValue(const View *v, double value, int channel) const;
+
+    double getValueForY(const View *v, int y, int &channel) const;
 
     bool getSourceFramesForX(View *v, int x, int modelZoomLevel,
-                             int &f0, int &f1) const;
+                             sv_frame_t &f0, sv_frame_t &f1) const;
 
     float getNormalizeGain(View *v, int channel) const;
 
     virtual void flagBaseColourChanged() { m_cacheValid = false; }
 

     bool         m_showMeans;
     bool         m_greyscale;
     ChannelMode  m_channelMode;
     int          m_channel;
     Scale        m_scale;
-    float        m_middleLineHeight;
+    double       m_middleLineHeight;
     bool         m_aggressive;
 
     mutable std::vector<float> m_effectiveGains;
 
     mutable QPixmap *m_cache;