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

Some more const, some stl idioms, remove unused declaration

Browse Source
This commit is contained in:
Paul Licameli 2016-09-13 19:17:40 -04:00
parent 740ec8b72b
commit 39d514b183
14 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/AudioIO.cpp
View File

@ -1631,7 +1631,7 @@ void AudioIO::StartMonitoring(double sampleRate)
}
}
int AudioIO::StartStream(const WaveTrackArray &playbackTracks,
int AudioIO::StartStream(const ConstWaveTrackArray &playbackTracks,
const WaveTrackArray &captureTracks,
#ifdef EXPERIMENTAL_MIDI_OUT
const NoteTrackArray &midiPlaybackTracks,
@ -1946,7 +1946,7 @@ int AudioIO::StartStream(const WaveTrackArray &playbackTracks,
int group = 0;
for (size_t i = 0, cnt = mPlaybackTracks.size(); i < cnt; i++)
{
WaveTrack *vt = gAudioIO->mPlaybackTracks[i];
const WaveTrack *vt = gAudioIO->mPlaybackTracks[i];
unsigned chanCnt = 1;
if (vt->GetLinked())
@ -4356,7 +4356,7 @@ int audacityAudioCallback(const void *inputBuffer, void *outputBuffer,
numSolo++;
#endif
WaveTrack **chans = (WaveTrack **) alloca(numPlaybackChannels * sizeof(WaveTrack *));
const WaveTrack **chans = (const WaveTrack **) alloca(numPlaybackChannels * sizeof(WaveTrack *));
float **tempBufs = (float **) alloca(numPlaybackChannels * sizeof(float *));
for (int c = 0; c < numPlaybackChannels; c++)
{
@ -4372,7 +4372,7 @@ int audacityAudioCallback(const void *inputBuffer, void *outputBuffer,
int maxLen = 0;
for (unsigned t = 0; t < numPlaybackTracks; t++)
{
WaveTrack *vt = gAudioIO->mPlaybackTracks[t];
const WaveTrack *vt = gAudioIO->mPlaybackTracks[t];
chans[chanCnt] = vt;

5
src/AudioIO.h
View File

@ -58,6 +58,7 @@ class AudacityProject;
class WaveTrack;
using WaveTrackArray = std::vector < WaveTrack* >;
using ConstWaveTrackArray = std::vector < const WaveTrack* >;
extern AUDACITY_DLL_API AudioIO *gAudioIO;
@ -145,7 +146,7 @@ class AUDACITY_DLL_API AudioIO final {
* If successful, returns a token identifying this particular stream
* instance. For use with IsStreamActive() below */
int StartStream(const WaveTrackArray &playbackTracks, const WaveTrackArray &captureTracks,
int StartStream(const ConstWaveTrackArray &playbackTracks, const WaveTrackArray &captureTracks,
#ifdef EXPERIMENTAL_MIDI_OUT
const NoteTrackArray &midiTracks,
#endif
@ -557,7 +558,7 @@ private:
RingBuffer **mCaptureBuffers;
WaveTrackArray mCaptureTracks;
RingBuffer **mPlaybackBuffers;
WaveTrackArray mPlaybackTracks;
ConstWaveTrackArray mPlaybackTracks;
Mixer **mPlaybackMixers;
volatile int mStreamToken;

2
src/FreqWindow.h
View File

@ -38,8 +38,6 @@ class wxChoice;
class FreqWindow;
class FreqGauge;
class TrackList;
DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_FREQWINDOW_RECALC, -1);
class SpectrumAnalyst

4
src/LabelDialog.cpp
View File

@ -418,7 +418,7 @@ void LabelDialog::FindAllLabels()
// Add labels from all label tracks
for (t = iter.First(); t; t = iter.Next()) {
if (t->GetKind() == Track::Label)
AddLabels(static_cast<LabelTrack *>(t));
AddLabels(static_cast<const LabelTrack *>(t));
}
FindInitialRow();
@ -429,7 +429,7 @@ void LabelDialog::FindAllLabels()
}
}
void LabelDialog::AddLabels(LabelTrack *t)
void LabelDialog::AddLabels(const LabelTrack *t)
{
wxString lab;
int tndx = 0;

2
src/LabelDialog.h
View File

@ -58,7 +58,7 @@ class LabelDialog final : public wxDialogWrapper
bool TransferDataFromWindow();
bool Validate();
void FindAllLabels();
void AddLabels(LabelTrack *t);
void AddLabels(const LabelTrack *t);
void FindInitialRow();
wxString TrackName(int & index, const wxString &dflt = _("Label Track"));

8
src/Menus.cpp
View File

@ -4129,13 +4129,13 @@ void AudacityProject::OnPaste()
TrackListIterator clipIter(msClipboard.get());
Track *n = iter.First();
Track *c = clipIter.First();
const Track *c = clipIter.First();
if (c == NULL)
return;
Track *ff = NULL;
Track *tmpSrc = NULL;
Track *tmpC = NULL;
Track *prev = NULL;
const Track *tmpSrc = NULL;
const Track *tmpC = NULL;
const Track *prev = NULL;
bool bAdvanceClipboard = true;
bool bPastedSomething = false;

4
src/Mix.cpp
View File

@ -50,7 +50,7 @@ void MixAndRender(TrackList *tracks, TrackFactory *trackFactory,
uLeft.reset(), uRight.reset();
// This function was formerly known as "Quick Mix".
Track *t;
const Track *t;
bool mono = false; /* flag if output can be mono without loosing anything*/
bool oneinput = false; /* flag set to true if there is only one input track
(mono or stereo) */
@ -93,7 +93,7 @@ void MixAndRender(TrackList *tracks, TrackFactory *trackFactory,
while (t) {
if (t->GetSelected() && t->GetKind() == Track::Wave) {
waveArray.push_back(static_cast<WaveTrack *>(t));
waveArray.push_back(static_cast<const WaveTrack *>(t));
tstart = t->GetStartTime();
tend = t->GetEndTime();
if (tend > mixEndTime)

8
src/Snap.cpp
View File

@ -112,7 +112,9 @@ void SnapManager::Reinit()
TrackListIterator iter(mTracks);
for (Track *track = iter.First(); track; track = iter.Next())
{
if (mTrackExclusions && mTrackExclusions->Index(track) != wxNOT_FOUND)
if (mTrackExclusions &&
mTrackExclusions->end() !=
std::find(mTrackExclusions->begin(), mTrackExclusions->end(), track))
{
continue;
}
@ -134,7 +136,7 @@ void SnapManager::Reinit()
}
else if (track->GetKind() == Track::Wave)
{
WaveTrack *waveTrack = static_cast<WaveTrack *>(track);
auto waveTrack = static_cast<const WaveTrack *>(track);
for (const auto &clip: waveTrack->GetClips())
{
if (mClipExclusions)
@ -174,7 +176,7 @@ void SnapManager::Reinit()
}
// Adds to mSnapPoints, filtering by TimeConverter
void SnapManager::CondListAdd(double t, Track *track)
void SnapManager::CondListAdd(double t, const Track *track)
{
if (mSnapToTime)
{

6
src/Snap.h
View File

@ -62,13 +62,13 @@ class SnapPoint
{
public:
explicit
SnapPoint(double t_ = 0.0, Track *track_ = nullptr)
SnapPoint(double t_ = 0.0, const Track *track_ = nullptr)
: t(t_), track(track_)
{
}
double t;
Track *track;
const Track *track;
};
using SnapPointArray = std::vector < SnapPoint > ;
@ -103,7 +103,7 @@ public:
private:
void Reinit();
void CondListAdd(double t, Track *track);
void CondListAdd(double t, const Track *track);
double Get(size_t index);
wxInt64 PixelDiff(double t, size_t index);
size_t Find(double t, size_t i0, size_t i1);

8
src/TrackPanel.cpp
View File

@ -3319,7 +3319,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
mHSlideAmount = 0.0;
mDidSlideVertically = false;
mTrackExclusions.Clear();
mTrackExclusions.clear();
Track *vt = FindTrack(event.m_x, event.m_y, false, false, &rect);
if (!vt)
@ -3367,7 +3367,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
if (t->GetSelected()) {
AddClipsToCaptured(t, true);
if (t->GetKind() != Track::Wave)
mTrackExclusions.Add(t);
mTrackExclusions.push_back(t);
}
}
}
@ -3406,7 +3406,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
mCapturedClipArray[i].clip->GetStartTime(),
mCapturedClipArray[i].clip->GetEndTime() );
if (t->GetKind() != Track::Wave)
mTrackExclusions.Add(t);
mTrackExclusions.push_back(t);
}
}
#ifdef USE_MIDI
@ -3419,7 +3419,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
{
AddClipsToCaptured(t, nt->GetStartTime(), nt->GetEndTime());
if (t->GetKind() != Track::Wave)
mTrackExclusions.Add(t);
mTrackExclusions.push_back(t);
}
}
#endif

8
src/commands/GetProjectInfoCommand.cpp
View File

@ -149,22 +149,22 @@ void GetProjectInfoCommand::SendTracksInfo(TrackList *projTracks,
Status(boolValueStr);
}
bool GetProjectInfoCommand::testSelected(Track * track) const
bool GetProjectInfoCommand::testSelected(const Track * track) const
{
return track->GetSelected();
}
bool GetProjectInfoCommand::testLinked(Track * track) const
bool GetProjectInfoCommand::testLinked(const Track * track) const
{
return track->GetLinked();
}
bool GetProjectInfoCommand::testSolo(Track * track) const
bool GetProjectInfoCommand::testSolo(const Track * track) const
{
return track->GetSolo();
}
bool GetProjectInfoCommand::testMute(Track * track) const
bool GetProjectInfoCommand::testMute(const Track * track) const
{
return track->GetMute();
}

10
src/commands/GetProjectInfoCommand.h
View File

@ -44,16 +44,16 @@ private:
int SendFocusedTrackIndex(CommandExecutionContext context);
// Function pointer to get a particular (Boolean only) Track parameter
typedef bool (GetProjectInfoCommand::*Getter)(Track *track) const;
typedef bool (GetProjectInfoCommand::*Getter)(const Track *track) const;
// Uses the Function pointer to set a particular parameter within a loop of otherwise duplicate code
void SendTracksInfo(TrackList *projTracks, Getter);
// Functions pointed to for getting track parameters
bool testSelected(Track * track) const;
bool testLinked(Track * track) const;
bool testSolo(Track * track) const;
bool testMute(Track * track) const;
bool testSelected(const Track * track) const;
bool testLinked(const Track * track) const;
bool testSolo(const Track * track) const;
bool testMute(const Track * track) const;
};

2
src/effects/Effect.cpp
View File

@ -2579,7 +2579,7 @@ void Effect::Preview(bool dryOnly)
if (success)
{
WaveTrackArray playbackTracks;
WaveTrackConstArray playbackTracks;
WaveTrackArray recordingTracks;
SelectedTrackListOfKindIterator iter(Track::Wave, mTracks);

11
src/toolbars/ControlToolBar.cpp
View File

@ -639,7 +639,7 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
myOptions.cutPreviewGapStart = t0;
myOptions.cutPreviewGapLen = t1 - t0;
token = gAudioIO->StartStream(
mCutPreviewTracks->GetWaveTrackArray(false),
mCutPreviewTracks->GetWaveTrackConstArray(false),
WaveTrackArray(),
#ifdef EXPERIMENTAL_MIDI_OUT
NoteTrackArray(),
@ -661,7 +661,7 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
timetrack = t->GetTimeTrack();
}
*/
token = gAudioIO->StartStream(t->GetWaveTrackArray(false),
token = gAudioIO->StartStream(t->GetWaveTrackConstArray(false),
WaveTrackArray(),
#ifdef EXPERIMENTAL_MIDI_OUT
t->GetNoteTrackArray(false),
@ -895,7 +895,8 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
/* TODO: set up stereo tracks if that is how the user has set up
* their preferences, and choose sample format based on prefs */
WaveTrackArray newRecordingTracks, playbackTracks;
WaveTrackArray newRecordingTracks;
WaveTrackConstArray playbackTracks;
#ifdef EXPERIMENTAL_MIDI_OUT
NoteTrackArray midiTracks;
#endif
@ -903,13 +904,13 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
gPrefs->Read(wxT("/AudioIO/Duplex"), &duplex, true);
if(duplex){
playbackTracks = trackList->GetWaveTrackArray(false);
playbackTracks = trackList->GetWaveTrackConstArray(false);
#ifdef EXPERIMENTAL_MIDI_OUT
midiTracks = trackList->GetNoteTrackArray(false);
#endif
}
else {
playbackTracks = WaveTrackArray();
playbackTracks = WaveTrackConstArray();
#ifdef EXPERIMENTAL_MIDI_OUT
midiTracks = NoteTrackArray();
#endif