FramePos: Ensure that all invalid frame positions are equal

mixxxdj · Jul 3, 2021 · 7c5f330 · 7c5f330
1 parent a710a02
commit 7c5f330
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/src/audio/frame.h b/src/audio/frame.h
@@ -135,7 +135,15 @@ inline bool operator>=(FramePos frame1, FramePos frame2) {
 }
 
 inline bool operator==(FramePos frame1, FramePos frame2) {
-    return frame1.value() == frame2.value();
+    if (frame1.isValid() && frame1.isValid()) {
+        return frame1.value() == frame2.value();
+    }
+
+    if (!frame1.isValid() && !frame1.isValid()) {
+        return true;
+    }
+
+    return false;
 }
 
 inline bool operator!=(FramePos frame1, FramePos frame2) {

diff --git a/src/test/frametest.cpp b/src/test/frametest.cpp
@@ -35,3 +35,34 @@ TEST_F(FrameTest, TestFramePosFractional) {
     EXPECT_TRUE(mixxx::audio::FramePos(128.5).isFractional());
     EXPECT_TRUE(mixxx::audio::FramePos(135.67).isFractional());
 }
+
+TEST_F(FrameTest, TestFramePosEquality) {
+    EXPECT_EQ(mixxx::audio::FramePos(0), mixxx::audio::FramePos(0));
+    EXPECT_EQ(mixxx::audio::FramePos(-100), mixxx::audio::FramePos(-100));
+    EXPECT_EQ(mixxx::audio::FramePos(100), mixxx::audio::FramePos(100));
+    EXPECT_EQ(mixxx::audio::FramePos(50) * 2, mixxx::audio::FramePos(100));
+
+    EXPECT_NE(mixxx::audio::FramePos(100), mixxx::audio::FramePos(200));
+    EXPECT_NE(mixxx::audio::FramePos(100), mixxx::audio::FramePos());
+    EXPECT_NE(mixxx::audio::FramePos(0), mixxx::audio::FramePos());
+
+    // Check that invalid positions are equal to each other
+    EXPECT_EQ(mixxx::audio::FramePos(), mixxx::audio::kInvalidFramePos);
+    EXPECT_EQ(mixxx::audio::FramePos(), mixxx::audio::kInvalidFramePos / 2);
+    EXPECT_EQ(mixxx::audio::FramePos(),
+            mixxx::audio::FramePos(mixxx::audio::FramePos::kInvalidValue));
+    EXPECT_EQ(mixxx::audio::FramePos(),
+            mixxx::audio::FramePos(std::numeric_limits<
+                    mixxx::audio::FramePos::value_t>::quiet_NaN()));
+    EXPECT_EQ(mixxx::audio::FramePos(),
+            mixxx::audio::FramePos(std::numeric_limits<
+                    mixxx::audio::FramePos::value_t>::infinity()));
+    EXPECT_EQ(mixxx::audio::FramePos(),
+            mixxx::audio::FramePos(
+                    -std::numeric_limits<
+                            mixxx::audio::FramePos::value_t>::infinity()));
+    EXPECT_EQ(mixxx::audio::FramePos(std::numeric_limits<
+                      mixxx::audio::FramePos::value_t>::quiet_NaN()),
+            mixxx::audio::FramePos(std::numeric_limits<
+                    mixxx::audio::FramePos::value_t>::infinity()));
+}