Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-03 09:09:47 +02:00
Code Issues Releases Wiki Activity

Bug 1774 - Recording does not honor waveform color

Browse Source 
New clip now takes colour from WaveTrack, and new WaveTrack takes colour of the WaveTrack its clips will be appended onto.
This commit is contained in:
James Crook 2017-11-07 14:26:32 +00:00
parent c28be778e2
commit 0bae8c3a90
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/WaveTrack.cpp
View File

@ -1437,7 +1437,7 @@ void WaveTrack::InsertSilence(double t, double len)
if (mClips.empty()) if (mClips.empty())
{ {
// Special case if there is no clip yet // Special case if there is no clip yet
auto clip = make_movable<WaveClip>(mDirManager, mFormat, mRate, 0 /*colourindex*/); auto clip = make_movable<WaveClip>(mDirManager, mFormat, mRate, this->GetWaveColorIndex());
clip->InsertSilence(0, len); clip->InsertSilence(0, len);
// use NOFAIL-GUARANTEE // use NOFAIL-GUARANTEE
mClips.push_back( std::move( clip ) ); mClips.push_back( std::move( clip ) );

1
src/effects/nyquist/Nyquist.cpp
View File

@ -1303,6 +1303,7 @@ bool NyquistEffect::ProcessOne()
} }
outputTrack[i] = mFactory->NewWaveTrack(format, rate); outputTrack[i] = mFactory->NewWaveTrack(format, rate);
outputTrack[i]->SetWaveColorIndex( mCurTrack[i]->GetWaveColorIndex() );
// Clean the initial buffer states again for the get callbacks // Clean the initial buffer states again for the get callbacks
// -- is this really needed? // -- is this really needed?

1
src/toolbars/ControlToolBar.cpp
View File

@ -1074,6 +1074,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
// Pad the recording track with silence, up to the // Pad the recording track with silence, up to the
// maximum time. // maximum time.
auto newTrack = p->GetTrackFactory()->NewWaveTrack(); auto newTrack = p->GetTrackFactory()->NewWaveTrack();
newTrack->SetWaveColorIndex( wt->GetWaveColorIndex() );
newTrack->InsertSilence(0.0, t0 - t1); newTrack->InsertSilence(0.0, t0 - t1);
newTrack->Flush(); newTrack->Flush();
wt->Clear(t1, t0); wt->Clear(t1, t0);