Connect WaveTrackMeter to the data stream

src/tracks/playabletrack/wavetrack/ui/WaveTrackMeter.cpp

@@ -13,6 +13,7 @@
 #include "Decibels.h"
 #include "PeakAndRmsMeter.h"
 #include "../../../../widgets/MeterPainter.h"
+#include "TransportUtilities.h"
 #include "WaveTrack.h"
 
 #include <wx/dc.h>
@@ -55,6 +56,16 @@ int ChooseBgColor(bool selected) {
 
 const AttachedTrackObjects::RegisteredFactory key{
    [](Track &track){ return std::make_shared<WaveTrackMeter>(); } };
+
+TransportUtilities::GetTrackMeters::WrapperScope scope {
+   [](const auto &prevFn){ return [prevFn](WaveTrack &track){
+      MeterPtrs results;
+      if (prevFn)
+         results = prevFn(track);
+      results.push_back(WaveTrackMeter::Get(track).weak_from_this());
+      return results;
+   }; }
+};
 }
 
 struct WaveTrackMeter::Impl{
@@ -123,3 +134,24 @@ void WaveTrackMeter::Draw(wxDC &dc, wxRect rect, bool selected) {
             meter.mStats[i]);
    }
 }
+
+void WaveTrackMeter::Update(unsigned numChannels,
+   unsigned long numFrames, const float *sampleData, bool interleaved)
+{
+   mpImpl->mpMeter->Update(numChannels, numFrames, sampleData, interleaved);
+}
+
+bool WaveTrackMeter::IsDisabled() const
+{
+   return mpImpl->mpMeter->IsDisabled();
+}
+
+void WaveTrackMeter::Clear()
+{
+   mpImpl->mpMeter->Clear();
+}
+
+void WaveTrackMeter::Reset(double sampleRate, bool resetClipping)
+{
+   mpImpl->mpMeter->Reset(sampleRate, resetClipping);
+}

src/tracks/playabletrack/wavetrack/ui/WaveTrackMeter.h

@@ -10,6 +10,7 @@
 #ifndef __AUDACITY_WAVE_TRACK_METER__
 #define __AUDACITY_WAVE_TRACK_METER__
 
+#include "Meter.h"
 #include "TrackAttachment.h"
 #include <memory>
 
@@ -18,17 +19,25 @@ class wxDC;
 struct wxRect;
 
 class WaveTrackMeter final
-   : public TrackAttachment
+   : public Meter
+   , public TrackAttachment
    , public std::enable_shared_from_this<WaveTrackMeter>
 {
 public:
    static WaveTrackMeter &Get(WaveTrack &track);
 
    WaveTrackMeter();
-   ~WaveTrackMeter();
+   ~WaveTrackMeter() override;
 
    void Draw(wxDC &dc, wxRect rect, bool selected);
 
+   void Update(unsigned numChannels,
+      unsigned long numFrames, const float *sampleData, bool interleaved)
+   override;
+   bool IsDisabled() const override;
+   void Clear() override;
+   void Reset(double sampleRate, bool resetClipping) override;
+
 private:
    struct Impl;
    const std::unique_ptr<Impl> mpImpl;