Rename isPartOf() to isSubrangeOf()

11 files changed, 35 insertions, 35 deletions

diff --git a/src/analyzer/analyzerthread.cpp b/src/analyzer/analyzerthread.cpp
index 17fa93e7fe..b561529e66 100644
--- a/src/analyzer/analyzerthread.cpp
+++ b/src/analyzer/analyzerthread.cpp
@@ -254,7 +254,7 @@ AnalyzerThread::AnalysisResult AnalyzerThread::analyzeAudioSource(
                                 chunkFrameRange,
                                 mixxx::SampleBuffer::WritableSlice(m_sampleBuffer)));
         // The returned range fits into the requested range
-        DEBUG_ASSERT(readableSampleFrames.frameIndexRange().isPartOf(chunkFrameRange));
+        DEBUG_ASSERT(readableSampleFrames.frameIndexRange().isSubrangeOf(chunkFrameRange));
 
         // Sometimes the duration of the audio source is inaccurate and adjusted
         // while reading. We need to adjust all frame ranges to reflect this new
@@ -265,7 +265,7 @@ AnalyzerThread::AnalysisResult AnalyzerThread::analyzeAudioSource(
         chunkFrameRange = intersect(chunkFrameRange, audioSourceProxy.frameIndexRange());
         // The audio data that has just been read should still fit into the adjusted
         // chunk range.
-        DEBUG_ASSERT(readableSampleFrames.frameIndexRange().isPartOf(chunkFrameRange));
+        DEBUG_ASSERT(readableSampleFrames.frameIndexRange().isSubrangeOf(chunkFrameRange));
 
         // We also need to adjust the remaining frame range for the next requests.
         remainingFrameRange = intersect(remainingFrameRange, audioSourceProxy.frameIndexRange());
diff --git a/src/engine/cachingreader/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp
index b69e324e60..d7332eb27c 100644
--- a/src/engine/cachingreader/cachingreader.cpp
+++ b/src/engine/cachingreader/cachingreader.cpp
@@ -461,7 +461,7 @@ CachingReader::ReadResult CachingReader::read(SINT startSample, SINT numSamples,
                     // finally fill the remaining buffer with silence.
                     break;
                 }
-                DEBUG_ASSERT(bufferedFrameIndexRange.isPartOf(remainingFrameIndexRange));
+                DEBUG_ASSERT(bufferedFrameIndexRange.isSubrangeOf(remainingFrameIndexRange));
                 if (remainingFrameIndexRange.start() < bufferedFrameIndexRange.start()) {
                     const auto paddingFrameIndexRange =
                             mixxx::IndexRange::between(
diff --git a/src/engine/cachingreader/cachingreaderchunk.cpp b/src/engine/cachingreader/cachingreaderchunk.cpp
index 8edc338dc1..5903383850 100644
--- a/src/engine/cachingreader/cachingreaderchunk.cpp
+++ b/src/engine/cachingreader/cachingreaderchunk.cpp
@@ -75,7 +75,7 @@ mixxx::IndexRange CachingReaderChunk::bufferSampleFrames(
                             sourceFrameIndexRange,
                             mixxx::SampleBuffer::WritableSlice(m_sampleBuffer)));
     DEBUG_ASSERT(m_bufferedSampleFrames.frameIndexRange().empty() ||
-            m_bufferedSampleFrames.frameIndexRange().isPartOf(sourceFrameIndexRange));
+            m_bufferedSampleFrames.frameIndexRange().isSubrangeOf(sourceFrameIndexRange));
     return m_bufferedSampleFrames.frameIndexRange();
 }
 
diff --git a/src/engine/cachingreader/cachingreaderworker.cpp b/src/engine/cachingreader/cachingreaderworker.cpp
index 2ecfb7cc45..ae5b9d8256 100644
--- a/src/engine/cachingreader/cachingreaderworker.cpp
+++ b/src/engine/cachingreader/cachingreaderworker.cpp
@@ -39,7 +39,7 @@ ReaderStatusUpdate CachingReaderWorker::processReadRequest(
     // actually available.
     auto chunkFrameIndexRange = pChunk->frameIndexRange(m_pAudioSource);
     DEBUG_ASSERT(!m_pAudioSource ||
-            chunkFrameIndexRange.isPartOf(m_pAudioSource->frameIndexRange()));
+            chunkFrameIndexRange.isSubrangeOf(m_pAudioSource->frameIndexRange()));
     if (chunkFrameIndexRange.empty()) {
         ReaderStatusUpdate result;
         result.init(CHUNK_READ_INVALID, pChunk, m_pAudioSource ? m_pAudioSource->frameIndexRange() : mixxx::IndexRange());
@@ -51,11 +51,11 @@ ReaderStatusUpdate CachingReaderWorker::processReadRequest(
             m_pAudioSource,
             mixxx::SampleBuffer::WritableSlice(m_tempReadBuffer));
     DEBUG_ASSERT(!m_pAudioSource ||
-            bufferedFrameIndexRange.isPartOf(m_pAudioSource->frameIndexRange()));
+            bufferedFrameIndexRange.isSubrangeOf(m_pAudioSource->frameIndexRange()));
     // The readable frame range might have changed
     chunkFrameIndexRange = intersect(chunkFrameIndexRange, m_pAudioSource->frameIndexRange());
     DEBUG_ASSERT(bufferedFrameIndexRange.empty() ||
-            bufferedFrameIndexRange.isPartOf(chunkFrameIndexRange));
+            bufferedFrameIndexRange.isSubrangeOf(chunkFrameIndexRange));
 
     ReaderStatus status = bufferedFrameIndexRange.empty() ? CHUNK_READ_EOF : CHUNK_READ_SUCCESS;
     if (bufferedFrameIndexRange != chunkFrameIndexRange) {
diff --git a/src/sources/audiosource.cpp b/src/sources/audiosource.cpp
index 3381ce7ce4..b4cd6b7f68 100644
--- a/src/sources/audiosource.cpp
+++ b/src/sources/audiosource.cpp
@@ -201,7 +201,7 @@ bool AudioSource::verifyReadable() {
             frameIndexRange().splitAndShrinkFront(numSampleFrames),
             SampleBuffer::WritableSlice(sampleBuffer));
     auto readableSampleFrames = readSampleFrames(writableSampleFrames);
-    DEBUG_ASSERT(readableSampleFrames.frameIndexRange().isPartOf(
+    DEBUG_ASSERT(readableSampleFrames.frameIndexRange().isSubrangeOf(
             writableSampleFrames.frameIndexRange()));
     if (readableSampleFrames.frameIndexRange().length() <
             writableSampleFrames.frameIndexRange().length()) {
@@ -293,7 +293,7 @@ ReadableSampleFrames AudioSource::readSampleFrames(
         // forward clamped request
         ReadableSampleFrames readable = readSampleFramesClamped(writable);
         DEBUG_ASSERT(readable.frameIndexRange().empty() ||
-                readable.frameIndexRange().isPartOf(writable.frameIndexRange()));
+                readable.frameIndexRange().isSubrangeOf(writable.frameIndexRange()));
         if (readable.frameIndexRange() != writable.frameIndexRange()) {
             kLogger.warning()
                     << "Failed to read sample frames:"
@@ -322,7 +322,7 @@ ReadableSampleFrames AudioSource::readSampleFrames(
                             readable.frameIndexRange().end());
                 }
             }
-            DEBUG_ASSERT(shrinkedFrameIndexRange.isPartOf(m_frameIndexRange) &&
+            DEBUG_ASSERT(shrinkedFrameIndexRange.isSubrangeOf(m_frameIndexRange) &&
                     shrinkedFrameIndexRange.length() < m_frameIndexRange.length());
             kLogger.info()
                     << "Shrinking readable frame index range:"
@@ -342,7 +342,7 @@ ReadableSampleFrames AudioSource::readSampleFrames(
 
 void AudioSource::adjustFrameIndexRange(
         IndexRange frameIndexRange) {
-    DEBUG_ASSERT(frameIndexRange.isPartOf(m_frameIndexRange));
+    DEBUG_ASSERT(frameIndexRange.isSubrangeOf(m_frameIndexRange));
     m_frameIndexRange = frameIndexRange;
 }
 
diff --git a/src/sources/audiosourcestereoproxy.cpp b/src/sources/audiosourcestereoproxy.cpp
index ce68c46a96..58fd110c2c 100644
--- a/src/sources/audiosourcestereoproxy.cpp
+++ b/src/sources/audiosourcestereoproxy.cpp
@@ -104,7 +104,7 @@ ReadableSampleFrames AudioSourceStereoProxy::readSampleFramesClamped(
         return readableSampleFrames;
     }
     DEBUG_ASSERT(
-            readableSampleFrames.frameIndexRange().isPartOf(sampleFrames.frameIndexRange()));
+            readableSampleFrames.frameIndexRange().isSubrangeOf(sampleFrames.frameIndexRange()));
     DEBUG_ASSERT(
             readableSampleFrames.frameIndexRange().start() >=
             sampleFrames.frameIndexRange().start());
diff --git a/src/sources/readaheadframebuffer.cpp b/src/sources/readaheadframebuffer.cpp
index 33834b9005..574bc65d59 100644
--- a/src/sources/readaheadframebuffer.cpp
+++ b/src/sources/readaheadframebuffer.cpp
@@ -207,7 +207,7 @@ WritableSampleFrames ReadAheadFrameBuffer::drainBuffer(
         return outputBuffer;
     }
     const auto consumableRange = intersect2(bufferedRange(), outputRange);
-    DEBUG_ASSERT(!consumableRange || consumableRange->isPartOf(outputRange));
+    DEBUG_ASSERT(!consumableRange || consumableRange->isSubrangeOf(outputRange));
     if (!consumableRange || consumableRange->empty()) {
         // No overlap between buffer and requested data
         return outputBuffer;
diff --git a/src/test/indexrange_test.cpp b/src/test/indexrange_test.cpp
index 437cea63fc..ad0a91312e 100644
--- a/src/test/indexrange_test.cpp
+++ b/src/test/indexrange_test.cpp
@@ -170,22 +170,22 @@ TEST_F(IndexRangeTest, equal) {
     EXPECT_TRUE(IndexRange::between(0, 0) != IndexRange::between(1, 1));
 }
 
-TEST_F(IndexRangeTest, isPartOf) {
-    EXPECT_FALSE(IndexRange::between(3, 3).isPartOf(IndexRange::between(-2, 2)));
-    EXPECT_TRUE(IndexRange::between(0, 0).isPartOf(IndexRange::between(2, -1)));
-    EXPECT_TRUE(IndexRange::between(2, 2).isPartOf(IndexRange::between(2, -1)));
-    EXPECT_FALSE(IndexRange::between(-2, -2).isPartOf(IndexRange::between(2, -1)));
-    EXPECT_TRUE(IndexRange::between(-2, 1).isPartOf(IndexRange::between(-2, 2)));
-    EXPECT_TRUE(IndexRange::between(1, -2).isPartOf(IndexRange::between(2, -2)));
-    EXPECT_FALSE(IndexRange::between(-2, 1).isPartOf(IndexRange::between(-1, 2)));
-    EXPECT_FALSE(IndexRange::between(1, -2).isPartOf(IndexRange::between(2, -1)));
-    EXPECT_FALSE(IndexRange::between(-2, 1).isPartOf(IndexRange::between(0, 1)));
-    EXPECT_FALSE(IndexRange::between(-2, 1).isPartOf(IndexRange::between(1, 2)));
-    EXPECT_FALSE(IndexRange::between(-2, 1).isPartOf(IndexRange::between(1, 1)));
-    EXPECT_FALSE(IndexRange::between(3, 3).isPartOf(IndexRange::between(-2, 1)));
-    EXPECT_FALSE(IndexRange::between(3, 3).isPartOf(IndexRange::between(1, -2)));
-    EXPECT_TRUE(IndexRange::between(1, 1).isPartOf(IndexRange::between(-2, 1)));
-    EXPECT_TRUE(IndexRange::between(1, 1).isPartOf(IndexRange::between(1, -2)));
+TEST_F(IndexRangeTest, isSubrangeOf) {
+    EXPECT_FALSE(IndexRange::between(3, 3).isSubrangeOf(IndexRange::between(-2, 2)));
+    EXPECT_TRUE(IndexRange::between(0, 0).isSubrangeOf(IndexRange::between(2, -1)));
+    EXPECT_TRUE(IndexRange::between(2, 2).isSubrangeOf(IndexRange::between(2, -1)));
+    EXPECT_FALSE(IndexRange::between(-2, -2).isSubrangeOf(IndexRange::between(2, -1)));
+    EXPECT_TRUE(IndexRange::between(-2, 1).isSubrangeOf(IndexRange::between(-2, 2)));
+    EXPECT_TRUE(IndexRange::between(1, -2).isSubrangeOf(IndexRange::between(2, -2)));
+    EXPECT_FALSE(IndexRange::between(-2, 1).isSubrangeOf(IndexRange::between(-1, 2)));
+    EXPECT_FALSE(IndexRange::between(1, -2).isSubrangeOf(IndexRange::between(2, -1)));
+    EXPECT_FALSE(IndexRange::between(-2, 1).isSubrangeOf(IndexRange::between(0, 1)));
+    EXPECT_FALSE(IndexRange::between(-2, 1).isSubrangeOf(IndexRange::between(1, 2)));
+    EXPECT_FALSE(IndexRange::between(-2, 1).isSubrangeOf(IndexRange::between(1, 1)));
+    EXPECT_FALSE(IndexRange::between(3, 3).isSubrangeOf(IndexRange::between(-2, 1)));
+    EXPECT_FALSE(IndexRange::between(3, 3).isSubrangeOf(IndexRange::between(1, -2)));
+    EXPECT_TRUE(IndexRange::between(1, 1).isSubrangeOf(IndexRange::between(-2, 1)));
+    EXPECT_TRUE(IndexRange::between(1, 1).isSubrangeOf(IndexRange::between(1, -2)));
 }
 
 TEST_F(IndexRangeTest, intersect2) {
diff --git a/src/test/soundproxy_test.cpp b/src/test/soundproxy_test.cpp
index efc0092ade..128e489800 100644
--- a/src/test/soundproxy_test.cpp
+++ b/src/test/soundproxy_test.cpp
@@ -129,7 +129,7 @@ class SoundSourceProxyTest : public MixxxTest {
                                     skipRange.length() - skippedRange.length(),
                                     pAudioSource->getSignalInfo().samples2frames(m_skipSampleBuffer.size())));
             EXPECT_FALSE(nextRange.empty());
-            EXPECT_TRUE(nextRange.isPartOf(skipRange));
+            EXPECT_TRUE(nextRange.isSubrangeOf(skipRange));
             const auto readRange = pAudioSource->readSampleFrames(
                     mixxx::WritableSampleFrames(
                             nextRange,
@@ -140,7 +140,7 @@ class SoundSourceProxyTest : public MixxxTest {
                 return skippedRange;
             }
             EXPECT_TRUE(readRange.start() == nextRange.start());
-            EXPECT_TRUE(readRange.isPartOf(skipRange));
+            EXPECT_TRUE(readRange.isSubrangeOf(skipRange));
             if (skippedRange.empty()) {
                 skippedRange = readRange;
             } else {
@@ -251,7 +251,7 @@ TEST_F(SoundSourceProxyTest, seekForwardBackward) {
                                     readFrameIndexRange,
                                     mixxx::SampleBuffer::WritableSlice(contReadData)));
             ASSERT_FALSE(contSampleFrames.frameIndexRange().empty());
-            ASSERT_TRUE(contSampleFrames.frameIndexRange().isPartOf(readFrameIndexRange));
+            ASSERT_TRUE(contSampleFrames.frameIndexRange().isSubrangeOf(readFrameIndexRange));
             ASSERT_EQ(contSampleFrames.frameIndexRange().start(), readFrameIndexRange.start());
             contFrameIndex += contSampleFrames.frameLength();
 
@@ -362,7 +362,7 @@ TEST_F(SoundSourceProxyTest, skipAndRead) {
                                         readFrameIndexRange,
                                         mixxx::SampleBuffer::WritableSlice(contReadData)));
                 ASSERT_FALSE(contSampleFrames.frameIndexRange().empty());
-                ASSERT_TRUE(contSampleFrames.frameIndexRange().isPartOf(readFrameIndexRange));
+                ASSERT_TRUE(contSampleFrames.frameIndexRange().isSubrangeOf(readFrameIndexRange));
                 ASSERT_EQ(contSampleFrames.frameIndexRange().start(), readFrameIndexRange.start());
                 contFrameIndex += contSampleFrames.frameLength();
 
diff --git a/src/util/indexrange.cpp b/src/util/indexrange.cpp
index 5b21efe028..cde8371a3e 100644
--- a/src/util/indexrange.cpp
+++ b/src/util/indexrange.cpp
@@ -42,7 +42,7 @@ IndexRange IndexRange::splitAndShrinkBack(SINT backLength) {
     }
 }
 
-bool IndexRange::isPartOf(IndexRange outerIndexRange) const {
+bool IndexRange::isSubrangeOf(IndexRange outerIndexRange) const {
     if (outerIndexRange.start() <= outerIndexRange.end()) {
         if (start() <= end()) {
             return (outerIndexRange.start() <= start() &&
diff --git a/src/util/indexrange.h b/src/util/indexrange.h
index 3453a4f367..65806b89a9 100644
--- a/src/util/indexrange.h
+++ b/src/util/indexrange.h
@@ -140,7 +140,7 @@ class IndexRange final: private std::pair<SINT, SINT> {
     // the length of this range.
     IndexRange splitAndShrinkBack(SINT backLength);
 
-    bool isPartOf(IndexRange outerIndexRange) const;
+    bool isSubrangeOf(IndexRange outerIndexRange) const;
 
     friend
     bool operator==(IndexRange lhs, IndexRange rhs) {