From fe35146464cad0defa7096c5f88caa7d79d0666e Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 5 Nov 2018 08:21:11 -0500
Subject: [PATCH] remove more TrackArtist arguments

---
 src/TrackArtist.cpp | 17 +++++------------
 src/TrackArtist.h   |  6 ++----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 2226bf157..74a457ea8 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -306,8 +306,7 @@ void TrackArtist::DrawTrack(TrackPanelDrawingContext &context,
 
          switch (wt->GetDisplay()) {
          case WaveTrack::Waveform:
-            DrawWaveform(context, wt, rect,
-                         drawEnvelope,  bigPoints, drawSliders, muted);
+            DrawWaveform(context, wt, rect, muted);
             break;
          case WaveTrack::Spectrum:
             DrawSpectrum( context, wt, rect );
@@ -922,7 +921,7 @@ void TrackArtist::DrawWaveformBackground(TrackPanelDrawingContext &context,
                                          int zeroLevelYCoordinate,
                                          bool dB, float dBRange,
                                          double t0, double t1,
-                                         bool drawEnvelope, bool bIsSyncLockSelected,
+                                         bool bIsSyncLockSelected,
                                          bool highlightEnvelope)
 {
    auto &dc = context.dc;
@@ -1191,7 +1190,7 @@ void TrackArtist::DrawIndividualSamples(TrackPanelDrawingContext &context,
                                         float zoomMin, float zoomMax,
                                         bool dB, float dBRange,
                                         const WaveClip *clip,
-                                        bool bigPoints, bool showPoints, bool muted,
+                                        bool showPoints, bool muted,
                                         bool highlight)
 {
    auto &dc = context.dc;
@@ -1374,9 +1373,6 @@ void TrackArtist::DrawEnvLine(
 void TrackArtist::DrawWaveform(TrackPanelDrawingContext &context,
                                const WaveTrack *track,
                                const wxRect & rect,
-                               bool drawEnvelope,
-                               bool bigPoints,
-                               bool drawSliders,
                                bool muted)
 {
    auto &dc = context.dc;
@@ -1397,7 +1393,6 @@ void TrackArtist::DrawWaveform(TrackPanelDrawingContext &context,
 
    for (const auto &clip: track->GetClips())
       DrawClipWaveform(context, track, clip.get(), rect,
-                       drawEnvelope, bigPoints,
                        dB, muted);
 
    // Update cache for locations, e.g. cutlines and merge points
@@ -1663,8 +1658,6 @@ void TrackArtist::DrawClipWaveform(TrackPanelDrawingContext &context,
                                    const WaveTrack *track,
                                    const WaveClip *clip,
                                    const wxRect & rect,
-                                   bool drawEnvelope,
-                                   bool bigPoints,
                                    bool dB,
                                    bool muted)
 {
@@ -1745,7 +1738,7 @@ void TrackArtist::DrawClipWaveform(TrackPanelDrawingContext &context,
          zoomMin, zoomMax,
          track->ZeroLevelYCoordinate(mid),
          dB, dBRange,
-         tt0, tt1, drawEnvelope,
+         tt0, tt1,
          !track->GetSelected(), highlightEnvelope);
    }
 
@@ -1884,7 +1877,7 @@ void TrackArtist::DrawClipWaveform(TrackPanelDrawingContext &context,
                context, leftOffset, rectPortion, zoomMin, zoomMax,
                dB, dBRange,
                clip,
-               bigPoints, showPoints, muted, highlight );
+               showPoints, muted, highlight );
          }
       }
 
diff --git a/src/TrackArtist.h b/src/TrackArtist.h
index 8c0aa207e..170d5e97a 100644
--- a/src/TrackArtist.h
+++ b/src/TrackArtist.h
@@ -97,7 +97,6 @@ class AUDACITY_DLL_API TrackArtist {
    void DrawWaveform(TrackPanelDrawingContext &context,
                      const WaveTrack *track,
                      const wxRect & rect,
-                     bool drawEnvelope, bool bigPoints, bool drawSliders,
                      bool muted);
 
    void DrawSpectrum(TrackPanelDrawingContext &context,
@@ -128,7 +127,6 @@ class AUDACITY_DLL_API TrackArtist {
    void DrawClipWaveform(TrackPanelDrawingContext &context,
                          const WaveTrack *track, const WaveClip *clip,
                          const wxRect & rect,
-                         bool drawEnvelope, bool bigPoints,
                          bool dB, bool muted);
 
    void DrawClipSpectrum(TrackPanelDrawingContext &context,
@@ -144,7 +142,7 @@ class AUDACITY_DLL_API TrackArtist {
                                int zeroLevelYCoordinate,
                                bool dB, float dBRange,
                                double t0, double t1,
-                               bool drawEnvelope, bool bIsSyncLockSelected,
+                               bool bIsSyncLockSelected,
                                bool highlightEnvelope);
    void DrawMinMaxRMS(TrackPanelDrawingContext &context,
                       const wxRect & rect, const double env[],
@@ -157,7 +155,7 @@ class AUDACITY_DLL_API TrackArtist {
                               float zoomMin, float zoomMax,
                               bool dB, float dBRange,
                               const WaveClip *clip,
-                              bool bigPoints, bool showPoints, bool muted,
+                              bool showPoints, bool muted,
                               bool highlight);
 
    void DrawNegativeOffsetTrackArrows( TrackPanelDrawingContext &context,