From 7c4c45a0d59cbe4005cc392fc84fe1e2b190365b Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 13 Feb 2016 10:43:16 -0500 Subject: [PATCH] "new"->"NEW" in comments, easier to find remaining naked operator new --- src/AColor.cpp | 2 +- src/Audacity.h | 2 +- src/AudacityApp.cpp | 10 ++--- src/AudacityHeaders.h | 4 +- src/AudioIO.cpp | 16 ++++---- src/AudioIO.h | 8 ++-- src/AutoRecovery.cpp | 4 +- src/AutoRecovery.h | 2 +- src/BatchCommands.cpp | 2 +- src/BlockFile.cpp | 6 +-- src/BlockFile.h | 2 +- src/CrossFade.cpp | 4 +- src/Dependencies.cpp | 2 +- src/DeviceManager.cpp | 6 +-- src/DeviceManager.h | 2 +- src/DirManager.cpp | 30 +++++++------- src/DirManager.h | 2 +- src/Dither.cpp | 4 +- src/Envelope.cpp | 24 ++++++------ src/Experimental.h | 8 ++-- src/FFmpeg.cpp | 2 +- src/FreqWindow.cpp | 2 +- src/ImageManipulation.cpp | 10 ++--- src/ImageManipulation.h | 4 +- src/Internat.cpp | 2 +- src/LabelDialog.cpp | 20 +++++----- src/LabelTrack.cpp | 20 +++++----- src/Languages.cpp | 4 +- src/Legacy.cpp | 2 +- src/Menus.cpp | 30 +++++++------- src/Mix.cpp | 2 +- src/MixerBoard.cpp | 4 +- src/NoteTrack.cpp | 8 ++-- src/PluginManager.cpp | 10 ++--- src/Prefs.cpp | 6 +-- src/Project.cpp | 54 +++++++++++++------------- src/Project.h | 2 +- src/RealFFTf.cpp | 6 +-- src/SampleFormat.h | 2 +- src/Sequence.cpp | 24 ++++++------ src/ShuttleGui.cpp | 2 +- src/Snap.cpp | 2 +- src/SplashDialog.cpp | 2 +- src/Tags.cpp | 4 +- src/Theme.cpp | 14 +++---- src/TimeTrack.cpp | 2 +- src/TimeTrack.h | 4 +- src/Track.cpp | 2 +- src/TrackArtist.cpp | 6 +-- src/TrackPanel.cpp | 36 ++++++++--------- src/TrackPanel.h | 2 +- src/TrackPanelAx.cpp | 2 +- src/UndoManager.cpp | 2 +- src/WaveClip.cpp | 8 ++-- src/WaveTrack.cpp | 28 ++++++------- src/WaveTrack.h | 8 ++-- src/blockfile/LegacyAliasBlockFile.cpp | 4 +- src/blockfile/LegacyBlockFile.cpp | 2 +- src/blockfile/LegacyBlockFile.h | 4 +- src/blockfile/ODDecodeBlockFile.cpp | 4 +- src/blockfile/ODDecodeBlockFile.h | 2 +- src/blockfile/ODPCMAliasBlockFile.cpp | 8 ++-- src/blockfile/ODPCMAliasBlockFile.h | 4 +- src/blockfile/PCMAliasBlockFile.cpp | 4 +- src/blockfile/SilentBlockFile.h | 2 +- src/blockfile/SimpleBlockFile.cpp | 4 +- src/blockfile/SimpleBlockFile.h | 2 +- src/commands/CommandHandler.cpp | 2 +- src/commands/CommandManager.cpp | 12 +++--- src/commands/CommandManager.h | 2 +- src/effects/ChangePitch.h | 4 +- src/effects/ChangeSpeed.cpp | 2 +- src/effects/ChangeSpeed.h | 4 +- src/effects/ChangeTempo.cpp | 6 +-- src/effects/ChangeTempo.h | 4 +- src/effects/ClickRemoval.cpp | 2 +- src/effects/Compressor.cpp | 4 +- src/effects/Effect.cpp | 12 +++--- src/effects/Effect.h | 8 ++-- src/effects/EffectManager.cpp | 10 ++--- src/effects/Equalization.cpp | 32 +++++++-------- src/effects/Equalization48x.cpp | 10 ++--- src/effects/NoiseReduction.cpp | 6 +-- src/effects/NoiseRemoval.cpp | 2 +- src/effects/Paulstretch.cpp | 6 +-- src/effects/Repeat.cpp | 2 +- src/effects/Reverse.cpp | 2 +- src/effects/ScoreAlignDialog.cpp | 6 +-- src/effects/StereoToMono.cpp | 2 +- src/effects/TruncSilence.cpp | 2 +- src/effects/VST/VSTEffect.cpp | 2 +- src/effects/ladspa/LadspaEffect.cpp | 2 +- src/effects/ladspa/ladspa.h | 6 +-- src/effects/lv2/LV2Effect.cpp | 2 +- src/effects/nyquist/LoadNyquist.cpp | 2 +- src/effects/vamp/VampEffect.cpp | 2 +- src/export/Export.cpp | 2 +- src/export/ExportCL.h | 2 +- src/export/ExportFFmpeg.h | 2 +- src/export/ExportFFmpegDialogs.cpp | 6 +-- src/export/ExportFFmpegDialogs.h | 4 +- src/export/ExportFLAC.h | 2 +- src/export/ExportMP2.h | 2 +- src/export/ExportMP3.h | 2 +- src/export/ExportOGG.cpp | 2 +- src/export/ExportOGG.h | 2 +- src/export/ExportPCM.h | 2 +- src/import/Import.h | 2 +- src/import/ImportFFmpeg.cpp | 4 +- src/import/ImportGStreamer.cpp | 12 +++--- src/import/ImportLOF.cpp | 8 ++-- src/import/ImportLOF.h | 6 +-- src/import/ImportMP3.cpp | 2 +- src/import/ImportPlugin.h | 2 +- src/import/RawAudioGuess.cpp | 8 ++-- src/ondemand/ODComputeSummaryTask.cpp | 4 +- src/ondemand/ODDecodeFFmpegTask.cpp | 16 ++++---- src/ondemand/ODDecodeTask.cpp | 4 +- src/ondemand/ODManager.cpp | 12 +++--- src/ondemand/ODManager.h | 4 +- src/ondemand/ODTask.cpp | 2 +- src/ondemand/ODTask.h | 2 +- src/ondemand/ODWaveTrackTaskQueue.cpp | 4 +- src/prefs/KeyConfigPrefs.cpp | 2 +- src/prefs/ModulePrefs.cpp | 6 +-- src/prefs/PrefsPanel.h | 2 +- src/prefs/ThemePrefs.cpp | 2 +- src/toolbars/ToolDock.cpp | 16 ++++---- src/toolbars/ToolManager.cpp | 8 ++-- src/toolbars/TranscriptionToolBar.cpp | 6 +-- src/widgets/ASlider.cpp | 6 +-- src/widgets/Grabber.cpp | 2 +- src/widgets/Grabber.h | 2 +- src/widgets/Grid.cpp | 6 +-- src/widgets/HelpSystem.h | 2 +- src/widgets/HtmlWindow.cpp | 2 +- src/widgets/HtmlWindow.h | 2 +- src/widgets/KeyView.cpp | 24 ++++++------ src/widgets/Meter.cpp | 4 +- src/widgets/NumericTextCtrl.cpp | 6 +-- src/widgets/valnum.cpp | 4 +- src/xml/XMLTagHandler.cpp | 2 +- src/xml/XMLTagHandler.h | 2 +- 143 files changed, 451 insertions(+), 451 deletions(-) diff --git a/src/AColor.cpp b/src/AColor.cpp index ed02a872a..590680e3a 100644 --- a/src/AColor.cpp +++ b/src/AColor.cpp @@ -102,7 +102,7 @@ void AColor::Arrow(wxDC & dc, wxCoord x, wxCoord y, int width, bool down) void AColor::Line(wxDC & dc, wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { // As of 2.8.9 (possibly earlier), wxDC::DrawLine() on the Mac draws the - // last point since it is now based on the new wxGraphicsContext system. + // last point since it is now based on the NEW wxGraphicsContext system. // Make the other platforms do the same thing since the other platforms // "may" follow they get wxGraphicsContext going. #if defined(__WXMAC__) || defined(__WXGTK3__) diff --git a/src/Audacity.h b/src/Audacity.h index 2c9881f64..aa33363df 100644 --- a/src/Audacity.h +++ b/src/Audacity.h @@ -29,7 +29,7 @@ // to 1. #define IS_ALPHA 1 -// Increment as appropriate every time we release a new version. +// Increment as appropriate every time we release a NEW version. #define AUDACITY_VERSION 2 #define AUDACITY_RELEASE 1 #define AUDACITY_REVISION 3 diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 6f519cccd..120ba1fea 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -792,21 +792,21 @@ bool AudacityApp::MRUOpen(wxString fullPathStr) { return false; // DMM: If the project is dirty, that means it's been touched at - // all, and it's not safe to open a new project directly in its - // place. Only if the project is brand-new clean and the user + // all, and it's not safe to open a NEW project directly in its + // place. Only if the project is brand-NEW clean and the user // hasn't done any action at all is it safe for Open to take place // inside the current project. // - // If you try to Open a new project inside the current window when + // If you try to Open a NEW project inside the current window when // there are no tracks, but there's an Undo history, etc, then - // bad things can happen, including data files moving to the new + // bad things can happen, including data files moving to the NEW // project directory, etc. if (!proj || proj->GetDirty() || !proj->GetIsEmpty()) { proj = CreateNewAudacityProject(); } // This project is clean; it's never been touched. Therefore // all relevant member variables are in their initial state, - // and it's okay to open a new project inside this window. + // and it's okay to open a NEW project inside this window. proj->OpenFile(fullPathStr); } else { diff --git a/src/AudacityHeaders.h b/src/AudacityHeaders.h index 6966c6dad..f91b5f6eb 100644 --- a/src/AudacityHeaders.h +++ b/src/AudacityHeaders.h @@ -72,13 +72,13 @@ #include "xml/XMLTagHandler.h" // PRL: These lines allow you to remove Project.h above. -// They must be included before the definition of macro new below. +// They must be included before the definition of macro NEW below. #include #include //#ifdef __WXMSW__ // Enable this to diagnose memory leaks too! -// #include // redefines the new() operator +// #include // redefines the NEW() operator //#endif #if __WXMSW__ diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index e90db2f17..4bf2ae8bf 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -243,7 +243,7 @@ all notes off messages, but the FillMidiBuffers() loop will exit if mNextEvent is NULL, so we create a "fake" mNextEvent for this special "event" of sending all notes off. After that, we destroy - the iterator and use PrepareMidiIterator() to set up a new one. + the iterator and use PrepareMidiIterator() to set up a NEW one. At each iteration, time must advance by (mT1 - mT0), so the accumulated time is held in mMidiLoopOffset. @@ -414,7 +414,7 @@ struct AudioIO::ScrubQueue { Entry &previous = mEntries[(mLeadingIdx + Size - 1) % Size]; - // Use the previous end as new start. + // Use the previous end as NEW start. const double startTime = previous.mS1 / mRate; // Might reject the request because of zero duration, // or a too-short "stutter" @@ -1794,7 +1794,7 @@ int AudioIO::StartStream(WaveTrackArray playbackTracks, EffectManager & em = EffectManager::Get(); em.RealtimeInitialize(); - // The following adds a new effect processor for each logical track and the + // The following adds a NEW effect processor for each logical track and the // group determination should mimic what is done in audacityAudioCallback() // when calling RealtimeProcess(). int group = 0; @@ -1819,7 +1819,7 @@ int AudioIO::StartStream(WaveTrackArray playbackTracks, if (options.pStartTime) { - // Calculate the new time position + // Calculate the NEW time position mTime = std::max(mT0, std::min(mT1, *options.pStartTime)); // Reset mixer positions for all playback tracks unsigned numMixers = mPlaybackTracks->GetCount(); @@ -2325,7 +2325,7 @@ void AudioIO::StopStream() WaveTrack* trackP = playbackTracks[j]; if( track == trackP ) { - if( track->GetStartTime() != mT0 ) // in a new track if these are equal + if( track->GetStartTime() != mT0 ) // in a NEW track if these are equal { appendRecord = true; break; @@ -2342,7 +2342,7 @@ void AudioIO::StopStream() wxASSERT(bResult); // TO DO: Actually handle this. } else - { // recording into a new track + { // recording into a NEW track track->SetOffset(track->GetStartTime() + recordingOffset); if(track->GetEndTime() < 0.) { @@ -3943,7 +3943,7 @@ static void DoSoftwarePlaythrough(const void *inputBuffer, int audacityAudioCallback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, // If there were more of these conditionally used arguments, it -// could make sense to make a new macro that looks like this: +// could make sense to make a NEW macro that looks like this: // USEDIF( EXPERIMENTAL_MIDI_OUT, timeInfo ) #ifdef EXPERIMENTAL_MIDI_OUT const PaStreamCallbackTimeInfo *timeInfo, @@ -4107,7 +4107,7 @@ int audacityAudioCallback(const void *inputBuffer, void *outputBuffer, wxMilliSleep( 50 ); } - // Calculate the new time position + // Calculate the NEW time position gAudioIO->mTime += gAudioIO->mSeek; gAudioIO->mTime = gAudioIO->LimitStreamTime(gAudioIO->mTime); gAudioIO->mSeek = 0.0; diff --git a/src/AudioIO.h b/src/AudioIO.h index a66580742..8d16c0ef2 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -175,7 +175,7 @@ class AUDACITY_DLL_API AudioIO { static double GetMaxScrubSpeed() { return 32.0; } // Is five octaves enough for your amusement? static double GetMinScrubSpeed() { return 0.01; } - /** \brief enqueue a new end time, using the last end as the new start, + /** \brief enqueue a NEW end time, using the last end as the new start, * to be played over the same duration, as between this and the last * enqueuing (or the starting of the stream). Except, we do not exceed maximum * scrub speed, so may need to adjust either the start or the end. @@ -188,8 +188,8 @@ class AUDACITY_DLL_API AudioIO { */ bool EnqueueScrubByPosition(double endTime, double maxSpeed, bool maySkip); - /** \brief enqueue a new positive or negative scrubbing speed, - * using the last end as the new start, + /** \brief enqueue a NEW positive or negative scrubbing speed, + * using the last end as the NEW start, * to be played over the same duration, as between this and the last * enqueueing (or the starting of the stream). Except, we do not exceed maximum * scrub speed, so may need to adjust either the start or the end. @@ -214,7 +214,7 @@ class AUDACITY_DLL_API AudioIO { * * Doesn't return true if the device has been closed but some disk i/o or * cleanup is still going on. If you want to know if it's safe to start a - * new stream, use IsBusy() */ + * NEW stream, use IsBusy() */ bool IsStreamActive(); bool IsStreamActive(int token); diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp index f18e61852..296585cc5 100644 --- a/src/AutoRecovery.cpp +++ b/src/AutoRecovery.cpp @@ -214,12 +214,12 @@ static bool RecoverAllProjects(AudacityProject** pproj) *pproj = NULL; } else { - // Create new project window + // Create NEW project window proj = CreateNewAudacityProject(); } // Open project. When an auto-save file has been opened successfully, - // the opened auto-save file is automatically deleted and a new one + // the opened auto-save file is automatically deleted and a NEW one // is created. proj->OpenFile(files[i], false); } diff --git a/src/AutoRecovery.h b/src/AutoRecovery.h index 66239401e..f9b459ba0 100644 --- a/src/AutoRecovery.h +++ b/src/AutoRecovery.h @@ -26,7 +26,7 @@ // Show auto recovery dialog if there are projects to recover. Should be // called once at Audacity startup. // -// This function possibly opens new project windows while it recovers all +// This function possibly opens NEW project windows while it recovers all // projects. If so, it will re-use *pproj, if != NULL and set it to NULL. // // Returns: True, if the start of Audacity should continue as normal diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp index 55fd5e74f..2d28691a5 100644 --- a/src/BatchCommands.cpp +++ b/src/BatchCommands.cpp @@ -689,7 +689,7 @@ bool BatchCommands::ApplyChain(const wxString & filename) return false; } - // Chain was successfully applied; save the new project state + // Chain was successfully applied; save the NEW project state wxString longDesc, shortDesc; wxString name = gPrefs->Read(wxT("/Batch/ActiveChain"), wxEmptyString); if (name.IsEmpty()) diff --git a/src/BlockFile.cpp b/src/BlockFile.cpp index f6e4bcde7..0d66a2a6d 100644 --- a/src/BlockFile.cpp +++ b/src/BlockFile.cpp @@ -568,7 +568,7 @@ void AliasBlockFile::WriteSummary() if( !summaryFile.IsOpened() ){ // Never silence the Log w.r.t write errors; they always count - // as new errors + // as NEW errors wxLogError(wxT("Unable to write summary data to file %s"), mFileName.GetFullPath().c_str()); // If we can't write, there's nothing to do. @@ -602,7 +602,7 @@ bool AliasBlockFile::ReadSummary(void *data) if( !summaryFile.IsOpened() ){ - // new model; we need to return valid data + // NEW model; we need to return valid data memset(data,0,(size_t)mSummaryInfo.totalSummaryBytes); if(silence) delete silence; @@ -613,7 +613,7 @@ bool AliasBlockFile::ReadSummary(void *data) mSilentLog=TRUE; return true; - }else mSilentLog=FALSE; // worked properly, any future error is new + }else mSilentLog=FALSE; // worked properly, any future error is NEW if(silence) delete silence; diff --git a/src/BlockFile.h b/src/BlockFile.h index 8f8eb6c1f..e3ce7d61e 100644 --- a/src/BlockFile.h +++ b/src/BlockFile.h @@ -106,7 +106,7 @@ class BlockFile { /// Returns TRUE if the summary has not yet been written, but is actively being computed and written to disk virtual bool IsSummaryBeingComputed(){return false;} - /// Create a new BlockFile identical to this, using the given filename + /// Create a NEW BlockFile identical to this, using the given filename virtual BlockFile *Copy(wxFileName newFileName) = 0; virtual wxLongLong GetSpaceUsage() = 0; diff --git a/src/CrossFade.cpp b/src/CrossFade.cpp index f09404a0f..d959828be 100644 --- a/src/CrossFade.cpp +++ b/src/CrossFade.cpp @@ -130,7 +130,7 @@ bool CrossFader::CrossFadeMix(samplePtr buffer, sampleFormat format, sampleCount short *dest = (short *)buffer; vector shortSeq; - //Copy the sequences over to the new vector, casting as you go. + //Copy the sequences over to the NEW vector, casting as you go. for(int i = 0; i < numclips; i++) shortSeq.push_back((short*)tmpSequence[i]); @@ -177,7 +177,7 @@ bool CrossFader::CrossFadeMix(samplePtr buffer, sampleFormat format, sampleCount vector intSeq; - //Copy the sequences over to the new vector, casting as you go. + //Copy the sequences over to the NEW vector, casting as you go. for(int i = 0; i < numclips; i++) intSeq.push_back((int*)tmpSequence[i]); diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp index 8e576dec6..517711c8b 100644 --- a/src/Dependencies.cpp +++ b/src/Dependencies.cpp @@ -227,7 +227,7 @@ static void RemoveDependencies(AudacityProject *project, // blockfiles in the Sequences, so we do that next... ReplaceBlockFiles(project, blockFileHash); - // Subtract one from reference count of new block files; they're + // Subtract one from reference count of NEW block files; they're // now all referenced the proper number of times by the Sequences ReplacedBlockFileHash::iterator it; for( it = blockFileHash.begin(); it != blockFileHash.end(); ++it ) diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp index 8f3ee7c54..75c30e5cf 100644 --- a/src/DeviceManager.cpp +++ b/src/DeviceManager.cpp @@ -179,7 +179,7 @@ static void AddSourcesFromStream(int deviceIndex, const PaDeviceInfo *info, std: static bool IsInputDeviceAMapperDevice(const PaDeviceInfo *info) { // For Windows only, portaudio returns the default mapper object - // as the first index after a new hostApi index is detected (true for MME and DS) + // as the first index after a NEW hostApi index is detected (true for MME and DS) // this is a bit of a hack, but there's no other way to find out which device is a mapper, // I've looked at string comparisons, but if the system is in a different language this breaks. #ifdef __WXMSW__ @@ -252,7 +252,7 @@ static void AddSources(int deviceIndex, int rate, std::vector * } -/// Gets a new list of devices by terminating and restarting portaudio +/// Gets a NEW list of devices by terminating and restarting portaudio /// Assumes that DeviceManager is only used on the main thread. void DeviceManager::Rescan() { @@ -260,7 +260,7 @@ void DeviceManager::Rescan() this->mInputDeviceSourceMaps.clear(); this->mOutputDeviceSourceMaps.clear(); - // if we are doing a second scan then restart portaudio to get new devices + // if we are doing a second scan then restart portaudio to get NEW devices if (m_inited) { // check to see if there is a stream open - can happen if monitoring, // but otherwise Rescan() should not be available to the user. diff --git a/src/DeviceManager.h b/src/DeviceManager.h index 82ba0824d..382e1272b 100644 --- a/src/DeviceManager.h +++ b/src/DeviceManager.h @@ -54,7 +54,7 @@ class DeviceManager /// Releases memory assosiated with the singleton static void Destroy(); - /// Gets a new list of devices by terminating and restarting portaudio + /// Gets a NEW list of devices by terminating and restarting portaudio /// Assumes that DeviceManager is only used on the main thread. void Rescan(); diff --git a/src/DirManager.cpp b/src/DirManager.cpp index 91877e3ae..d36401385 100644 --- a/src/DirManager.cpp +++ b/src/DirManager.cpp @@ -24,7 +24,7 @@ \brief Creates and manages BlockFile objects. This class manages the files that a project uses to store most - of its data. It creates new BlockFile objects, which can + of its data. It creates NEW BlockFile objects, which can be used to store any type of data. BlockFiles support all of the common file operations, but they also support reference counting, so two different parts of a project can point to @@ -32,8 +32,8 @@ For example, a track might contain 10 blocks of data representing its audio. If you copy the last 5 blocks and paste at the - end of the file, no new blocks need to be created - we just store - pointers to new ones. When part of a track is deleted, the + end of the file, no NEW blocks need to be created - we just store + pointers to NEW ones. When part of a track is deleted, the affected blocks decrement their reference counts, and when they reach zero they are deleted. This same mechanism is also used to implement Undo. @@ -439,7 +439,7 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const return false; } - /* Move all files into this new directory. Files which are + /* Move all files into this NEW directory. Files which are "locked" get copied instead of moved. (This happens when we perform a Save As - the files which belonged to the last saved version of the old project must not be moved, @@ -510,9 +510,9 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const // blockfiles. Cleanup code trigger is the same if (mBlockFileHash.size()>0){ // Clean up after ourselves; look for empty directories in the old - // and new project directories. The easiest way to do this is to + // and NEW project directories. The easiest way to do this is to // recurse depth-first and rmdir every directory seen in old and - // new; rmdir will fail on non-empty dirs. + // NEW; rmdir will fail on non-empty dirs. wxArrayString dirlist; count = RecursivelyEnumerate(cleanupLoc1, dirlist, wxEmptyString, false, true); @@ -583,7 +583,7 @@ wxFileName DirManager::MakeBlockFilePath(wxString value){ } if(value.GetChar(0)==wxT('e')){ - // this file is located in a new style two-deep subdirectory tree + // this file is located in a NEW style two-deep subdirectory tree wxString topdir=value.Mid(0,3); wxString middir=wxT("d"); middir.Append(value.Mid(3,2)); @@ -786,7 +786,7 @@ wxFileName DirManager::MakeBlockFileName() if(dirMidPool.empty()){ - // is there a toplevel directory with space for a new subdir? + // is there a toplevel directory with space for a NEW subdir? if(!dirTopPool.empty()){ @@ -798,7 +798,7 @@ wxFileName DirManager::MakeBlockFileName() // search for unused midlevels; linear search adequate - // add 32 new topnum/midnum dirs full of prospective filenames to midpool + // add 32 NEW topnum/midnum dirs full of prospective filenames to midpool for(midnum=0;midnum<256;midnum++){ midkey=(topnum<<8)+midnum; if(BalanceMidAdd(topnum,midkey)){ @@ -953,7 +953,7 @@ bool DirManager::ContainsBlockFile(wxString filepath) const } // Adds one to the reference count of the block file, -// UNLESS it is "locked", then it makes a new copy of +// UNLESS it is "locked", then it makes a NEW copy of // the BlockFile. BlockFile *DirManager::CopyBlockFile(BlockFile *b) { @@ -979,7 +979,7 @@ BlockFile *DirManager::CopyBlockFile(BlockFile *b) { wxFileName newFile = MakeBlockFileName(); - // We assume that the new file should have the same extension + // We assume that the NEW file should have the same extension // as the existing file newFile.SetExt(b->GetFileName().GetExt()); @@ -1099,7 +1099,7 @@ bool DirManager::HandleXMLTag(const wxChar *tag, const wxChar **attrs) return true; } - // This is a new object + // This is a NEW object mBlockFileHash[name] = target; // MakeBlockFileName wasn't used so we must add the directory // balancing information @@ -1142,7 +1142,7 @@ bool DirManager::MoveOrCopyToNewProjectDirectory(BlockFile *f, bool copy) ::wxMilliSleep(50); //check to make sure the oldfile exists. - //if it doesn't, we can assume it was written to the new name, which is fine. + //if it doesn't, we can assume it was written to the NEW name, which is fine. if (oldFileName.FileExists()) { bool ok = wxCopyFile(oldFileName.GetFullPath(), @@ -1209,7 +1209,7 @@ bool DirManager::EnsureSafeFilename(wxFileName fName) return true; /* i18n-hint: 'old' is part of a filename used when a file is renamed. */ - // Figure out what the new name for the existing file would be. + // Figure out what the NEW name for the existing file would be. /* i18n-hint: e.g. Try to go from "mysong.wav" to "mysong-old1.wav". */ // Keep trying until we find a filename that doesn't exist. @@ -1313,7 +1313,7 @@ bool DirManager::EnsureSafeFilename(wxFileName fName) } else { - //point the aliases to the new filename. + //point the aliases to the NEW filename. BlockHash::iterator iter = mBlockFileHash.begin(); while (iter != mBlockFileHash.end()) { diff --git a/src/DirManager.h b/src/DirManager.h index b5f265ecb..9ba6fbf8a 100644 --- a/src/DirManager.h +++ b/src/DirManager.h @@ -79,7 +79,7 @@ class DirManager: public XMLTagHandler { bool ContainsBlockFile(wxString filepath) const; // Adds one to the reference count of the block file, - // UNLESS it is "locked", then it makes a new copy of + // UNLESS it is "locked", then it makes a NEW copy of // the BlockFile. BlockFile *CopyBlockFile(BlockFile *b); diff --git a/src/Dither.cpp b/src/Dither.cpp index 94e7b25ff..b178f70a0 100644 --- a/src/Dither.cpp +++ b/src/Dither.cpp @@ -332,11 +332,11 @@ void Dither::Apply(enum DitherType ditherType, DITHER(RectangleDither, dest, destFormat, destStride, source, sourceFormat, sourceStride, len); break; case triangle: - Reset(); // reset dither filter for this new conversion + Reset(); // reset dither filter for this NEW conversion DITHER(TriangleDither, dest, destFormat, destStride, source, sourceFormat, sourceStride, len); break; case shaped: - Reset(); // reset dither filter for this new conversion + Reset(); // reset dither filter for this NEW conversion DITHER(ShapedDither, dest, destFormat, destStride, source, sourceFormat, sourceStride, len); break; default: diff --git a/src/Envelope.cpp b/src/Envelope.cpp index 616f39f73..3ce97819f 100644 --- a/src/Envelope.cpp +++ b/src/Envelope.cpp @@ -81,9 +81,9 @@ void Envelope::Mirror(bool mirror) /// Rescale function for time tracks (could also be used for other tracks though). /// This is used to load old time track project files where the envelope used a 0 to 1 /// range instead of storing the actual time track values. This function will change the range of the envelope -/// and rescale all envelope points accordingly (unlike SetRange, which clamps the envelope points to the new range). -/// @minValue - the new minimum value -/// @maxValue - the new maximum value +/// and rescale all envelope points accordingly (unlike SetRange, which clamps the envelope points to the NEW range). +/// @minValue - the NEW minimum value +/// @maxValue - the NEW maximum value void Envelope::Rescale(double minValue, double maxValue) { double oldMinValue = mMinValue; @@ -117,7 +117,7 @@ void Envelope::SetRange(double minValue, double maxValue) { mMaxValue = maxValue; mDefaultValue = ClampValue(mDefaultValue); for( unsigned int i = 0; i < mEnv.size(); i++ ) - mEnv[i].SetVal(mEnv[i].GetVal()); // this clamps the value to the new range + mEnv[i].SetVal(mEnv[i].GetVal()); // this clamps the value to the NEW range } EnvPoint *Envelope::AddPointAtEnd( double t, double val ) @@ -325,7 +325,7 @@ float Envelope::ValueOfPixel( int y, int height, bool upper, return ClampValue(-v); } -/// HandleMouseButtonDown either finds an existing control point or adds a new one +/// HandleMouseButtonDown either finds an existing control point or adds a NEW one /// which is then recorded as the point to drag. /// This is slightly complicated by there possibly being four control points for /// a given time value: @@ -672,13 +672,13 @@ Old analysis of cases: // parts is unchanged. // // 1) This may introduce a discontnuity in the envelope at a boundary between the -// old and new clips. In that case we must ensure there are envelope points +// old and NEW clips. In that case we must ensure there are envelope points // at sample positions immediately before and immediately after the boundary. // 2) If the points have the same value we only need one of them. // 3) If the points have the same value AND it is the same as the value interpolated // from the rest of the envelope then we don't need it at all. // -// We do the same for the left and right edge of the new clip. +// We do the same for the left and right edge of the NEW clip. // // Even simpler: we could always add two points at a boundary and then call // RemoveUnneededPoints() (provided that function behaves correctly). @@ -729,7 +729,7 @@ Old analysis of cases: } } else { - if(onPoint) { // Case 7: move the point L and insert a new one to the R + if(onPoint) { // Case 7: move the point L and insert a NEW one to the R mEnv[pos].SetT(mEnv[pos].GetT() - mTrackEpsilon); Insert(t0 + mTrackEpsilon, splitval); someToShift = true; @@ -764,11 +764,11 @@ Old analysis of cases: mTrackLen += deltat; } else { // Case 10: - if( mTrackLen == 0 ) // creating a new envelope + if( mTrackLen == 0 ) // creating a NEW envelope { mTrackLen = e->mTrackLen; mOffset = e->mOffset; - //wxLogDebug(wxT("Case 10, new env/clip: mTrackLen %f mOffset %f t0 %f"), mTrackLen, mOffset, t0); + //wxLogDebug(wxT("Case 10, NEW env/clip: mTrackLen %f mOffset %f t0 %f"), mTrackLen, mOffset, t0); } else { @@ -915,7 +915,7 @@ void Envelope::GetPoints(double *bufferWhen, * because you are working in relative time inside the envelope * @param when the time in seconds when the envelope point should be created. * @param value the envelope value to use at the given point. - * @return the index of the new envelope point within array of envelope points. + * @return the index of the NEW envelope point within array of envelope points. */ int Envelope::Insert(double when, double value) { @@ -959,7 +959,7 @@ int Envelope::Insert(double when, double value) } else { - // Add new + // Add NEW EnvPoint e(this, when, value); if (i < len) { Insert(i, e); diff --git a/src/Experimental.h b/src/Experimental.h index 9c1b9ba27..d69528842 100644 --- a/src/Experimental.h +++ b/src/Experimental.h @@ -16,10 +16,10 @@ JKC: This file solves a problem of how to avoid forking the - code base when working on new features e.g: + code base when working on NEW features e.g: - Additional displays in Audacity - Modular architecture. - Add #defines in here for the new features, and make your code + Add #defines in here for the NEW features, and make your code conditional on those #defines. All the #defines are positive, i.e., when defined, @@ -42,7 +42,7 @@ #define EXPERIMENTAL_SCIENCE_FILTERS // LLL, 01 Oct 2013: -// new key assignment view for preferences +// NEW key assignment view for preferences #define EXPERIMENTAL_KEY_VIEW // feature to link audio tracks to a label track @@ -160,7 +160,7 @@ // Define to enable the device change handler //#define EXPERIMENTAL_DEVICE_CHANGE_HANDLER -// Define for new noise reduction effect from Paul Licameli. +// Define for NEW noise reduction effect from Paul Licameli. #define EXPERIMENTAL_NOISE_REDUCTION // Define to enable Nyquist audio clip boundary control (Steve Daulton Dec 2014) diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 90863b303..7fb52fb40 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -346,7 +346,7 @@ int import_ffmpeg_decode_frame(streamContext *sc, bool flushing) if (flushing) { - // If we're flushing the decoders we don't actually have any new data to decode. + // If we're flushing the decoders we don't actually have any NEW data to decode. pDecode = NULL; nDecodeSiz = 0; } diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp index e6b8b6c40..f5ffb3cbf 100644 --- a/src/FreqWindow.cpp +++ b/src/FreqWindow.cpp @@ -1400,7 +1400,7 @@ bool SpectrumAnalyst::Calculate(Algorithm alg, int windowFunc, if (mProcessed[i] < 0.0) mProcessed[i] = float(0.0); - // Find new min/max + // Find NEW min/max mYMin = mProcessed[0]; mYMax = mProcessed[0]; for (int i = 1; i < half; i++) diff --git a/src/ImageManipulation.cpp b/src/ImageManipulation.cpp index 7f6f5a913..d31ccec73 100644 --- a/src/ImageManipulation.cpp +++ b/src/ImageManipulation.cpp @@ -47,7 +47,7 @@ wxImage *ChangeImageColour(wxImage * srcImage, // This function takes a source image, which it assumes to // be grayscale, and smoothly changes the overall color // to the specified color, and returns the result as a - // new image. This works well for grayscale 3D images. + // NEW image. This works well for grayscale 3D images. // Audacity uses this routines to make the buttons // (skip-start, play, stop, record, skip-end) adapt to // the color scheme of the user. @@ -95,7 +95,7 @@ wxImage *ChangeImageColour(wxImage * srcImage, /// Takes a background image, foreground image, and mask /// (i.e. the alpha channel for the foreground), and -/// returns an new image where the foreground has been +/// returns an NEW image where the foreground has been /// overlaid onto the background using alpha-blending, /// at location (xoff, yoff). wxImage *OverlayImage(wxImage * background, wxImage * foreground, @@ -129,7 +129,7 @@ wxImage *OverlayImage(wxImage * background, wxImage * foreground, hCutoff = (bgHeight - yoff > hCutoff) ? hCutoff : bgHeight - yoff; - //Make a new image the size of the background + //Make a NEW image the size of the background wxImage * dstImage = new wxImage(bgWidth, bgHeight); unsigned char *dst = dstImage->GetData(); memcpy(dst, bg, bgWidth * bgHeight * 3); @@ -161,7 +161,7 @@ wxImage *OverlayImage(wxImage * background, wxImage * foreground, /// Takes a background image, foreground image, and mask /// (i.e. the alpha channel for the foreground), and -/// returns an new image where the foreground has been +/// returns an NEW image where the foreground has been /// overlaid onto the background using alpha-blending, /// at location (xoff, yoff). wxImage *OverlayImage(teBmps eBack, teBmps eForeground, @@ -204,7 +204,7 @@ wxImage *OverlayImage(teBmps eBack, teBmps eForeground, wCutoff = (bgWidth - xoff > wCutoff) ? wCutoff : bgWidth - xoff; hCutoff = (bgHeight - yoff > hCutoff) ? hCutoff : bgHeight - yoff; - //Make a new image the size of the background + //Make a NEW image the size of the background wxImage * dstImage = new wxImage(bgWidth, bgHeight); unsigned char *dst = dstImage->GetData(); memcpy(dst, bg, bgWidth * bgHeight * 3); diff --git a/src/ImageManipulation.h b/src/ImageManipulation.h index aac5d112f..8d7da0d9e 100644 --- a/src/ImageManipulation.h +++ b/src/ImageManipulation.h @@ -23,7 +23,7 @@ wxImage *ChangeImageColour(wxImage * srcImage, wxColour & dstColour); // This function takes a source image, which it assumes to // be grayscale, and smoothly changes the overall color // to the specified color, and returns the result as a -// new image. This works well for grayscale 3D images. +// NEW image. This works well for grayscale 3D images. // Audacity uses this routines to make the buttons // (skip-start, play, stop, record, skip-end) adapt to // the color scheme of the user. @@ -33,7 +33,7 @@ wxImage *ChangeImageColour(wxImage * srcImage, // Takes a background image, foreground image, and mask // (i.e. the alpha channel for the foreground), and -// returns an new image where the foreground has been +// returns an NEW image where the foreground has been // overlaid onto the background using alpha-blending, // at location (xoff, yoff). wxImage *OverlayImage(wxImage * background, wxImage * foreground, diff --git a/src/Internat.cpp b/src/Internat.cpp index 1fe69c7e0..8ef172ee7 100644 --- a/src/Internat.cpp +++ b/src/Internat.cpp @@ -170,7 +170,7 @@ wxString Internat::FormatSize(double size) // // On Windows, wxString::mb_str() can return a NULL pointer if the // conversion to multi-byte fails. So, based on direction intent, -// returns a pointer to an empty string or prompts for a new name. +// returns a pointer to an empty string or prompts for a NEW name. // char *Internat::VerifyFilename(const wxString &s, bool input) { diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index b7c361c00..037811731 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -223,7 +223,7 @@ bool LabelDialog::TransferDataToWindow() int i; // Set the editor parameters. Do this each time since they may change - // due to new tracks and change in NumericTextCtrl format. Rate won't + // due to NEW tracks and change in NumericTextCtrl format. Rate won't // change but might as well leave it here. mChoiceEditor->SetChoices(mTrackNames); mTimeEditor->SetFormat(mFormat); @@ -314,7 +314,7 @@ bool LabelDialog::TransferDataFromWindow() // Extract the name wxString name = mTrackNames[tndx + 1].AfterFirst(wxT('-')).Mid(1); - // Create the new track and add to track list + // Create the NEW track and add to track list LabelTrack *newTrack = new LabelTrack(mDirManager); newTrack->SetName(name); mTracks->Add(newTrack); @@ -356,7 +356,7 @@ bool LabelDialog::Validate() wxString LabelDialog::TrackName(int & index, wxString dflt) { - // Generate a new track name if the passed index is out of range + // Generate a NEW track name if the passed index is out of range if (index < 1 || index >= (int)mTrackNames.GetCount()) { index = mTrackNames.GetCount(); mTrackNames.Add(wxString::Format(wxT("%d - %s"), index, dflt.c_str())); @@ -393,7 +393,7 @@ void LabelDialog::AddLabels(LabelTrack *t) int tndx = 0; int i; - // Add a new track name + // Add a NEW track name TrackName(tndx, t->GetName()); // Add each label in the track @@ -446,7 +446,7 @@ void LabelDialog::FindInitialRow() void LabelDialog::OnUpdate(wxCommandEvent &event) { - // Remember the new format and repopulate grid + // Remember the NEW format and repopulate grid mFormat = event.GetString(); TransferDataToWindow(); @@ -475,7 +475,7 @@ void LabelDialog::OnInsert(wxCommandEvent &event) } } - // Insert new label before or after the current row + // Insert NEW label before or after the current row if (event.GetId() == ID_INSERTA && row < cnt) { row++; } @@ -484,7 +484,7 @@ void LabelDialog::OnInsert(wxCommandEvent &event) // Repopulate the grid TransferDataToWindow(); - // Reposition cursor to new row/col and put user into edit mode to + // Reposition cursor to NEW row/col and put user into edit mode to // set the label name mGrid->SetGridCursor(row, Col_Label); mGrid->EnableCellEditControl(true); @@ -677,7 +677,7 @@ void LabelDialog::OnCellChange(wxGridEvent &event) static bool guard = false; int row = event.GetRow(); - // Guard against recursion which can happen when a change to the "new label" row + // Guard against recursion which can happen when a change to the "NEW label" row // is made. When InsertRow() is done in TransferDataToWindow(), checks are made // within wxGrid to see if the edit control is active and since it hasn't yet // been marked inactive on the first time through here, we get entered again. @@ -719,7 +719,7 @@ void LabelDialog::OnChangeTrack(wxGridEvent & WXUNUSED(event), int row, RowData { wxString val = mGrid->GetCellValue(row, Col_Track); - // User selected the "New..." choice so ask for a new name + // User selected the "New..." choice so ask for a NEW name if (mTrackNames.Index(val) == 0) { wxTextEntryDialog d(this, _("New Label Track"), @@ -734,7 +734,7 @@ void LabelDialog::OnChangeTrack(wxGridEvent & WXUNUSED(event), int row, RowData return; } - // Force generation of a new track name + // Force generation of a NEW track name rd->index = 0; TrackName(rd->index, d.GetValue()); } diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index a80fa43d6..d35e7ec35 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -107,7 +107,7 @@ LabelTrack::LabelTrack(DirManager * projDirManager): SetName(GetDefaultName()); // Label tracks are narrow - // Default is to allow two rows so that new users get the + // Default is to allow two rows so that NEW users get the // idea that labels can 'stack' when they would overlap. SetHeight(73); @@ -770,7 +770,7 @@ void LabelTrack::Draw(wxDC & dc, const wxRect & r, // We need to set mTextHeight to something sensible, // guarding against the case where there are no // labels or all are empty strings, which for example - // happens with a new label track. + // happens with a NEW label track. dc.GetTextExtent(wxT("Demo Text x^y"), &textWidth, &textHeight); mTextHeight = (int)textHeight; ComputeLayout( r, zoomInfo ); @@ -1159,7 +1159,7 @@ void LabelTrack::SetSelected(bool s) /// rather than a linear one. int LabelTrack::OverGlyph(int x, int y) { - //Determine the new selection. + //Determine the NEW selection. LabelStruct * pLabel; int result=0; const int d1=10; //distance in pixels, used for have we hit drag handle. @@ -1334,7 +1334,7 @@ LabelStruct::TimeRelations LabelStruct::RegionRelation( /// @iLabel - index of label, -1 for none. /// @iEdge - which edge is requested to move, -1 for left +1 for right. /// @bAllowSwapping - if we can switch which edge is being dragged. -/// fNewTime - the new time for this edge of the label. +/// fNewTime - the NEW time for this edge of the label. void LabelTrack::MayAdjustLabel( int iLabel, int iEdge, bool bAllowSwapping, double fNewTime) { if( iLabel < 0 ) @@ -1435,7 +1435,7 @@ bool LabelTrack::HandleGlyphDragRelease(const wxMouseEvent & evt, if( mSelIndex >=0 ) { //Set the selection region to be equal to - //the new size of the label. + //the NEW size of the label. *newSel = mLabels[mSelIndex]->selectedRegion; } SortLabels(); @@ -1610,7 +1610,7 @@ void LabelTrack::HandleClick(const wxMouseEvent & evt, #if defined(__WXGTK__) && (HAVE_GTK) if (evt.MiddleDown()) { // Check for a click outside of the selected label's text box; in this - // case PasteSelectedText() will start a new label at the click + // case PasteSelectedText() will start a NEW label at the click // location if (mSelIndex != -1) { if (!OverTextBox(mLabels[mSelIndex], evt.m_x, evt.m_y)) @@ -1961,9 +1961,9 @@ bool LabelTrack::OnChar(SelectedRegion &WXUNUSED(newSel), wxKeyEvent & event) return false; } - // If we've reached this point and aren't currently editing, add new label + // If we've reached this point and aren't currently editing, add NEW label if (mSelIndex < 0) { - // Don't create a new label for a space + // Don't create a NEW label for a space if (wxIsspace(charCode)) { event.Skip(); return false; @@ -2367,7 +2367,7 @@ bool LabelTrack::Load(wxTextFile * in, DirManager * dirManager) l->selectedRegion.setT0(t0, false); // Legacy file format does not include label end-times. l->selectedRegion.collapseToT0(); - // PRL: nothing new to do, legacy file support + // PRL: nothing NEW to do, legacy file support l->title = in->GetNextLine(); mLabels.Add(l); } @@ -2697,7 +2697,7 @@ void LabelTrack::DeleteLabel(int index) mCurrentCursorPos = 1; } // IF we removed a label before the selected label - // THEN the new selected label number is one less. + // THEN the NEW selected label number is one less. else if( index < mSelIndex ) { mSelIndex--; diff --git a/src/Languages.cpp b/src/Languages.cpp index 6d1461ab3..7f0deca2f 100644 --- a/src/Languages.cpp +++ b/src/Languages.cpp @@ -24,7 +24,7 @@ Other languages will only be supported if they're added to the database using wxLocale::AddLanguage. - But for the most part, this means that somebody could add a new + But for the most part, this means that somebody could add a NEW translation and have it work immediately. *//*******************************************************************/ @@ -195,7 +195,7 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames) // Note that if the language for a fullCode exists but we only // have a name for the short code, we will use the short code's // name but associate it with the full code. This allows someone - // to drop in a new language and still get reasonable behavior. + // to drop in a NEW language and still get reasonable behavior. if (fullCode.Length() < 2) continue; diff --git a/src/Legacy.cpp b/src/Legacy.cpp index 0e359218a..0bdaea7a3 100644 --- a/src/Legacy.cpp +++ b/src/Legacy.cpp @@ -20,7 +20,7 @@ AutoRollbackRenamer. \class AutoRollbackRenamer \brief AutoRollbackRenamer handles the renaming of files -which is needed when producing a new version of a file which may fail. +which is needed when producing a NEW version of a file which may fail. On failure the old version is put back in place. *//*******************************************************************/ diff --git a/src/Menus.cpp b/src/Menus.cpp index 064dc7662..5650fb849 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -337,7 +337,7 @@ void AudacityProject::CreateMenusAndCommands() c->BeginMenu(_("&File")); c->SetDefaultFlags(AudioIONotBusyFlag, AudioIONotBusyFlag); - /*i18n-hint: "New" is an action (verb) to create a new project*/ + /*i18n-hint: "New" is an action (verb) to create a NEW project*/ c->AddItem(wxT("New"), _("&New"), FN(OnNew), wxT("Ctrl+N"), AudioIONotBusyFlag, AudioIONotBusyFlag); @@ -2236,7 +2236,7 @@ void AudacityProject::OnPlayStop() toolbar->StopPlaying(); } else if (gAudioIO->IsStreamActive()) { - //If this project isn't playing, but another one is, stop playing the old and start the new. + //If this project isn't playing, but another one is, stop playing the old and start the NEW. //find out which project we need; AudacityProject* otherProject = NULL; @@ -3340,7 +3340,7 @@ bool AudacityProject::OnEffect(const PluginID & ID, int flags) if (count == 0) { // No tracks were selected... if (type == EffectTypeGenerate) { - // Create a new track for the generated audio... + // Create a NEW track for the generated audio... newTrack = mTrackFactory->NewWaveTrack(); mTracks->Add(newTrack); newTrack->SetSelected(true); @@ -3976,7 +3976,7 @@ void AudacityProject::OnPaste() if (this->HandlePasteText()) return; - // If nothing's selected, we just insert new tracks. + // If nothing's selected, we just insert NEW tracks. if (this->HandlePasteNothingSelected()) return; @@ -4213,7 +4213,7 @@ bool AudacityProject::HandlePasteText() } // Return true if nothing selected, regardless of paste result. -// If nothing was selected, create and paste into new tracks. +// If nothing was selected, create and paste into NEW tracks. // (This was formerly the second part of overly-long OnPaste.) bool AudacityProject::HandlePasteNothingSelected() { @@ -4311,7 +4311,7 @@ bool AudacityProject::HandlePasteNothingSelected() } -// Creates a new label in each selected label track with text from the system +// Creates a NEW label in each selected label track with text from the system // clipboard void AudacityProject::OnPasteNewLabel() { @@ -4357,7 +4357,7 @@ void AudacityProject::OnPasteNewLabel() if (plt) plt->Unselect(); - // Add a new label, paste into it + // Add a NEW label, paste into it // Paul L: copy whatever defines the selected region, not just times lt->AddLabel(mViewInfo.selectedRegion); if (lt->PasteSelectedText(mViewInfo.selectedRegion.t0(), @@ -4808,7 +4808,7 @@ void AudacityProject::OnSplitNew() double newt0 = 0, newt1 = 0; double offset = n->GetOffset(); if (n->GetKind() == Track::Wave) { - // Clips must be aligned to sample positions or the new clip will not fit in the gap where it came from + // Clips must be aligned to sample positions or the NEW clip will not fit in the gap where it came from offset = ((WaveTrack*)n)->LongSamplesToTime(((WaveTrack*)n)->TimeToLongSamples(offset)); newt0 = ((WaveTrack*)n)->LongSamplesToTime(((WaveTrack*)n)->TimeToLongSamples(mViewInfo.selectedRegion.t0())); newt1 = ((WaveTrack*)n)->LongSamplesToTime(((WaveTrack*)n)->TimeToLongSamples(mViewInfo.selectedRegion.t1())); @@ -5446,7 +5446,7 @@ void AudacityProject::OnImport() gPrefs->Flush(); - HandleResize(); // Adjust scrollers for new track sizes. + HandleResize(); // Adjust scrollers for NEW track sizes. ODManager::Resume(); } @@ -5560,7 +5560,7 @@ void AudacityProject::OnImportRaw() return; AddImportedTracks(fileName, newTracks, numTracks); - HandleResize(); // Adjust scrollers for new track sizes. + HandleResize(); // Adjust scrollers for NEW track sizes. } void AudacityProject::OnEditMetadata() @@ -5606,7 +5606,7 @@ void AudacityProject::HandleMixAndRender(bool toNewTrack) t = iter.Next(); } - // Add new tracks + // Add NEW tracks mTracks->Add(newLeft); if (newRight) @@ -6341,7 +6341,7 @@ int AudacityProject::DoAddLabel(const SelectedRegion ®ion, bool preserveFocus } } - // If none found, start a new label track and use it + // If none found, start a NEW label track and use it if (!lt) { lt = new LabelTrack(mDirManager); mTracks->Add(lt); @@ -6881,7 +6881,7 @@ void AudacityProject::SeekLeftOrRight : t0 + multiplier * quietSeekStepPositive )); - // Make sure new position is in view. + // Make sure NEW position is in view. GetTrackPanel()->ScrollIntoView(mViewInfo.selectedRegion.t0()); } GetTrackPanel()->Refresh(false); @@ -6949,7 +6949,7 @@ void AudacityProject::SeekLeftOrRight : t1 + multiplier * quietSeekStepPositive )); - // Make sure new position is in view. + // Make sure NEW position is in view. GetTrackPanel()->ScrollIntoView(mViewInfo.selectedRegion.t1()); } GetTrackPanel()->Refresh(false); @@ -6991,7 +6991,7 @@ void AudacityProject::SeekLeftOrRight GetTrackPanel()->Refresh(false); } - // Make sure new position is in view + // Make sure NEW position is in view GetTrackPanel()->ScrollIntoView(mViewInfo.selectedRegion.t1()); } } diff --git a/src/Mix.cpp b/src/Mix.cpp index d3180d019..709239b55 100644 --- a/src/Mix.cpp +++ b/src/Mix.cpp @@ -119,7 +119,7 @@ bool MixAndRender(TrackList *tracks, TrackFactory *trackFactory, t = iter.Next(); } - /* create the destination track (new track) */ + /* create the destination track (NEW track) */ if ((numWaves == 1) || ((numWaves == 2) && (usefulIter.First()->GetLink() != NULL))) oneinput = true; // only one input track (either 1 mono or one linked stereo pair) diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index 20d877e4f..4c2adee1a 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -1100,12 +1100,12 @@ void MixerBoard::UpdateTrackClusters() } else { - // Not already showing it. Add a new MixerTrackCluster. + // Not already showing it. Add a NEW MixerTrackCluster. wxPoint clusterPos( (kInset + // extra inset to left for first one, so it's double (nClusterIndex * (kInset + kMixerTrackClusterWidth)) + // left margin and width for each to its left - kInset), // plus left margin for new cluster + kInset), // plus left margin for NEW cluster kInset); wxSize clusterSize(kMixerTrackClusterWidth, nClusterHeight); pMixerTrackCluster = diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index 00141bb0e..795126871 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -564,7 +564,7 @@ bool NoteTrack::Shift(double t) // t is always seconds int m = ROUND(t * tempo / beats_per_measure); // need at least 1 measure, so if we rounded down to zero, fix it if (m == 0) m = 1; - // compute new tempo so that m measures at new tempo take t seconds + // compute NEW tempo so that m measures at new tempo take t seconds tempo = beats_per_measure * m / t; // in beats per second mSeq->insert_silence(0.0, beats_per_measure * m); mSeq->set_tempo(tempo * 60.0 /* bpm */, 0.0, beats_per_measure * m); @@ -617,7 +617,7 @@ Alg_seq_ptr NoteTrack::MakeExportableSeq() // extend past "start" (because "all" parameter is set to false) Alg_seq_ptr seq = mSeq->copy(start, mSeq->get_dur() - start, false); if (offset > 0) { - // swap seq and mSeq so that Shift operates on the new copy + // swap seq and mSeq so that Shift operates on the NEW copy Alg_seq_ptr old_seq = mSeq; mSeq = seq; Shift(offset); @@ -673,7 +673,7 @@ Alg_seq_ptr NoteTrack::MakeExportableSeq() double beat = mSeq->get_time_map()->time_to_beat(start); // Find the time signature in mSeq in effect at start (beat): int i = mSeq->time_sig.find_beat(beat); - // i is where you would insert a new time sig at beat, + // i is where you would insert a NEW time sig at beat, // Case 1: beat coincides with a time sig at i. Time signature // at beat means that there is a barline at beat, so when beat // is shifted to 0, the relative barline positions are preserved @@ -711,7 +711,7 @@ Alg_seq_ptr NoteTrack::MakeExportableSeq() // beat double bar = tsp->beat + beats_per_measure * (int(measures) + 1); double bar_offset = bar - beat; - // insert new time signature at bar_offset in new sequence + // insert NEW time signature at bar_offset in new sequence // It will have the same time signature, but the position will // force a barline to match the barlines in mSeq seq->set_time_sig(bar_offset, tsp->num, tsp->den); diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index f1a17a9a0..52ea191d1 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -621,7 +621,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S) } wxString path = plug.GetPath(); - ItemData & item = mItems[path]; // will create new entry + ItemData & item = mItems[path]; // will create NEW entry item.plugs.Add(&plug); item.path = path; item.state = plug.IsEnabled() ? STATE_Enabled : STATE_Disabled; @@ -2138,9 +2138,9 @@ void PluginManager::CheckForUpdates() pathIndex.Add(plug.GetPath().BeforeFirst(wxT(';'))); } - // Check all known plugins to ensure they are still valid and scan for new ones. + // Check all known plugins to ensure they are still valid and scan for NEW ones. // - // All new plugins get a stub entry created that will remain in place until the + // All NEW plugins get a stub entry created that will remain in place until the // user enables or disables the plugin. // // Becuase we use the plugins "path" as returned by the providers, we can actually @@ -2179,7 +2179,7 @@ void PluginManager::CheckForUpdates() if (pathIndex.Index(path) == wxNOT_FOUND) { PluginID ID = plugID + wxT("_") + path; - PluginDescriptor & plug = mPlugins[ID]; // This will create a new descriptor + PluginDescriptor & plug = mPlugins[ID]; // This will create a NEW descriptor plug.SetPluginType(PluginTypeStub); plug.SetID(ID); plug.SetProviderID(plugID); @@ -2483,7 +2483,7 @@ PluginDescriptor & PluginManager::CreatePlugin(const PluginID & id, IdentInterface *ident, PluginType type) { - // This will either create a new entry or replace an existing entry + // This will either create a NEW entry or replace an existing entry PluginDescriptor & plug = mPlugins[id]; plug.SetPluginType(type); diff --git a/src/Prefs.cpp b/src/Prefs.cpp index c5360b937..8714d5228 100755 --- a/src/Prefs.cpp +++ b/src/Prefs.cpp @@ -21,7 +21,7 @@ Preference field specification: / Version - Audacity Version that created these prefs - DefaultOpenPath - Default directory for new file selector + DefaultOpenPath - Default directory for NEW file selector /FileFormats CopyOrEditUncompressedData - Copy data from uncompressed files or [ "copy", "edit"] - edit in place? @@ -250,7 +250,7 @@ void InitPreferences() // In 2.1.0, the Meter toolbar was split and lengthened, but strange arrangements happen // if upgrading due to the extra length. So, if a user is upgrading, use the pre-2.1.0 - // lengths, but still use the new split versions. + // lengths, but still use the NEW split versions. if (gPrefs->Exists(wxT("/GUI/ToolBars/Meter")) && !gPrefs->Exists(wxT("/GUI/ToolBars/CombinedMeter"))) { @@ -264,7 +264,7 @@ void InitPreferences() gPrefs->Read(wxT("/GUI/ToolBars/Meter/W"), &w, -1); gPrefs->Read(wxT("/GUI/ToolBars/Meter/H"), &h, -1); - // "Order" must be adjusted since we're inserting two new toolbars + // "Order" must be adjusted since we're inserting two NEW toolbars if (dock > 0) { wxString oldPath = gPrefs->GetPath(); gPrefs->SetPath(wxT("/GUI/ToolBars")); diff --git a/src/Project.cpp b/src/Project.cpp index ce6ab17fd..25adcdade 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -417,7 +417,7 @@ public: mProject->Import(sortednames[i]); } - mProject->HandleResize(); // Adjust scrollers for new track sizes. + mProject->HandleResize(); // Adjust scrollers for NEW track sizes. ODManager::Resume(); @@ -490,7 +490,7 @@ AudacityProject *CreateNewAudacityProject() bool bIconized; GetNextWindowPlacement(&wndRect, &bMaximized, &bIconized); - //Create and show a new project + //Create and show a NEW project AudacityProject *p = new AudacityProject(NULL, -1, wxDefaultPosition, wxSize(wndRect.width, wndRect.height)); @@ -511,7 +511,7 @@ AudacityProject *CreateNewAudacityProject() //Initialise the Listener gAudioIO->SetListener(p); - //Set the new project as active: + //Set the NEW project as active: SetActiveProject(p); // Okay, GetActiveProject() is ready. Now we can get its CommandManager, @@ -559,7 +559,7 @@ void GetDefaultWindowRect(wxRect *defRect) int height = 674; //These conditional values assist in improving placement and size - //of new windows on different platforms. + //of NEW windows on different platforms. #ifdef __WXGTK__ height += 20; #endif @@ -946,7 +946,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id, SetSizer( bs ); bs->Layout(); - // The right hand side translates to new TrackPanel(... in normal + // The right hand side translates to NEW TrackPanel(... in normal // Audacity without additional DLLs. mTrackPanel = TrackPanel::FactoryFunction(pPage, TrackPanelID, @@ -1104,7 +1104,7 @@ void AudacityProject::UpdatePrefsVariables() gPrefs->Read(wxT("/GUI/SelectAllOnNone"), &mSelectAllOnNone, true); gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &mShowSplashScreen, true); gPrefs->Read(wxT("/GUI/Solo"), &mSoloPref, wxT("Simple")); - // Update the old default to the new default. + // Update the old default to the NEW default. if (mSoloPref == wxT("Standard")) mSoloPref = wxT("Simple"); gPrefs->Read(wxT("/GUI/TracksFitVerticallyZoomed"), &mTracksFitVerticallyZoomed, false); @@ -1920,7 +1920,7 @@ void AudacityProject::OnShow(wxShowEvent & event) // applicable with wxWidgets 3.0 because it's based on changing the // gdk event handler, a change that would be overridden by wxWidgets's // own gdk event handler change. - // Instead, as a new workaround, specifically protect those processings + // Instead, as a NEW workaround, specifically protect those processings // of wxShowEvent and wxTimerEvent that try to do clipboard operations // from being executed within Yield(). This is done by delaying their // execution by posting pure wxWidgets events - which are never executed @@ -2179,7 +2179,7 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event) // audio, and if so, make sure Audio I/O is completely finished. // The main point of this is to properly push the state // and flush the tracks once we've completely finished - // recording new state. + // recording NEW state. // This code is derived from similar code in // AudacityProject::~AudacityProject() and TrackPanel::OnTimer(). if (GetAudioIOToken()>0 && @@ -2346,7 +2346,7 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event) AllProjectsDeleteUnlock(); if (gActiveProject == this) { - // Find a new active project + // Find a NEW active project if (gAudacityProjects.Count() > 0) { SetActiveProject(gAudacityProjects[0]); } @@ -2547,22 +2547,22 @@ void AudacityProject::OpenFiles(AudacityProject *proj) gPrefs->Flush(); // DMM: If the project is dirty, that means it's been touched at - // all, and it's not safe to open a new project directly in its - // place. Only if the project is brand-new clean and the user + // all, and it's not safe to open a NEW project directly in its + // place. Only if the project is brand-NEW clean and the user // hasn't done any action at all is it safe for Open to take place // inside the current project. // - // If you try to Open a new project inside the current window when + // If you try to Open a NEW project inside the current window when // there are no tracks, but there's an Undo history, etc, then - // bad things can happen, including data files moving to the new + // bad things can happen, including data files moving to the NEW // project directory, etc. if (!proj || proj->mDirty || !proj->mTracks->IsEmpty()) { - // Open in a new window + // Open in a NEW window proj = CreateNewAudacityProject(); } // This project is clean; it's never been touched. Therefore // all relevant member variables are in their initial state, - // and it's okay to open a new project inside this window. + // and it's okay to open a NEW project inside this window. proj->OpenFile(fileName); } @@ -2612,7 +2612,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory) // Vaughan, 2011-03-25: This was done previously in AudacityProject::OpenFiles() // and AudacityApp::MRUOpen(), but if you open an aup file by double-clicking it // from, e.g., Win Explorer, it would bypass those, get to here with no check, - // then open a new project from the same data with no warning. + // then open a NEW project from the same data with no warning. // This was reported in http://bugzilla.audacityteam.org/show_bug.cgi?id=137#c17, // but is not really part of that bug. Anyway, prevent it! if (AudacityProject::IsAlreadyOpen(fileName)) @@ -2670,7 +2670,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory) // If they bail out, return and do no more. if( !WarnOfLegacyFile() ) return; - // Convert to the new format. + // Convert to the NEW format. bool success = ConvertLegacyProjectFile(wxFileName(fileName)); if (!success) { wxMessageBox(_("Audacity was unable to convert an Audacity 1.0 project to the new project format."), @@ -2799,7 +2799,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory) if (mIsRecovered) { - // This project has been recovered, so write a new auto-save file + // This project has been recovered, so write a NEW auto-save file // now and then DELETE the old one in the auto-save folder. Note that // at this point mFileName != fileName, because when opening a // recovered file mFileName is faked to point to the original file @@ -2913,7 +2913,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory) newTasks[i]->AddWaveTrack((WaveTrack*)tr); } - //create whatever new tasks we need to. + //create whatever NEW tasks we need to. //we want at most one instance of each class for the project while((odFlags|createdODTasks) != createdODTasks) { @@ -3157,7 +3157,7 @@ bool AudacityProject::HandleXMLTag(const wxChar *tag, const wxChar **attrs) if (wxStrcmp(tag, wxT("audacityproject")) && wxStrcmp(tag, wxT("project"))) { - // If the tag name is not one of these two (the new name is + // If the tag name is not one of these two (the NEW name is // "project" with an Audacity namespace, but we don't detect // the namespace yet), then we don't know what the error is return false; @@ -3483,10 +3483,10 @@ bool AudacityProject::Save(bool overwrite /* = true */ , else { // We are about to move files from the current directory to - // the new directory. We need to make sure files that belonged + // the NEW directory. We need to make sure files that belonged // to the last saved project don't get erased, so we "lock" them, so that // SetProject() copies instead of moves the files. - // (Otherwise the new project would be fine, but the old one would + // (Otherwise the NEW project would be fine, but the old one would // be empty of all of its files.) if (mLastSavedTracks && !overwrite) @@ -3732,7 +3732,7 @@ void AudacityProject::AddImportedTracks(wxString fileName, newTracks[i]->SetName(trackNameBase); } - // Check if new track contains aliased blockfiles and if yes, + // Check if NEW track contains aliased blockfiles and if yes, // remember this to show a warning later if (newTracks[i]->GetKind() == WaveTrack::Wave) { @@ -3786,7 +3786,7 @@ void AudacityProject::AddImportedTracks(wxString fileName, // HandleResize(); } -// If pNewTrackList is passed in non-NULL, it gets filled with the pointers to new tracks. +// If pNewTrackList is passed in non-NULL, it gets filled with the pointers to NEW tracks. bool AudacityProject::Import(wxString fileName, WaveTrackArray* pTrackArray /*= NULL*/) { Track **newTracks; @@ -3847,7 +3847,7 @@ bool AudacityProject::SaveAs(const wxString & newFileName, bool bWantSaveCompres { wxString oldFileName = mFileName; - //check to see if the new project file already exists. + //check to see if the NEW project file already exists. //We should only overwrite it if this project already has the same name, where the user //simply chose to use the save as command although the save command would have the effect. if(mFileName!=newFileName && wxFileExists(newFileName)) { @@ -3933,7 +3933,7 @@ For an audio file that will open in other apps, use 'Export'.\n"), filename.SetExt(wxT("aup")); fName = filename.GetFullPath(); - //check to see if the new project file already exists. + //check to see if the NEW project file already exists. //We should only overwrite it if this project already has the same name, where the user //simply chose to use the save as command although the save command would have the effect. if (mFileName != fName && filename.FileExists()) { @@ -4781,7 +4781,7 @@ void AudacityProject::AutoSave() return; } - // Now that we have a new auto-save file, DELETE the old one + // Now that we have a NEW auto-save file, DELETE the old one DeleteCurrentAutoSaveFile(); if (!mAutoSaveFileName.IsEmpty()) diff --git a/src/Project.h b/src/Project.h index 168a4451c..e5dc7b830 100644 --- a/src/Project.h +++ b/src/Project.h @@ -226,7 +226,7 @@ class AUDACITY_DLL_API AudacityProject: public wxFrame, void OpenFile(wxString fileName, bool addtohistory = true); bool WarnOfLegacyFile( ); - // If pNewTrackList is passed in non-NULL, it gets filled with the pointers to new tracks. + // If pNewTrackList is passed in non-NULL, it gets filled with the pointers to NEW tracks. bool Import(wxString fileName, WaveTrackArray *pTrackArray = NULL); void AddImportedTracks(wxString fileName, diff --git a/src/RealFFTf.cpp b/src/RealFFTf.cpp index 08b253f0c..c904c5f83 100644 --- a/src/RealFFTf.cpp +++ b/src/RealFFTf.cpp @@ -101,7 +101,7 @@ HFFT InitializeFFT(int fftlen) } #ifdef EXPERIMENTAL_EQ_SSE_THREADED - // new SSE FFT routines work on live data + // NEW SSE FFT routines work on live data for(i=0;i<32;i++) if((1<pow2Bits=i; @@ -128,7 +128,7 @@ static HFFT hFFTArray[MAX_HFFT] = { NULL }; static int nFFTLockCount[MAX_HFFT] = { 0 }; /* Get a handle to the FFT tables of the desired length */ -/* This version keeps common tables rather than allocating a new table every time */ +/* This version keeps common tables rather than allocating a NEW table every time */ HFFT GetFFT(int fftlen) { int h,n = fftlen/2; @@ -141,7 +141,7 @@ HFFT GetFFT(int fftlen) nFFTLockCount[h]++; return hFFTArray[h]; } else { - // All buffers used, so fall back to allocating a new set of tables + // All buffers used, so fall back to allocating a NEW set of tables return InitializeFFT(fftlen);; } } diff --git a/src/SampleFormat.h b/src/SampleFormat.h index ed1546877..3d6fdb6f3 100644 --- a/src/SampleFormat.h +++ b/src/SampleFormat.h @@ -145,7 +145,7 @@ void ReverseSamples(samplePtr buffer, sampleFormat format, int start, int len); // -// This must be called on startup and everytime new ditherers +// This must be called on startup and everytime NEW ditherers // are set in preferences. // diff --git a/src/Sequence.cpp b/src/Sequence.cpp index a4ad58333..ac0da2d85 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -174,7 +174,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format, bool* pbChanged) mMaxSamples = mMinSamples * 2; BlockArray newBlockArray; - // Use the ratio of old to new mMaxSamples to make a reasonable guess at allocation. + // Use the ratio of old to NEW mMaxSamples to make a reasonable guess at allocation. newBlockArray.reserve(1 + mBlock.size() * ((float)oldMaxSamples / (float)mMaxSamples)); bool bSuccess = true; @@ -204,7 +204,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format, bool* pbChanged) // If so, need to special-case (len < mMinSamples) and start combining data // from the old blocks... Oh no! - // Using Blockify will handle the cases where len > the new mMaxSamples. Previous code did not. + // Using Blockify will handle the cases where len > the NEW mMaxSamples. Previous code did not. const sampleCount blockstart = oldSeqBlock.start; const unsigned prevSize = newBlockArray.size(); Blockify(newBlockArray, blockstart, bufferNew.ptr(), len); @@ -221,7 +221,7 @@ bool Sequence::ConvertToSampleFormat(sampleFormat format, bool* pbChanged) DerefAllFiles(); - // Replace with new blocks. + // Replace with NEW blocks. mBlock.swap(newBlockArray); } else @@ -540,7 +540,7 @@ bool Sequence::Paste(sampleCount s, const Sequence *src) // and the following test fails, perhaps we could test // whether coalescence with the previous block is possible. if (largerBlockLen <= mMaxSamples) { - // Special case: we can fit all of the new samples inside of + // Special case: we can fit all of the NEW samples inside of // one block! SeqBlock &block = *pBlock; @@ -644,8 +644,8 @@ bool Sequence::Paste(sampleCount s, const Sequence *src) mDirManager->Deref(splitBlock.f); - // Copy remaining blocks to new block array and - // swap the new block array in for the old + // Copy remaining blocks to NEW block array and + // swap the NEW block array in for the old for (i = b + 1; i < numBlocks; i++) newBlock.push_back(mBlock[i].Plus(addedLen)); @@ -670,7 +670,7 @@ bool Sequence::InsertSilence(sampleCount s0, sampleCount len) if (len <= 0) return true; - // Create a new track containing as much silence as we + // Create a NEW track containing as much silence as we // need to insert, and then call Paste to do the insertion. // We make use of a SilentBlockFile, which takes up no // space on disk. @@ -1145,7 +1145,7 @@ bool Sequence::CopyWrite(SampleBuffer &scratch, { // We don't ever write to an existing block; to support Undo, // we copy the old block entirely into memory, dereference it, - // make the change, and then write the new block to disk. + // make the change, and then write the NEW block to disk. const sampleCount length = b.f->GetLength(); wxASSERT(length <= mMaxSamples); @@ -1552,7 +1552,7 @@ bool Sequence::Append(samplePtr buffer, sampleFormat format, mNumSamples += addLen; buffer += addLen * SAMPLE_SIZE(format); } - // Append the rest as new blocks + // Append the rest as NEW blocks while (len) { const sampleCount idealSamples = GetIdealBlockSize(); const sampleCount l = std::min(idealSamples, len); @@ -1665,12 +1665,12 @@ bool Sequence::Delete(sampleCount start, sampleCount len) return ConsistencyCheck(wxT("Delete - branch one")); } - // Create a new array of blocks + // Create a NEW array of blocks BlockArray newBlock; newBlock.reserve(numBlocks - (b1 - b0) + 2); // Copy the blocks before the deletion point over to - // the new array + // the NEW array newBlock.insert(newBlock.end(), mBlock.begin(), mBlock.begin() + b0); unsigned int i; @@ -1770,7 +1770,7 @@ bool Sequence::Delete(sampleCount start, sampleCount len) for (i = b1 + 1; i < numBlocks; i++) newBlock.push_back(mBlock[i].Plus(-len)); - // Substitute our new array for the old one + // Substitute our NEW array for the old one mBlock.swap(newBlock); // Update total number of samples and do a consistency check. diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index 3d71f80e0..6890e8443 100644 --- a/src/ShuttleGui.cpp +++ b/src/ShuttleGui.cpp @@ -1885,7 +1885,7 @@ wxRadioButton * ShuttleGuiBase::TieRadioButton( // We're now into ShuttleGuiBase sizer and misc functions. -/// The Ids increment as we add new controls. +/// The Ids increment as we add NEW controls. /// However, the user can force the id manually, for example /// if they need a specific Id for a button, and then let it /// resume normal numbering later. diff --git a/src/Snap.cpp b/src/Snap.cpp index 0bb920078..c3c880d78 100644 --- a/src/Snap.cpp +++ b/src/Snap.cpp @@ -75,7 +75,7 @@ void SnapManager::Reinit() return; } - // Save new settings + // Save NEW settings mSnapTo = snapTo; mRate = rate; mFormat = format; diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index fc526a769..bc487fd2b 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -12,7 +12,7 @@ \brief The SplashDialog shows help information for Audacity when Audacity starts up. -It was written for the benefit of new users who do not want to +It was written for the benefit of NEW users who do not want to read the manual. The text of the dialog is kept short to increase the chance of it being read. The content is designed to reduce the most commonly asked questions about Audacity. diff --git a/src/Tags.cpp b/src/Tags.cpp index e17dd0e80..620c7e15e 100644 --- a/src/Tags.cpp +++ b/src/Tags.cpp @@ -437,7 +437,7 @@ void Tags::SetTag(const wxString & name, const wxString & value) // Didn't find the tag if (iter == mXref.end()) { - // Add a new tag + // Add a NEW tag mXref[key] = name; mMap[name] = value; return; @@ -552,7 +552,7 @@ public: { wxGridCellChoiceEditor::SetParameters(params); - // Refresh the wxComboBox with new values + // Refresh the wxComboBox with NEW values if (Combo()) { Combo()->Clear(); Combo()->Append(m_choices); diff --git a/src/Theme.cpp b/src/Theme.cpp index f7b47b58e..3ccba0a1e 100644 --- a/src/Theme.cpp +++ b/src/Theme.cpp @@ -301,7 +301,7 @@ void ThemeBase::LoadThemeAtStartUp( bool bLookForExternalFiles ) // code that follows... // // However, I think it is better to get the user to - // build a new image cache, which they can do easily + // build a NEW image cache, which they can do easily // from the Theme preferences tab. #if 0 // and now add any available component images. @@ -434,7 +434,7 @@ void FlowPacker::SetNewGroup( int iGroupSize ) void FlowPacker::GetNextPosition( int xSize, int ySize ) { - // if the height has increased, then we are on a new group. + // if the height has increased, then we are on a NEW group. if(( ySize > myHeight )||(mFlags != mOldFlags )) { SetNewGroup( ((mFlags & resFlagPaired)!=0) ? 2 : 1 ); @@ -684,7 +684,7 @@ void ThemeBase::WriteImageMap( ) int i; mFlow.Init( ImageCacheWidth ); - wxFFile File( FileNames::ThemeCacheHtm(), wxT("wb") );// I'll put in new lines explicitly. + wxFFile File( FileNames::ThemeCacheHtm(), wxT("wb") );// I'll put in NEW lines explicitly. if( !File.IsOpened() ) return; @@ -822,7 +822,7 @@ bool ThemeBase::ReadImageCache( bool bBinaryRead, bool bOkIfNotFound) // If we get this message, it means that the data in file // was not a valid png image. // Most likely someone edited it by mistake, - // Or some experiment is being tried with new formats for it. + // Or some experiment is being tried with NEW formats for it. wxMessageBox(_("Audacity could not read its default theme.\nPlease report the problem.")); return false; } @@ -856,16 +856,16 @@ bool ThemeBase::ReadImageCache( bool bBinaryRead, bool bOkIfNotFound) mFlow.GetNextPosition( iColSize, iColSize ); mFlow.RectMid( x, y ); // Only change the colour if the alpha is opaque. - // This allows us to add new colours more easily. + // This allows us to add NEW colours more easily. if( ImageCache.GetAlpha(x,y ) > 128 ) { TempColour = wxColour( ImageCache.GetRed( x,y), ImageCache.GetGreen( x,y), ImageCache.GetBlue(x,y)); - /// \todo revisit this hack which makes adding new colours easier + /// \todo revisit this hack which makes adding NEW colours easier /// but which prevents a colour of (1,1,1) from being added. - /// find an alternative way to make adding new colours easier. + /// find an alternative way to make adding NEW colours easier. /// e.g. initialise the background to translucent, perhaps. if( TempColour != wxColour(1,1,1) ) mColours[i] = TempColour; diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp index 4189c2d88..6d20fe7b8 100644 --- a/src/TimeTrack.cpp +++ b/src/TimeTrack.cpp @@ -252,7 +252,7 @@ void TimeTrack::Draw(wxDC & dc, const wxRect & r, const ZoomInfo &zoomInfo) mRuler->SetFlip(false); // If we don't do this, the Ruler doesn't redraw itself when the envelope is modified. // I have no idea why! // - // LL: It's because the ruler only Invalidate()s when the new value is different + // LL: It's because the ruler only Invalidate()s when the NEW value is different // than the current value. mRuler->SetFlip(GetHeight() > 75 ? true : true); // MB: so why don't we just call Invalidate()? :) mRuler->Draw(dc, this); diff --git a/src/TimeTrack.h b/src/TimeTrack.h index b2bb2d871..c148fb503 100644 --- a/src/TimeTrack.h +++ b/src/TimeTrack.h @@ -28,7 +28,7 @@ class TimeTrack: public Track { public: TimeTrack(DirManager * projDirManager, const ZoomInfo *zoomInfo); - /** @brief Copy-Constructor - create a new TimeTrack:: which is an independent copy of the original + /** @brief Copy-Constructor - create a NEW TimeTrack:: which is an independent copy of the original * * Calls TimeTrack::Init() to copy the track metadata, then does a bunch of manipulations on the * Envelope:: and Ruler:: members in order to copy one to the other - unfortunately both lack a @@ -74,7 +74,7 @@ class TimeTrack: public Track { /** @brief Compute the integral warp factor between two non-warped time points * * Calculate the relative length increase of the chosen segment from the original sound. - * So if this time track has a low value (i.e. makes the sound slower), the new warped + * So if this time track has a low value (i.e. makes the sound slower), the NEW warped * sound will be *longer* than the original sound, so the return value of this function * is larger. * @param t0 The starting time to calculate from diff --git a/src/Track.cpp b/src/Track.cpp index 62ec4bde6..7b3360d20 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -95,7 +95,7 @@ void Track::Init(const Track &orig) mDirManager->Deref(); // MM: unreference old DirManager } - // MM: Assign and ref new DirManager + // MM: Assign and ref NEW DirManager mDirManager = orig.mDirManager; mDirManager->Ref(); } diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 76a429767..de108303e 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -56,7 +56,7 @@ existing bitmap can be used for waveform images. Audacity also draws directly to the screen to update the time indicator during playback. To move the indicator, one column of pixels is drawn to the screen to remove the indicator. Then the indicator is drawn at -a new time location. +a NEW time location. The track panel consists of many components. The tree of calls that update the bitmap looks like this: @@ -783,7 +783,7 @@ void TrackArtist::UpdateVRuler(Track *t, wxRect & rect) const float extreme = LINEAR_TO_DB(2); // recover dB value of max const float dB = std::min(extreme, (float(fabs(max)) * lastdBRange - lastdBRange)); - // find new scale position, but old max may get trimmed if the db limit rises + // find NEW scale position, but old max may get trimmed if the db limit rises // Don't trim it to zero though, but leave max and limit distinct newMax = sign * std::max(ZOOMLIMIT, (dBRange + dB) / dBRange); // Adjust the min of the scale if we can, @@ -2742,7 +2742,7 @@ void TrackArtist::DrawNoteBackground(NoteTrack *track, wxDC &dc, double beats_per_measure = 4.0; while (true) { if (i < sigs.length() && sigs[i].beat < next_bar_beat + ALG_EPS) { - // new time signature takes effect + // NEW time signature takes effect Alg_time_sig &sig = sigs[i++]; next_bar_beat = sig.beat; beats_per_measure = (sig.num * 4.0) / sig.den; diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 044cfefc6..43b9167ef 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -34,7 +34,7 @@ // Documentation: Rather than have a lengthy \todo section, having // a \todo a \file and a \page in EXACTLY that order gets Doxygen to -// put the following lengthy description of refactoring on a new page +// put the following lengthy description of refactoring on a NEW page // and link to it from the docs. /*****************************************************************//** @@ -146,7 +146,7 @@ is time to refresh some aspect of the screen. Stereo channel grouping. The precise names of the classes are subject to revision. - Have deliberately not created new files for the new classes + Have deliberately not created NEW files for the new classes such as AdornedRulerPanel and TrackInfo - yet. *//*****************************************************************/ @@ -1148,7 +1148,7 @@ void TrackPanel::DrawQuickPlayIndicator(int x, bool snapped) // Convert virtual coordinate to physical int y = t->GetY() - mViewInfo->vpos; - // Draw the new indicator in its new location + // Draw the NEW indicator in its new location AColor::Line(dc, x, y + kTopMargin, @@ -1198,7 +1198,7 @@ void TrackPanel::TimerUpdateIndicator(double playPos) } // Always update scrollbars even if not scrolling the window. This is - // important when new audio is recorded, because this can change the + // important when NEW audio is recorded, because this can change the // length of the project and therefore the appearance of the scrollbar. MakeParentRedrawScrollbars(); @@ -1295,7 +1295,7 @@ void TrackPanel::DoDrawIndicator(wxDC & dc) // Convert virtual coordinate to physical int y = t->GetY() - mViewInfo->vpos; - // Draw the new indicator in its new location + // Draw the NEW indicator in its new location AColor::Line(dc, mLastIndicatorX, y + kTopMargin, @@ -2100,7 +2100,7 @@ void TrackPanel::HandleSelect(wxMouseEvent & event) if (event.LeftDown() || (event.LeftDClick() && event.CmdDown())) { // AS: Now, did they click in a track somewhere? If so, we want - // to extend the current selection or start a new selection, + // to extend the current selection or start a NEW selection, // depending on the shift key. If not, cancel all selections. if (t) SelectionHandleClick(event, t, rect); @@ -2116,7 +2116,7 @@ void TrackPanel::HandleSelect(wxMouseEvent & event) } SetCapturedTrack( NULL ); - //Send the new selection state to the undo/redo stack: + //Send the NEW selection state to the undo/redo stack: MakeParentModifyState(false); #ifdef EXPERIMENTAL_SPECTRAL_EDITING @@ -2211,7 +2211,7 @@ void TrackPanel::StartOrJumpPlayback(wxMouseEvent &event) //to the clicked point. //This unpauses paused audio as well. The right thing to do might be to //leave it paused but move the point. This would probably - //require a new method in ControlToolBar: SetPause(); + //require a NEW method in ControlToolBar: SetPause(); ControlToolBar * ctb = p->GetControlToolBar(); ctb->StopPlaying(); ctb->PlayPlayRegion(SelectedRegion(clicktime, endtime), p->GetDefaultPlayOptions()); @@ -2490,7 +2490,7 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event, } } - // We create a new snap manager in case any snap-points have changed + // We create a NEW snap manager in case any snap-points have changed if (mSnapManager) delete mSnapManager; @@ -2754,7 +2754,7 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event, } #endif if (startNewSelection) { - // If we didn't move a selection boundary, start a new selection + // If we didn't move a selection boundary, start a NEW selection SelectNone(); #ifdef EXPERIMENTAL_SPECTRAL_EDITING StartFreqSelection (event.m_y, rect.y, rect.height, pTrack); @@ -3208,7 +3208,7 @@ void TrackPanel::ResetFreqSelectionPin(double hintFrequency, bool logF) void TrackPanel::Stretch(int mouseXCoordinate, int trackLeftEdge, Track *pTrack) { - if (mStretched) { // Undo stretch and redo it with new mouse coordinates + if (mStretched) { // Undo stretch and redo it with NEW mouse coordinates // Drag handling was not originally implemented with Undo in mind -- // there are saved pointers to tracks that are not supposed to change. // Undo will change tracks, so convert pTrack, mCapturedTrack to index @@ -4207,7 +4207,7 @@ void TrackPanel::DoSlide(wxMouseEvent & event) newClipRight = clipRight; } - // Take whichever one snapped (if any) and compute the new desiredSlideAmount + // Take whichever one snapped (if any) and compute the NEW desiredSlideAmount mSnapLeft = -1; mSnapRight = -1; if (newClipLeft != clipLeft) { @@ -4394,7 +4394,7 @@ void TrackPanel::DoSlide(wxMouseEvent & event) } if (slidVertically) { - // new origin + // NEW origin mHSlideAmount = 0; } @@ -4952,7 +4952,7 @@ float TrackPanel::FindSampleEditingLevel(wxMouseEvent &event, double dBRange, do else newLevel = 0; - //Make sure the new level is between +/-1 + //Make sure the NEW level is between +/-1 newLevel = std::max(-1.0f, std::min(1.0f, newLevel)); } @@ -5037,7 +5037,7 @@ void TrackPanel::HandleSampleEditingClick( wxMouseEvent & event ) } - // Now that the new sample levels are determined, go through each and mix it appropriately + // Now that the NEW sample levels are determined, go through each and mix it appropriately // with the original point, according to a 2-part linear function whose center has probability // SMOOTHING_PROPORTION_MAX and extends out SMOOTHING_BRUSH_RADIUS, at which the probability is // SMOOTHING_PROPORTION_MIN. _MIN and _MAX specify how much of the smoothed curve make it through. @@ -5179,7 +5179,7 @@ void TrackPanel::HandleSampleEditingButtonUp( wxMouseEvent & WXUNUSED(event)) /// /// There are several member data structure for handling drawing: /// - mDrawingTrack: keeps track of which track you clicked down on, so drawing doesn't -/// jump to a new track +/// jump to a NEW track /// - mDrawingTrackTop: The top position of the drawing track--makes drawing easier. /// - mDrawingStartSample: The sample you clicked down on, so that you can hold it steady /// - mDrawingLastDragSample: When drag-drawing, this keeps track of the last sample you dragged over, @@ -5524,7 +5524,7 @@ void TrackPanel::HandleLabelClick(wxMouseEvent & event) { wxRect midiRect; #ifdef EXPERIMENTAL_MIDI_OUT - // this is an awful hack: make a new rectangle at an offset because + // this is an awful hack: make a NEW rectangle at an offset because // MuteSoloFunc thinks buttons are located below some text, e.g. // "Mono, 44100Hz 32-bit float", but this is not true for a Note track wxRect muteSoloRect(rect); @@ -8810,7 +8810,7 @@ void TrackPanel::OnMergeStereo(wxCommandEvent & WXUNUSED(event)) mPopupMenuTarget->SetChannel(Track::LeftChannel); partner->SetChannel(Track::RightChannel); - // Set new track heights and minimized state + // Set NEW track heights and minimized state bool bBothMinimizedp=((mPopupMenuTarget->GetMinimized())&&(partner->GetMinimized())); mPopupMenuTarget->SetMinimized(false); partner->SetMinimized(false); diff --git a/src/TrackPanel.h b/src/TrackPanel.h index a30f9a1ff..825e4692b 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -514,7 +514,7 @@ public: ViewInfo * GetViewInfo(){ return mViewInfo;} TrackPanelListener * GetListener(){ return mListener;} AdornedRulerPanel * GetRuler(){ return mRuler;} -// JKC and here is a factory function which just does 'new' in standard Audacity. +// JKC and here is a factory function which just does 'NEW' in standard Audacity. static TrackPanel *(*FactoryFunction)(wxWindow * parent, wxWindowID id, const wxPoint & pos, diff --git a/src/TrackPanelAx.cpp b/src/TrackPanelAx.cpp index 1ef9a29f7..41aadee1d 100644 --- a/src/TrackPanelAx.cpp +++ b/src/TrackPanelAx.cpp @@ -333,7 +333,7 @@ wxAccStatus TrackPanelAx::GetName( int childId, wxString* name ) // Many of translations of the strings with a leading space omitted // the leading space. Therefore a space has been added using wxT(" "). // Because screen readers won't be affected by multiple spaces, the - // leading spaces have not been removed, so that no new translations are needed. + // leading spaces have not been removed, so that no NEW translations are needed. /* i18n-hint: This is for screen reader software and indicates that on this track mute is on.*/ name->Append( wxT(" ") + wxString(_( " Mute On" )) ); diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp index 3730775fa..f279203cc 100644 --- a/src/UndoManager.cpp +++ b/src/UndoManager.cpp @@ -67,7 +67,7 @@ void UndoManager::CalculateSpaceUsage() prev = cur; cur = swap; - // And clean out the new current map + // And clean out the NEW current map cur->clear(); // Scan all tracks at current level diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp index 1e9e51e78..18099ba90 100644 --- a/src/WaveClip.cpp +++ b/src/WaveClip.cpp @@ -105,7 +105,7 @@ public: }; - //Thread safe call to add a new region to invalidate. If it overlaps with other regions, it unions the them. + //Thread safe call to add a NEW region to invalidate. If it overlaps with other regions, it unions the them. void AddInvalidRegion(sampleCount sampleStart, sampleCount sampleEnd) { //use pps to figure out where we are. (pixels per second) @@ -456,7 +456,7 @@ void findCorrection(const std::vector &oldWhere, int oldLen, int ne // What sample would go in where[0] with no correction? const double guessWhere0 = t0 * rate; - if ( // Skip if old and new are disjoint: + if ( // Skip if old and NEW are disjoint: oldWhereLast <= guessWhere0 || guessWhere0 + newLen * samplesPerPixel <= oldWhere0 || // Skip unless denom rounds off to at least 1. @@ -474,7 +474,7 @@ void findCorrection(const std::vector &oldWhere, int oldLen, int ne oldX0 = floor(0.5 + oldLen * (guessWhere0 - oldWhere0) / denom); // What sample count would the old cache have put there? const double where0 = oldWhere0 + double(oldX0) * samplesPerPixel; - // What correction is needed to align the new cache with the old? + // What correction is needed to align the NEW cache with the old? const double correction0 = where0 - guessWhere0; correction = std::max(-samplesPerPixel, std::min(samplesPerPixel, correction0)); wxASSERT(correction == correction0); @@ -1580,7 +1580,7 @@ bool WaveClip::ClearAndAddCutLine(double t0, double t1) return false; newClip->SetOffset(clip_t0-mOffset); - // Sort out cutlines that belong to the new cutline + // Sort out cutlines that belong to the NEW cutline WaveClipList::compatibility_iterator nextIt; for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it; it=nextIt) diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 7b25b35ab..1029940d6 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -210,9 +210,9 @@ void WaveTrack::SetOffset(double o) WaveTrack::WaveTrackDisplay WaveTrack::FindDefaultViewMode() { // PRL: Bugs 1043, 1044 - // 2.1.1 writes a new key for this preference, which got new values, + // 2.1.1 writes a NEW key for this preference, which got new values, // to avoid confusing version 2.1.0 if it reads the preference file afterwards. - // Prefer the new preference key if it is present + // Prefer the NEW preference key if it is present WaveTrack::WaveTrackDisplay viewMode; gPrefs->Read(wxT("/GUI/DefaultViewModeNew"), (int*)&viewMode, -1); @@ -883,11 +883,11 @@ bool WaveTrack::ClearAndPaste(double t0, // Start of time to clear // Now, clear the selection if (HandleClear(t0, t1, false, false)) { - // And paste in the new data + // And paste in the NEW data if (Paste(t0, src)) { unsigned int i; - // First, merge the new clip(s) in with the existing clips + // First, merge the NEW clip(s) in with the existing clips if (merge && splits.GetCount() > 0) { WaveClipArray clips; @@ -1065,7 +1065,7 @@ bool WaveTrack::HandleClear(double t0, double t1, } else { // Delete in the middle of the clip...we actually create two - // new clips out of the left and right halves... + // NEW clips out of the left and right halves... WaveClip *left = new WaveClip(*clip, mDirManager); left->Clear(t0, clip->GetEndTime()); @@ -1205,9 +1205,9 @@ bool WaveTrack::Paste(double t0, Track *src) // Currently, two modes are implemented: // // - If a single clip should be pasted, and it should be pasted inside another - // clip, no new clips are generated. The audio is simply inserted. + // clip, no NEW clips are generated. The audio is simply inserted. // This resembles the old (pre-multiclip support) behaviour. However, if - // the clip is pasted outside of any clip, a new clip is generated. This is + // the clip is pasted outside of any clip, a NEW clip is generated. This is // the only behaviour which is different to what was done before, but it // shouldn't confuse users too much. // @@ -1316,10 +1316,10 @@ bool WaveTrack::Paste(double t0, Track *src) return insideClip->Paste(t0, other->GetClipByIndex(0)); } - // Just fall through and exhibit new behaviour + // Just fall through and exhibit NEW behaviour } - // Insert new clips + // Insert NEW clips //printf("paste: multi clip mode!\n"); if (!editClipCanMove && !IsEmpty(t0, t0+insertDuration-1.0/mRate)) @@ -1465,7 +1465,7 @@ bool WaveTrack::Disjoin(double t0, double t1) { sampleCount curSamplePos = start + done + i; - //start a new sequence + //start a NEW sequence if( buffer[ i ] == 0.0 && seqStart == -1 ) seqStart = curSamplePos; else if( buffer[ i ] != 0.0 || curSamplePos == end - 1 ) @@ -1757,7 +1757,7 @@ void WaveTrack::HandleXMLEndTag(const wxChar * WXUNUSED(tag)) XMLTagHandler *WaveTrack::HandleXMLChild(const wxChar *tag) { // - // This is legacy code (1.2 and previous) and is not called for new projects! + // This is legacy code (1.2 and previous) and is not called for NEW projects! // if (!wxStrcmp(tag, wxT("sequence")) || !wxStrcmp(tag, wxT("envelope"))) { @@ -1782,7 +1782,7 @@ XMLTagHandler *WaveTrack::HandleXMLChild(const wxChar *tag) } // - // This is for the new file format (post-1.2) + // This is for the NEW file format (post-1.2) // if (!wxStrcmp(tag, wxT("waveclip"))) return CreateClip(); @@ -2355,7 +2355,7 @@ bool WaveTrack::CanOffsetClip(WaveClip* clip, double amount, if (*allowedAmount == amount) return true; - // Check if the new calculated amount would not violate + // Check if the NEW calculated amount would not violate // any other constraint if (!CanOffsetClip(clip, *allowedAmount, NULL)) { *allowedAmount = 0; // play safe and don't allow anything @@ -2415,7 +2415,7 @@ bool WaveTrack::SplitAt(double t) return false; } - //offset the new clip by the splitpoint (noting that it is already offset to c->GetStartTime()) + //offset the NEW clip by the splitpoint (noting that it is already offset to c->GetStartTime()) sampleCount here = llrint(floor(((t - c->GetStartTime()) * mRate) + 0.5)); newClip->Offset((double)here/(double)mRate); mClips.Append(newClip); diff --git a/src/WaveTrack.h b/src/WaveTrack.h index d10828908..1a51bdb8f 100644 --- a/src/WaveTrack.h +++ b/src/WaveTrack.h @@ -193,7 +193,7 @@ class AUDACITY_DLL_API WaveTrack : public Track { * after the last Append. * * If there is an existing WaveClip in the WaveTrack then the data is - * appended to that clip. If there are no WaveClips in the track, then a new + * appended to that clip. If there are no WaveClips in the track, then a NEW * one is created. */ bool Append(samplePtr buffer, sampleFormat format, @@ -311,7 +311,7 @@ class AUDACITY_DLL_API WaveTrack : public Track { // be cleaner if this could be removed, though... WaveClipList::compatibility_iterator GetClipIterator() { return mClips.GetFirst(); } - // Create new clip and add it to this track. Returns a pointer + // Create NEW clip and add it to this track. Returns a pointer // to the newly created clip. WaveClip* CreateClip(); @@ -355,7 +355,7 @@ class AUDACITY_DLL_API WaveTrack : public Track { // existing clips). bool CanInsertClip(WaveClip* clip); - // Move a clip into a new track. This will remove the clip + // Move a clip into a NEW track. This will remove the clip // in this cliplist and add it to the cliplist of the // other track (if that is not NULL). No fancy additional stuff is done. // unused void MoveClipToTrack(int clipIndex, WaveTrack* dest); @@ -386,7 +386,7 @@ class AUDACITY_DLL_API WaveTrack : public Track { bool RemoveCutLine(double cutLinePosition); // This track has been merged into a stereo track. Copy shared parameters - // from the new partner. + // from the NEW partner. virtual void Merge(const Track &orig); // Resample track (i.e. all clips in the track) diff --git a/src/blockfile/LegacyAliasBlockFile.cpp b/src/blockfile/LegacyAliasBlockFile.cpp index 3e967e906..53eae0206 100644 --- a/src/blockfile/LegacyAliasBlockFile.cpp +++ b/src/blockfile/LegacyAliasBlockFile.cpp @@ -45,8 +45,8 @@ LegacyAliasBlockFile::~LegacyAliasBlockFile() { } -/// Construct a new LegacyAliasBlockFile based on this one, but writing -/// the summary data to a new file. +/// Construct a NEW LegacyAliasBlockFile based on this one, but writing +/// the summary data to a NEW file. /// /// @param newFileName The filename to copy the summary data to. BlockFile *LegacyAliasBlockFile::Copy(wxFileName newFileName) diff --git a/src/blockfile/LegacyBlockFile.cpp b/src/blockfile/LegacyBlockFile.cpp index 319cfefab..2bfbc497d 100644 --- a/src/blockfile/LegacyBlockFile.cpp +++ b/src/blockfile/LegacyBlockFile.cpp @@ -323,7 +323,7 @@ BlockFile *LegacyBlockFile::BuildFromXML(wxString projDir, const wxChar **attrs, /// Create a copy of this BlockFile, but using a different disk file. /// -/// @param newFileName The name of the new file to use. +/// @param newFileName The name of the NEW file to use. BlockFile *LegacyBlockFile::Copy(wxFileName newFileName) { BlockFile *newBlockFile = new LegacyBlockFile(newFileName, diff --git a/src/blockfile/LegacyBlockFile.h b/src/blockfile/LegacyBlockFile.h index 353597bff..d71fd96fb 100644 --- a/src/blockfile/LegacyBlockFile.h +++ b/src/blockfile/LegacyBlockFile.h @@ -29,7 +29,7 @@ void ComputeLegacySummaryInfo(wxFileName fileName, // Audacity BlockFile formats (versions 0.98 through 1.0, or // versions 1.1.0 through 1.1.2). You can load a BlockFile // in this format, and you can save information about it -// back to disk, but you can't create a new one from new +// back to disk, but you can't create a NEW one from new // sample data. // class LegacyBlockFile : public BlockFile { @@ -53,7 +53,7 @@ class LegacyBlockFile : public BlockFile { virtual int ReadData(samplePtr data, sampleFormat format, sampleCount start, sampleCount len); - /// Create a new block file identical to this one + /// Create a NEW block file identical to this one virtual BlockFile *Copy(wxFileName newFileName); /// Write an XML representation of this file virtual void SaveXML(XMLWriter &xmlFile); diff --git a/src/blockfile/ODDecodeBlockFile.cpp b/src/blockfile/ODDecodeBlockFile.cpp index 2a7af9a28..b8380e20a 100644 --- a/src/blockfile/ODDecodeBlockFile.cpp +++ b/src/blockfile/ODDecodeBlockFile.cpp @@ -152,7 +152,7 @@ bool ODDecodeBlockFile::Read64K(float *buffer, sampleCount start, sampleCount le } /// If the summary has been computed, -/// Construct a new PCMAliasBlockFile based on this one. +/// Construct a NEW PCMAliasBlockFile based on this one. /// otherwise construct an ODPCMAliasBlockFile that still needs to be computed. /// @param newFileName The filename to copy the summary data to. BlockFile *ODDecodeBlockFile::Copy(wxFileName newFileName) @@ -173,7 +173,7 @@ BlockFile *ODDecodeBlockFile::Copy(wxFileName newFileName) mAudioFileName, mAliasStart, mLen, mAliasChannel, mType, mMin, mMax, mRMS,IsSummaryAvailable()); - //The client code will need to schedule this blockfile for OD decoding if it is going to a new track. + //The client code will need to schedule this blockfile for OD decoding if it is going to a NEW track. //It can do this by checking for IsDataAvailable()==false. } diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h index 28da169a0..c21d2bd4a 100644 --- a/src/blockfile/ODDecodeBlockFile.h +++ b/src/blockfile/ODDecodeBlockFile.h @@ -76,7 +76,7 @@ class ODDecodeBlockFile : public SimpleBlockFile - ///Makes new ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability + ///Makes NEW ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability virtual BlockFile *Copy(wxFileName fileName); ///Saves as xml ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability diff --git a/src/blockfile/ODPCMAliasBlockFile.cpp b/src/blockfile/ODPCMAliasBlockFile.cpp index 84bf611d8..4bb50c738 100644 --- a/src/blockfile/ODPCMAliasBlockFile.cpp +++ b/src/blockfile/ODPCMAliasBlockFile.cpp @@ -210,7 +210,7 @@ bool ODPCMAliasBlockFile::Read64K(float *buffer, sampleCount start, sampleCount } /// If the summary has been computed, -/// Construct a new PCMAliasBlockFile based on this one. +/// Construct a NEW PCMAliasBlockFile based on this one. /// otherwise construct an ODPCMAliasBlockFile that still needs to be computed. /// @param newFileName The filename to copy the summary data to. BlockFile *ODPCMAliasBlockFile::Copy(wxFileName newFileName) @@ -238,7 +238,7 @@ BlockFile *ODPCMAliasBlockFile::Copy(wxFileName newFileName) mAliasedFileName, mAliasStart, mLen, mAliasChannel, mMin, mMax, mRMS,IsSummaryAvailable()); - //The client code will need to schedule this blockfile for OD summarizing if it is going to a new track. + //The client code will need to schedule this blockfile for OD summarizing if it is going to a NEW track. } UnlockRead(); @@ -696,7 +696,7 @@ bool ODPCMAliasBlockFile::ReadSummary(void *data) if( !summaryFile.IsOpened() ){ - // new model; we need to return valid data + // NEW model; we need to return valid data memset(data,0,(size_t)mSummaryInfo.totalSummaryBytes); // we silence the logging for this operation in this object @@ -708,7 +708,7 @@ bool ODPCMAliasBlockFile::ReadSummary(void *data) mFileNameMutex.Unlock(); return true; - }else mSilentLog=FALSE; // worked properly, any future error is new + }else mSilentLog=FALSE; // worked properly, any future error is NEW int read = summaryFile.Read(data, (size_t)mSummaryInfo.totalSummaryBytes); diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h index 1594c8096..099c3d7ee 100644 --- a/src/blockfile/ODPCMAliasBlockFile.h +++ b/src/blockfile/ODPCMAliasBlockFile.h @@ -19,7 +19,7 @@ Load On-Demand implementation of the AliasBlockFile for PCM files. to load large files more quickly, we take skip computing the summary data and put ODPCMAliasBlockFiles in the sequence as place holders. A background thread loads and computes the summary data into these classes. -ODPCMAliasBlockFiles are unlike all other BlockFiles are not immutable (for the most part,) because when new +ODPCMAliasBlockFiles are unlike all other BlockFiles are not immutable (for the most part,) because when NEW summary data is computed for an existing ODPCMAliasBlockFile we save the buffer then and write the Summary File. All BlockFile methods that treat the summary data as a buffer that exists in its BlockFile @@ -74,7 +74,7 @@ class ODPCMAliasBlockFile : public PCMAliasBlockFile /// Returns the 64K summary data block virtual bool Read64K(float *buffer, sampleCount start, sampleCount len); - ///Makes new ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability + ///Makes NEW ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability virtual BlockFile *Copy(wxFileName fileName); ///Saves as xml ODPCMAliasBlockFile or PCMAliasBlockFile depending on summary availability diff --git a/src/blockfile/PCMAliasBlockFile.cpp b/src/blockfile/PCMAliasBlockFile.cpp index 5deaece2d..2e9a7dd63 100644 --- a/src/blockfile/PCMAliasBlockFile.cpp +++ b/src/blockfile/PCMAliasBlockFile.cpp @@ -152,8 +152,8 @@ int PCMAliasBlockFile::ReadData(samplePtr data, sampleFormat format, return framesRead; } -/// Construct a new PCMAliasBlockFile based on this one, but writing -/// the summary data to a new file. +/// Construct a NEW PCMAliasBlockFile based on this one, but writing +/// the summary data to a NEW file. /// /// @param newFileName The filename to copy the summary data to. BlockFile *PCMAliasBlockFile::Copy(wxFileName newFileName) diff --git a/src/blockfile/SilentBlockFile.h b/src/blockfile/SilentBlockFile.h index 205a8ed26..bf3e891c5 100644 --- a/src/blockfile/SilentBlockFile.h +++ b/src/blockfile/SilentBlockFile.h @@ -38,7 +38,7 @@ class SilentBlockFile : public BlockFile { virtual int ReadData(samplePtr data, sampleFormat format, sampleCount start, sampleCount len); - /// Create a new block file identical to this one + /// Create a NEW block file identical to this one virtual BlockFile *Copy(wxFileName newFileName); /// Write an XML representation of this file virtual void SaveXML(XMLWriter &xmlFile); diff --git a/src/blockfile/SimpleBlockFile.cpp b/src/blockfile/SimpleBlockFile.cpp index de3717498..a0a38eacf 100644 --- a/src/blockfile/SimpleBlockFile.cpp +++ b/src/blockfile/SimpleBlockFile.cpp @@ -36,7 +36,7 @@ default is to disable caching. memory, so they are never read from disk in the current session. * Write-caching: If caching is enabled and the parameter allowDeferredWrite - is enabled at the block file constructor, new block files are held in memory + is enabled at the block file constructor, NEW block files are held in memory and written to disk only when WriteCacheToDisk() is called. This is used during recording to prevent disk access. After recording, WriteCacheToDisk() will be called on all block files and they will be written to disk. During @@ -529,7 +529,7 @@ BlockFile *SimpleBlockFile::BuildFromXML(DirManager &dm, const wxChar **attrs) /// Create a copy of this BlockFile, but using a different disk file. /// -/// @param newFileName The name of the new file to use. +/// @param newFileName The name of the NEW file to use. BlockFile *SimpleBlockFile::Copy(wxFileName newFileName) { BlockFile *newBlockFile = new SimpleBlockFile(newFileName, mLen, diff --git a/src/blockfile/SimpleBlockFile.h b/src/blockfile/SimpleBlockFile.h index 2cbad4282..5e4cece9b 100644 --- a/src/blockfile/SimpleBlockFile.h +++ b/src/blockfile/SimpleBlockFile.h @@ -67,7 +67,7 @@ class SimpleBlockFile : public BlockFile { virtual int ReadData(samplePtr data, sampleFormat format, sampleCount start, sampleCount len); - /// Create a new block file identical to this one + /// Create a NEW block file identical to this one virtual BlockFile *Copy(wxFileName newFileName); /// Write an XML representation of this file virtual void SaveXML(XMLWriter &xmlFile); diff --git a/src/commands/CommandHandler.cpp b/src/commands/CommandHandler.cpp index 0a6f0ce5e..46094abeb 100644 --- a/src/commands/CommandHandler.cpp +++ b/src/commands/CommandHandler.cpp @@ -44,7 +44,7 @@ void CommandHandler::OnReceiveCommand(AppCommandEvent &event) Command *cmd = event.GetCommand(); // JKC: In case the user changed the project, let us track that. - // This saves us the embarrassment (crash) of a new project + // This saves us the embarrassment (crash) of a NEW project // being opened, the old one closed and still trying to act // on the old one. SetProject( GetActiveProject() ); diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index 0388b6d37..156238007 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -448,7 +448,7 @@ void CommandManager::PurgeData() /// -/// Makes a new menubar for placement on the top of a project +/// Makes a NEW menubar for placement on the top of a project /// Names it according to the passed-in string argument. /// /// If the menubar already exists, simply returns it. @@ -497,7 +497,7 @@ wxMenuBar * CommandManager::CurrentMenuBar() const /// -/// This starts a new menu +/// This starts a NEW menu /// void CommandManager::BeginMenu(const wxString & tName) { @@ -523,7 +523,7 @@ void CommandManager::EndMenu() /// -/// This starts a new submenu, and names it according to +/// This starts a NEW submenu, and names it according to /// the function's argument. wxMenu* CommandManager::BeginSubMenu(const wxString & tName) { @@ -550,7 +550,7 @@ void CommandManager::EndSubMenu() //Save the submenu's information SubMenuListEntry *tmpSubMenu = mSubMenuList[submenu_count]; - //Pop off the new submenu so CurrentMenu returns the parent of the submenu + //Pop off the NEW submenu so CurrentMenu returns the parent of the submenu mSubMenuList.RemoveAt(submenu_count); //Add the submenu to the current menu @@ -798,7 +798,7 @@ int CommandManager::NextIdentifier(int ID) return ID; } -///Given all of the information for a command, comes up with a new unique +///Given all of the information for a command, comes up with a NEW unique ///ID, adds it to a list, and returns the ID. ///WARNING: Does this conflict with the identifiers set for controls/windows? ///If it does, a workaround may be to keep controls below wxID_LOWEST @@ -840,7 +840,7 @@ CommandListEntry *CommandManager::NewIdentifier(const wxString & name, // wxMac 2.5 and higher will do special things with the // Preferences, Exit (Quit), and About menu items, // if we give them the right IDs. - // Otherwise we just pick increasing ID numbers for each new + // Otherwise we just pick increasing ID numbers for each NEW // command. Note that the name string we are comparing // ("About", "Preferences") is the internal command name // (untranslated), not the label that actually appears in the diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h index 76ef9cc33..bbeaa6d2f 100644 --- a/src/commands/CommandManager.h +++ b/src/commands/CommandManager.h @@ -164,7 +164,7 @@ class AUDACITY_DLL_API CommandManager: public XMLTagHandler // Command masks // - // For new items/commands + // For NEW items/commands void SetDefaultFlags(wxUint32 flags, wxUint32 mask); void SetCommandFlags(wxString name, wxUint32 flags, wxUint32 mask); diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 236f5e420..5a620fcec 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -71,13 +71,13 @@ private: virtual void DeduceFrequencies(); // calculations - void Calc_ToPitch(); // Update m_nToPitch from new m_dSemitonesChange. + void Calc_ToPitch(); // Update m_nToPitch from NEW m_dSemitonesChange. void Calc_ToOctave(); void Calc_SemitonesChange_fromPitches(); void Calc_SemitonesChange_fromOctaveChange(); void Calc_SemitonesChange_fromPercentChange(); void Calc_ToFrequency(); // Update m_ToFrequency from m_FromFrequency & m_dPercentChange. - void Calc_PercentChange(); // Update m_dPercentChange based on new m_dSemitonesChange. + void Calc_PercentChange(); // Update m_dPercentChange based on NEW m_dSemitonesChange. // handlers void OnChoice_FromPitch(wxCommandEvent & evt); diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index bc011c7bb..bfb06b813 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -629,7 +629,7 @@ void EffectChangeSpeed::OnChoice_Vinyl(wxCommandEvent & WXUNUSED(evt)) SetPrivateConfig(GetCurrentSettingsGroup(), wxT("VinylChoice"), mFromVinyl); } - // If mFromVinyl & mToVinyl are set, then there's a new percent change. + // If mFromVinyl & mToVinyl are set, then there's a NEW percent change. if ((mFromVinyl != kVinyl_NA) && (mToVinyl != kVinyl_NA)) { double fromRPM; diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 7df4ef8d4..158786499 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -77,8 +77,8 @@ private: void Update_Text_PercentChange(); // Update control per current m_PercentChange. void Update_Text_Multiplier(); // Update control per current m_PercentChange. void Update_Slider_PercentChange(); // Update control per current m_PercentChange. - void Update_Vinyl(); // Update Vinyl controls for new percent change. - void Update_TimeCtrl_ToLength(); // Update target length controls for new percent change. + void Update_Vinyl(); // Update Vinyl controls for NEW percent change. + void Update_TimeCtrl_ToLength(); // Update target length controls for NEW percent change. void UpdateUI(); // Enable / disable OK / preview. private: diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp index e274d6bb7..9caa05a03 100644 --- a/src/effects/ChangeTempo.cpp +++ b/src/effects/ChangeTempo.cpp @@ -324,7 +324,7 @@ void EffectChangeTempo::OnText_ToBPM(wxCommandEvent & WXUNUSED(evt)) m_bLoopDetect = true; - // If FromBPM has already been set, then there's a new percent change. + // If FromBPM has already been set, then there's a NEW percent change. if (m_FromBPM != 0.0 && m_ToBPM != 0.0) { m_PercentChange = ((m_ToBPM * 100.0) / m_FromBPM) - 100.0; @@ -379,14 +379,14 @@ void EffectChangeTempo::Update_Slider_PercentChange() } void EffectChangeTempo::Update_Text_ToBPM() -// Use m_FromBPM & m_PercentChange to set new m_ToBPM & control. +// Use m_FromBPM & m_PercentChange to set NEW m_ToBPM & control. { m_ToBPM = (((m_FromBPM * (100.0 + m_PercentChange)) / 100.0)); m_pTextCtrl_ToBPM->GetValidator()->TransferToWindow(); } void EffectChangeTempo::Update_Text_ToLength() -// Use m_FromLength & m_PercentChange to set new m_ToLength & control. +// Use m_FromLength & m_PercentChange to set NEW m_ToLength & control. { m_ToLength = (m_FromLength * 100.0) / (100.0 + m_PercentChange); m_pTextCtrl_ToLength->GetValidator()->TransferToWindow(); diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index d20b98dfd..bb873ee0a 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -71,8 +71,8 @@ private: // helper fns void Update_Text_PercentChange(); // Update control per current m_PercentChange. void Update_Slider_PercentChange(); // Update control per current m_PercentChange. - void Update_Text_ToBPM(); // Use m_FromBPM & m_PercentChange to set new m_ToBPM & control. - void Update_Text_ToLength(); // Use m_FromLength & m_PercentChange to set new m_ToLength & control. + void Update_Text_ToBPM(); // Use m_FromBPM & m_PercentChange to set NEW m_ToBPM & control. + void Update_Text_ToLength(); // Use m_FromLength & m_PercentChange to set NEW m_ToLength & control. private: double m_PercentChange; // percent change to apply to tempo diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 0481c48d9..1c5587f36 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -17,7 +17,7 @@ is considered to be a click. The structure was largely stolen from Domonic Mazzoni's NoiseRemoval - module, and reworked for the new effect. + module, and reworked for the NEW effect. This file is intended to become part of Audacity. You may modify and/or distribute it under the same terms as Audacity itself. diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index 6f188c467..f0fd831e8 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -509,9 +509,9 @@ void EffectCompressor::Follow(float *buffer, float *env, int len, float *previou rise_factor, then we compute a rising envelope that meets the input value by working bacwards in time, changing the previous values to input / rise_factor, input / rise_factor^2, - input / rise_factor^3, etc. until this new envelope intersects + input / rise_factor^3, etc. until this NEW envelope intersects the previously computed values. There is only a limited buffer - in which we can work backwards, so if the new envelope does not + in which we can work backwards, so if the NEW envelope does not intersect the old one, then make yet another pass, this time from the oldest buffered value forward, increasing on each sample by rise_factor to produce a maximal envelope. This will diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 2537c1d54..7fac5d051 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -1874,7 +1874,7 @@ bool Effect::ProcessTrack(int count, // Transfer the data from the temporary tracks to the actual ones genLeft->Flush(); - // mT1 gives us the new selection. We want to replace up to GetSel1(). + // mT1 gives us the NEW selection. We want to replace up to GetSel1(). left->ClearAndPaste(mT0, p->GetSel1(), genLeft, true, true, warper); delete genLeft; @@ -2167,15 +2167,15 @@ void Effect::ReplaceProcessedTracks(const bool bGoodResult) Track *t = (Track *) mIMap[i]; if (t == NULL) { - // This track is a new addition to output tracks; add it to mTracks + // This track is a NEW addition to output tracks; add it to mTracks mTracks->Add(o); } else { - // Replace mTracks entry with the new track + // Replace mTracks entry with the NEW track mTracks->Replace(t, o, false); - // Swap the wavecache track the ondemand task uses, since now the new + // Swap the wavecache track the ondemand task uses, since now the NEW // one will be kept in the project if (ODManager::IsInstanceCreated()) { ODManager::Instance()->ReplaceWaveTrack((WaveTrack *)t, @@ -2293,7 +2293,7 @@ bool Effect::RealtimeAddProcessor(int group, int chans, float rate) ochans -= mNumAudioOut; } - // Add a new processor + // Add a NEW processor RealtimeAddProcessor(gchans, rate); // Bump to next processor @@ -2481,7 +2481,7 @@ void Effect::Preview(bool dryOnly) // Save the original track list TrackList *saveTracks = mTracks; - // Build new tracklist from rendering tracks + // Build NEW tracklist from rendering tracks mTracks = new TrackList(); // Linear Effect preview optimised by pre-mixing to one track. diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 005570ece..d3a72bf76 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -50,7 +50,7 @@ class WaveTrack; // TODO: Apr-06-2015 // TODO: Much more cleanup of old methods and variables is needed, but -// TODO: can't be done until after all effects are using the new API. +// TODO: can't be done until after all effects are using the NEW API. class AUDACITY_DLL_API Effect : public wxEvtHandler, public EffectClientInterface, @@ -352,7 +352,7 @@ protected: // Else clear and DELETE mOutputTracks copies. void ReplaceProcessedTracks(const bool bGoodResult); - // Use this to append a new output track. + // Use this to append a NEW output track. void AddToOutputTracks(Track *t); // @@ -363,7 +363,7 @@ protected: // protected: ProgressDialog *mProgress; - double mProjectRate; // Sample rate of the project - new tracks should + double mProjectRate; // Sample rate of the project - NEW tracks should // be created with this rate... double mSampleRate; TrackFactory *mFactory; @@ -466,7 +466,7 @@ private: // FIXME: -// FIXME: Remove this once all effects are using the new dialog +// FIXME: Remove this once all effects are using the NEW dialog // FIXME: #define ID_EFFECT_PREVIEW ePreviewID diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index 023297fc8..b25e9496e 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -371,7 +371,7 @@ void EffectManager::RealtimeSetEffects(const EffectArray & effects) { Effect *e = mRealtimeEffects[i]; - // Scan the new chain for the effect + // Scan the NEW chain for the effect for (int j = 0; j < newCount; j++) { // Found it so we're done @@ -382,14 +382,14 @@ void EffectManager::RealtimeSetEffects(const EffectArray & effects) } } - // Must not have been in the new chain, so tell it to cleanup + // Must not have been in the NEW chain, so tell it to cleanup if (e && mRealtimeActive) { e->RealtimeFinalize(); } } - // Tell any new effects to get ready + // Tell any NEW effects to get ready for (int i = 0; i < newCount; i++) { Effect *e = newEffects[i]; @@ -417,7 +417,7 @@ void EffectManager::RealtimeSetEffects(const EffectArray & effects) delete [] mRealtimeEffects; } - // And install the new one + // And install the NEW one mRealtimeEffects = newEffects; mRealtimeCount = newCount; @@ -630,7 +630,7 @@ sampleCount EffectManager::RealtimeProcess(int group, int chans, float **buffers float **obuf = (float **) alloca(chans * sizeof(float *)); // And populate the input with the buffers we've been given while allocating - // new output buffers + // NEW output buffers for (int i = 0; i < chans; i++) { ibuf[i] = buffers[i]; diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 9fdd1955a..591f0d375 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -1061,7 +1061,7 @@ bool EffectEqualization::TransferDataFromWindow() bool EffectEqualization::ProcessOne(int count, WaveTrack * t, sampleCount start, sampleCount len) { - // create a new WaveTrack to hold all of the output, including 'tails' each end + // create a NEW WaveTrack to hold all of the output, including 'tails' each end AudacityProject *p = GetActiveProject(); WaveTrack *output = p->GetTrackFactory()->NewWaveTrack(floatSample, t->GetRate()); @@ -1162,7 +1162,7 @@ bool EffectEqualization::ProcessOne(int count, WaveTrack * t, //output has one waveclip for the total length, even though //t might have whitespace seperating multiple clips //we want to maintain the original clip structure, so - //only paste the intersections of the new clip. + //only paste the intersections of the NEW clip. //Find the bits of clips that need replacing std::vector > clipStartEndTimes; @@ -1185,18 +1185,18 @@ bool EffectEqualization::ProcessOne(int count, WaveTrack * t, clipRealStartEndTimes.push_back(std::pair(clipStartT,clipEndT)); if( clipStartT < startT ) // does selection cover the whole clip? - clipStartT = startT; // don't copy all the new clip + clipStartT = startT; // don't copy all the NEW clip if( clipEndT > startT + lenT ) // does selection cover the whole clip? - clipEndT = startT + lenT; // don't copy all the new clip + clipEndT = startT + lenT; // don't copy all the NEW clip //save them clipStartEndTimes.push_back(std::pair(clipStartT,clipEndT)); } - //now go thru and replace the old clips with new + //now go thru and replace the old clips with NEW for(unsigned int i=0;iClear(clipStartEndTimes[i].first,clipStartEndTimes[i].second); output->Copy(clipStartEndTimes[i].first-startT+offsetT0,clipStartEndTimes[i].second-startT+offsetT0, &toClipOutput); if(toClipOutput) @@ -1619,7 +1619,7 @@ void EffectEqualization::setCurve(wxString curveName) } // -// Set new curve selection (safe to call outside of the UI) +// Set NEW curve selection (safe to call outside of the UI) // void EffectEqualization::Select( int curve ) { @@ -1758,7 +1758,7 @@ bool EffectEqualization::HandleXMLTag(const wxChar *tag, const wxChar **attrs) return true; } - // Located a new curve + // Located a NEW curve if( !wxStrcmp(tag, wxT("curve") ) ) { // Process the attributes @@ -1768,7 +1768,7 @@ bool EffectEqualization::HandleXMLTag(const wxChar *tag, const wxChar **attrs) const wxChar *attr = *attrs++; const wxChar *value = *attrs++; - // Create a new curve and name it + // Create a NEW curve and name it if( !wxStrcmp( attr, wxT("name") ) ) { const wxString strValue = value; @@ -1803,7 +1803,7 @@ bool EffectEqualization::HandleXMLTag(const wxChar *tag, const wxChar **attrs) return true; } - // Located a new point + // Located a NEW point if( !wxStrcmp( tag, wxT("point") ) ) { // Set defaults in case attributes are missing @@ -1837,7 +1837,7 @@ bool EffectEqualization::HandleXMLTag(const wxChar *tag, const wxChar **attrs) } } - // Create a new point + // Create a NEW point mCurves[ mCurves.GetCount() - 1 ].points.Add( EQPoint( f, d ) ); // Tell caller it was processed @@ -1884,7 +1884,7 @@ void EffectEqualization::WriteXML(XMLWriter &xmlFile) int curve; for( curve = 0; curve < numCurves; curve++ ) { - // Start a new curve + // Start a NEW curve xmlFile.StartTag( wxT( "curve" ) ); xmlFile.WriteAttr( wxT( "name" ), mCurves[ curve ].Name ); @@ -1893,7 +1893,7 @@ void EffectEqualization::WriteXML(XMLWriter &xmlFile) int point; for( point = 0; point < numPoints; point++ ) { - // Write new point + // Write NEW point xmlFile.StartTag( wxT( "point" ) ); xmlFile.WriteAttr( wxT( "f" ), mCurves[ curve ].points[ point ].Freq, 12 ); xmlFile.WriteAttr( wxT( "d" ), mCurves[ curve ].points[ point ].dB, 12 ); @@ -2516,7 +2516,7 @@ void EffectEqualization::OnSliderDBMAX(wxCommandEvent & WXUNUSED(event)) // void EffectEqualization::OnCurve(wxCommandEvent & WXUNUSED(event)) { - // Select new curve + // Select NEW curve setCurve( mCurve->GetCurrentSelection() ); if( !mDrawMode ) UpdateGraphic(); @@ -3222,11 +3222,11 @@ void EditCurvesDialog::OnRename(wxCommandEvent & WXUNUSED(event)) } } else if( item == (numCurves-1) ) // renaming 'unnamed' - { // Create a new entry + { // Create a NEW entry mEditCurves.Add( EQCurve( wxT("unnamed") ) ); // Copy over the points mEditCurves[ numCurves ].points = mEditCurves[ numCurves - 1 ].points; - // Give the original unnamed entry the new name + // Give the original unnamed entry the NEW name mEditCurves[ numCurves - 1 ].Name = name; numCurves++; } diff --git a/src/effects/Equalization48x.cpp b/src/effects/Equalization48x.cpp index cb2366cf0..1d93e43e7 100644 --- a/src/effects/Equalization48x.cpp +++ b/src/effects/Equalization48x.cpp @@ -516,7 +516,7 @@ bool EffectEqualization48x::ProcessTail(WaveTrack * t, WaveTrack * output, sampl //output has one waveclip for the total length, even though //t might have whitespace seperating multiple clips //we want to maintain the original clip structure, so - //only paste the intersections of the new clip. + //only paste the intersections of the NEW clip. //Find the bits of clips that need replacing std::vector > clipStartEndTimes; @@ -539,18 +539,18 @@ bool EffectEqualization48x::ProcessTail(WaveTrack * t, WaveTrack * output, sampl clipRealStartEndTimes.push_back(std::pair(clipStartT,clipEndT)); if( clipStartT < startT ) // does selection cover the whole clip? - clipStartT = startT; // don't copy all the new clip + clipStartT = startT; // don't copy all the NEW clip if( clipEndT > startT + lenT ) // does selection cover the whole clip? - clipEndT = startT + lenT; // don't copy all the new clip + clipEndT = startT + lenT; // don't copy all the NEW clip //save them clipStartEndTimes.push_back(std::pair(clipStartT,clipEndT)); } - //now go thru and replace the old clips with new + //now go thru and replace the old clips with NEW for(unsigned int i=0;iClear(clipStartEndTimes[i].first,clipStartEndTimes[i].second); // output->Copy(clipStartEndTimes[i].first-startT+offsetT0,clipStartEndTimes[i].second-startT+offsetT0, &toClipOutput); output->Copy(clipStartEndTimes[i].first-startT,clipStartEndTimes[i].second-startT, &toClipOutput); diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 191414b3b..eb542c15a 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -1034,7 +1034,7 @@ void EffectNoiseReduction::Worker::GatherStatistics(Statistics &statistics) ++statistics.mTrackWindows; { - // new statistics + // NEW statistics const float *pPower = &mQueue[0]->mSpectrums[0]; float *pSum = &statistics.mSums[0]; for (int jj = 0; jj < mSpectrumSize; ++jj) { @@ -1080,7 +1080,7 @@ bool EffectNoiseReduction::Worker::Classify(const Statistics &statistics, int ba } #endif // New methods suppose an exponential distribution of power values - // in the noise; new sensitivity is meant to be log of probability + // in the noise; NEW sensitivity is meant to be log of probability // that noise strays above the threshold. Call that probability // 1 - F. The quantile function of an exponential distribution is // log (1 - F) * mean. Thus simply multiply mean by sensitivity @@ -1568,7 +1568,7 @@ void EffectNoiseReduction::Dialog::DisableControlsIfIsolating() // If Isolate is chosen, disable controls that define // "what to do with noise" rather than "what is noise." // Else, enable them. - // This does NOT include sensitivity, new or old, nor + // This does NOT include sensitivity, NEW or old, nor // the choice of window functions, size, or step. // The method choice is not included, because it affects // which sensitivity slider is operative, and that is part diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp index b7043b62f..36597d854 100644 --- a/src/effects/NoiseRemoval.cpp +++ b/src/effects/NoiseRemoval.cpp @@ -433,7 +433,7 @@ void EffectNoiseRemoval::RotateHistoryWindows() mImagFFTs[i] = mImagFFTs[i-1]; } - // Reuse the last buffers as the new first window + // Reuse the last buffers as the NEW first window mSpectrums[0] = lastSpectrum; mGains[0] = lastGain; mRealFFTs[0] = lastRealFFT; diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index c6d5e32a5..1144cae4d 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -412,17 +412,17 @@ void PaulStretch::set_rap(float newrap) void PaulStretch::process(float *smps,int nsmps) { - //add new samples to the pool + //add NEW samples to the pool if ((smps!=NULL)&&(nsmps!=0)){ if (nsmps>poolsize){ nsmps=poolsize; } int nleft=poolsize-nsmps; - //move left the samples from the pool to make room for new samples + //move left the samples from the pool to make room for NEW samples for (int i=0;iGetTrackFactory()->NewWaveTrack(floatSample, mLeftTrack->GetRate()); } diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index 9d4126ec0..6a20b529a 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -447,7 +447,7 @@ bool EffectTruncSilence::DoRemoval if ((r->end - r->start) < (mInitialAllowedSilence - 0.000000001)) continue; - // Find new silence length as requested + // Find NEW silence length as requested double inLength = r->end - r->start; double outLength; diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index a1922363d..0614e0b5c 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -2051,7 +2051,7 @@ bool VSTEffect::Load() return false; } - // Try to locate the new plugin entry point + // Try to locate the NEW plugin entry point pluginMain = (vstPluginMain) dlsym(mModule, "VSTPluginMain"); // If not found, try finding the old entry point diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp index 01817d4cc..642e83d17 100644 --- a/src/effects/ladspa/LadspaEffect.cpp +++ b/src/effects/ladspa/LadspaEffect.cpp @@ -1449,7 +1449,7 @@ bool LadspaEffect::PopulateUI(wxWindow *parent) wxSize sz2 = mParent->GetMinSize(); w->SetSizeHints(wxSize(wxMin(sz1.x, sz2.x), wxMin(sz1.y, sz2.y))); - // And let the parent reduce to the new minimum if possible + // And let the parent reduce to the NEW minimum if possible mParent->SetSizeHints(-1, -1); return true; diff --git a/src/effects/ladspa/ladspa.h b/src/effects/ladspa/ladspa.h index b1a9c4e59..5d864b993 100644 --- a/src/effects/ladspa/ladspa.h +++ b/src/effects/ladspa/ladspa.h @@ -111,7 +111,7 @@ typedef int LADSPA_Properties; satisfy all of the following: (1) The plugin must not use malloc(), free() or other heap memory - management within its run() or run_adding() functions. All new + management within its run() or run_adding() functions. All NEW memory used in run() must be managed via the stack. These restrictions only apply to the run() function. @@ -381,7 +381,7 @@ typedef struct _LADSPA_Descriptor { /* This identifier can be used as a unique, case-sensitive identifier for the plugin type within the plugin file. Plugin types should be identified by file and label rather than by index - or plugin name, which may be changed in new plugin + or plugin name, which may be changed in NEW plugin versions. Labels must not contain white-space characters. */ const char * Label; @@ -426,7 +426,7 @@ typedef struct _LADSPA_Descriptor { void * ImplementationData; /* This member is a function pointer that instantiates a plugin. A - handle is returned indicating the new plugin instance. The + handle is returned indicating the NEW plugin instance. The instantiation function accepts a sample rate as a parameter. The plugin descriptor from which this instantiate function was found must also be passed. This function must return NULL if diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index b39885492..800185913 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -1857,7 +1857,7 @@ bool LV2Effect::BuildPlain() wxSize sz2 = mParent->GetMinSize(); w->SetSizeHints(wxSize(-1, wxMin(sz1.y, sz2.y))); - // And let the parent reduce to the new minimum if possible + // And let the parent reduce to the NEW minimum if possible mParent->SetSizeHints(w->GetMinSize()); TransferDataToWindow(); diff --git a/src/effects/nyquist/LoadNyquist.cpp b/src/effects/nyquist/LoadNyquist.cpp index 77764ee08..e39838ee1 100644 --- a/src/effects/nyquist/LoadNyquist.cpp +++ b/src/effects/nyquist/LoadNyquist.cpp @@ -196,7 +196,7 @@ wxArrayString NyquistEffectsModule::FindPlugins(PluginManagerInterface & pm) // Load .ny plug-ins pm.FindFilesInPathList(wxT("*.ny"), pathList, files); - // LLL: Works for all platform with new plugin support (dups are removed) + // LLL: Works for all platform with NEW plugin support (dups are removed) pm.FindFilesInPathList(wxT("*.NY"), pathList, files); // Ed's fix for bug 179 return files; diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp index 4f4e00fbc..d956fe9b0 100644 --- a/src/effects/vamp/VampEffect.cpp +++ b/src/effects/vamp/VampEffect.cpp @@ -414,7 +414,7 @@ bool VampEffect::Process() { // if there is another track beyond this one and any linked one, // then we're processing more than one track. That means we - // should use the originating track name in each new label + // should use the originating track name in each NEW label // track's name, to make clear which is which multiple = true; } diff --git a/src/export/Export.cpp b/src/export/Export.cpp index c228ee62b..eba071971 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -93,7 +93,7 @@ bool ExportPlugin::CheckFileName(wxFileName & WXUNUSED(filename), int WXUNUSED(f return true; } -/** \brief Add a new entry to the list of formats this plug-in can export +/** \brief Add a NEW entry to the list of formats this plug-in can export * * To configure the format use SetFormat, SetCanMetaData etc with the index of * the format. diff --git a/src/export/ExportCL.h b/src/export/ExportCL.h index 680edabef..8bd024395 100644 --- a/src/export/ExportCL.h +++ b/src/export/ExportCL.h @@ -15,7 +15,7 @@ class ExportPlugin; /** The only part of this class which is publically accessible is the - * factory method New_ExportCL() which creates a new ExportCL object and + * factory method New_ExportCL() which creates a NEW ExportCL object and * returns a pointer to it. The rest of the class declaration is in ExportCL.cpp */ ExportPlugin *New_ExportCL(); diff --git a/src/export/ExportFFmpeg.h b/src/export/ExportFFmpeg.h index 02e1ef8fd..6351c4074 100644 --- a/src/export/ExportFFmpeg.h +++ b/src/export/ExportFFmpeg.h @@ -14,7 +14,7 @@ LRN class ExportPlugin; /** The only part of this class which is publically accessible is the - * factory method New_ExportFFmpeg() which creates a new ExportFFmpeg object and + * factory method New_ExportFFmpeg() which creates a NEW ExportFFmpeg object and * returns a pointer to it. The rest of the class declaration is in ExportFFmpeg.cpp */ ExportPlugin *New_ExportFFmpeg(); diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 0b1308a1b..65b730379 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -1621,7 +1621,7 @@ int ExportFFmpegOptions::FetchCompatibleCodecList(const wxChar *fmt, AVCodecID i // If it exists, is audio and has encoder if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && av_codec_is_encoder(codec)) { - // If it was selected - remember it's new index + // If it was selected - remember it's NEW index if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount(); mShownCodecNames.Add(wxString::FromUTF8(codec->name)); mShownCodecLongNames.Add(wxString::Format(wxT("%s - %s"),mShownCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str())); @@ -1646,7 +1646,7 @@ int ExportFFmpegOptions::FetchCompatibleCodecList(const wxChar *fmt, AVCodecID i } } // Format is not found - find format in libavformat and add it's default audio codec - // This allows us to provide limited support for new formats without modifying the compatibility list + // This allows us to provide limited support for NEW formats without modifying the compatibility list else if (found == 0) { wxCharBuffer buf = str.ToUTF8(); @@ -1662,7 +1662,7 @@ int ExportFFmpegOptions::FetchCompatibleCodecList(const wxChar *fmt, AVCodecID i } } } - // Show new codec list + // Show NEW codec list mCodecList->Append(mShownCodecNames); return index; diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h index d538d89ba..255bf4733 100644 --- a/src/export/ExportFFmpegDialogs.h +++ b/src/export/ExportFFmpegDialogs.h @@ -277,7 +277,7 @@ private: /// Retreives a list of formats compatible to codec ///\param id Codec ID ///\param selfmt format selected at the moment - ///\return index of the selfmt in new format list or -1 if it is not in the list + ///\return index of the selfmt in NEW format list or -1 if it is not in the list int FetchCompatibleFormatList(AVCodecID id, wxString *selfmt); /// Retreives codec list from libavcodec @@ -286,7 +286,7 @@ private: /// Retreives a list of codecs compatible to format ///\param fmt Format short name ///\param id id of the codec selected at the moment - ///\return index of the id in new codec list or -1 if it is not in the list + ///\return index of the id in NEW codec list or -1 if it is not in the list int FetchCompatibleCodecList(const wxChar *fmt, AVCodecID id); /// Retreives list of presets from configuration file diff --git a/src/export/ExportFLAC.h b/src/export/ExportFLAC.h index 4be233f9a..bf22afc17 100644 --- a/src/export/ExportFLAC.h +++ b/src/export/ExportFLAC.h @@ -14,7 +14,7 @@ class ExportPlugin; /* The only part of this class which is publically accessible is the - * factory method New_ExportFLAC() which creates a new ExportFLAC object and + * factory method New_ExportFLAC() which creates a NEW ExportFLAC object and * returns a pointer to it. The rest of the class declaration is in ExportFLAC.cpp */ ExportPlugin *New_ExportFLAC(); diff --git a/src/export/ExportMP2.h b/src/export/ExportMP2.h index b3eca0b53..0e60b2e84 100644 --- a/src/export/ExportMP2.h +++ b/src/export/ExportMP2.h @@ -15,7 +15,7 @@ class ExportPlugin; /** The only part of this class which is publically accessible is the - * factory method New_ExportMP2() which creates a new ExportMP2 object and + * factory method New_ExportMP2() which creates a NEW ExportMP2 object and * returns a pointer to it. The rest of the class declaration is in ExportMP2.cpp */ ExportPlugin *New_ExportMP2(); diff --git a/src/export/ExportMP3.h b/src/export/ExportMP3.h index 18d3fc90c..732998508 100644 --- a/src/export/ExportMP3.h +++ b/src/export/ExportMP3.h @@ -16,7 +16,7 @@ class ExportPlugin; class wxString; class wxWindow; -/** Factory method New_ExportMP3() which creates a new ExportMP3 object and +/** Factory method New_ExportMP3() which creates a NEW ExportMP3 object and * returns a pointer to it. The rest of the class declaration is in ExportMP3.cpp */ ExportPlugin *New_ExportMP3(); diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index 20d33ee06..15369b27a 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -239,7 +239,7 @@ int ExportOGG::Export(AudacityProject *project, ogg_stream_packetin(&stream, &codebook_header); // Flushing these headers now guarentees that audio data will - // start on a new page, which apparently makes streaming easier + // start on a NEW page, which apparently makes streaming easier while (ogg_stream_flush(&stream, &page)) { outFile.Write(page.header, page.header_len); outFile.Write(page.body, page.body_len); diff --git a/src/export/ExportOGG.h b/src/export/ExportOGG.h index d8db236fe..76fdbfbc4 100644 --- a/src/export/ExportOGG.h +++ b/src/export/ExportOGG.h @@ -14,7 +14,7 @@ class ExportPlugin; /** The only part of this class which is publically accessible is the - * factory method New_ExportOGG() which creates a new ExportOGG object and + * factory method New_ExportOGG() which creates a NEW ExportOGG object and * returns a pointer to it. The rest of the class declaration is in ExportOGG.cpp */ ExportPlugin *New_ExportOGG(); diff --git a/src/export/ExportPCM.h b/src/export/ExportPCM.h index d53f19663..b6d8c552f 100644 --- a/src/export/ExportPCM.h +++ b/src/export/ExportPCM.h @@ -14,7 +14,7 @@ class ExportPlugin; /** The only part of this class which is publically accessible is the - * factory method New_ExportPCM() which creates a new ExportPCM object and + * factory method New_ExportPCM() which creates a NEW ExportPCM object and * returns a pointer to it. The rest of the class declaration is in ExportPCM.cpp */ ExportPlugin *New_ExportPCM(); diff --git a/src/import/Import.h b/src/import/Import.h index 72c2b82e7..5f8be945e 100644 --- a/src/import/Import.h +++ b/src/import/Import.h @@ -133,7 +133,7 @@ public: ExtImportItems *GetImportItems() { return mExtImportItems; }; /** - * Allocates new ExtImportItem, fills it with default data + * Allocates NEW ExtImportItem, fills it with default data * and returns a pointer to it. */ ExtImportItem *CreateDefaultImportItem(); diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp index b4cdbb3d4..df0a5d345 100644 --- a/src/import/ImportFFmpeg.cpp +++ b/src/import/ImportFFmpeg.cpp @@ -506,7 +506,7 @@ int FFmpegImportFileHandle::Import(TrackFactory *trackFactory, break; } - // There is a possibility that number of channels will change over time, but we do not have WaveTracks for new channels. Remember the number of channels and stick to it. + // There is a possibility that number of channels will change over time, but we do not have WaveTracks for NEW channels. Remember the number of channels and stick to it. mScs[s]->m_initialchannels = mScs[s]->m_stream->codec->channels; mChannels[s] = new WaveTrack *[mScs[s]->m_stream->codec->channels]; int c; @@ -682,7 +682,7 @@ int FFmpegImportFileHandle::Import(TrackFactory *trackFactory, *outNumTracks += mScs[s]->m_initialchannels; } - // Create new tracks + // Create NEW tracks *outTracks = new Track *[*outNumTracks]; // Copy audio from mChannels to newly created tracks (destroying mChannels elements in process) diff --git a/src/import/ImportGStreamer.cpp b/src/import/ImportGStreamer.cpp index 6f52198a2..6ec123b27 100644 --- a/src/import/ImportGStreamer.cpp +++ b/src/import/ImportGStreamer.cpp @@ -156,7 +156,7 @@ public: ///\param tags - List of tags void OnTag(GstAppSink *appsink, GstTagList *tags); - ///! Called when a new samples are queued + ///! Called when a NEW samples are queued ///\param c - stream context ///\param sample - gstreamer sample void OnNewSample(GStreamContext *c, GstSample *sample); @@ -426,7 +426,7 @@ GStreamerPadRemovedCallback(GstElement * WXUNUSED(element), } // ---------------------------------------------------------------------------- -// Handle the "new-sample" signal from uridecodebin +// Handle the "NEW-sample" signal from uridecodebin static GstFlowReturn GStreamerNewSample(GstAppSink *appsink, gpointer data) { @@ -495,7 +495,7 @@ GStreamerImportFileHandle::OnPadAdded(GstPad *pad) return; } - // Allocate a new stream context + // Allocate a NEW stream context GStreamContext *c = g_new0(GStreamContext, 1); if (!c) { @@ -655,11 +655,11 @@ GStreamerImportFileHandle::OnPadRemoved(GstPad *pad) } // ---------------------------------------------------------------------------- -// Handle the "new-sample" message +// Handle the "NEW-sample" message void GStreamerImportFileHandle::OnNewSample(GStreamContext *c, GstSample *sample) { - // Allocate new tracks + // Allocate NEW tracks // // It is done here because, at least in the case of chained oggs, // not all streams are known ahead of time. @@ -1135,7 +1135,7 @@ GStreamerImportFileHandle::Import(TrackFactory *trackFactory, } } - // Create new tracks + // Create NEW tracks *outTracks = new Track *[*outNumTracks]; // Copy audio from mChannels to newly created tracks (destroying mChannels in process) diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp index 31058691f..8321cd476 100644 --- a/src/import/ImportLOF.cpp +++ b/src/import/ImportLOF.cpp @@ -38,16 +38,16 @@ file "C:\sample2.wav" offset 5 # sample2 is displayed with a 5s offset File "C:\sample3.wav" # sample3 is displayed with no offset File "foo.aiff" # foo is loaded from the same directory as the LOF file - window offset 5 duration 10 # open a new window, zoom to display + window offset 5 duration 10 # open a NEW window, zoom to display # 10 seconds total starting at 5 (ending at 15) seconds file "C:\sample3.wav" offset 2.5 \endverbatim SEMANTICS: - There are two commands: "window" creates a new window, and "file" + There are two commands: "window" creates a NEW window, and "file" appends a track to the current window and displays the file there. The - first file is always placed in a new window, whether or not an initial + first file is always placed in a NEW window, whether or not an initial "window" command is given. Commands have optional keyword parameters that may be listed in any @@ -145,7 +145,7 @@ private: interpret relative paths in it */ AudacityProject *mProject; - // In order to know whether or not to create a new window + // In order to know whether or not to create a NEW window bool windowCalledOnce; // In order to zoom in, it must be done after files are opened diff --git a/src/import/ImportLOF.h b/src/import/ImportLOF.h index 912725df0..df89b9ec5 100644 --- a/src/import/ImportLOF.h +++ b/src/import/ImportLOF.h @@ -26,15 +26,15 @@ file "C:\folder1\sample1.wav" # sample1.wav is displayed file "C:\sample2.wav" offset 5 # sample2 is displayed with a 5s offset File "C:\sample3.wav" # sample3 is displayed with no offset - window offset 5 duration 10 # open a new window, zoom to display + window offset 5 duration 10 # open a NEW window, zoom to display # 10 seconds total starting at 5 (ending at 15) seconds file "C:\sample3.wav" offset 2.5 SEMANTICS: - There are two commands: "window" creates a new window, and "file" + There are two commands: "window" creates a NEW window, and "file" appends a track to the current window and displays the file there. The - first file is always placed in a new window, whether or not an initial + first file is always placed in a NEW window, whether or not an initial "window" command is given. Commands have optional keyword parameters that may be listed in any diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index f0b3c6b16..2c1087050 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -441,7 +441,7 @@ enum mad_flow input_cb(void *_data, struct mad_stream *stream) * your existing buffer from stream.next_frame to the end. * * This usually amounts to calling memmove() on this unconsumed portion - * of the buffer and appending new data after it, before calling + * of the buffer and appending NEW data after it, before calling * mad_stream_buffer()" * -- Rob Leslie, on the mad-dev mailing list */ diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h index 775a85aea..ce5ec31a6 100644 --- a/src/import/ImportPlugin.h +++ b/src/import/ImportPlugin.h @@ -74,7 +74,7 @@ public: // Get unique string ID of this plugin, usually it corresponds // to the underlying library, i.e. "libsndfile", "libflac", "libav" - // These MUST NOT change across Audacity versions (but new IDs can + // These MUST NOT change across Audacity versions (but NEW IDs can // be added). virtual wxString GetPluginStringID() = 0; diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp index a2ff6e07d..a7fd17cf2 100644 --- a/src/import/RawAudioGuess.cpp +++ b/src/import/RawAudioGuess.cpp @@ -714,7 +714,7 @@ static int Guess16Bit(int numTests, char **rawData, float signL, signR, unsignL, unsignR; int i; - /* Extract a new array of the MSBs only: */ + /* Extract a NEW array of the MSBs only: */ for (i = 0; i < dataSize / 2; i++) rawData2[i] = rawData[test][2 * i + (evenMSB ? 0 : 1)]; @@ -765,7 +765,7 @@ static int Guess16Bit(int numTests, char **rawData, float leftChannel, rightChannel, combinedChannel; int i; - /* Extract a new array of the MSBs only: */ + /* Extract a NEW array of the MSBs only: */ for (i = 0; i < dataSize / 2; i++) rawData2[i] = rawData[test][2 * i + (evenMSB ? 0 : 1)]; @@ -806,7 +806,7 @@ static int Guess16Bit(int numTests, char **rawData, float redundant; int i; - /* Extract a new array of the MSBs only: */ + /* Extract a NEW array of the MSBs only: */ for (i = 0; i < dataSize / 2; i++) rawData2[i] = rawData[test][2 * i + (evenMSB ? 0 : 1)]; @@ -858,7 +858,7 @@ static int Guess16Bit(int numTests, char **rawData, float former, latter; int i, offs; - /* Extract a new array of the MSBs only: */ + /* Extract a NEW array of the MSBs only: */ if (guessStereo) for (i = 0; i < (dataSize/4)-1; i++) diff --git a/src/ondemand/ODComputeSummaryTask.cpp b/src/ondemand/ODComputeSummaryTask.cpp index 1d818fb03..12a8693d9 100644 --- a/src/ondemand/ODComputeSummaryTask.cpp +++ b/src/ondemand/ODComputeSummaryTask.cpp @@ -27,7 +27,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data. //36 blockfiles > 3 minutes stereo 44.1kHz per ODTask::DoSome #define kNumBlockFilesPerDoSome 36 -///Creates a new task that computes summaries for a wavetrack that needs to be specified through SetWaveTrack() +///Creates a NEW task that computes summaries for a wavetrack that needs to be specified through SetWaveTrack() ODComputeSummaryTask::ODComputeSummaryTask() { mMaxBlockFiles = 0; @@ -229,7 +229,7 @@ void ODComputeSummaryTask::Update() } mWaveTrackMutex.Unlock(); - //get the new order. + //get the NEW order. mBlockFilesMutex.Lock(); OrderBlockFiles(tempBlocks); mBlockFilesMutex.Unlock(); diff --git a/src/ondemand/ODDecodeFFmpegTask.cpp b/src/ondemand/ODDecodeFFmpegTask.cpp index fdeb06311..82a5e1f1d 100644 --- a/src/ondemand/ODDecodeFFmpegTask.cpp +++ b/src/ondemand/ODDecodeFFmpegTask.cpp @@ -114,7 +114,7 @@ ODDecodeFFmpegTask::ODDecodeFFmpegTask(void* scs,int numStreams, WaveTrack*** ch mChannels=channels; mFormatContext = formatContext; mStreamIndex = streamIndex; - //TODO we probably need to create a new WaveTrack*** pointer and copy. + //TODO we probably need to create a NEW WaveTrack*** pointer and copy. //same for streamContext, but we should also use a ref counting system - this should be added to streamContext // mScs = (streamContext**)malloc(sizeof(streamContext**)*mFormatContext->nb_streams); } @@ -185,7 +185,7 @@ bool ODFFmpegDecoder::SeekingAllowed() if(!audioStreamExists) goto test_failed; //TODO: now try a seek and see if dts/pts (decode/presentation timestamp) is updated as we expected it to be. - //This should be done using a new AVFormatContext clone so that we don't ruin the file pointer if we fail. + //This should be done using a NEW AVFormatContext clone so that we don't ruin the file pointer if we fail. // url_fseek(mFormatContext->pb,0,SEEK_SET); @@ -308,7 +308,7 @@ int ODFFmpegDecoder::Decode(SampleBuffer & data, sampleFormat & format, sampleCo //TODO update this to work with seek - this only works linearly now. if(mCurrentPos > start && mCurrentPos <= start+len + kDecodeSampleAllowance) { - //this next call takes data, start and len as reference variables and updates them to reflect the new area that is needed. + //this next call takes data, start and len as reference variables and updates them to reflect the NEW area that is needed. FillDataFromCache(bufStart, format, start,len,channel); } @@ -448,10 +448,10 @@ int ODFFmpegDecoder::Decode(SampleBuffer & data, sampleFormat & format, sampleCo } } - //this next call takes data, start and len as reference variables and updates them to reflect the new area that is needed. + //this next call takes data, start and len as reference variables and updates them to reflect the NEW area that is needed. FillDataFromCache(bufStart, format, start, len, channel); - // CHECK: not sure if we need this. In any case it has to be updated for the new float case (not just int16) + // CHECK: not sure if we need this. In any case it has to be updated for the NEW float case (not just int16) //if for some reason we couldn't get the samples, fill them with silence /* int16_t* outBuf = (int16_t*) bufStart; @@ -466,7 +466,7 @@ int ODFFmpegDecoder::Decode(SampleBuffer & data, sampleFormat & format, sampleCo // the minimum amount of cache entries necessary to warrant a binary search. #define kODFFmpegSearchThreshold 10 ///returns the number of samples filled in from start. -//also updates data and len to reflect new unfilled area - start is unmodified. +//also updates data and len to reflect NEW unfilled area - start is unmodified. int ODFFmpegDecoder::FillDataFromCache(samplePtr & data, sampleFormat outFormat, sampleCount &start, sampleCount& len, unsigned int channel) { if(mDecodeCache.size() <= 0) @@ -600,7 +600,7 @@ int ODFFmpegDecoder::DecodeFrame(streamContext *sc, bool flushing) //stick it in the cache. //TODO- consider growing/unioning a few cache buffers like WaveCache does. //however we can't use wavecache as it isn't going to handle our stereo interleaved part, and isn't for samples - //However if other ODDecode tasks need this, we should do a new class for caching. + //However if other ODDecode tasks need this, we should do a NEW class for caching. FFMpegDecodeCache* cache = new FFMpegDecodeCache; //len is number of samples per channel cache->numChannels = sc->m_stream->codec->channels; @@ -630,7 +630,7 @@ void ODFFmpegDecoder::InsertCache(FFMpegDecodeCache* cache) { //check greater than OR equals because we want to insert infront of old dupes. if(mDecodeCache[guess]->start>= cache->start) { // if(mDecodeCache[guess]->start == cache->start) { -// printf("dupe! start cache %llu start new cache %llu, mCurrentPos %llu\n",mDecodeCache[guess]->start, cache->start, mCurrentPos); +// printf("dupe! start cache %llu start NEW cache %llu, mCurrentPos %llu\n",mDecodeCache[guess]->start, cache->start, mCurrentPos); // } searchEnd = guess; } diff --git a/src/ondemand/ODDecodeTask.cpp b/src/ondemand/ODDecodeTask.cpp index b0867f5a4..652f3c490 100644 --- a/src/ondemand/ODDecodeTask.cpp +++ b/src/ondemand/ODDecodeTask.cpp @@ -22,7 +22,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data. #include "../WaveTrack.h" #include -///Creates a new task that computes summaries for a wavetrack that needs to be specified through SetWaveTrack() +///Creates a NEW task that computes summaries for a wavetrack that needs to be specified through SetWaveTrack() ODDecodeTask::ODDecodeTask() { mMaxBlockFiles = 0; @@ -184,7 +184,7 @@ void ODDecodeTask::Update() } mWaveTrackMutex.Unlock(); - //get the new order. + //get the NEW order. OrderBlockFiles(tempBlocks); } diff --git a/src/ondemand/ODManager.cpp b/src/ondemand/ODManager.cpp index fe0db3f91..b39326b95 100644 --- a/src/ondemand/ODManager.cpp +++ b/src/ondemand/ODManager.cpp @@ -134,7 +134,7 @@ void ODManager::RemoveTaskIfInQueue(ODTask* task) } -///Adds a new task to the queue. Creates a queue if the tracks associated with the task is not in the list +///Adds a NEW task to the queue. Creates a queue if the tracks associated with the task is not in the list /// ///@param task the task to add ///@param lockMutex locks the mutexes if true (default). This function is used within other ODManager calls, which many need to set this to false. @@ -161,7 +161,7 @@ void ODManager::AddNewTask(ODTask* task, bool lockMutex) } else { - //Make a new one, add it to the local track queue, and to the immediate running task list, + //Make a NEW one, add it to the local track queue, and to the immediate running task list, //since this task is definitely at the head queue = new ODWaveTrackTaskQueue(); queue->AddTask(task); @@ -251,7 +251,7 @@ void ODManager::Start() mTerminateMutex.Unlock(); // printf("ODManager thread running \n"); - //we should look at our WaveTrack queues to see if we can process a new task to the running queue. + //we should look at our WaveTrack queues to see if we can process a NEW task to the running queue. UpdateQueues(); //start some threads if necessary @@ -272,7 +272,7 @@ void ODManager::Start() mCurrentThreadsMutex.Unlock(); mTasksMutex.Lock(); - //detach a new thread. + //detach a NEW thread. thread = new ODTaskThread(mTasks[0]);//task); //thread->SetPriority(10);//default is 50. thread->Create(); @@ -404,7 +404,7 @@ void ODManager::ReplaceWaveTrack(WaveTrack* oldTrack,WaveTrack* newTrack) mQueuesMutex.Unlock(); } -///if it shares a queue/task, creates a new queue/task for the track, and removes it from any previously existing tasks. +///if it shares a queue/task, creates a NEW queue/task for the track, and removes it from any previously existing tasks. void ODManager::MakeWaveTrackIndependent(WaveTrack* track) { ODWaveTrackTaskQueue* owner=NULL; @@ -485,7 +485,7 @@ void ODManager::DemandTrackUpdate(WaveTrack* track, double seconds) mQueuesMutex.Unlock(); } -///remove tasks from ODWaveTrackTaskQueues that have been done. Schedules new ones if they exist +///remove tasks from ODWaveTrackTaskQueues that have been done. Schedules NEW ones if they exist ///Also remove queues that have become empty. void ODManager::UpdateQueues() { diff --git a/src/ondemand/ODManager.h b/src/ondemand/ODManager.h index b4cbd503f..4937eea16 100644 --- a/src/ondemand/ODManager.h +++ b/src/ondemand/ODManager.h @@ -70,7 +70,7 @@ class ODManager ///removes a wavetrack and notifies its associated tasks to stop using its reference. void RemoveWaveTrack(WaveTrack* track); - ///if it shares a queue/task, creates a new queue/task for the track, and removes it from any previously existing tasks. + ///if it shares a queue/task, creates a NEW queue/task for the track, and removes it from any previously existing tasks. void MakeWaveTrackIndependent(WaveTrack* track); ///attach the track in question to another, already existing track's queues and tasks. Remove the task/tracks. @@ -126,7 +126,7 @@ class ODManager ///Start the main loop for the manager. void Start(); - ///Remove references in our array to Tasks that have been completed/Schedule new ones + ///Remove references in our array to Tasks that have been completed/Schedule NEW ones void UpdateQueues(); //instance diff --git a/src/ondemand/ODTask.cpp b/src/ondemand/ODTask.cpp index 350ec71d4..774118b67 100644 --- a/src/ondemand/ODTask.cpp +++ b/src/ondemand/ODTask.cpp @@ -356,7 +356,7 @@ void ODTask::StopUsingWaveTrack(WaveTrack* track) mWaveTrackMutex.Unlock(); } -///Replaces all instances to a wavetrack with a new one, effectively transferring the task. +///Replaces all instances to a wavetrack with a NEW one, effectively transferring the task. void ODTask::ReplaceWaveTrack(WaveTrack* oldTrack,WaveTrack* newTrack) { mWaveTrackMutex.Lock(); diff --git a/src/ondemand/ODTask.h b/src/ondemand/ODTask.h index bfa87709f..e2faa5ea9 100644 --- a/src/ondemand/ODTask.h +++ b/src/ondemand/ODTask.h @@ -81,7 +81,7 @@ class ODTask virtual void StopUsingWaveTrack(WaveTrack* track); - ///Replaces all instances to a wavetrack with a new one, effectively transferring the task. + ///Replaces all instances to a wavetrack with a NEW one, effectively transferring the task. ///ODTask has no wavetrack, so it does nothing. But subclasses that do should override this. virtual void ReplaceWaveTrack(WaveTrack* oldTrack,WaveTrack* newTrack); diff --git a/src/ondemand/ODWaveTrackTaskQueue.cpp b/src/ondemand/ODWaveTrackTaskQueue.cpp index 3351cfc73..6ded46f5b 100644 --- a/src/ondemand/ODWaveTrackTaskQueue.cpp +++ b/src/ondemand/ODWaveTrackTaskQueue.cpp @@ -202,7 +202,7 @@ void ODWaveTrackTaskQueue::DemandTrackUpdate(WaveTrack* track, double seconds) } -//Replaces all instances of a wavetracck with a new one (effectively transferes the task.) +//Replaces all instances of a wavetracck with a NEW one (effectively transferes the task.) void ODWaveTrackTaskQueue::ReplaceWaveTrack(WaveTrack* oldTrack, WaveTrack* newTrack) { if(oldTrack) @@ -285,7 +285,7 @@ bool ODWaveTrackTaskQueue::IsFrontTaskComplete() mTasksMutex.Lock(); if(mTasks.size()) { - //there is a chance the task got updated and now has more to do, (like when it is joined with a new track) + //there is a chance the task got updated and now has more to do, (like when it is joined with a NEW track) //check. mTasks[0]->RecalculatePercentComplete(); bool ret; diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index b8b44c677..6da10858a 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -14,7 +14,7 @@ \brief A PrefsPanel for keybindings. The code for displaying keybindings is similar to code in MousePrefs. -It would be nice to create a new 'Bindings' class which both +It would be nice to create a NEW 'Bindings' class which both KeyConfigPrefs and MousePrefs use. *//*********************************************************************/ diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp index 01544b50b..b6afc548d 100644 --- a/src/prefs/ModulePrefs.cpp +++ b/src/prefs/ModulePrefs.cpp @@ -11,7 +11,7 @@ \class ModulePrefs \brief A PrefsPanel to enable/disable certain modules. 'Modules' are dynamically linked libraries that modify Audacity. They are plug-ins -with names like mnod-script-pipe that add new features. +with names like mnod-script-pipe that add NEW features. *//*******************************************************************/ @@ -27,7 +27,7 @@ with names like mnod-script-pipe that add new features. //////////////////////////////////////////////////////////////////////////////// -/* i18n-hint: Modules are optional extensions to Audacity that add new features.*/ +/* i18n-hint: Modules are optional extensions to Audacity that add NEW features.*/ ModulePrefs::ModulePrefs(wxWindow * parent) : PrefsPanel(parent, _("Modules")) { @@ -139,7 +139,7 @@ bool ModulePrefs::Apply() // static function that tells us about a module. int ModulePrefs::GetModuleStatus( wxString fname ){ - // Default status is new module, and we will ask once. + // Default status is NEW module, and we will ask once. int iStatus = kModuleNew; wxString ShortName = wxFileName( fname ).GetName(); diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h index c6cd0688d..bd01b147b 100644 --- a/src/prefs/PrefsPanel.h +++ b/src/prefs/PrefsPanel.h @@ -20,7 +20,7 @@ ThemePrefs. global preferences object gPrefs, and instructing the applicable parts of the program to re-read the preference options. - To actually add a the new panel, edit the PrefsDialog constructor + To actually add a the NEW panel, edit the PrefsDialog constructor to append the panel to its list of panels. *//*******************************************************************/ diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp index f6d947b3e..628448336 100644 --- a/src/prefs/ThemePrefs.cpp +++ b/src/prefs/ThemePrefs.cpp @@ -117,7 +117,7 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S) // This next button is only provided in Debug mode. // It is for developers who are compiling Audacity themselves - // and who who wish to generate a new ThemeAsCeeCode.h and compile it in. + // and who who wish to generate a NEW ThemeAsCeeCode.h and compile it in. #ifdef __WXDEBUG__ S.Id(idSaveThemeAsCode).AddButton(wxT("Output Sourcery")); #endif diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index 6202657d9..b801122d7 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -137,7 +137,7 @@ void ToolDock::Dock( ToolBar *bar, int before ) // Reset height bar->SetSize( bar->GetSize().x, bar->GetDockedSize().y ); - // Park the new bar in the correct berth + // Park the NEW bar in the correct berth if( before >= 0 && before < (int)mDockedBars.GetCount() ) { mDockedBars.Insert( bar, before ); @@ -231,7 +231,7 @@ void ToolDock::LayoutToolBars() // Calc the next possible horizontal location. int x = cpos.x + tw; - // Add a new stack entry + // Add a NEW stack entry stkcnt++; stack[ stkcnt ].SetX( x ); stack[ stkcnt ].SetY( cpos.y ); @@ -267,7 +267,7 @@ void ToolDock::LayoutToolBars() } // -// Determine the location and bar before which a new bar would be placed +// Determine the location and bar before which a NEW bar would be placed // // 'rect' will be the rectangle for the dock marker. int ToolDock::PositionBar( ToolBar *t, wxPoint & pos, wxRect & rect ) @@ -307,10 +307,10 @@ int ToolDock::PositionBar( ToolBar *t, wxPoint & pos, wxRect & rect ) // If last entry, then it is the if (ndx == cnt) { - // ...so check to see if the new bar has been placed yet + // ...so check to see if the NEW bar has been placed yet if (tindx == -1) { - // Add the new bars' dimensions to the mix + // Add the NEW bars' dimensions to the mix tinfo[ct].rect = t->GetRect(); tinfo[ct].min = t->GetDockedSize(); tindx = ct; @@ -325,7 +325,7 @@ int ToolDock::PositionBar( ToolBar *t, wxPoint & pos, wxRect & rect ) tinfo[ct].rect = b->GetRect(); tinfo[ct].min = b->GetSize(); - // Maybe insert the new bar if it hasn't already been done + // Maybe insert the NEW bar if it hasn't already been done // and is in the right place. if (tindx == -1) { @@ -340,7 +340,7 @@ int ToolDock::PositionBar( ToolBar *t, wxPoint & pos, wxRect & rect ) // Does the location fall within this bar? if (r.Contains(pos) || pos.y <= r.y) { - // Add the new bars' dimensions to the mix + // Add the NEW bars' dimensions to the mix tinfo[ct].rect = t->GetRect(); tinfo[ct].min = t->GetDockedSize(); tindx = ct; @@ -387,7 +387,7 @@ int ToolDock::PositionBar( ToolBar *t, wxPoint & pos, wxRect & rect ) // Calc the next possible horizontal location. int x = cpos.x + tw; - // Add a new stack entry + // Add a NEW stack entry stkcnt++; stack[stkcnt].SetX(x); stack[stkcnt].SetY(cpos.y); diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index 714566c10..32a7b9370 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -539,7 +539,7 @@ void ToolManager::Reset() // in turn floater will have mParent (the entire App) as its // parent. - // Maybe construct a new floater + // Maybe construct a NEW floater // this happens if we have just been bounced out of a dock. if( floater == NULL ) { floater = new ToolFrame( mParent, this, bar, wxPoint(-1,-1) ); @@ -709,7 +709,7 @@ void ToolManager::ReadConfig() - // Construct a new floater + // Construct a NEW floater ToolFrame *f = new ToolFrame( mParent, this, bar, wxPoint( x, y ) ); // Set the width and height @@ -1124,7 +1124,7 @@ void ToolManager::OnMouse( wxMouseEvent & event ) } // -// Deal with new capture lost event +// Deal with NEW capture lost event // void ToolManager::OnCaptureLost( wxMouseCaptureLostEvent & event ) { @@ -1240,7 +1240,7 @@ void ToolManager::OnGrabber( GrabberEvent & event ) mDragBar->SetDocked( NULL, true ); mDragBar->SetPositioned(); - // Construct a new floater + // Construct a NEW floater mDragWindow = new ToolFrame( mParent, this, mDragBar, mp ); // Make sure the ferry is visible diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index b348d9972..58338a6ad 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -816,7 +816,7 @@ void TranscriptionToolBar::OnAutomateSelection(wxCommandEvent & WXUNUSED(event)) if( newStart==start) break; - //Adjust len by the new start position + //Adjust len by the NEW start position len -= (newStart - start); //Adjust len by the minimum word size @@ -824,7 +824,7 @@ void TranscriptionToolBar::OnAutomateSelection(wxCommandEvent & WXUNUSED(event)) - //OK, now we have found a new starting point. A 'word' should be at least + //OK, now we have found a NEW starting point. A 'word' should be at least //50 ms long, so jump ahead minWordSize newEnd = mVk->OffForward(*(WaveTrack*)t,newStart+minWordSize, len); @@ -835,7 +835,7 @@ void TranscriptionToolBar::OnAutomateSelection(wxCommandEvent & WXUNUSED(event)) break; - //Adjust len by the new word end + //Adjust len by the NEW word end len -= (newEnd - newStart); //Calculate the start and end of the words, in seconds diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp index 53c775437..9253909b4 100644 --- a/src/widgets/ASlider.cpp +++ b/src/widgets/ASlider.cpp @@ -1392,8 +1392,8 @@ void LWSlider::SetSpeed(float speed) mSpeed = speed; } -// Given the mouse slider coordinate in fromPos, compute the new value -// of the slider when clicking to set a new position. +// Given the mouse slider coordinate in fromPos, compute the NEW value +// of the slider when clicking to set a NEW position. float LWSlider::ClickPositionToValue(int fromPos, bool shiftDown) { int nSpan; @@ -1436,7 +1436,7 @@ float LWSlider::ClickPositionToValue(int fromPos, bool shiftDown) return val; } -// Given the mouse slider coordinate in fromPos, compute the new value +// Given the mouse slider coordinate in fromPos, compute the NEW value // of the slider during a drag. float LWSlider::DragPositionToValue(int fromPos, bool shiftDown) { diff --git a/src/widgets/Grabber.cpp b/src/widgets/Grabber.cpp index aff2ce64e..b578b2a98 100644 --- a/src/widgets/Grabber.cpp +++ b/src/widgets/Grabber.cpp @@ -16,7 +16,7 @@ \class Grabber \brief The widget to the left of a ToolBar that allows it to be dragged -around to new positions. +around to NEW positions. *//**********************************************************************/ diff --git a/src/widgets/Grabber.h b/src/widgets/Grabber.h index 6e4257c72..4c336caf5 100644 --- a/src/widgets/Grabber.h +++ b/src/widgets/Grabber.h @@ -16,7 +16,7 @@ \class Grabber \brief The widget to the left of a ToolBar that allows it to be dragged -around to new positions. +around to NEW positions. *//**********************************************************************/ diff --git a/src/widgets/Grid.cpp b/src/widgets/Grid.cpp index f5bb68c24..a34ae0633 100644 --- a/src/widgets/Grid.cpp +++ b/src/widgets/Grid.cpp @@ -464,7 +464,7 @@ void Grid::OnKeyDown(wxKeyEvent &event) } #if wxUSE_ACCESSIBILITY - // Make sure the new cell is made available to the screen reader + // Make sure the NEW cell is made available to the screen reader mAx->SetCurrentCell(GetGridCursorRow(), GetGridCursorCol()); #endif } @@ -512,7 +512,7 @@ void Grid::OnKeyDown(wxKeyEvent &event) MakeCellVisible(GetGridCursorRow(), GetGridCursorCol()); #if wxUSE_ACCESSIBILITY - // Make sure the new cell is made available to the screen reader + // Make sure the NEW cell is made available to the screen reader mAx->SetCurrentCell(GetGridCursorRow(), GetGridCursorCol()); #endif } @@ -535,7 +535,7 @@ void Grid::OnKeyDown(wxKeyEvent &event) // This looks strange, but what it does is selects the cell when // enter is pressed after editing. Without it, Jaws and Window-Eyes - // do not speak the new cell contents (the one below the edited one). + // do not speak the NEW cell contents (the one below the edited one). SetGridCursor(GetGridCursorRow(), GetGridCursorCol()); } break; diff --git a/src/widgets/HelpSystem.h b/src/widgets/HelpSystem.h index 7bd744349..9e5b1a4c2 100644 --- a/src/widgets/HelpSystem.h +++ b/src/widgets/HelpSystem.h @@ -35,7 +35,7 @@ public: const wxString &message, const int xSize, const int ySize); - /// Displays a new window with wxHTML help. + /// Displays a NEW window with wxHTML help. /// @param HtmlText Either the literal HTML code to go into the window, /// or the name of the file to read said HTML code from (see below). /// @param bIsFile If true, treat HtmlText argument as a file name, if false diff --git a/src/widgets/HtmlWindow.cpp b/src/widgets/HtmlWindow.cpp index 2d4333d5c..959af8e41 100644 --- a/src/widgets/HtmlWindow.cpp +++ b/src/widgets/HtmlWindow.cpp @@ -16,7 +16,7 @@ \class HtmlWindow \brief The widget to the left of a ToolBar that allows it to be dragged -around to new positions. +around to NEW positions. *//**********************************************************************/ diff --git a/src/widgets/HtmlWindow.h b/src/widgets/HtmlWindow.h index a5418c691..6d7983de8 100644 --- a/src/widgets/HtmlWindow.h +++ b/src/widgets/HtmlWindow.h @@ -16,7 +16,7 @@ \class HtmlWindow \brief The widget to the left of a ToolBar that allows it to be dragged -around to new positions. +around to NEW positions. *//**********************************************************************/ diff --git a/src/widgets/KeyView.cpp b/src/widgets/KeyView.cpp index e900d5ebd..7339c5a7d 100644 --- a/src/widgets/KeyView.cpp +++ b/src/widgets/KeyView.cpp @@ -266,7 +266,7 @@ KeyView::SetKey(int index, const wxString & key) return false; } - // Set the new key + // Set the NEW key node.key = key; // Check to see if the key column needs to be expanded @@ -339,7 +339,7 @@ KeyView::SetView(ViewByType type) // Unselect any currently selected line...do even if none selected SelectNode(-1); - // Save new type + // Save NEW type mViewType = type; // Refresh the view lines @@ -512,7 +512,7 @@ KeyView::UpdateHScroll() } // -// Process a new set of bindings +// Process a NEW set of bindings // void KeyView::RefreshBindings(const wxArrayString & names, @@ -556,10 +556,10 @@ KeyView::RefreshBindings(const wxArrayString & names, cat += _("Menu"); } - // Process a new category + // Process a NEW category if (cat != lastcat) { - // A new category always finishes any current subtree + // A NEW category always finishes any current subtree if (inpfx) { // Back to category level @@ -578,7 +578,7 @@ KeyView::RefreshBindings(const wxArrayString & names, // Remember for next iteration lastcat = cat; - // Add a new category node + // Add a NEW category node if (cat != wxEmptyString) { KeyNode node; @@ -604,7 +604,7 @@ KeyView::RefreshBindings(const wxArrayString & names, } } - // Process a new prefix + // Process a NEW prefix if (pfx != lastpfx) { // Done with prefix branch @@ -617,7 +617,7 @@ KeyView::RefreshBindings(const wxArrayString & names, // Remember for next iteration lastpfx = pfx; - // Add a new prefix node + // Add a NEW prefix node if (pfx != wxEmptyString) { KeyNode node; @@ -949,7 +949,7 @@ KeyView::RefreshLines() } #endif - // Tell listbox the new count and refresh the entire view + // Tell listbox the NEW count and refresh the entire view SetItemCount(mLines.GetCount()); RefreshAll(); @@ -1199,7 +1199,7 @@ KeyView::OnSetFocus(wxFocusEvent & event) event.Skip(); // Refresh the selected line to pull in any changes while - // focus was away...like when setting a new key value. This + // focus was away...like when setting a NEW key value. This // will also refresh the visual (highlighted) state. if (GetSelection() != wxNOT_FOUND) { @@ -1252,7 +1252,7 @@ KeyView::OnScroll(wxScrollWinEvent & event) return; } - // Get new scroll position and scroll the view + // Get NEW scroll position and scroll the view mScrollX = event.GetPosition(); SetScrollPos(wxHORIZONTAL, mScrollX); @@ -1811,7 +1811,7 @@ KeyViewAx::ListUpdated() } // -// Inform accessibility a new line has been selected and/or a previously +// Inform accessibility a NEW line has been selected and/or a previously // selected line is being unselected // void diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index 62a17e95b..b0dbeb4f8 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -399,7 +399,7 @@ void Meter::UpdatePrefs() // Set the desired orientation (resets ruler orientation) SetActiveStyle(mDesiredStyle); - // Reset to ensure new size is retrieved when language changes + // Reset to ensure NEW size is retrieved when language changes mLeftSize = wxSize(0, 0); mRightSize = wxSize(0, 0); @@ -429,7 +429,7 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event)) delete mBitmap; } - // Create a new one using current size and select into the DC + // Create a NEW one using current size and select into the DC mBitmap = new wxBitmap(); mBitmap->Create(mWidth, mHeight, destDC); wxMemoryDC dc; diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp index 68bb83c49..a4dfbb5f6 100644 --- a/src/widgets/NumericTextCtrl.cpp +++ b/src/widgets/NumericTextCtrl.cpp @@ -21,7 +21,7 @@ in the selection bar of Audacity. exact way that a single value is split into several fields, such as the hh:mm:ss format. The advantage of this format string is that it is very small and compact, but human-readable and - somewhat intuitive, so that it's easy to add new layouts + somewhat intuitive, so that it's easy to add NEW layouts in the future. It's also designed to make it easier to add i18n support, since the way that numbers are displayed in different languages could conceivably vary a lot. @@ -108,7 +108,7 @@ in the selection bar of Audacity. Summary of format string rules: - The characters '0-9', '*', and '#' are numeric. Any sequence of - these characters is treated as defining a new field by specifying + these characters is treated as defining a NEW field by specifying its range. All other characters become delimiters between fields. (The one exception is that '.' is treated as numeric after the optional '|'.) @@ -1980,7 +1980,7 @@ wxAccStatus NumericTextCtrlAx::GetName(int childId, wxString *name) int cnt = mFields.GetCount(); wxString decimal = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER); - // If the new field is the last field, then check it to see if + // If the NEW field is the last field, then check it to see if // it represents fractions of a second. // PRL: click a digit of the control and use left and right arrow keys // to exercise this code diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp index 23a405faa..7061806e8 100644 --- a/src/widgets/valnum.cpp +++ b/src/widgets/valnum.cpp @@ -123,7 +123,7 @@ NumValidatorBase::GetCurrentValueAndInsertionPoint(wxString& val, // Remove selected text because pressing a key would make it disappear. val.erase(selFrom, selLen); - // And adjust the insertion point to have correct position in the new + // And adjust the insertion point to have correct position in the NEW // string. if ( pos > selFrom ) { @@ -307,7 +307,7 @@ IntegerValidatorBase::IsCharOk(const wxString& val, int pos, wxChar ch) const { // Notice that entering '-' can make our value invalid, for example if // we're limited to -5..15 range and the current value is 12, then the - // new value would be (invalid) -12. We consider it better to let the + // NEW value would be (invalid) -12. We consider it better to let the // user do this because perhaps he is going to press Delete key next to // make it -2 and forcing him to DELETE 1 first would be unnatural. // diff --git a/src/xml/XMLTagHandler.cpp b/src/xml/XMLTagHandler.cpp index 112c14c95..fdb163bd0 100644 --- a/src/xml/XMLTagHandler.cpp +++ b/src/xml/XMLTagHandler.cpp @@ -214,7 +214,7 @@ bool XMLTagHandler::ReadXMLTag(const char *tag, const char **attrs) } // JKC: Previously the next line was: -// const char **out_attrs = new char (const char *)[tmp_attrs.GetCount()+1]; +// const char **out_attrs = NEW char (const char *)[tmp_attrs.GetCount()+1]; // however MSVC doesn't like the constness in this position, so this is now // added by a cast after creating the array of pointers-to-non-const chars. const wxChar **out_attrs = (const wxChar**)new wxChar *[tmp_attrs.GetCount()+1]; diff --git a/src/xml/XMLTagHandler.h b/src/xml/XMLTagHandler.h index 57c003b56..16d77b569 100644 --- a/src/xml/XMLTagHandler.h +++ b/src/xml/XMLTagHandler.h @@ -91,7 +91,7 @@ class AUDACITY_DLL_API XMLTagHandler { virtual void HandleXMLContent(const wxString & WXUNUSED(content)) {} // If the XML document has children of your tag, this method - // should be called. Typically you should construct a new + // should be called. Typically you should construct a NEW // object for the child, insert it into your own local data // structures, and then return it. If you do not wish to // handle this child, return NULL and it will be ignored.