Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 08:38:39 +02:00
Code Issues Releases Wiki Activity

remove more TrackArtist arguments

Browse Source
This commit is contained in:
Paul Licameli 2018-11-05 08:21:11 -05:00
parent 99106e3ed3
commit fe35146464
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/TrackArtist.cpp
View File

@ -306,8 +306,7 @@ void TrackArtist::DrawTrack(TrackPanelDrawingContext &context,
switch (wt->GetDisplay()) { switch (wt->GetDisplay()) {
case WaveTrack::Waveform: case WaveTrack::Waveform:
DrawWaveform(context, wt, rect, DrawWaveform(context, wt, rect, muted);
drawEnvelope, bigPoints, drawSliders, muted);
break; break;
case WaveTrack::Spectrum: case WaveTrack::Spectrum:
DrawSpectrum( context, wt, rect ); DrawSpectrum( context, wt, rect );
@ -922,7 +921,7 @@ void TrackArtist::DrawWaveformBackground(TrackPanelDrawingContext &context,
int zeroLevelYCoordinate, int zeroLevelYCoordinate,
bool dB, float dBRange, bool dB, float dBRange,
double t0, double t1, double t0, double t1,
bool drawEnvelope, bool bIsSyncLockSelected, bool bIsSyncLockSelected,
bool highlightEnvelope) bool highlightEnvelope)
{ {
auto &dc = context.dc; auto &dc = context.dc;
@ -1191,7 +1190,7 @@ void TrackArtist::DrawIndividualSamples(TrackPanelDrawingContext &context,
float zoomMin, float zoomMax, float zoomMin, float zoomMax,
bool dB, float dBRange, bool dB, float dBRange,
const WaveClip *clip, const WaveClip *clip,
bool bigPoints, bool showPoints, bool muted, bool showPoints, bool muted,
bool highlight) bool highlight)
{ {
auto &dc = context.dc; auto &dc = context.dc;
@ -1374,9 +1373,6 @@ void TrackArtist::DrawEnvLine(
void TrackArtist::DrawWaveform(TrackPanelDrawingContext &context, void TrackArtist::DrawWaveform(TrackPanelDrawingContext &context,
const WaveTrack *track, const WaveTrack *track,
const wxRect & rect, const wxRect & rect,
bool drawEnvelope,
bool bigPoints,
bool drawSliders,
bool muted) bool muted)
{ {
auto &dc = context.dc; auto &dc = context.dc;
@ -1397,7 +1393,6 @@ void TrackArtist::DrawWaveform(TrackPanelDrawingContext &context,
for (const auto &clip: track->GetClips()) for (const auto &clip: track->GetClips())
DrawClipWaveform(context, track, clip.get(), rect, DrawClipWaveform(context, track, clip.get(), rect,
drawEnvelope, bigPoints,
dB, muted); dB, muted);
// Update cache for locations, e.g. cutlines and merge points // Update cache for locations, e.g. cutlines and merge points
@ -1663,8 +1658,6 @@ void TrackArtist::DrawClipWaveform(TrackPanelDrawingContext &context,
const WaveTrack *track, const WaveTrack *track,
const WaveClip *clip, const WaveClip *clip,
const wxRect & rect, const wxRect & rect,
bool drawEnvelope,
bool bigPoints,
bool dB, bool dB,
bool muted) bool muted)
{ {
@ -1745,7 +1738,7 @@ void TrackArtist::DrawClipWaveform(TrackPanelDrawingContext &context,
zoomMin, zoomMax, zoomMin, zoomMax,
track->ZeroLevelYCoordinate(mid), track->ZeroLevelYCoordinate(mid),
dB, dBRange, dB, dBRange,
tt0, tt1, drawEnvelope, tt0, tt1,
!track->GetSelected(), highlightEnvelope); !track->GetSelected(), highlightEnvelope);
} }
@ -1884,7 +1877,7 @@ void TrackArtist::DrawClipWaveform(TrackPanelDrawingContext &context,
context, leftOffset, rectPortion, zoomMin, zoomMax, context, leftOffset, rectPortion, zoomMin, zoomMax,
dB, dBRange, dB, dBRange,
clip, clip,
bigPoints, showPoints, muted, highlight ); showPoints, muted, highlight );
} }
} }

6
src/TrackArtist.h
View File

@ -97,7 +97,6 @@ class AUDACITY_DLL_API TrackArtist {
void DrawWaveform(TrackPanelDrawingContext &context, void DrawWaveform(TrackPanelDrawingContext &context,
const WaveTrack *track, const WaveTrack *track,
const wxRect & rect, const wxRect & rect,
bool drawEnvelope, bool bigPoints, bool drawSliders,
bool muted); bool muted);
void DrawSpectrum(TrackPanelDrawingContext &context, void DrawSpectrum(TrackPanelDrawingContext &context,
@ -128,7 +127,6 @@ class AUDACITY_DLL_API TrackArtist {
void DrawClipWaveform(TrackPanelDrawingContext &context, void DrawClipWaveform(TrackPanelDrawingContext &context,
const WaveTrack *track, const WaveClip *clip, const WaveTrack *track, const WaveClip *clip,
const wxRect & rect, const wxRect & rect,
bool drawEnvelope, bool bigPoints,
bool dB, bool muted); bool dB, bool muted);
void DrawClipSpectrum(TrackPanelDrawingContext &context, void DrawClipSpectrum(TrackPanelDrawingContext &context,
@ -144,7 +142,7 @@ class AUDACITY_DLL_API TrackArtist {
int zeroLevelYCoordinate, int zeroLevelYCoordinate,
bool dB, float dBRange, bool dB, float dBRange,
double t0, double t1, double t0, double t1,
bool drawEnvelope, bool bIsSyncLockSelected, bool bIsSyncLockSelected,
bool highlightEnvelope); bool highlightEnvelope);
void DrawMinMaxRMS(TrackPanelDrawingContext &context, void DrawMinMaxRMS(TrackPanelDrawingContext &context,
const wxRect & rect, const double env[], const wxRect & rect, const double env[],
@ -157,7 +155,7 @@ class AUDACITY_DLL_API TrackArtist {
float zoomMin, float zoomMax, float zoomMin, float zoomMax,
bool dB, float dBRange, bool dB, float dBRange,
const WaveClip *clip, const WaveClip *clip,
bool bigPoints, bool showPoints, bool muted, bool showPoints, bool muted,
bool highlight); bool highlight);
void DrawNegativeOffsetTrackArrows( TrackPanelDrawingContext &context, void DrawNegativeOffsetTrackArrows( TrackPanelDrawingContext &context,