Merge pull request #4358 from Holzhaus/qdebugsaver

Use QDebugStateSaver to reset debug formatting

CMakeLists.txt

@@ -454,6 +454,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/analyzer/plugins/analyzersoundtouchbeats.cpp
   src/analyzer/plugins/buffering_utils.cpp
   src/analyzer/trackanalysisscheduler.cpp
+  src/audio/frame.cpp
   src/audio/types.cpp
   src/audio/signalinfo.cpp
   src/audio/streaminfo.cpp

src/audio/frame.cpp

@@ -0,0 +1,17 @@
+#include "audio/frame.h"
+
+namespace mixxx {
+namespace audio {
+
+QDebug operator<<(QDebug dbg, FramePos arg) {
+    if (arg.isValid()) {
+        QDebugStateSaver saver(dbg);
+        dbg.nospace() << "FramePos(" << arg.value() << ")";
+    } else {
+        dbg << "FramePos()";
+    }
+    return dbg;
+}
+
+} // namespace audio
+} // namespace mixxx

src/audio/frame.h

@@ -208,14 +208,7 @@ inline bool operator!=(FramePos frame1, FramePos frame2) {
     return !(frame1 == frame2);
 }
 
-inline QDebug operator<<(QDebug dbg, FramePos arg) {
-    if (arg.isValid()) {
-        dbg.nospace() << "FramePos(" << arg.value() << ")";
-    } else {
-        dbg << "FramePos()";
-    }
-    return dbg;
-}
+QDebug operator<<(QDebug dbg, FramePos arg);
 
 constexpr FramePos kInvalidFramePos = FramePos(FramePos::kInvalidValue);
 constexpr FramePos kStartFramePos = FramePos(FramePos::kStartValue);

src/track/bpm.cpp

@@ -65,4 +65,14 @@ QString Bpm::displayValueText(double value) {
     return QString("%1").arg(value, 3, 'f', 1);
 }
 
+QDebug operator<<(QDebug dbg, Bpm arg) {
+    if (arg.isValid()) {
+        QDebugStateSaver saver(dbg);
+        dbg.nospace() << "Bpm(" << arg.value() << ")";
+    } else {
+        dbg << "Bpm(Invalid)";
+    }
+    return dbg;
+}
+
 } // namespace mixxx

src/track/bpm.h

@@ -196,14 +196,7 @@ inline bool operator>=(Bpm bpm1, Bpm bpm2) {
     return bpm2 <= bpm1;
 }
 
-inline QDebug operator<<(QDebug dbg, Bpm arg) {
-    if (arg.isValid()) {
-        dbg.nospace() << "Bpm(" << arg.value() << ")";
-    } else {
-        dbg << "Bpm(Invalid)";
-    }
-    return dbg;
-}
+QDebug operator<<(QDebug dbg, Bpm arg);
 }
 
 Q_DECLARE_TYPEINFO(mixxx::Bpm, Q_MOVABLE_TYPE);