Merge branch 'main' into syncleader

.github/workflows/build-checks.yml

@@ -11,6 +11,7 @@ jobs:
         include:
           - name: clazy
           - name: clang-tidy
+          - name: coverage
     runs-on: ubuntu-20.04
     name: ${{ matrix.name }}
     steps:
@@ -71,6 +72,31 @@ jobs:
           -DWAVPACK=ON \
           ..
       working-directory: build
+    - name: Configure (coverage)
+      if: matrix.name == 'coverage'
+      run: |
+        cmake \
+          -DCMAKE_BUILD_TYPE=Debug \
+          -DOPTIMIZE=off \
+          -DCOVERAGE=ON \
+          -DWARNINGS_FATAL=OFF \
+          -DDEBUG_ASSERTIONS_FATAL=OFF \
+          -DBATTERY=ON \
+          -DBROADCAST=ON \
+          -DBULK=ON \
+          -DHID=ON \
+          -DLILV=ON \
+          -DOPUS=ON \
+          -DQTKEYCHAIN=ON \
+          -DVINYLCONTROL=ON \
+          -DFFMPEG=ON \
+          -DKEYFINDER=ON \
+          -DLOCALECOMPARE=ON \
+          -DMAD=ON \
+          -DMODPLUG=ON \
+          -DWAVPACK=ON \
+          ..
+      working-directory: build
     - name: Set up problem matcher
       uses: ammaraskar/gcc-problem-matcher@master
     - name: Build
@@ -80,3 +106,34 @@ jobs:
       env:
         CLAZY_CHECKS: level2,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression,no-missing-typeinfo,no-base-class-event
         CLAZY_IGNORE_DIRS: lib/.*
+    - name: "Test"
+      if: matrix.name == 'coverage'
+      run: ctest --timeout 45
+      working-directory: build
+      env:
+        # Render analyzer waveform tests to an offscreen buffer
+        QT_QPA_PLATFORM: ${{ matrix.qt_qpa_platform }}
+        GTEST_COLOR: 1
+        # Only use single thread to prevent *.gcna files from overwriting each other
+        CTEST_PARALLEL_LEVEL: 1
+        CTEST_OUTPUT_ON_FAILURE: 1
+    - name: "Generate Coverage Report"
+      if: matrix.name == 'coverage'
+      run: >-
+        lcov
+        --capture
+        --directory .
+        --base-directory ..
+        --include "${PWD%/*}/src/*"
+        --exclude "${PWD%/*}/src/test/*"
+        --exclude "${PWD%/*}/build/*"
+        --exclude "${PWD%/*}/lib/*"
+        --output-file lcov.info
+      working-directory: build
+    - name: "Upload Coverage Report to coveralls.io"
+      if: matrix.name == 'coverage'
+      uses: coverallsapp/github-action@master
+      with:
+        flag-name: ubuntu-20.04
+        path-to-lcov: build/lcov.info
+        github-token: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -119,6 +119,16 @@ if(NOT BUILD_LOW_MEMORY)
   add_compile_options(-pipe)
 endif()
 
+# Coverage
+#
+# This is only available with GCC, therefore this option is forcibly set to OFF
+# for all other compilers.
+cmake_dependent_option(COVERAGE "Coverage (i.e. gcov) support" OFF "GNU_GCC" OFF)
+if(COVERAGE)
+  add_compile_options(--coverage -fprofile-arcs -ftest-coverage)
+  add_link_options(--coverage -fprofile-arcs -ftest-coverage)
+endif()
+
 # Profiling
 #
 # This is only available on Linux, therefore this option is forcibly set to OFF

cmake/modules/GitInfo.cmake

@@ -1,7 +1,7 @@
 # Get the current commit ref
 if(NOT GIT_DESCRIBE)
   execute_process(
-    COMMAND git describe --tags --always --dirty=-modified
+    COMMAND git describe --tags --always --first-parent --dirty=-modified
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     OUTPUT_VARIABLE GIT_DESCRIBE
     OUTPUT_STRIP_TRAILING_WHITESPACE

res/skins/Deere/style.qss

@@ -264,12 +264,11 @@ WLibrary QLineEdit,
 }
 
 /* checkbox in library "Played" column */
-WTrackTableView::indicator:checked {
-  image: url(skin:/../Deere/icon/ic_library_checkmark.svg);
-  border: 1px solid #ff6600;
-}
 WTrackTableView::indicator:unchecked {
-  border: 1px solid rgba(151,151,151,128);
+  image: url(skin:/../Deere/icon/ic_library_checkbox.svg);
+}
+WTrackTableView::indicator:checked {
+  image: url(skin:/../Deere/icon/ic_library_checkbox_checked.svg);
 }
 
 /* focused BPM cell in the library "BPM" column */
@@ -2122,7 +2121,6 @@ WTrackMenu QMenu QCheckBox::indicator:disabled {
   background-color: #333;
 }
 WLibrarySidebar QMenu::indicator:checked,
-WTrackTableView::indicator:checked,
 WTrackMenu QMenu QCheckBox::indicator:checked {
   image: url(skin:/../Deere/icon/ic_library_checkmark_orange.svg);
 }
@@ -2158,8 +2156,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/LateNight/style.qss

@@ -134,7 +134,8 @@ WEffectSelector QAbstractScrollArea {
     margin: 2px;
   }
   WEffectSelector::down-arrow,
-  #fadeModeCombobox::down-arrow {
+  #fadeModeCombobox::down-arrow,
+  WTrackTableView::indicator {
     border: 0;
     padding: 0;
     margin: 0;

res/skins/LateNight/style_classic.qss

@@ -2450,8 +2450,6 @@ QLineEdit QMenu::item:disabled {
   }
 
   WLibrarySidebar QMenu::indicator:checked,
-  WTrackTableViewHeader QMenu::indicator:checked,
-  WTrackTableView::indicator:checked,
   WTrackMenu QMenu QCheckBox::indicator:checked,
   WEffectSelector::indicator:checked,
   #fadeModeCombobox::indicator:checked {
@@ -2490,18 +2488,13 @@ QLineEdit QMenu::item:disabled {
 
 /* This is the only way to select the 'Played' checkbox.
   Note that this also selects the BPM lock. */
-WTrackTableView::indicator {
-  /* border is added to size defined in style.qss */
-  border: 1px solid transparent;
-  margin: 0px;
-  padding: 0px;
-  }
   WTrackTableView::indicator:checked {
-    border: 1px solid #ff6600;
+    image: url(skin:/classic/buttons/btn__lib_checkbox_checked.svg);
     }
   WTrackTableView::indicator:unchecked {
-    border: 1px solid rgba(151,151,151,128);
+    image: url(skin:/classic/buttons/btn__lib_checkbox.svg);
     }
+
   #MainMenu QMenu::separator,
   WLibrarySidebar QMenu::separator,
   WTrackTableViewHeader QMenu::separator,
@@ -2520,8 +2513,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/LateNight/style_palemoon.qss

@@ -2568,18 +2568,6 @@ WTrackTableView {
   qproperty-focusBorderColor: #fff;
 }
 
-/* This is the only way to select the 'Played' checkbox.
-  Note that this also selects the BPM lock. */
-WTrackTableView::indicator {
-  /* border is added to configured size */
-  border: 1px solid transparent;
-  margin: 0px;
-  padding: 0px;
-  }
-  WTrackTableView::indicator:unchecked {
-    border: 1px solid rgba(151,151,151,128);
-  }
-
 /* Table cell in edit mode */
 WLibrary QLineEdit,
 #LibraryBPMSpinBox {
@@ -2994,12 +2982,15 @@ QLineEdit QMenu::item:disabled {
       image: url(skin:/palemoon/buttons/btn__menu_checkbox.svg);
     }
 
+  /* This is the only way to select the 'Played' checkbox.
+    Note that this also selects the BPM lock, so style that afterwards. */
+  WTrackTableView::indicator:unchecked {
+    image: url(skin:/palemoon/buttons/btn__lib_checkbox.svg);
+  }
   WLibrarySidebar QMenu::indicator:checked,
   WTrackTableViewHeader QMenu::indicator:checked,
   WTrackTableView::indicator:checked,
-  WTrackMenu QMenu QCheckBox::indicator:checked,
-  WEffectSelector::indicator:checked,
-  #fadeModeCombobox::indicator:checked {
+  WTrackMenu QMenu QCheckBox::indicator:checked {
     image: url(skin:/palemoon/buttons/btn__lib_checkmark_blue.svg);
   }
   WEffectSelector::indicator:checked,
@@ -3035,8 +3026,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/Shade/style.qss

@@ -549,15 +549,13 @@ WTrackTableView {
   WTrackTableView::indicator {
     margin: 0px;
     padding: 0px;
-    color: #cfcfcf;
-    border: 1px solid transparent;
+    border: 0px;
     }
-    WTrackTableView::indicator:checked {
-      image: url(skin:/btn/btn_lib_checkmark.svg) no-repeat center center;
-      border: 1px solid #ff6600;
+  WTrackTableView::indicator:unchecked {
+    image: url(skin:/btn/btn_lib_checkbox.svg);
     }
-    WTrackTableView::indicator:unchecked {
-      border: 1px solid rgba(151,151,151,128);
+  WTrackTableView::indicator:checked {
+    image: url(skin:/btn/btn_lib_checkbox_checked.svg);
     }
 
 /* explicitly remove icons from unchecked items otherwise
@@ -566,8 +564,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/Tango/style.qss

@@ -2902,21 +2902,11 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
     }*/
 
   /* checkbox in library "Played" column */
-  WTrackTableView::indicator {
-    margin: 0px;
-    padding: 0px;
-    color: #cfcfcf;
-    /* border is added to size defined above */
-    border: 1px solid rgba(151,151,151,128);
-    }
-  WTrackTableView::indicator:hover {
-      border: 1px solid #888;
-    }
   WTrackTableView::indicator:checked {
-    image: url(skin:/../Tango/buttons/btn_lib_checkmark.svg);
+    image: url(skin:/../Tango/buttons/btn_lib_checkbox_checked.svg);
     }
   WTrackTableView::indicator:unchecked {
-    background: none;
+    image: url(skin:/../Tango/buttons/btn_lib_checkbox.svg);
     }
 
 WLibrary QSpinBox {
@@ -2977,8 +2967,6 @@ WLibrarySidebar QMenu::indicator:unchecked,
 WLibrarySidebar QMenu::indicator:unchecked:selected,
 WTrackTableViewHeader QMenu::indicator:unchecked,
 WTrackTableViewHeader QMenu::indicator:unchecked:selected,
-WTrackTableView::indicator:unchecked,
-WTrackTableView::indicator:unchecked:selected,
 WEffectSelector::indicator:unchecked,
 WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked,

res/skins/default.qss

@@ -11,13 +11,12 @@
   image: url(:/images/library/ic_library_preview_play.svg);
 }
 
-/* These library table indicators are scaled with the library font:
-checkbox next to the 'Played' counter */
+/* 'Played' checkbox */
 WTrackTableView::indicator,
 /* BPM lock icon */
 #LibraryBPMButton::indicator {
-  width: 0.5em;
-  height: 0.5em;
+  /* The indicator size is dynamically adjusted in c++ to match the size
+  of the library font: width/height = 0.7em*/
 }
 /* Style the library BPM Button with a default image */
 QPushButton#LibraryBPMButton {

src/audio/frame.h

@@ -109,6 +109,12 @@ class FramePos final {
         return FramePos(std::floor(value()));
     }
 
+    /// Return position rounded to the nearest full frame position, without
+    /// the fractional part.
+    [[nodiscard]] FramePos toNearestFrameBoundary() const {
+        return FramePos(std::round(value()));
+    }
+
     FramePos& operator+=(FrameDiff_t increment) {
         DEBUG_ASSERT(isValid());
         m_framePosition += increment;

src/engine/controls/bpmcontrol.cpp

@@ -815,9 +815,11 @@ double BpmControl::getBeatMatchPosition(
     }
     if (playing) {
         if (!pOtherEngineBuffer || pOtherEngineBuffer->getSpeed() == 0.0) {
-            // "this" track is playing, or just starting
-            // only match phase if the sync target is playing as well
-            // else use the previous phase of "this" track before the seek
+            // "this" track is playing, or just starting.
+            // Only match phase if the sync target is playing as well,
+            // otherwise use the previous phase of "this" track before the seek.
+            // This occurs when the DJ does a quantized seek -- we preserve
+            // the exact beat distance.
             pOtherEngineBuffer = getEngineBuffer();
         }
     } else if (!pOtherEngineBuffer) {