diff --git a/3rdparty/README.md b/3rdparty/README.md index 076f2312..c3904c76 100644 --- a/3rdparty/README.md +++ b/3rdparty/README.md @@ -19,7 +19,7 @@ TagLib is a library for reading and editing the meta-data of several popular aud by Strawberry to identify audio files. It is important that it is kept up-to-date for Strawberry to function correctly. -It is kept in 3rdparty because there currently is no offical release of TagLib with the features and bugfixes +It is kept in 3rdparty because there currently is no official release of TagLib with the features and bugfixes that are in the official repository. And also because some distros use older, or unpatched versions. There is a bug in the latest version (1.11.1) corrupting Ogg files, @@ -37,6 +37,6 @@ URL: https://github.com/taglib/taglib utf8-cpp -------- -This is 2 header files used by taglib, but kept in a seperate directory because it is maintained by others. +This is 2 header files used by taglib, but kept in a separate directory because it is maintained by others. URL: http://utfcpp.sourceforge.net/ diff --git a/3rdparty/singleapplication/singleapplication.h b/3rdparty/singleapplication/singleapplication.h index 5f754e08..1ced4c05 100644 --- a/3rdparty/singleapplication/singleapplication.h +++ b/3rdparty/singleapplication/singleapplication.h @@ -69,7 +69,7 @@ public: * if there is already a primary instance. * @arg {Mode} mode - Whether for the SingleApplication block to be applied * User wide or System wide. - * @arg {int} timeout - Timeout to wait in miliseconds. + * @arg {int} timeout - Timeout to wait in milliseconds. * @note argc and argv may be changed as Qt removes arguments that it * recognizes * @note Mode::SecondaryNotification only works if set on both the primary diff --git a/3rdparty/singleapplication/singlecoreapplication.h b/3rdparty/singleapplication/singlecoreapplication.h index 8909c05e..661e726e 100644 --- a/3rdparty/singleapplication/singlecoreapplication.h +++ b/3rdparty/singleapplication/singlecoreapplication.h @@ -30,7 +30,7 @@ class SingleCoreApplicationPrivate; /** - * @brief The SingleCoreApplication class handles multipe instances of the same + * @brief The SingleCoreApplication class handles multiple instances of the same * Application * @see QCoreApplication */ @@ -69,7 +69,7 @@ public: * if there is already a primary instance. * @arg {Mode} mode - Whether for the SingleCoreApplication block to be applied * User wide or System wide. - * @arg {int} timeout - Timeout to wait in miliseconds. + * @arg {int} timeout - Timeout to wait in milliseconds. * @note argc and argv may be changed as Qt removes arguments that it * recognizes * @note Mode::SecondaryNotification only works if set on both the primary diff --git a/3rdparty/taglib/dsdiff/dsdifffile.h b/3rdparty/taglib/dsdiff/dsdifffile.h index eb60c163..95f25646 100644 --- a/3rdparty/taglib/dsdiff/dsdifffile.h +++ b/3rdparty/taglib/dsdiff/dsdifffile.h @@ -43,7 +43,7 @@ namespace TagLib { * chunk as well as properties from the file. * Description of the DSDIFF format is available * at http://dsd-guide.com/sites/default/files/white-papers/DSDIFF_1.5_Spec.pdf - * DSDIFF standard does not explictly specify the ID3V2 chunk + * DSDIFF standard does not explicitly specify the ID3V2 chunk * It can be found at the root level, but also sometimes inside the PROP chunk * In addition, title and artist info are stored as part of the standard */ diff --git a/3rdparty/taglib/dsf/dsffile.h b/3rdparty/taglib/dsf/dsffile.h index 45635802..06050624 100644 --- a/3rdparty/taglib/dsf/dsffile.h +++ b/3rdparty/taglib/dsf/dsffile.h @@ -56,7 +56,7 @@ namespace TagLib { { public: /*! - * Contructs an DSF file from \a file. If \a readProperties is true the + * Constructs an DSF file from \a file. If \a readProperties is true the * file's audio properties will also be read using \a propertiesStyle. If * false, \a propertiesStyle is ignored. */ @@ -64,7 +64,7 @@ namespace TagLib { Properties::ReadStyle propertiesStyle = Properties::Average); /*! - * Contructs an DSF file from \a file. If \a readProperties is true the + * Constructs an DSF file from \a file. If \a readProperties is true the * file's audio properties will also be read using \a propertiesStyle. If * false, \a propertiesStyle is ignored. */ diff --git a/3rdparty/taglib/it/itfile.cpp b/3rdparty/taglib/it/itfile.cpp index e1bf0c3a..a05ae5af 100644 --- a/3rdparty/taglib/it/itfile.cpp +++ b/3rdparty/taglib/it/itfile.cpp @@ -277,7 +277,7 @@ void IT::File::read(bool) // in the instrument/sample names and more characters // afterwards. The spec does not mention such a case. // Currently I just discard anything after a nil, but - // e.g. VLC seems to interprete a nil as a space. I + // e.g. VLC seems to interpret a nil as a space. I // don't know what is the proper behaviour. for(unsigned short i = 0; i < instrumentCount; ++ i) { seek(192L + length + ((long)i << 2)); diff --git a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp index fe4b3803..db3131e7 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp @@ -55,7 +55,7 @@ public: namespace { // These functions are needed to try to aim for backward compatibility with - // an API that previously (unreasonably) required null bytes to be appeneded + // an API that previously (unreasonably) required null bytes to be appended // at the end of identifiers explicitly by the API user. // BIC: remove these diff --git a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp index 14c87f90..9e80e083 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -277,7 +277,7 @@ PropertyMap TextIdentificationFrame::makeTIPLProperties() const break; } if(!found){ - // invalid involved role -> mark whole frame as unsupported in order to be consisten with writing + // invalid involved role -> mark whole frame as unsupported in order to be consistent with writing map.clear(); map.unsupportedData().append(frameID()); return map; diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h index e10ad3ce..a952a556 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h +++ b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h @@ -39,7 +39,7 @@ namespace TagLib { /*! * This class implements ID3v2 extended headers. It attempts to follow, - * both semantically and programatically, the structure specified in + * both semantically and programmatically, the structure specified in * the ID3v2 standard. The API is based on the properties of ID3v2 extended * headers specified there. If any of the terms used in this documentation * are unclear please check the specification in the linked section. diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h index 51170838..54cadb10 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h +++ b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h @@ -225,7 +225,7 @@ namespace TagLib { * This is useful for reading strings sequentially. */ String readStringField(const ByteVector &data, String::Type encoding, - int *positon = 0); + int *position = 0); /*! * Checks a the list of string values to see if they can be used with the @@ -256,7 +256,7 @@ namespace TagLib { /*! - * Parses the contents of this frame as PropertyMap. If that fails, the returend + * Parses the contents of this frame as PropertyMap. If that fails, the returned * PropertyMap will be empty, and its unsupportedData() will contain this frame's * ID. * BIC: Will be a virtual function in future releases. diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2tag.h b/3rdparty/taglib/mpeg/id3v2/id3v2tag.h index 6bad4034..74adc3fb 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2tag.h +++ b/3rdparty/taglib/mpeg/id3v2/id3v2tag.h @@ -311,7 +311,7 @@ namespace TagLib { * - otherwise, the key "LYRICS:" is used; * - if the frame ID is "TIPL" (involved peoples list), and if all the * roles defined in the frame are known in TextIdentificationFrame::involvedPeopleMap(), - * then "=" will be contained in the returned obejct for each + * then "=" will be contained in the returned object for each * - if the frame ID is "TMCL" (musician credit list), then * "PERFORMER:=" will be contained in the returned * PropertyMap for each defined musician diff --git a/3rdparty/taglib/ogg/oggpageheader.h b/3rdparty/taglib/ogg/oggpageheader.h index c308185c..2e295379 100644 --- a/3rdparty/taglib/ogg/oggpageheader.h +++ b/3rdparty/taglib/ogg/oggpageheader.h @@ -157,7 +157,7 @@ namespace TagLib { /*! * A special value of containing the position of the packet to be * interpreted by the codec. It is only supported here so that it may be - * coppied from one page to another. + * copied from one page to another. * * \see absoluteGranularPosition() */ diff --git a/3rdparty/taglib/toolkit/tfilestream.cpp b/3rdparty/taglib/toolkit/tfilestream.cpp index 2625a727..cbb6c815 100644 --- a/3rdparty/taglib/toolkit/tfilestream.cpp +++ b/3rdparty/taglib/toolkit/tfilestream.cpp @@ -264,7 +264,7 @@ void FileStream::insert(const ByteVector &data, unsigned long start, unsigned lo // Now I'll explain the steps in this ugliness: // First, make sure that we're working with a buffer that is longer than - // the *differnce* in the tag sizes. We want to avoid overwriting parts + // the *difference* in the tag sizes. We want to avoid overwriting parts // that aren't yet in memory, so this is necessary. unsigned long bufferLength = bufferSize(); diff --git a/3rdparty/taglib/xm/xmfile.cpp b/3rdparty/taglib/xm/xmfile.cpp index 1d64d939..20b94f45 100644 --- a/3rdparty/taglib/xm/xmfile.cpp +++ b/3rdparty/taglib/xm/xmfile.cpp @@ -592,7 +592,7 @@ void XM::File::read(bool) sumSampleCount += sampleCount; // wouldn't know which header size to assume otherwise: READ_ASSERT(instrumentHeaderSize >= count + 4 && readU32L(sampleHeaderSize)); - // skip unhandeled header proportion: + // skip unhandled header proportion: seek(instrumentHeaderSize - count - 4, Current); for(unsigned short j = 0; j < sampleCount; ++ j) { @@ -620,7 +620,7 @@ void XM::File::read(bool) unsigned int count = sample.read(*this, sampleHeaderSize); READ_ASSERT(count == std::min(sampleHeaderSize, (unsigned long)sample.size())); - // skip unhandeled header proportion: + // skip unhandled header proportion: seek(sampleHeaderSize - count, Current); offset += sampleLength; diff --git a/README.md b/README.md index 1cb7ec3c..9afa7fe4 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Strawberry is a music player and music collection organizer. It is a fork of Cle It has so far been tested to work on Linux, OpenBSD, macOS and Windows. -**We do not provide releases for macOS, only exprimental builds, they may have issues. There currently isn't any macOS developers actively working on this project.** +**We do not provide releases for macOS, only experimental builds, they may have issues. There currently isn't any macOS developers actively working on this project.** ### :heavy_exclamation_mark: Requirements diff --git a/cmake/FindFFTW3.cmake b/cmake/FindFFTW3.cmake index e711dd3a..ec67f2a2 100644 --- a/cmake/FindFFTW3.cmake +++ b/cmake/FindFFTW3.cmake @@ -54,8 +54,7 @@ SET(FFTW3_POSSIBLE_LIBRARY_PATH ) -# the lib prefix is containe din filename onf W32, unfortuantely. JW -# teh "general" lib: +# The lib prefix is contained in filename of W32, unfortunately. In the "general" lib: FIND_LIBRARY(FFTW3_FFTW_LIBRARY NAMES fftw3 libfftw libfftw3 libfftw3-3 PATHS diff --git a/dist/scripts/gen-icons-resource.sh b/dist/scripts/gen-icons-resource.sh index 07830cc5..7ef4b551 100755 --- a/dist/scripts/gen-icons-resource.sh +++ b/dist/scripts/gen-icons-resource.sh @@ -11,12 +11,12 @@ do id=`identify "$i"` || exit 1 if [ "$id" = "" ] ; then - echo "ERROR: Cannot dermine format and geometry for image: \"$i\"." + echo "ERROR: Cannot determine format and geometry for image: \"$i\"." continue fi g=`echo $id | awk '{print $3}'` || exit 1 if [ "$g" = "" ] ; then - echo "ERROR: Cannot dermine geometry for image: \"$i\"." + echo "ERROR: Cannot determine geometry for image: \"$i\"." continue fi @@ -24,12 +24,12 @@ do # we need to get rid of the plus (+) and the x characters: w=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $1}'` || exit 1 if [ "$w" = "" ] ; then - echo "ERROR: Cannot dermine width for image: \"$x\"." + echo "ERROR: Cannot determine width for image: \"$x\"." continue fi h=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $2}'` || exit 1 if [ "$h" = "" ] ; then - echo "ERROR: Cannot dermine height for image: \"$x\"." + echo "ERROR: Cannot determine height for image: \"$x\"." continue fi @@ -66,12 +66,12 @@ do id=`identify "$x"` || exit 1 if [ "$id" = "" ] ; then - echo "ERROR: Cannot dermine format and geometry for image: \"$x\"." + echo "ERROR: Cannot determine format and geometry for image: \"$x\"." continue fi g=`echo $id | awk '{print $3}'` || exit 1 if [ "$g" = "" ] ; then - echo "ERROR: Cannot dermine geometry for image: \"$x\"." + echo "ERROR: Cannot determine geometry for image: \"$x\"." continue fi @@ -79,12 +79,12 @@ do # we need to get rid of the plus (+) and the x characters: w=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $1}'` || exit 1 if [ "$w" = "" ] ; then - echo "ERROR: Cannot dermine width for image: \"$x\"." + echo "ERROR: Cannot determine width for image: \"$x\"." continue fi h=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $2}'` || exit 1 if [ "$h" = "" ] ; then - echo "ERROR: Cannot dermine height for image: \"$x\"." + echo "ERROR: Cannot determine height for image: \"$x\"." continue fi diff --git a/src/analyzer/analyzercontainer.cpp b/src/analyzer/analyzercontainer.cpp index 1c341e5a..7ad64168 100644 --- a/src/analyzer/analyzercontainer.cpp +++ b/src/analyzer/analyzercontainer.cpp @@ -158,7 +158,7 @@ void AnalyzerContainer::ChangeAnalyzer(int id) { QObject *instance = analyzer_types_[id]->newInstance(Q_ARG(QWidget*, this)); if (!instance) { - qLog(Warning) << "Couldn't intialise a new" << analyzer_types_[id]->className(); + qLog(Warning) << "Couldn't initialise a new" << analyzer_types_[id]->className(); return; } diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index 1504d3f5..b5c93008 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -274,7 +274,7 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, uint amount = 150) { int dh = abs(bh - fh); if (dh > 120) { - // a third of the colour wheel automatically guarentees contrast + // a third of the colour wheel automatically guarantees contrast // but only if the values are high enough and saturations significant enough // to allow the colours to be visible and not be shades of grey or black diff --git a/src/core/commandlineoptions.cpp b/src/core/commandlineoptions.cpp index f5c3a8b8..11045ae8 100644 --- a/src/core/commandlineoptions.cpp +++ b/src/core/commandlineoptions.cpp @@ -167,8 +167,8 @@ bool CommandlineOptions::Parse() { .arg(tr("Skip backwards in playlist"), tr("Skip forwards in playlist"), tr("Set the volume to percent"), - tr("Increase the volume by 4 precent"), - tr("Decrease the volume by 4 precent"), + tr("Increase the volume by 4 percent"), + tr("Decrease the volume by 4 percent"), tr("Increase the volume by percent"), tr("Decrease the volume by percent")) .arg(tr("Seek the currently playing track to an absolute position"), diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 36bf406b..f0ddcf6b 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -741,7 +741,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co // Load theme // This is tricky: we need to save the default/system palette now, - // before loading user preferred theme (which will overide it), to be able to restore it later + // before loading user preferred theme (which will override it), to be able to restore it later const_cast(Appearance::kDefaultPalette) = QApplication::palette(); app_->appearance()->LoadUserTheme(); StyleSheetLoader *css_loader = new StyleSheetLoader(this); diff --git a/src/core/systemtrayicon.h b/src/core/systemtrayicon.h index ba0f5794..187c1835 100644 --- a/src/core/systemtrayicon.h +++ b/src/core/systemtrayicon.h @@ -46,7 +46,7 @@ class SystemTrayIcon : public QObject { // Called by the OSD virtual void ShowPopup(const QString &summary, const QString &message, int timeout) {} - // If this get's invoked with image_path equal to nullptr, the tooltip should still be shown - just without the cover art. + // If this gets invoked with image_path equal to nullptr, the tooltip should still be shown - just without the cover art. virtual void SetNowPlaying(const Song &song, const QUrl &cover_url) {} virtual void ClearNowPlaying() {} diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp index 40e81df4..8d2bee39 100644 --- a/src/covermanager/albumcoverfetchersearch.cpp +++ b/src/covermanager/albumcoverfetchersearch.cpp @@ -63,7 +63,7 @@ AlbumCoverFetcherSearch::AlbumCoverFetcherSearch( network_(network), cancel_requested_(false) { - // We will terminate the search after kSearchTimeoutMs miliseconds if we are not able to find all of the results before that point in time + // We will terminate the search after kSearchTimeoutMs milliseconds if we are not able to find all of the results before that point in time QTimer::singleShot(kSearchTimeoutMs, this, SLOT(TerminateSearch())); } diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp index 1ec95bb7..57ed02dc 100644 --- a/src/engine/gstengine.cpp +++ b/src/engine/gstengine.cpp @@ -678,7 +678,7 @@ QByteArray GstEngine::FixupUrl(const QUrl &url) { } else { // Currently, Gstreamer can't handle input CD devices inside cdda URL. - // So we handle them ourselve: we extract the track number and re-create an URL with only cdda:// + the track number (which can be handled by Gstreamer). + // So we handle them ourselves: we extract the track number and re-create an URL with only cdda:// + the track number (which can be handled by Gstreamer). // We keep the device in mind, and we will set it later using SourceSetupCallback QStringList path = url.path().split('/'); str = QString("cdda://%1").arg(path.takeLast()); diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index a161b272..2e8e2011 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -888,7 +888,7 @@ void GstEnginePipeline::SourceSetupCallback(GstPlayBin *bin, GParamSpec *pspec, } if (g_object_class_find_property(G_OBJECT_GET_CLASS(element), "device") && !instance->source_device().isEmpty()) { - // Gstreamer is not able to handle device in URL (refering to Gstreamer documentation, this might be added in the future). + // Gstreamer is not able to handle device in URL (referring to Gstreamer documentation, this might be added in the future). // Despite that, for now we include device inside URL: we decompose it during Init and set device here, when this callback is called. g_object_set(element, "device", instance->source_device().toLocal8Bit().constData(), nullptr); } diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h index e61ebd77..40d65f82 100644 --- a/src/musicbrainz/musicbrainzclient.h +++ b/src/musicbrainz/musicbrainzclient.h @@ -189,7 +189,6 @@ class MusicBrainzClient : public QObject { ResultList results_; }; - QNetworkReply *CreateRequest(const QString &ressource, const ParamList ¶ms_provided); QByteArray GetReplyData(QNetworkReply *reply, QString &error); static bool MediumHasDiscid(const QString& discid, QXmlStreamReader* reader); static ResultList ParseMedium(QXmlStreamReader* reader); diff --git a/src/organise/organisedialog.cpp b/src/organise/organisedialog.cpp index 634e0dec..eeea608d 100644 --- a/src/organise/organisedialog.cpp +++ b/src/organise/organisedialog.cpp @@ -316,7 +316,7 @@ void OrganiseDialog::UpdatePreviews() { const bool format_valid = !has_local_destination || format_.IsValid(); - // Are we gonna enable the ok button? + // Are we going to enable the ok button? bool ok = format_valid && !songs_.isEmpty(); if (capacity != 0 && total_size_ > free) ok = false; diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index 266324e7..b5009e48 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -385,7 +385,7 @@ void PlaylistManager::SetActiveToCurrent() { // Check if we need to update the active playlist. // By calling SetActiveToCurrent, the playlist manager emits the signal "ActiveChanged". - // This signal causes the network remote module to send all playlists to the clients, even no change happend. + // This signal causes the network remote module to send all playlists to the clients, even if no change happen. if (current_id() != active_id()) { SetActivePlaylist(current_id()); } diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index eb31630a..01a7f35e 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -658,7 +658,7 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, QListGetSongById(1); EXPECT_FALSE(song.is_valid()); EXPECT_EQ(-1, song.id());