Merge branch '2.3' of [email protected]:mixxxdj/mixxx.git

.codespellignore

@@ -2,3 +2,4 @@ Crate
 crate
 InOut
 copyable
+sord

.pre-commit-config.yaml

@@ -45,7 +45,7 @@ default_language_version:
   python: python3
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.3.0
+  rev: v4.0.1
   hooks:
   - id: fix-byte-order-marker
     exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters)$
@@ -67,14 +67,16 @@ repos:
     - manual
   - id: no-commit-to-branch
 - repo: https://github.com/codespell-project/codespell
-  rev: v1.17.1
+  rev: v2.1.0
   hooks:
   - id: codespell
-    # ignore-regex is substituted by ' '
-    entry: tools/codespell.py --ignore-file .codespellignore --ignore-regex "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))" --files
-    exclude: ^(\.codespellignore|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl))$
+    # The wrapper script tools/codespell.py only checks changed lines instead of all files.
+    entry: tools/codespell.py --ignore-words .codespellignore --ignore-regex "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))" --files
+    # Replace 'entry' with 'args' to run the checks on all files instead of only changed lines.
+    #args: [--ignore-words, .codespellignore, --ignore-regex, "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))"]
+    exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl))$
 - repo: https://github.com/pre-commit/mirrors-eslint
-  rev: v7.12.1
+  rev: v7.32.0
   hooks:
   - id: eslint
     args: [--fix, --report-unused-disable-directives]
@@ -94,18 +96,18 @@ repos:
     language: python
     files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|m|mm|proto|vert)$
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 21.7b0
   hooks:
   - id: black
     files: ^tools/.*$
 - repo: https://gitlab.com/pycqa/flake8
-  rev: '3.8.4'
+  rev: '3.9.2'
   hooks:
   - id: flake8
     files: ^tools/.*$
     types: [text, python]
 - repo: https://github.com/shellcheck-py/shellcheck-py
-  rev: v0.7.1.1
+  rev: v0.7.2.1
   hooks:
   - id: shellcheck
 - repo: local

CHANGELOG.md

@@ -378,87 +378,79 @@ lots of controller mappings, rewrote the audio file decoders twice, and of
 course fixed a bunch of bugs. Download it!
 
 Here is a quick summary of what is new in Mixxx 2.1.0:
-  * Graphical interface scales for high resolution screens
-  * Overhauled Deere and LateNight skins
-  * New Tango skin
-  * Effects are synchronized to the tempo
-  * Effects are processed post-fader and post-crossfader and can be previewed
-in headphones
-  * One metaknob per effect with customizable parameter control for intuitive
-use of effect chains
-  * Nine new effects: Autopan, Biquad Equalizer, Biquad Full Kill Equalizer,
-Loudness Contour, Metronome, Parametric Equalizer, Phaser, Stereo Balance,
-Tremolo
-  * Loaded effects and their parameters are saved and restored when Mixxx
-restarts
-  * More transparent sounding equalizers (Biquad Equalizer and Biquad Full Kill
-Equalizer)
-  * Improved scratching sounds with jog wheels, vinyl control, and dragging
-waveforms with the mouse
-  * Simplified looping and beatjump controls
-  * Configurable rows of 8 samplers with up to 8 rows available for a total of
-64 samplers
-  * Files loaded to samplers are reloaded when Mixxx restarts
-  * Improved volume normalization algorithm (EBU-R 128)
-  * Filter library table by crates
-  * Sort musical keys in library table by circle of fifths
-  * Write metadata tags back to audio files
-  * New JavaScript library for controller mapping
-  * Configure multiple Internet broadcasting stations and use multiple stations
-at the same time
-  * Broadcast and record microphones with direct monitoring and latency
-compensation
-  * Broadcast and record from an external mixer
-  * Booth output with independent gain knob for using sound cards with 6
-output channels without an external mixer
-  * Prevent screensaver from starting while Mixxx is running
-  * CUP (Cue And Play) cue button mode
-  * Time remaining and time elapsed now take into account the tempo fader
-  * Clicking cover art now shows it full size in a separate window
-  * and of course, lots and lots of bug fixes.
+
+* Graphical interface scales for high resolution screens
+* Overhauled Deere and LateNight skins
+* New Tango skin
+* Effects are synchronized to the tempo
+* Effects are processed post-fader and post-crossfader and can be previewed in headphones
+* One metaknob per effect with customizable parameter control for intuitive use of effect chains
+* Nine new effects: Autopan, Biquad Equalizer, Biquad Full Kill Equalizer, Loudness Contour, Metronome, Parametric Equalizer, Phaser, Stereo Balance, Tremolo
+* Loaded effects and their parameters are saved and restored when Mixxx restarts
+* More transparent sounding equalizers (Biquad Equalizer and Biquad Full Kill Equalizer)
+* Improved scratching sounds with jog wheels, vinyl control, and dragging waveforms with the mouse
+* Simplified looping and beatjump controls
+* Configurable rows of 8 samplers with up to 8 rows available for a total of 64 samplers
+* Files loaded to samplers are reloaded when Mixxx restarts
+* Improved volume normalization algorithm (EBU-R 128)
+* Filter library table by crates
+* Sort musical keys in library table by circle of fifths
+* Write metadata tags back to audio files
+* New JavaScript library for controller mapping
+* Configure multiple Internet broadcasting stations and use multiple stations at the same time
+* Broadcast and record microphones with direct monitoring and latency compensation
+* Broadcast and record from an external mixer
+* Booth output with independent gain knob for using sound cards with 6 output channels without an external mixer
+* Prevent screensaver from starting while Mixxx is running
+* CUP (Cue And Play) cue button mode
+* Time remaining and time elapsed now take into account the tempo fader
+* Clicking cover art now shows it full size in a separate window
+* and of course, lots and lots of bug fixes.
 
 Here are controllers with mappings that have been added or updated since the 2.0
 release. Mappings marked with an asterisk (*) have been updated for the new
 effects interface:
-  * American Audio VMS2
-  * American Audio VMS4
-  * Allen & Heath Xone K2/K1*
-  * Behringer CMD Micro
-  * Behringer CMD MM1*
-  * Behringer CMD Studio 4a
-  * Denon MC4000*
-  * Denon MC6000 Mk2*
-  * FaderFox DJ2
-  * Hercules DJ Console 4-Mx*
-  * Hercules DJ Control MP3 LE / Glow
-  * Hercules DJ Control Compact
-  * Hercules P32*
-  * Ion Discover DJ
-  * Korg Nanokontrol 2
-  * Korg KAOSS DJ
-  * M-Audio Xponent
-  * Native Instruments Traktor Kontrol S4 Mk2*
-  * Novation Launchpad Mk1 & Mk2
-  * Novation Twitch
-  * Numark Mixtrack Pro 3 & Numark Mixtrack 3*
-  * Pioneer DDJ-SB2*
-  * Pioneer DDJ-SX*
-  * Reloop Beatmix 2
-  * Reloop Beatmix 4
-  * Reloop Digital Jockey 3 ME
-  * Reloop Terminal Mix 2
-  * Reloop Terminal Mix 4
-  * Vestax VCI-100 Mk2
-  * Vestax Typhoon
+
+* American Audio VMS2
+* American Audio VMS4
+* Allen & Heath Xone K2/K1*
+* Behringer CMD Micro
+* Behringer CMD MM1*
+* Behringer CMD Studio 4a
+* Denon MC4000*
+* Denon MC6000 Mk2*
+* FaderFox DJ2
+* Hercules DJ Console 4-Mx*
+* Hercules DJ Control MP3 LE / Glow
+* Hercules DJ Control Compact
+* Hercules P32*
+* Ion Discover DJ
+* Korg Nanokontrol 2
+* Korg KAOSS DJ
+* M-Audio Xponent
+* Native Instruments Traktor Kontrol S4 Mk2*
+* Novation Launchpad Mk1 & Mk2
+* Novation Twitch
+* Numark Mixtrack Pro 3 & Numark Mixtrack 3*
+* Pioneer DDJ-SB2*
+* Pioneer DDJ-SX*
+* Reloop Beatmix 2
+* Reloop Beatmix 4
+* Reloop Digital Jockey 3 ME
+* Reloop Terminal Mix 2
+* Reloop Terminal Mix 4
+* Vestax VCI-100 Mk2
+* Vestax Typhoon
 
 For users upgrading from older versions of Mixxx, we have a few important
 announcements. First, if you are using Windows, you will have to uninstall any
 old versions of Mixxx before you can install 2.1. How to uninstall Mixxx
 varies on different versions of Windows:
-  * Windows Vista, 7, and 8: [Start > Control Panel > Programs > Uninstall a
-    Program](https://support.microsoft.com/en-us/help/2601726)
-  * Windows 10: [Start > Control Panel > Programs > Programs And Features >
-    look for Mixxx > Uninstall](https://support.microsoft.com/en-gb/help/4028054/windows-repair-or-remove-programs-in-windows-10)
+
+* Windows Vista, 7, and 8: [Start > Control Panel > Programs > Uninstall a
+  Program](https://support.microsoft.com/en-us/help/2601726)
+* Windows 10: [Start > Control Panel > Programs > Programs And Features >
+  look for Mixxx > Uninstall](https://support.microsoft.com/en-gb/help/4028054/windows-repair-or-remove-programs-in-windows-10)
 
 If you are upgrading from an older version of Mixxx and have MP3 files in
 your library, we have another important announcement. The good news is that we

CMakeLists.txt

@@ -1380,7 +1380,7 @@ if(UNIX AND NOT APPLE)
   # .desktop file for KDE/GNOME menu
   install(
     FILES
-      "${CMAKE_CURRENT_SOURCE_DIR}/res/linux/mixxx.desktop"
+      "${CMAKE_CURRENT_SOURCE_DIR}/res/linux/org.mixxx.Mixxx.desktop"
     DESTINATION
       "${CMAKE_INSTALL_DATADIR}/applications"
   )

res/linux/mixxx.metainfo.xml

@@ -2,7 +2,7 @@
 <!-- Author 2014 Tuukka Pasanen <[email protected]> -->
 <component type="desktop-application">
   <id>org.mixxx.Mixxx</id>
-  <launchable type="desktop-id">mixxx.desktop</launchable>
+  <launchable type="desktop-id">org.mixxx.Mixxx.desktop</launchable>
   <metadata_license>CC-BY-SA-3.0</metadata_license>
   <project_license>GPL-2.0</project_license>
   <name>Mixxx DJ Software</name>

src/sources/soundsource.cpp

@@ -6,7 +6,7 @@ namespace mixxx {
 
 namespace {
 
-const Logger kLogger("AudioSource");
+const Logger kLogger("SoundSource");
 
 inline QUrl validateUrl(QUrl url) {
     DEBUG_ASSERT(url.isValid());

tools/codespell.py

@@ -62,7 +62,7 @@ def main(argv: typing.Optional[typing.List[str]] = None) -> int:
     parser.add_argument("--from-ref", help="use changes changes since commit")
     parser.add_argument("--to-ref", help="use changes until commit")
     parser.add_argument(
-        "--ignore-file",
+        "--ignore-words",
         type=argparse.FileType("r"),
         help="ignore matches (one per line)",
     )
@@ -98,8 +98,8 @@ def main(argv: typing.Optional[typing.List[str]] = None) -> int:
     )
 
     ignore_matches = set()
-    if args.ignore_file:
-        ignore_matches = set(get_ignore_matches(args.ignore_file))
+    if args.ignore_words:
+        ignore_matches = set(get_ignore_matches(args.ignore_words))
 
     result = 0
     for filename, file_lines in itertools.groupby(