Fix code style issues

mixxxdj · Aug 31, 2023 · 37a86ed · 37a86ed
1 parent 809f249
commit 37a86ed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.codespellignore b/.codespellignore
@@ -6,3 +6,4 @@ sord
 doubleClick
 sur
 jus
+caf
diff --git a/src/sources/soundsourcecoreaudio.cpp b/src/sources/soundsourcecoreaudio.cpp
@@ -3,8 +3,8 @@
 #include "engine/engine.h"
 #include "sources/mp3decoding.h"
 #include "util/logger.h"
-#include "util/math.h"
 #include "util/macosversion.h"
+#include "util/math.h"
 
 namespace mixxx {
 

diff --git a/src/test/soundproxy_test.cpp b/src/test/soundproxy_test.cpp
@@ -760,7 +760,7 @@ TEST_F(SoundSourceProxyTest, firstSoundTest) {
             {QStringLiteral("cover-test-alac.caf"), 1166},
             {QStringLiteral("cover-test.flac"), 1166},
             {QStringLiteral("cover-test-itunes-12.3.0-aac.m4a"),
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__)
                     1390}, // Media Foundation 10.0.17763.2989
                            // Media Foundation 10.0.20348.1
 #else
@@ -771,8 +771,9 @@ TEST_F(SoundSourceProxyTest, firstSoundTest) {
                            // CoreAusio Version 12.6.7 (Build 21G651)
 #endif
                            // 1168 FFmpeg 4.2.7-0ubuntu0.1
+
             {QStringLiteral("cover-test-ffmpeg-aac.m4a"),
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__)
                     3160}, // Media Foundation 10.0.17763.2989
                            // Media Foundation 10.0.20348.1
 #else
@@ -782,25 +783,28 @@ TEST_F(SoundSourceProxyTest, firstSoundTest) {
                            // CoreAudio Version 11.7.8 (Build 20G1351)
                            // CoreAusio Version 12.6.7 (Build 21G651)
 #endif
+
             {QStringLiteral("cover-test-itunes-12.7.0-alac.m4a"), 1166},
             {QStringLiteral("cover-test-png.mp3"),
-#ifdef __LINUX__
+#ifdef defined(__LINUX__)
                     1752}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_64BIT
-#elif __WINDOWS__
+#elif defined(__WINDOWS__)
                     1752}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_DEFAULT
 #else
-                    0}, // CoreAudio Version 11.7.8 (Build 20G1351)
+                    0},    // CoreAudio Version 11.7.8 (Build 20G1351)
 #endif
+
             {QStringLiteral("cover-test-vbr.mp3"),
-#ifdef __LINUX__
+#if defined(__LINUX__)
                     3376}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_64BIT
-#elif __WINDOWS__
+#elif defined(__WINDOWS__)
                     3326}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_DEFAULT
                            // No offset compared to FPM_64BIT builds but rounding differences
 #else
                     2318}, // CoreAudio Version 11.7.8 (Build 20G1351)
 #endif
                            // 1166 FFmpeg
+
             {QStringLiteral("cover-test.ogg"), 1166},
             {QStringLiteral("cover-test.opus"), 1268},
             {QStringLiteral("cover-test.wav"), 1166},
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ sord @@
     doubleClick
     sur
     jus
+    caf