From 534359de6cd9222c681d4b3601471be16d61a40f Mon Sep 17 00:00:00 2001 From: freddii Date: Tue, 12 Jan 2021 12:56:09 +0100 Subject: [PATCH] Fix minor typos (#720) Co-authored-by: freddii --- include/audacity/ModuleInterface.h | 2 +- lib-src/sqlite/sqlite3.c | 2 +- plug-ins/label-sounds.ny | 2 +- plug-ins/spectral-delete.ny | 2 +- plug-ins/vocalrediso.ny | 2 +- scripts/mw2html_audacity/mw2html.py | 4 ++-- src/AudacityApp.cpp | 2 +- src/AudioIO.cpp | 2 +- src/DBConnection.h | 2 +- src/Envelope.h | 2 +- src/KeyboardCapture.cpp | 2 +- src/ProjectFileIO.cpp | 2 +- src/ProjectSerializer.cpp | 2 +- src/SseMathFuncs.h | 2 +- src/commands/CommandManager.cpp | 2 +- src/effects/Effect.cpp | 2 +- src/effects/Equalization48x.cpp | 6 +++--- src/effects/RealtimeEffectManager.cpp | 4 ++-- src/export/Export.cpp | 6 +++--- src/export/ExportFFmpegDialogs.h | 2 +- src/export/ExportMultiple.cpp | 2 +- src/import/ImportMP3.cpp | 2 +- src/menus/HelpMenus.cpp | 2 +- src/prefs/DevicePrefs.cpp | 2 +- src/toolbars/SelectionBar.cpp | 4 ++-- src/toolbars/ToolBar.cpp | 2 +- src/toolbars/ToolManager.cpp | 2 +- .../playabletrack/wavetrack/ui/WaveTrackControls.cpp | 2 +- src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp | 2 +- src/widgets/FileDialog/mac/FileDialogPrivate.mm | 2 +- src/widgets/KeyView.cpp | 2 +- src/widgets/NumericTextCtrl.cpp | 4 ++-- src/widgets/Overlay.h | 2 +- src/widgets/PopupMenuTable.h | 2 +- src/xml/XMLTagHandler.h | 8 ++++---- 35 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/audacity/ModuleInterface.h b/include/audacity/ModuleInterface.h index 8f538b9fd..9993153c7 100644 --- a/include/audacity/ModuleInterface.h +++ b/include/audacity/ModuleInterface.h @@ -160,7 +160,7 @@ typedef ModuleInterface *(*ModuleMain)(const wxString *path); static ModuleInterface * name(const wxString *path) // ---------------------------------------------------------------------------- -// This will create a class and instnace that will register the module entry +// This will create a class and instance that will register the module entry // point during Audacity startup. At the appropriate time, the entry point // will be called to create the module instance. // ---------------------------------------------------------------------------- diff --git a/lib-src/sqlite/sqlite3.c b/lib-src/sqlite/sqlite3.c index 50e256445..e080a8c1e 100644 --- a/lib-src/sqlite/sqlite3.c +++ b/lib-src/sqlite/sqlite3.c @@ -32492,7 +32492,7 @@ SQLITE_PRIVATE int sqlite3SafetyCheckSickOrOk(sqlite3 *db){ } /* -** Attempt to add, substract, or multiply the 64-bit signed value iB against +** Attempt to add, subtract, or multiply the 64-bit signed value iB against ** the other 64-bit signed integer at *pA and store the result in *pA. ** Return 0 on success. Or if the operation would have resulted in an ** overflow, leave *pA unchanged and return 1. diff --git a/plug-ins/label-sounds.ny b/plug-ins/label-sounds.ny index 024c890f6..3da629236 100644 --- a/plug-ins/label-sounds.ny +++ b/plug-ins/label-sounds.ny @@ -206,7 +206,7 @@ $control text (_ "Label text") string "" (_ "Sound ##1") (setf end-time (first (nth (1- i) snd-list))) ;don't overlap next sound (setf label-start (min end-time (+ start-time pre-offset))) - ;dont't overlap previous sound + ;don't overlap previous sound (setf label-end (max start-time (- end-time post-offset))) ;ensure end is not before start (when (< (- label-end label-start) 0) diff --git a/plug-ins/spectral-delete.ny b/plug-ins/spectral-delete.ny index fd14ebd36..640a997d9 100644 --- a/plug-ins/spectral-delete.ny +++ b/plug-ins/spectral-delete.ny @@ -125,7 +125,7 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" (setf f1 (/ f1 *sound-srate*))) ;(format t "Low: ~a High: ~a" (if f0 (* f0 *sound-srate*) nil) (if f1 (* f1 *sound-srate*) nil)) (if (not (or f0 f1)) - "" ;may occur if multiple tracks with diferent sample rates + "" ;may occur if multiple tracks with different sample rates (sim (mult env (if f0 (dofilter f0 lp-width 0) 0)) diff --git a/plug-ins/vocalrediso.ny b/plug-ins/vocalrediso.ny index 3e6516a10..9f9a0e6c5 100644 --- a/plug-ins/vocalrediso.ny +++ b/plug-ins/vocalrediso.ny @@ -195,7 +195,7 @@ $control high-transition (_ "High Cut for Vocals (Hz)") real "" 9000 1 24000 ;; Make a weighted center (mono) -;; that can be substracted from L&R +;; that can be subtracted from L&R (defun steer (side obj &aux (mid (send obj :next))) (cond ((and mid side) diff --git a/scripts/mw2html_audacity/mw2html.py b/scripts/mw2html_audacity/mw2html.py index 8469eb32d..3d4639380 100644 --- a/scripts/mw2html_audacity/mw2html.py +++ b/scripts/mw2html_audacity/mw2html.py @@ -191,7 +191,7 @@ def monobook_fix_html(doc, page_url): if config.made_by: doc = doc.replace('', '', '>1); mBufferInfo[currentIndex].mBufferStatus=BufferReady; // free for grabbin bigBlocksRead++; - } else mBufferInfo[currentIndex].mBufferStatus=BufferEmpty; // this is completely unecessary + } else mBufferInfo[currentIndex].mBufferStatus=BufferEmpty; // this is completely unnecessary currentIndex=(currentIndex+1)%mWorkerDataCount; } } @@ -1261,7 +1261,7 @@ bool EffectEqualization48x::ProcessOne8xThreaded(int count, WaveTrack * t, currentSample-=mBlockSize+(mFilterSize>>1); mBufferInfo[currentIndex].mBufferStatus=BufferReady; // free for grabbin bigBlocksRead++; - } else mBufferInfo[currentIndex].mBufferStatus=BufferEmpty; // this is completely unecessary + } else mBufferInfo[currentIndex].mBufferStatus=BufferEmpty; // this is completely unnecessary currentIndex=(currentIndex+1)%mWorkerDataCount; } } diff --git a/src/effects/RealtimeEffectManager.cpp b/src/effects/RealtimeEffectManager.cpp index 5ca5a8fc6..f7e7f7c0c 100644 --- a/src/effects/RealtimeEffectManager.cpp +++ b/src/effects/RealtimeEffectManager.cpp @@ -550,7 +550,7 @@ size_t RealtimeEffectState::RealtimeProcess(int group, // All input channels have been consumed ichans = 0; } - // Otherwise fullfil the client's needs with as many input channels as possible. + // Otherwise fulfill the client's needs with as many input channels as possible. // After calling the client with this set, we will loop back up to process more // of the input/output channels. else if (ichans >= numAudioIn) @@ -582,7 +582,7 @@ size_t RealtimeEffectState::RealtimeProcess(int group, // All output channels have been consumed ochans = 0; } - // Otherwise fullfil the client's needs with as many output channels as possible. + // Otherwise fulfill the client's needs with as many output channels as possible. // After calling the client with this set, we will loop back up to process more // of the input/output channels. else if (ochans >= numAudioOut) diff --git a/src/export/Export.cpp b/src/export/Export.cpp index 9fb7e1655..d6b5aea43 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -830,7 +830,7 @@ bool Exporter::CheckMix(bool prompt /*= true*/ ) // Clean up ... should never happen mMixerSpec.reset(); - // Detemine if exported file will be stereo or mono or multichannel, + // Determine if exported file will be stereo or mono or multichannel, // and if mixing will occur. auto downMix = ImportExportPrefs::ExportDownMixSetting.ReadEnum(); @@ -923,7 +923,7 @@ bool Exporter::ExportTracks() ::wxRemoveFile(mActualName.GetFullPath()); ::wxRenameFile(mFilename.GetFullPath(), mActualName.GetFullPath()); } - // Restore filname + // Restore filename mFilename = mActualName; } else { @@ -1290,7 +1290,7 @@ double ExportMixerPanel::Distance( wxPoint &a, wxPoint &b ) return sqrt( pow( a.x - b.x, 2.0 ) + pow( a.y - b.y, 2.0 ) ); } -//checks if p is on the line connecting la, lb with tolerence +//checks if p is on the line connecting la, lb with tolerance bool ExportMixerPanel::IsOnLine( wxPoint p, wxPoint la, wxPoint lb ) { return Distance( p, la ) + Distance( p, lb ) - Distance( la, lb ) < 0.1; diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h index 9b3bbc007..cef88b212 100644 --- a/src/export/ExportFFmpegDialogs.h +++ b/src/export/ExportFFmpegDialogs.h @@ -63,7 +63,7 @@ struct ExposedFormat /// Describes format-codec compatibility struct CompatibilityEntry { - const wxChar *fmt; //!< format, recognizeable by guess_format() + const wxChar *fmt; //!< format, recognizable by guess_format() AVCodecID codec; //!< codec ID }; diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index 169201a8b..0edcaa511 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -1139,7 +1139,7 @@ wxString ExportMultipleDialog::MakeFileName(const wxString &input) // build the dialog TranslatableString msg; wxString excluded = ::wxJoin( Internat::GetExcludedCharacters(), wxChar(' ') ); - // TODO: For Russian langauge we should have separate cases for 2 and more than 2 letters. + // TODO: For Russian language we should have separate cases for 2 and more than 2 letters. if( excluded.length() > 1 ){ msg = XO( // i18n-hint: The second %s gives some letters that can't be used. diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index 0f66adabf..fdd95e1ce 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -332,7 +332,7 @@ bool MP3ImportFileHandle::Open() return false; } - // Get the legnth of the file + // Get the length of the file mFileLen = mFile.Seek(0, wxFromEnd); if (mFileLen == wxInvalidOffset || mFile.Error()) { diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp index e1a50bfdf..136327b1f 100644 --- a/src/menus/HelpMenus.cpp +++ b/src/menus/HelpMenus.cpp @@ -93,7 +93,7 @@ void ShowDiagnostics( * This class originated with the 'Stuck in a mode' problem, where far too many * users get into a mode without realising, and don't know how to get out. * It is a band-aid, and we should do more towards a full and proper solution - * where there are fewer special modes, and they don't persisit. + * where there are fewer special modes, and they don't persist. */ class QuickFixDialog : public wxDialogWrapper { diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index 7cdd8945f..c2ed9dfa2 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -262,7 +262,7 @@ void DevicePrefs::OnHost(wxCommandEvent & e) device = MakeDeviceSourceString(&inMaps[i]); devindex = mRecord->Append(device); // We need to const cast here because SetClientData is a wx function - // It is okay beause the original variable is non-const. + // It is okay because the original variable is non-const. mRecord->SetClientData(devindex, const_cast(&inMaps[i])); if (device == recDevice) { /* if this is the default device, select it */ mRecord->SetSelection(devindex); diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index 017edd5c0..9134a5e55 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -302,7 +302,7 @@ void SelectionBar::Populate() // It works around a wxWidgets-on-Windows RadioButton bug, where tabbing // into the radiobutton group jumps to selecting the first item in the // group even if some other item had been selected. - // It is an important bug to work around for sceen reader users, who use TAB + // It is an important bug to work around for screen reader users, who use TAB // a lot in navigation. // More about the bug here: // https://forums.wxwidgets.org/viewtopic.php?t=41120 @@ -355,7 +355,7 @@ void SelectionBar::UpdatePrefs() // If necessary we can drive the SelectionBar mRate via the Project // calling our SetRate(). // As of 13-Sep-2018, changes to the sample rate pref will only affect - // creation of new projects, not the smaple rate in existing ones. + // creation of new projects, not the sample rate in existing ones. wxCommandEvent e; e.SetInt(mStartTime->GetFormatIndex()); diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp index a9fe62097..396fbc7c3 100644 --- a/src/toolbars/ToolBar.cpp +++ b/src/toolbars/ToolBar.cpp @@ -235,7 +235,7 @@ void ToolBarResizer::OnMotion( wxMouseEvent & event ) // Adjust the size based on updated mouse position. r.width = ( pos.x - mResizeOffset.x ) - r.x; - // Keep it within max size, if specificed + // Keep it within max size, if specified if( maxsz != wxDefaultSize ) { if( r.width > maxsz.x ) diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index cfca6f107..69ea4c466 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -214,7 +214,7 @@ void ToolFrame::OnMotion( wxMouseEvent & event ) rect.SetBottomRight( pos ); - // Keep it within max size, if specificed + // Keep it within max size, if specified wxSize maxsz = mBar->GetMaxSize(); if (maxsz != wxDefaultSize) { diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp index 09d648e06..2887e4423 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp @@ -266,7 +266,7 @@ void FormatMenuTable::OnFormatChange(wxCommandEvent & event) // Below is the lambda function that is passed along the call chain to // the Sequence::ConvertToSampleFormat. This callback function is used - // to report the convertion progress and update the progress dialog. + // to report the conversion progress and update the progress dialog. auto progressUpdate = [&progress, &totalSamples, &processedSamples] (size_t newlyProcessedCount)->void { diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp index bd64d8698..c31f53ab3 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp @@ -792,7 +792,7 @@ void DrawClipWaveform(TrackPanelDrawingContext &context, } // TODO Add a comment to say what this loop does. - // Possily make it into a subroutine. + // Possibly make it into a subroutine. for (unsigned ii = 0; ii < nPortions; ++ii) { WavePortion &portion = portions[ii]; const bool showIndividualSamples = portion.averageZoom > threshold1; diff --git a/src/widgets/FileDialog/mac/FileDialogPrivate.mm b/src/widgets/FileDialog/mac/FileDialogPrivate.mm index 74a60440b..3a44509a0 100644 --- a/src/widgets/FileDialog/mac/FileDialogPrivate.mm +++ b/src/widgets/FileDialog/mac/FileDialogPrivate.mm @@ -552,7 +552,7 @@ int FileDialog::ShowModal() // makes things more convenient: [sPanel setCanCreateDirectories:YES]; [sPanel setMessage:cf.AsNSString()]; - // if we should be able to descend into pacakges we must somehow + // if we should be able to descend into packages we must somehow // be able to pass this in [sPanel setTreatsFilePackagesAsDirectories:NO]; [sPanel setCanSelectHiddenExtension:YES]; diff --git a/src/widgets/KeyView.cpp b/src/widgets/KeyView.cpp index 166790ac2..f238a1001 100644 --- a/src/widgets/KeyView.cpp +++ b/src/widgets/KeyView.cpp @@ -995,7 +995,7 @@ KeyView::RefreshLines(bool bSort) node.line = linecnt++; mLines.push_back(&node); - // If this node is not open, then skip all of its decendants + // If this node is not open, then skip all of its descendants if (!node.isopen) { bool iscat = node.iscat; diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp index 9fb9fb3f4..15301baf4 100644 --- a/src/widgets/NumericTextCtrl.cpp +++ b/src/widgets/NumericTextCtrl.cpp @@ -79,7 +79,7 @@ in the selection bar of Audacity. 3758.5 seconds, "*:060:060 and .24 frames" -> "1:02:38 and 12 frames" - Note that the decimal '.' is associated with the delimeter, not + Note that the decimal '.' is associated with the delimiter, not with the 24. Additionally, the special character '#' can be used in place of a number @@ -124,7 +124,7 @@ in the selection bar of Audacity. - Any non-numeric characters before the first field are treated as a prefix, and will be displayed to the left of the first field. - A delimiter ending in '.' is treated specially. All fields after - this delimeter are fractional fields, after the decimal point. + this delimiter are fractional fields, after the decimal point. - The '|' character is treated as a special delimiter. The number to the right of this character (which is allowed to contain a decimal point) is treated as a scaling factor. The number is diff --git a/src/widgets/Overlay.h b/src/widgets/Overlay.h index cdeca438d..5d8ab79e4 100644 --- a/src/widgets/Overlay.h +++ b/src/widgets/Overlay.h @@ -64,7 +64,7 @@ Notice that the zoom guidelines, the focused track highlight, and snap guidelines could be drawn directly to the screen rather than to the bitmap, generally eliminating redraw work. -One problem is slider udpates. Sliders are in the left area of the track +One problem is slider updates. Sliders are in the left area of the track panel. They are not wxWindows like wxSliders, but instead are just drawn on the TrackPanel. When slider state changes, *all* tracks do a full refresh, including recomputing the backing store. It would make more sense diff --git a/src/widgets/PopupMenuTable.h b/src/widgets/PopupMenuTable.h index 22017796a..8251e723d 100644 --- a/src/widgets/PopupMenuTable.h +++ b/src/widgets/PopupMenuTable.h @@ -242,7 +242,7 @@ public: /* The following macros make it easy to attach a popup menu to a window. -Exmple of usage: +Example of usage: In class MyTable (maybe in the private section), which inherits from PopupMenuTable, diff --git a/src/xml/XMLTagHandler.h b/src/xml/XMLTagHandler.h index bbaa33c98..59dbcbc07 100644 --- a/src/xml/XMLTagHandler.h +++ b/src/xml/XMLTagHandler.h @@ -30,7 +30,7 @@ class XMLValueChecker public: // "Good" means well-formed and for the file-related functions, names an existing file or folder. // These are used in HandleXMLTag and BuildFomXML methods to check the input for - // security vulnerabilites, per the NGS report for UmixIt. + // security vulnerabilities, per the NGS report for UmixIt. static bool IsGoodString(const wxString & str); // Labels are allowed to be very long. At some future date we will format long labels nicely. static bool IsGoodLongString(const wxString & str); @@ -48,7 +48,7 @@ public: * duplicate that testing, so use wxString::ToLong after IsGoodInt, not just * atoi. * @param strInt The string to test - * @return true if the string is convertable, false if not + * @return true if the string is convertible, false if not */ static bool IsGoodInt(const wxString & strInt); /** @brief Check that the supplied string can be converted to a 64bit @@ -58,7 +58,7 @@ public: * doesn't duplicate that testing, so use wxString::ToLongLong after IsGoodInt64 * not just atoll. * @param strInt The string to test - * @return true if the string is convertable, false if not + * @return true if the string is convertible, false if not */ static bool IsGoodInt64(const wxString & strInt); static bool IsGoodIntForRange(const wxString & strInt, const wxString & strMAXABS); @@ -108,7 +108,7 @@ class AUDACITY_DLL_API XMLTagHandler /* not final */ { // handle this child, return NULL and it will be ignored. virtual XMLTagHandler *HandleXMLChild(const wxChar *tag) = 0; - // These functions recieve data from expat. They do charset + // These functions receive data from expat. They do charset // conversion and then pass the data to the handlers above. bool ReadXMLTag(const char *tag, const char **attrs); void ReadXMLEndTag(const char *tag);