Render bar and phrase marks and a menu option to enable / disable

.gitignore

@@ -1,3 +1,5 @@
+.cproject
+.project
 *.diff
 *.log
 *.o

res/skins/Deere/deck_visual_row.xml

@@ -28,6 +28,8 @@
         <SignalRGBLowColor></SignalRGBLowColor>
         <SignalColor><Variable name="DeckSignalColor"/></SignalColor>
         <BeatColor>#ffffff</BeatColor>
+        <BarColor>#ccffff</BarColor>
+        <PhraseColor>#00ff00</PhraseColor>
         <PlayPosColor>#00FF00</PlayPosColor>
         <EndOfTrackColor>#EA0000</EndOfTrackColor>
         <AxesColor></AxesColor>

res/skins/LateNight/waveform.xml

@@ -14,6 +14,8 @@
         <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
         <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
         <BeatColor>#ffffff</BeatColor>
+        <BarColor>#ccffff</BarColor>
+        <PhraseColor>#00ff00</PhraseColor>
         <BeatHighlightColor></BeatHighlightColor>
         <PlayPosColor>#00FF00</PlayPosColor>
         <EndOfTrackColor>#EA0000</EndOfTrackColor>

res/skins/Shade/waveform.xml

@@ -11,6 +11,8 @@
     <SignalLowColor></SignalLowColor>
     <SignalColor>#191F24</SignalColor>
     <BeatColor>#FFFFFF</BeatColor>
+    <BarColor>#CCFFFFF</BarColor>
+    <PhraseColor>#00FF00</PhraseColor>
     <PlayPosColor>#00FF00</PlayPosColor>
     <EndOfTrackColor>#EA0000</EndOfTrackColor>
     <AxesColor>#00FF00</AxesColor>

res/skins/Tango/waveform.xml

@@ -29,6 +29,8 @@ Variables:
         <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
         <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
         <BeatColor>#ffffff</BeatColor>
+        <BarColor>#00630e</BarColor>
+        <PhraseColor>#00ff00</PhraseColor>
         <PlayPosColor>#FF4300</PlayPosColor>
         <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
         <DefaultMark>

src/engine/controls/bpmcontrol.cpp

@@ -1,4 +1,5 @@
 #include <QStringList>
+#include <QtDebug>
 
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
@@ -114,6 +115,9 @@ BpmControl::BpmControl(QString group,
             this, &BpmControl::slotBeatsTranslate,
             Qt::DirectConnection);
 
+    m_pButtonPhraseMark = new ControlObject(ConfigKey(group, "set_phrase_mark"));
+    connect(m_pButtonPhraseMark, &ControlObject::valueChanged, this, &BpmControl::slotSetPhraseMark, Qt::DirectConnection);
+
     m_pBeatsTranslateMatchAlignment = new ControlPushButton(ConfigKey(group, "beats_translate_match_alignment"));
     connect(m_pBeatsTranslateMatchAlignment, &ControlObject::valueChanged,
             this, &BpmControl::slotBeatsTranslateMatchAlignment,
@@ -794,6 +798,16 @@ void BpmControl::slotBeatsTranslate(double v) {
     }
 }
 
+void BpmControl::slotSetPhraseMark(double v) {
+    if (v > 0) {
+        TrackPointer pTrack = m_pTrack;
+        double currentSample = getSampleOfTrack().current;
+        if (pTrack) {
+            pTrack->setPhraseBegin(currentSample);
+        }
+    }
+}
+
 void BpmControl::slotBeatsTranslateMatchAlignment(double v) {
     BeatsPointer pBeats = m_pBeats;
     if (v > 0 && pBeats && (pBeats->getCapabilities() & Beats::BEATSCAP_TRANSLATE)) {

src/engine/controls/bpmcontrol.h

@@ -88,6 +88,7 @@ class BpmControl : public EngineControl {
     void slotUpdatedTrackBeats();
     void slotBeatsTranslate(double);
     void slotBeatsTranslateMatchAlignment(double);
+    void slotSetPhraseMark(double);
 
   private:
     SyncMode getSyncMode() const {
@@ -144,6 +145,10 @@ class BpmControl : public EngineControl {
     // Button that translates the beats so the nearest beat is on the current
     // playposition.
     ControlPushButton* m_pTranslateBeats;
+
+    // Button that sets a phrase mark to the closest beat.
+    ControlObject* m_pButtonPhraseMark;
+
     // Button that translates beats to match another playing deck
     ControlPushButton* m_pBeatsTranslateMatchAlignment;
 

src/preferences/dialog/dlgprefwaveform.cpp

@@ -1,3 +1,5 @@
+#include <QtDebug>
+
 #include "preferences/dialog/dlgprefwaveform.h"
 
 #include "mixxx.h"
@@ -73,6 +75,7 @@ DlgPrefWaveform::DlgPrefWaveform(QWidget* pParent, MixxxMainWindow* pMixxx,
             this, SLOT(slotSetVisualGainHigh(double)));
     connect(normalizeOverviewCheckBox, SIGNAL(toggled(bool)),
             this, SLOT(slotSetNormalizeOverview(bool)));
+    connect(showBarAndPhraseMarksCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotSetBarAndPhrase(bool)));
     connect(factory, SIGNAL(waveformMeasured(float,int)),
             this, SLOT(slotWaveformMeasured(float,int)));
     connect(waveformOverviewComboBox, SIGNAL(currentIndexChanged(int)),
@@ -111,6 +114,7 @@ void DlgPrefWaveform::slotUpdate() {
     midVisualGain->setValue(factory->getVisualGain(WaveformWidgetFactory::Mid));
     highVisualGain->setValue(factory->getVisualGain(WaveformWidgetFactory::High));
     normalizeOverviewCheckBox->setChecked(factory->isOverviewNormalized());
+    showBarAndPhraseMarksCheckBox->setChecked(factory->getShowBarAndPhrase());
     // Round zoom to int to get a default zoom index.
     defaultZoomComboBox->setCurrentIndex(static_cast<int>(factory->getDefaultZoom()) - 1);
     playMarkerPositionSlider->setValue(factory->getPlayMarkerPosition() * 100);
@@ -231,6 +235,10 @@ void DlgPrefWaveform::slotSetNormalizeOverview(bool normalize) {
     WaveformWidgetFactory::instance()->setOverviewNormalized(normalize);
 }
 
+void DlgPrefWaveform::slotSetBarAndPhrase(bool showBarAndPhrase) {
+    WaveformWidgetFactory::instance()->setShowBarAndPhrase(showBarAndPhrase);
+}
+
 void DlgPrefWaveform::slotWaveformMeasured(float frameRate, int droppedFrames) {
     frameRateAverage->setText(
             QString::number((double)frameRate, 'f', 2) + " : " +

src/preferences/dialog/dlgprefwaveform.h

@@ -34,6 +34,7 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
     void slotSetVisualGainMid(double gain);
     void slotSetVisualGainHigh(double gain);
     void slotSetNormalizeOverview(bool normalize);
+    void slotSetBarAndPhrase(bool barAndPhrase);
     void slotWaveformMeasured(float frameRate, int droppedFrames);
     void slotClearCachedWaveforms();
     void slotSetBeatGridAlpha(int alpha);

src/preferences/dialog/dlgprefwaveformdlg.ui

@@ -16,7 +16,7 @@
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout_2">
-     <item row="10" column="0">
+     <item row="12" column="0">
       <widget class="QLabel" name="visualGainLabel">
        <property name="text">
         <string>Visual gain</string>
@@ -64,7 +64,14 @@
        </property>
       </widget>
      </item>
-     <item row="13" column="1">
+     <item row="10" column="1">
+      <widget class="QCheckBox" name="showBarAndPhraseMarksCheckBox">
+       <property name="text">
+        <string>Show bar and phrase marks</string>
+       </property>
+      </widget>
+     </item>
+     <item row="14" column="1">
       <widget class="QLabel" name="openGlStatusIcon">
        <property name="toolTip">
         <string>Displays which OpenGL version is supported by the current platform.</string>
@@ -93,7 +100,7 @@
        </property>
       </widget>
      </item>
-     <item row="14" column="0">
+     <item row="15" column="0">
       <widget class="QLabel" name="openGlStatusLabel_2">
        <property name="toolTip">
         <string/>
@@ -123,14 +130,14 @@
       <widget class="QComboBox" name="defaultZoomComboBox"/>
      </item>
 
-     <item row="12" column="0" colspan="4">
+     <item row="13" column="0" colspan="4">
       <widget class="Line" name="line">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="13" column="0">
+     <item row="14" column="0">
       <widget class="QLabel" name="openGlStatusLabel">
        <property name="toolTip">
         <string/>
@@ -165,7 +172,7 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="1" colspan="3">
+     <item row="12" column="1" colspan="3">
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="1" column="2">
         <widget class="QDoubleSpinBox" name="midVisualGain">
@@ -323,7 +330,7 @@ Select from different types of displays for the waveform, which differ primarily
        </property>
       </widget>
      </item>
-     <item row="14" column="1">
+     <item row="16" column="1">
       <widget class="QLabel" name="frameRateAverage">
        <property name="toolTip">
         <string>Displays the actual frame rate.</string>

src/proto/beats.proto

@@ -28,4 +28,5 @@ message BeatMap {
 message BeatGrid {
   optional Bpm bpm = 1;
   optional Beat first_beat = 2;
+  optional Beat first_phrase = 3;
 }

src/test/beatgridtest.cpp

@@ -41,7 +41,7 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat) {
     TrackPointer pTrack(Track::newTemporary());
 
     int sampleRate = 44100;
-    double bpm = 60.0;
+    double bpm = 60.1;
     const int kFrameSize = 2;
     pTrack->setBpm(bpm);
     pTrack->setSampleRate(sampleRate);
@@ -58,26 +58,26 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat) {
     // findNthBeat should return exactly the current beat if we ask for 1 or
     // -1. For all other values, it should return n times the beat length.
     for (int i = 1; i < 20; ++i) {
-        EXPECT_EQ(position + beatLength*(i-1), pGrid->findNthBeat(position, i));
-        EXPECT_EQ(position + beatLength*(-i+1), pGrid->findNthBeat(position, -i));
+        EXPECT_DOUBLE_EQ(position + beatLength * (i - 1), pGrid->findNthBeat(position, i));
+        EXPECT_DOUBLE_EQ(position + beatLength * (-i + 1), pGrid->findNthBeat(position, -i));
     }
 
     // Also test prev/next beat calculation.
     double prevBeat, nextBeat;
     pGrid->findPrevNextBeats(position, &prevBeat, &nextBeat);
-    EXPECT_EQ(position, prevBeat);
-    EXPECT_EQ(position + beatLength, nextBeat);
+    EXPECT_DOUBLE_EQ(position, prevBeat);
+    EXPECT_DOUBLE_EQ(position + beatLength, nextBeat);
 
     // Both previous and next beat should return the current position.
-    EXPECT_EQ(position, pGrid->findNextBeat(position));
-    EXPECT_EQ(position, pGrid->findPrevBeat(position));
+    EXPECT_DOUBLE_EQ(position, pGrid->findNextBeat(position));
+    EXPECT_DOUBLE_EQ(position, pGrid->findPrevBeat(position));
 }
 
 TEST(BeatGridTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
     TrackPointer pTrack(Track::newTemporary());
 
     int sampleRate = 44100;
-    double bpm = 60.0;
+    double bpm = 60.1;
     const int kFrameSize = 2;
     pTrack->setBpm(bpm);
     pTrack->setSampleRate(sampleRate);
@@ -96,26 +96,26 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
     // findNthBeat should return exactly the current beat if we ask for 1 or
     // -1. For all other values, it should return n times the beat length.
     for (int i = 1; i < 20; ++i) {
-        EXPECT_EQ(kClosestBeat + beatLength*(i-1), pGrid->findNthBeat(position, i));
-        EXPECT_EQ(kClosestBeat + beatLength*(-i+1), pGrid->findNthBeat(position, -i));
+        EXPECT_DOUBLE_EQ(kClosestBeat + beatLength * (i - 1), pGrid->findNthBeat(position, i));
+        EXPECT_DOUBLE_EQ(kClosestBeat + beatLength * (-i + 1), pGrid->findNthBeat(position, -i));
     }
 
     // Also test prev/next beat calculation.
     double prevBeat, nextBeat;
     pGrid->findPrevNextBeats(position, &prevBeat, &nextBeat);
-    EXPECT_EQ(kClosestBeat, prevBeat);
-    EXPECT_EQ(kClosestBeat + beatLength, nextBeat);
+    EXPECT_DOUBLE_EQ(kClosestBeat, prevBeat);
+    EXPECT_DOUBLE_EQ(kClosestBeat + beatLength, nextBeat);
 
     // Both previous and next beat should return the closest beat.
-    EXPECT_EQ(kClosestBeat, pGrid->findNextBeat(position));
-    EXPECT_EQ(kClosestBeat, pGrid->findPrevBeat(position));
+    EXPECT_DOUBLE_EQ(kClosestBeat, pGrid->findNextBeat(position));
+    EXPECT_DOUBLE_EQ(kClosestBeat, pGrid->findPrevBeat(position));
 }
 
 TEST(BeatGridTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
     TrackPointer pTrack(Track::newTemporary());
 
     int sampleRate = 44100;
-    double bpm = 60.0;
+    double bpm = 60.1;
     const int kFrameSize = 2;
     pTrack->setBpm(bpm);
     pTrack->setSampleRate(sampleRate);
@@ -134,25 +134,25 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
     // findNthBeat should return exactly the current beat if we ask for 1 or
     // -1. For all other values, it should return n times the beat length.
     for (int i = 1; i < 20; ++i) {
-        EXPECT_EQ(kClosestBeat + beatLength*(i-1), pGrid->findNthBeat(position, i));
-        EXPECT_EQ(kClosestBeat + beatLength*(-i+1), pGrid->findNthBeat(position, -i));
+        EXPECT_DOUBLE_EQ(kClosestBeat + beatLength * (i - 1), pGrid->findNthBeat(position, i));
+        EXPECT_DOUBLE_EQ(kClosestBeat + beatLength * (-i + 1), pGrid->findNthBeat(position, -i));
     }
 
     // Also test prev/next beat calculation.
     double prevBeat, nextBeat;
     pGrid->findPrevNextBeats(position, &prevBeat, &nextBeat);
-    EXPECT_EQ(kClosestBeat, prevBeat);
-    EXPECT_EQ(kClosestBeat + beatLength, nextBeat);
+    EXPECT_DOUBLE_EQ(kClosestBeat, prevBeat);
+    EXPECT_DOUBLE_EQ(kClosestBeat + beatLength, nextBeat);
 
     // Both previous and next beat should return the closest beat.
-    EXPECT_EQ(kClosestBeat, pGrid->findNextBeat(position));
-    EXPECT_EQ(kClosestBeat, pGrid->findPrevBeat(position));
+    EXPECT_DOUBLE_EQ(kClosestBeat, pGrid->findNextBeat(position));
+    EXPECT_DOUBLE_EQ(kClosestBeat, pGrid->findPrevBeat(position));
 }
 
 TEST(BeatGridTest, TestNthBeatWhenNotOnBeat) {
     TrackPointer pTrack(Track::newTemporary());
     int sampleRate = 44100;
-    double bpm = 60.0;
+    double bpm = 60.1;
     const int kFrameSize = 2;
     pTrack->setBpm(bpm);
     pTrack->setSampleRate(sampleRate);