Fix minor typos

Author: yurchor

src/Audacity.h

@@ -209,7 +209,7 @@ class wxWindow;
 
 // These macros are used widely, so declared here.
 #define QUANTIZED_TIME(time, rate) (floor(((double)(time) * (rate)) + 0.5) / (rate))
-// dB - linear amplitude convesions
+// dB - linear amplitude conversions
 #define DB_TO_LINEAR(x) (pow(10.0, (x) / 20.0))
 #define LINEAR_TO_DB(x) (20.0 * log10(x))
 

src/AudacityApp.cpp

@@ -22,7 +22,7 @@ It handles initialization and termination by subclassing wxApp.
 
 #if 0
 // This may be used to debug memory leaks.
-// See: Visual Leak Dectector @ http://vld.codeplex.com/
+// See: Visual Leak Detector @ http://vld.codeplex.com/
 #include <vld.h>
 #endif
 
@@ -1384,7 +1384,7 @@ bool AudacityApp::OnInit()
    std::shared_ptr< wxCmdLineParser > parser{ ParseCommandLine().release() };
    if (!parser)
    {
-      // Either user requested help or a parsing error occured
+      // Either user requested help or a parsing error occurred
       exit(1);
    }
 
@@ -1886,7 +1886,7 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
 
    mIPCServ.reset();
 
-   // Try twice to either become the server or make a connnection to one.  If
+   // Try twice to either become the server or make a connection to one.  If
    // both attempts fail, then there's something wrong that we can't deal with,
    // like insufficient access to create the socket, no memory, etc.
    for (int attempts = 0; attempts < 2; ++attempts)

src/AudioIO.cpp

@@ -2054,7 +2054,7 @@ void AudioIO::PrepareMidiIterator(bool send, double offset)
    // instead of initializing with an Alg_seq, we use begin_seq()
    // below to add ALL Alg_seq's.
    mIterator = std::make_unique<Alg_iterator>(nullptr, false);
-   // Iterator not yet intialized, must add each track...
+   // Iterator not yet initialized, must add each track...
    for (i = 0; i < nTracks; i++) {
       const auto t = mMidiPlaybackTracks[i].get();
       Alg_seq_ptr seq = &t->GetSeq();
@@ -4389,7 +4389,7 @@ int AudioIoCallback::AudioCallback(const void *inputBuffer, void *outputBuffer,
 #endif
 
    // ------ MEMORY ALLOCATIONS -----------------------------------------------
-   // tempFloats will be a resusable scratch pad for (possibly format converted)
+   // tempFloats will be a reusable scratch pad for (possibly format converted)
    // audio data.  One temporary use is for the InputMeter data.
    const auto numPlaybackChannels = mNumPlaybackChannels;
    const auto numCaptureChannels = mNumCaptureChannels;

src/AudioIO.h

@@ -700,7 +700,7 @@ class AUDACITY_DLL_API AudioIO final
    * audacity actually runs the audio I/O stream at. if there is no suitable
    * rate available from the hardware, it returns 0.
    * The sampleRate argument gives the desired sample rate (the rate of the
-   * audio to be handeled, i.e. the currently Project Rate).
+   * audio to be handled, i.e. the currently Project Rate).
    * capturing is true if the stream is capturing one or more audio channels,
    * and playing is true if one or more channels are being played. */
    double GetBestRate(bool capturing, bool playing, double sampleRate);
@@ -730,7 +730,7 @@ class AUDACITY_DLL_API AudioIO final
     * currently in use (for many reasons). The number of Capture and Playback
     * channels requested includes an allocation for doing software playthrough
     * if necessary. The captureFormat is used for recording only, the playback
-    * being floating point always. Returns true if the stream opened sucessfully
+    * being floating point always. Returns true if the stream opened successfully
     * and false if it did not. */
    bool StartPortAudioStream(const AudioIOStartStreamOptions &options,
                              unsigned int numPlaybackChannels,

src/AudioIOBase.cpp

@@ -1042,7 +1042,7 @@ wxString AudioIOBase::GetDeviceInfo()
          s << XO("%d - %s\n").Format( i, name );
       }
 
-      // Determine mixer capabilities - it it doesn't support either
+      // Determine mixer capabilities - if it doesn't support either
       // input or output, we emulate them (by multiplying this value
       // by all incoming/outgoing samples)
 

src/BatchCommands.cpp

@@ -187,7 +187,7 @@ bool MacroCommands::ReadMacro(const wxString & macro)
    if (lines > 0) {
       for (int i = 0; i < lines; i++) {
 
-         // Find the command name terminator...ingore line if not found
+         // Find the command name terminator...ignore line if not found
          int splitAt = tf[i].Find(wxT(':'));
          if (splitAt < 0) {
             continue;
@@ -722,7 +722,7 @@ bool MacroCommands::ApplySpecialCommand(
 }
 // end CLEANSPEECH remnant
 
-/// DoAudacityCommand() takes a PluginID and executes the assocated command.
+/// DoAudacityCommand() takes a PluginID and executes the associated command.
 ///
 /// At the moment flags are used only to indicate whether to prompt for
 /// parameters

src/Benchmark.cpp

@@ -352,7 +352,7 @@ void BenchmarkDialog::OnRun( wxCommandEvent & WXUNUSED(event))
    gPrefs->Write(wxT("/GUI/EditClipCanMove"), false);
    gPrefs->Flush();
 
-   // Rememebr the old blocksize, so that we can restore it later.
+   // Remember the old blocksize, so that we can restore it later.
    auto oldBlockSize = Sequence::GetMaxDiskBlockSize();
    Sequence::SetMaxDiskBlockSize(blockSize * 1024);
 

src/BlockFile.cpp

@@ -588,7 +588,7 @@ size_t BlockFile::CommonReadData(
              format == int16Sample &&
              sf_subtype_is_integer(info.format)) {
             // If both the src and dest formats are integer formats,
-            // read integers directly from the file, comversions not needed
+            // read integers directly from the file, conversions not needed
             framesRead = SFCall<sf_count_t>(
                sf_readf_short, sf.get(), (short *)data, len);
          }

src/DeviceManager.cpp

@@ -213,8 +213,8 @@ static void AddSources(int deviceIndex, int rate, std::vector<DeviceSourceMap> *
    // If the device is for input, open a stream so we can use portmixer to query
    // the number of inputs.  We skip this for outputs because there are no 'sources'
    // and some platforms (e.g. XP) have the same device for input and output, (while
-   // Vista/Win7 seperate these into two devices with the same names (but different
-   // portaudio indecies)
+   // Vista/Win7 separate these into two devices with the same names (but different
+   // portaudio indices)
    // Also, for mapper devices we don't want to keep any sources, so check for it here
    if (isInput && !IsInputDeviceAMapperDevice(info)) {
       if (info)
@@ -279,7 +279,7 @@ void DeviceManager::Rescan()
    // FIXME: TRAP_ERR PaErrorCode not handled in ReScan()
    int nDevices = Pa_GetDeviceCount();
 
-   //The heirarchy for devices is Host/device/source.
+   //The hierarchy for devices is Host/device/source.
    //Some newer systems aggregate this.
    //So we need to call port mixer for every device to get the sources
    for (int i = 0; i < nDevices; i++) {

src/DirManager.cpp

@@ -896,7 +896,7 @@ bool DirManager::AssignFile(wxFileNameWrapper &fileName,
       wxDir checkit(dir.GetFullPath());
       if(!checkit.IsOpened()) return FALSE;
 
-      // this code is only valid if 'value' has no extention; that
+      // this code is only valid if 'value' has no extension; that
       // means, effectively, AssignFile may be called with 'diskcheck'
       // set to true only if called from MakeFileBlockName().
 
@@ -1105,7 +1105,7 @@ wxFileNameWrapper DirManager::MakeBlockFileName()
 
    while(1){
 
-      /* blockfiles are divided up into heirarchical directories.
+      /* blockfiles are divided up into hierarchical directories.
          Each toplevel directory is represented by "e" + two unique
          hexadecimal digits, for a total possible number of 256
          toplevels.  Each toplevel contains up to 256 subdirs named

src/Envelope.cpp

@@ -283,7 +283,7 @@ void Envelope::CopyRange(const Envelope &orig, size_t begin, size_t end)
    }
 
    // Create the final point if it needs interpolated representation
-   // If the last point of e was exatly at t1, this effectively copies it too.
+   // If the last point of e was exactly at t1, this effectively copies it too.
    if (mTrackLen > 0 && i < len)
       AddPointAtEnd( mTrackLen, orig.GetValue(mOffset + mTrackLen));
 }

src/EnvelopeEditor.cpp

@@ -316,7 +316,7 @@ bool EnvelopeEditor::HandleDragging(const wxMouseEvent & event, wxRect & r,
    return true;
 }
 
-// Exit dragging mode and delete dragged point if neccessary.
+// Exit dragging mode and delete dragged point if necessary.
 bool EnvelopeEditor::HandleMouseButtonUp()
 {
    mEnvelope.ClearDragPoint();

src/FFmpeg.h

@@ -430,12 +430,12 @@ extern "C" {
    //
    // The FFMPEG_FUNCTION_WITH_RETURN takes 4 arguments:
    // 1)  The return type           <---|
-   // 2)  The function name             | Taken from the FFmpeg funciton prototype
+   // 2)  The function name             | Taken from the FFmpeg function prototype
    // 3)  The function arguments    <---|
    // 4)  The argument list to pass to the real function
    //
    // The FFMPEG_FUNCTION_NO_RETURN takes 3 arguments:
-   // 1)  The function name         <---| Taken from the FFmpeg funciton prototype
+   // 1)  The function name         <---| Taken from the FFmpeg function prototype
    // 2)  The function arguments    <---|
    // 3)  The argument list to pass to the real function
    //

src/FileFormats.h

@@ -72,7 +72,7 @@ wxString sf_header_shortname(int format);
 /** @brief Get the most common file extension for the given format
  *
  * AND the given format with SF_FORMAT_TYPEMASK to get just the container
- * format, then retreive the most common extension using SFC_GET_FORMAT_INFO.
+ * format, then retrieve the most common extension using SFC_GET_FORMAT_INFO.
  * @param format the libsndfile format to get the name for (only the container
  * part is used) */
 wxString sf_header_extension(int format);

src/FreqWindow.cpp

@@ -1012,7 +1012,7 @@ void FrequencyPlotDialog::Recalc()
    // In wxMac, the skipped window MUST be a top level window.  I'd originally made it
    // just the mProgress window with the idea of preventing user interaction with the
    // controls while the plot was being recalculated.  This doesn't appear to be necessary
-   // so just use the the top level window instead.
+   // so just use the top level window instead.
    {
       Optional<wxWindowDisabler> blocker;
       if (IsShown())

src/ImageManipulation.h

@@ -63,5 +63,5 @@ std::unique_ptr<wxImage> CreateSysBackground(int width, int height, int offset,
 // Pastes one image into another at specified location.
 void PasteSubImage( wxImage * pDest, wxImage * pSrc, int x, int y );
 
-// Gets a rectangle from within anothe rimage, INCLUDING the alpha channel
+// Gets a rectangle from within another image, INCLUDING the alpha channel
 wxImage GetSubImageWithAlpha( const wxImage & Src,  const wxRect &rect );

src/Internat.h

@@ -65,7 +65,7 @@ extern AUDACITY_DLL_API const wxString& GetCustomSubstitution(const wxString& st
 #endif
 
 
-// The two string arugments will go to the .pot file, as
+// The two string arguments will go to the .pot file, as
 // msgid sing
 // msgid_plural plural
 //
@@ -135,7 +135,7 @@ class Internat
     */
    static bool SanitiseFilename(wxString &name, const wxString &sub);
 
-   /** \brief Remove accelerator charactors from strings
+   /** \brief Remove accelerator characters from strings
     *
     * Utility function - takes a translatable string to be used as a menu item,
     * for example _("&Splash...\tAlt+S"), and strips all of the menu

src/Lyrics.cpp

@@ -222,7 +222,7 @@ void LyricsPanel::Finish(double finalT)
    mHighlightTextCtrl->ShowPosition(0);
 }
 
-// Binary-search for the syllable syllable whose char0 <= startChar <= char1.
+// Binary-search for the syllable whose char0 <= startChar <= char1.
 int LyricsPanel::FindSyllable(long startChar)
 {
    int i1, i2;

src/MacroMagic.h

@@ -20,7 +20,7 @@ For example DEFINE_IMAGE will generate:
 
   - extern int name;
   - int name = -1;
-  - RegisterImage( name, initiialiser, textual_name);
+  - RegisterImage( name, initialiser, textual_name);
 
 On three different passes.  We control which by defining one of
 THEME_INITS or THEME_DECLARATIONS or neither of these.

src/MixerBoard.h

@@ -203,7 +203,7 @@ class MixerBoard final : public wxWindow, private PrefsListener
    void UpdatePrefs() override;
 
    // Add clusters for any tracks we're not yet showing.
-   // Update pointers for tracks we're aleady showing.
+   // Update pointers for tracks we're already showing.
    void UpdateTrackClusters();
 
    int GetTrackClustersWidth();

src/NoteTrack.cpp

@@ -1069,7 +1069,7 @@ void NoteTrack::ZoomAllNotes()
    }
 
    if (!hasNotes) {
-      // Semi-arbitary default values:
+      // Semi-arbitrary default values:
       minPitch = 48;
       maxPitch = 72;
    }
@@ -1102,7 +1102,7 @@ NoteTrackDisplayData::NoteTrackDisplayData(const NoteTrack* track, const wxRect
    }
    // Effective space, excluding the margins and the lines between some notes
    auto effectiveHeight = r.height - (2 * (mMargin + 1)) - numC - numF;
-   // Guarenteed that both the bottom and top notes will be visible
+   // Guaranteed that both the bottom and top notes will be visible
    // (assuming that the clamping below does not happen)
    mPitchHeight = effectiveHeight / ((float) span);
 

src/NoteTrack.h

@@ -138,7 +138,7 @@ class AUDACITY_DLL_API NoteTrack final
 
    /// Zooms out a constant factor (subject to zoom limits)
    void ZoomOut(const wxRect &rect, int y) { Zoom(rect, y, 1.0f / ZoomStep, true); }
-   /// Zooms in a contant factor (subject to zoom limits)
+   /// Zooms in a constant factor (subject to zoom limits)
    void ZoomIn(const wxRect &rect, int y) { Zoom(rect, y, ZoomStep, true); }
    /// Zoom the note track around y.
    /// If center is true, the result will be centered at y.

src/PitchName.h

@@ -50,7 +50,7 @@ TranslatableString PitchName(
 
 // PitchName_Absolute does the same thing as PitchName, but appends
 // the octave number, e.g., instead of "C" it will return "C4"
-// if the dMIDInote corresonds to middle C, i.e., is 60.
+// if the dMIDInote corresponds to middle C, i.e., is 60.
 TranslatableString PitchName_Absolute(
    const double dMIDInote,
    const PitchNameChoice choice = PitchNameChoice::Sharps);

src/PlatformCompatibility.h

@@ -41,7 +41,7 @@ class PlatformCompatibility
    static const FilePath &GetExecutablePath();
 
    //
-   // Audacity treats the / as a file seperator always for Mac OS,
+   // Audacity treats the / as a file separator always for Mac OS,
    // however /'s are allowed in the filename. In order for /'s to
    // work they muse be treated as :'s. To facilitate this, this
    // function should be called when opening or saving a file on

src/PluginManager.h

@@ -124,7 +124,7 @@ class PluginDescriptor
 
    // Common
 
-   // Among other purposes, PluginDescriptor acts as the resouce handle,
+   // Among other purposes, PluginDescriptor acts as the resource handle,
    // or smart pointer, to a resource created in a plugin library, and is responsible
    // for a cleanup of this pointer.
    ComponentInterface *mInstance;

src/ProjectFileIO.cpp

@@ -334,7 +334,7 @@ bool ProjectFileIO::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
 
    if (!bFileVersionFound ||
          (fileVersion.length() != 5) || // expecting '1.1.0', for example
-         // JKC: I commentted out next line.  IsGoodInt is not for
+         // JKC: I commented out next line.  IsGoodInt is not for
          // checking dotted numbers.
          //!XMLValueChecker::IsGoodInt(fileVersion) ||
          (fileVersion > wxT(AUDACITY_FILE_FORMAT_VERSION)))
@@ -358,7 +358,7 @@ bool ProjectFileIO::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
    // KLUDGE: guess the true 'fileversion' by stripping away any '-beta-Rc' stuff on
    // audacityVersion.
    // It's fairly safe to do this as it has already been established that the
-   // puported file version was five chars long.
+   // supported file version was five chars long.
    fileVersion = audacityVersion.Mid(0,5);
 
    bool bIsOld = fileVersion < wxT(AUDACITY_FILE_FORMAT_VERSION);
@@ -459,7 +459,7 @@ void ProjectFileIO::WriteXML(
       xmlFile.WriteAttr(wxT("datadir"), dirManager.GetDataFilesDir());
 
       // Note that the code at the start assumes that if mFileName has a value
-      // then the file has been saved.  This is not neccessarily true when
+      // then the file has been saved.  This is not necessarily true when
       // autosaving as it gets set by AddImportedTracks (presumably as a proposal).
       // I don't think that mDirManager.projName gets set without a save so check that.
       if( !IsProjectSaved() )

src/ProjectFileIORegistry.h

@@ -19,7 +19,7 @@ class wxString;
 
 namespace ProjectFileIORegistry {
 
-// Type of functions returning objects that intepret a part of the saved XML
+// Type of functions returning objects that interpret a part of the saved XML
 using TagHandlerFactory =
    std::function< XMLTagHandler *( AudacityProject & ) >;
 

src/ProjectFileManager.cpp

@@ -360,7 +360,7 @@ bool ProjectFileManager::DoSave (const bool fromSaveAs,
    auto &projectFileIO = ProjectFileIO::Get( proj );
    const auto &settings = ProjectSettings::Get( proj );
 
-   wxASSERT_MSG(!bWantSaveCopy || fromSaveAs, "Copy Project SHOULD only be availabele from SaveAs");
+   wxASSERT_MSG(!bWantSaveCopy || fromSaveAs, "Copy Project SHOULD only be available from SaveAs");
 
    // Some confirmation dialogs
    if (!bWantSaveCopy)
@@ -931,7 +931,7 @@ will be irreversibly overwritten.").Format( fName, fName );
       }
       else
       {
-         // Overwrite disalowed. The destination project is open in another window.
+         // Overwrite disallowed. The destination project is open in another window.
          AudacityMessageDialog m(
             nullptr,
             XO("The project will not saved because the selected project is open in another window.\nPlease try again and select an original name."),
@@ -1226,7 +1226,7 @@ void ProjectFileManager::OpenFile(const FilePath &fileNameArg, bool addtohistory
    auto &window = ProjectWindow::Get( project );
 
    // On Win32, we may be given a short (DOS-compatible) file name on rare
-   // occassions (e.g. stuff like "C:\PROGRA~1\AUDACI~1\PROJEC~1.AUP"). We
+   // occasions (e.g. stuff like "C:\PROGRA~1\AUDACI~1\PROJEC~1.AUP"). We
    // convert these to long file name first.
    auto fileName = PlatformCompatibility::ConvertSlashInFileName(
       PlatformCompatibility::GetLongFileName(fileNameArg));
@@ -1444,7 +1444,7 @@ void ProjectFileManager::OpenFile(const FilePath &fileNameArg, bool addtohistory
             // Going through OnClose() may be overkill, but it's safe.
             /*
                // There was an error in the load/check and the user
-               // explictly opted to close the project.
+               // explicitly opted to close the project.
                mTracks->Clear(true);
                mFileName = wxT("");
                SetProjectTitle();
@@ -1598,7 +1598,7 @@ ProjectFileManager::AddImportedTracks(const FilePath &fileName,
    // See bug #1224
    // The track panel hasn't we been fully created, so the DoZoomFit() will not give
    // expected results due to a window width of zero.  Should be safe to yield here to
-   // allow the creattion to complete.  If this becomes a problem, it "might" be possible
+   // allow the creation to complete.  If this becomes a problem, it "might" be possible
    // to queue a dummy event to trigger the DoZoomFit().
    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI | wxEVT_CATEGORY_USER_INPUT);
 #endif