Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-27 15:08:39 +01:00
Code Issues Releases Wiki Activity

Remove EXPERIMENTAL_OUTPUT_DISPLAY...

Browse Source 
... Maybe a good feature idea, but the implementation pollutes the code in
too many places.

It's a special case of the more general idea of many-to-one associations
between screen rectangles and track objects.  More generalized ways to
accommodate that should be sought.
This commit is contained in:
Paul Licameli
2018-01-12 12:08:09 -05:00
parent ad221b3e82
commit 5407079c62
15 changed files with 62 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
View File

@@ -738,14 +738,6 @@ void WaveTrackMenuTable::OnSetDisplay(wxCommandEvent & event)
? WaveformSettings::stLinear
: WaveformSettings::stLogarithmic;
}
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if (pTrack->GetDisplay() == WaveTrack::Waveform) {
pTrack->SetVirtualState(false);
}
else if (id == WaveTrack::Waveform) {
pTrack->SetVirtualState(true);
}
#endif
AudacityProject *const project = ::GetActiveProject();
project->ModifyState(true);
@@ -853,13 +845,6 @@ void WaveTrackMenuTable::OnMergeStereo(wxCommandEvent &)
// Assume partner is wave or null
const auto partner = static_cast<WaveTrack*>(pTrack->GetLink());
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if (MONO_WAVE_PAN(pTrack))
pTrack->SetVirtualState(false);
if (MONO_WAVE_PAN(partner))
static_cast<WaveTrack*>(partner)->SetVirtualState(false);
#endif
if (partner) {
// Set partner's parameters to match target.
partner->Merge(*pTrack);
@@ -918,13 +903,6 @@ void WaveTrackMenuTable::SplitStereo(bool stereo)
if (!partner)
return;
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if (!stereo && MONO_WAVE_PAN(pTrack))
pTrack->SetVirtualState(true, true);
if (!stereo && MONO_WAVE_PAN(partner))
partner->SetVirtualState(true, true);
#endif
if (partner)
{
// Keep original stereo track name.

10
src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp
View File

@@ -131,12 +131,7 @@ UIHandle::Result PanSliderHandle::SetValue(AudacityProject *pProject, float newV
auto pTrack = GetWaveTrack();
if (pTrack) {
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
bool panZero = false;
panZero = static_cast<WaveTrack*>(mpTrack)->SetPan(newValue);
#else
pTrack->SetPan(newValue);
#endif
// Assume linked track is wave or null
const auto link = static_cast<WaveTrack*>(pTrack->GetLink());
@@ -146,11 +141,6 @@ UIHandle::Result PanSliderHandle::SetValue(AudacityProject *pProject, float newV
MixerBoard *const pMixerBoard = pProject->GetMixerBoard();
if (pMixerBoard)
pMixerBoard->UpdatePan(pTrack.get());
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if(panZero)
result |= FixScrollbars;
#endif
}
return result;

14
src/tracks/ui/EditCursorOverlay.cpp
View File

@@ -20,10 +20,6 @@ Paul Licameli split from TrackPanel.cpp
#include "../../TrackPanelAx.h"
#include "../../ViewInfo.h"
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
#include "../../WaveTrack.h"
#endif
#include <wx/dc.h>
namespace {
@@ -117,16 +113,6 @@ void EditCursorOverlay::Draw(OverlayPanel &panel, wxDC &dc)
AColor::Line(dc, mLastCursorX, rect.GetTop(), mLastCursorX, rect.GetBottom());
// ^^^ The whole point of this routine.
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if (MONO_WAVE_PAN(pTrack)){
auto y = pTrack->GetY(true) - viewInfo.vpos;
auto top = y + kTopMargin;
auto height = pTrack->GetHeight(true) - (kTopMargin + kBottomMargin);
// - 1 because AColor::Line is inclusive of endpoint
AColor::Line(dc, mLastCursorX, top, mLastCursorX, top + height - 1);
}
#endif
}
}
}