Merge pull request #18 from daschuer/auto-dj-crates

Auto dj crates from @ulatekh
mixxxdj · Jul 16, 2013 · df18c70 · df18c70
2 parents 341cef8 + 1c3df49
commit df18c70
Show file tree

Hide file tree

Showing 27 changed files with 1,742 additions and 32 deletions.
diff --git a/SConstruct b/SConstruct
@@ -55,6 +55,7 @@ available_features = [features.HifiEq,
                       features.MSVSHacks,
                       features.Vamp,
                       features.PromoTracks,
+                      features.AutoDjCrates,
 
                       # "Features" of dubious quality
                       features.PerfTools,

diff --git a/build/features.py b/build/features.py
@@ -133,7 +133,7 @@ def sources(self, build):
         sources = ['controllers/bulk/bulkcontroller.cpp',
                    'controllers/bulk/bulkenumerator.cpp']
         if not int(build.flags['hid']):
-		    sources.append('controllers/hid/hidcontrollerpresetfilehandler.cpp')
+            sources.append('controllers/hid/hidcontrollerpresetfilehandler.cpp')
         return sources
 
 
@@ -1082,3 +1082,25 @@ def sources(self, build):
                 'library/bundledsongswebview.cpp',
                 "library/featuredartistswebview.cpp",
                 ]
+
+class AutoDjCrates(Feature):
+    def description(self):
+        return "Auto-DJ crates (for random tracks)"
+
+    def enabled(self, build):
+        build.flags['autodjcrates'] = \
+            util.get_flags(build.env, 'autodjcrates', 1)
+        if int(build.flags['autodjcrates']):
+            return True
+        return False
+
+    def add_options(self, build, vars):
+        vars.Add('autodjcrates', 'Set to 1 to enable crates as a source for random Auto-DJ tracks.', 1)
+
+    def configure(self, build, conf):
+        if not self.enabled(build):
+            return
+        build.env.Append(CPPDEFINES = '__AUTODJCRATES__')
+
+    def sources(self, build):
+        return ['library/dao/autodjcratesdao.cpp']
diff --git a/build/qtcreator/mixxx.pro b/build/qtcreator/mixxx.pro
@@ -1,4 +1,4 @@
-CONFIG += debug link_pkgconfig portmidi script vinylcontrol m4a
+CONFIG += debug link_pkgconfig portmidi script vinylcontrol m4a autodjcrates
 # ladspa
 DEFINES += QMAKE \ # define QMAKE for not-SCons specific ifdefs like ui_scriptstudio.h
     __PORTAUDIO__ \
@@ -742,15 +742,15 @@ SOURCES += $$BASE_DIR/src/vamp/vampanalyser.cpp \
     $$BASE_DIR/src/analyservamptest.cpp \
     $$BASE_DIR/src/analyservampkeytest.cpp \
     $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginChannelAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginHostAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginLoader.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginWrapper.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-hostsdk/RealTime.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-sdk/PluginAdapter.cpp \
-	$$BASE_DIR/lib/vamp/src/vamp-sdk/RealTime.cpp
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginChannelAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginHostAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginLoader.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/PluginWrapper.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-hostsdk/RealTime.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-sdk/PluginAdapter.cpp \
+    $$BASE_DIR/lib/vamp/src/vamp-sdk/RealTime.cpp
 }
 
 CONFIG(tonal) {
@@ -856,6 +856,14 @@ CONFIG(ffmpeg) {
         -logg
 }
 
+CONFIG(autodjcrates) {
+    DEFINES += __AUTODJCRATES__
+    HEADERS +=
+        $$BASE_DIR/src/library/dao/autodjcratesdao.h
+    SOURCES +=
+        $$BASE_DIR/src/library/dao/autodjcratesdao.cpp
+}
+
 # Copy Windows dependencies to DESTDIR.
 win32 {
     !exists($$DESTDIR):system( mkdir \"$$replace(DESTDIR, /,$$DIR_SEPARATOR)\" )

diff --git a/src/dlgautodj.cpp b/src/dlgautodj.cpp
@@ -77,6 +77,14 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
     connect(pushButtonSkipNext, SIGNAL(clicked(bool)),
             this, SLOT(skipNextButton(bool)));
 
+#ifdef __AUTODJCRATES__
+    connect(pushButtonAddRandom, SIGNAL(clicked(bool)),
+            this, SIGNAL(addRandomButton(bool)));
+#else // __AUTODJCRATES__
+    pushButtonAddRandom->setVisible(false);
+    horizontalLayout->removeWidget(pushButtonAddRandom);
+#endif // __AUTODJCRATES__
+
     m_pCOFadeNow = new ControlPushButton(
             ConfigKey("[AutoDJ]", "fade_now"));
     m_pCOTFadeNow = new ControlObjectThreadMain(m_pCOFadeNow->getKey());
@@ -666,3 +674,9 @@ void DlgAutoDJ::transitionValueChanged(int value) {
                    ConfigValue(value));
     m_backUpTransition = value;
 }
+
+void DlgAutoDJ::enableRandomButton(bool enabled) {
+#ifdef __AUTODJCRATES__
+    pushButtonAddRandom->setEnabled(enabled);
+#endif // __AUTODJCRATES__
+}
diff --git a/src/dlgautodj.h b/src/dlgautodj.h
@@ -44,8 +44,10 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     void player1PlayChanged(double value);
     void player2PlayChanged(double value);
     void transitionValueChanged(int value);
+    void enableRandomButton(bool enabled);
 
   signals:
+    void addRandomButton(bool buttonChecked);
     void loadTrack(TrackPointer tio);
     void loadTrackToPlayer(TrackPointer tio, QString group, bool);
 

diff --git a/src/dlgautodj.ui b/src/dlgautodj.ui
@@ -53,6 +53,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="pushButtonAddRandom">
+       <property name="text">
+        <string>Add random</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="pushButtonSkipNext">
        <property name="toolTip">

diff --git a/src/dlgprefcontrols.cpp b/src/dlgprefcontrols.cpp
@@ -212,6 +212,45 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxApp * mixxx,
     ComboBoxAutoDjRequeue->setCurrentIndex(m_pConfig->getValueString(ConfigKey("[Auto DJ]", "Requeue")).toInt());
     connect(ComboBoxAutoDjRequeue, SIGNAL(activated(int)), this, SLOT(slotSetAutoDjRequeue(int)));
 
+#ifdef __AUTODJCRATES__
+
+    // The minimum available for randomly-selected tracks
+    autoDjMinimumAvailableSpinBox->setValue(
+            m_pConfig->getValueString(
+                    ConfigKey("[Auto DJ]", "MinimumAvailable"), "20").toInt());
+    connect(autoDjMinimumAvailableSpinBox, SIGNAL(valueChanged(int)), this,
+            SLOT(slotSetAutoDjMinimumAvailable(int)));
+
+    // The auto-DJ replay-age for randomly-selected tracks
+    autoDjIgnoreTimeCheckBox->setChecked(
+            (bool) m_pConfig->getValueString(
+                    ConfigKey("[Auto DJ]", "UseIgnoreTime"), "0").toInt());
+    connect(autoDjIgnoreTimeCheckBox, SIGNAL(stateChanged(int)), this,
+            SLOT(slotSetAutoDjUseIgnoreTime(int)));
+    autoDjIgnoreTimeEdit->setTime(
+            QTime::fromString(
+                    m_pConfig->getValueString(
+                            ConfigKey("[Auto DJ]", "IgnoreTime"), "23:59"),
+                    autoDjIgnoreTimeEdit->displayFormat()));
+    autoDjIgnoreTimeEdit->setEnabled(
+            autoDjIgnoreTimeCheckBox->checkState() == Qt::Checked);
+    connect(autoDjIgnoreTimeEdit, SIGNAL(timeChanged(const QTime &)), this,
+            SLOT(slotSetAutoDjIgnoreTime(const QTime &)));
+
+#else // __AUTODJCRATES__
+
+    // Remove the preferences.
+    autoDjMinimumAvailableLabel->setVisible(false);
+    GridLayout1->removeWidget(autoDjMinimumAvailableLabel);
+    autoDjMinimumAvailableSpinBox->setVisible(false);
+    GridLayout1->removeWidget(autoDjMinimumAvailableSpinBox);
+    autoDjIgnoreTimeCheckBox->setVisible(false);
+    GridLayout1->removeWidget(autoDjIgnoreTimeCheckBox);
+    autoDjIgnoreTimeEdit->setVisible(false);
+    GridLayout1->removeWidget(autoDjIgnoreTimeEdit);
+
+#endif // __AUTODJCRATES__
+
     //
     // Skin configurations
     //
@@ -424,8 +463,31 @@ void DlgPrefControls::slotSetAutoDjRequeue(int)
     m_pConfig->set(ConfigKey("[Auto DJ]", "Requeue"), ConfigValue(ComboBoxAutoDjRequeue->currentIndex()));
 }
 
-void DlgPrefControls::slotSetTooltips(int)
-{
+void DlgPrefControls::slotSetAutoDjMinimumAvailable(int a_iValue) {
+#ifdef __AUTODJCRATES__
+    QString str;
+    str.setNum(a_iValue);
+    m_pConfig->set(ConfigKey("[Auto DJ]","MinimumAvailable"),str);
+#endif // __AUTODJCRATES__
+}
+
+void DlgPrefControls::slotSetAutoDjUseIgnoreTime(int a_iState) {
+#ifdef __AUTODJCRATES__
+    bool bChecked = (a_iState == Qt::Checked);
+    QString strChecked = (bChecked) ? "1" : "0";
+    m_pConfig->set(ConfigKey("[Auto DJ]", "UseIgnoreTime"), strChecked);
+    autoDjIgnoreTimeEdit->setEnabled(bChecked);
+#endif // __AUTODJCRATES__
+}
+
+void DlgPrefControls::slotSetAutoDjIgnoreTime(const QTime &a_rTime) {
+#ifdef __AUTODJCRATES__
+    QString str = a_rTime.toString(autoDjIgnoreTimeEdit->displayFormat());
+    m_pConfig->set(ConfigKey("[Auto DJ]", "IgnoreTime"),str);
+#endif // __AUTODJCRATES__
+}
+
+void DlgPrefControls::slotSetTooltips(int) {
     int configValue = (ComboBoxTooltips->currentIndex() + 1) % 3;
     m_mixxx->setToolTipsCfg(configValue);
 }

diff --git a/src/dlgprefcontrols.h b/src/dlgprefcontrols.h
@@ -59,6 +59,9 @@ public slots:
     void slotSetCueDefault(int);
     void slotSetCueRecall(int);
     void slotSetAutoDjRequeue(int);
+    void slotSetAutoDjMinimumAvailable(int);
+    void slotSetAutoDjUseIgnoreTime(int);
+    void slotSetAutoDjIgnoreTime(const QTime &a_rTime);
     void slotSetRateRamp(bool);
     void slotSetRateRampSensitivity(int);
     void slotSetLocale(int);

diff --git a/src/dlgprefcontrolsdlg.ui b/src/dlgprefcontrolsdlg.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>519</width>
-    <height>729</height>
+    <height>939</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -283,6 +283,49 @@
        </property>
       </widget>
      </item>
+     <item row="11" column="0">
+      <widget class="QLabel" name="autoDjMinimumAvailableLabel">
+       <property name="text">
+        <string>Auto DJ: Minimum available tracks [%]</string>
+       </property>
+      </widget>
+     </item>
+     <item row="11" column="1" colspan="2">
+      <widget class="QSpinBox" name="autoDjMinimumAvailableSpinBox">
+       <property name="toolTip">
+        <string>This percentage of tracks are always available for selecting, regardless of when they were last played.</string>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="value">
+        <number>20</number>
+       </property>
+      </widget>
+     </item>
+     <item row="12" column="0">
+      <widget class="QCheckBox" name="autoDjIgnoreTimeCheckBox">
+       <property name="toolTip">
+        <string>Uncheck, to ignore all played tracks.</string>
+       </property>
+       <property name="text">
+        <string>Auto DJ: Suspend track from re-queue</string>
+       </property>
+      </widget>
+     </item>
+     <item row="12" column="1" colspan="2">
+      <widget class="QTimeEdit" name="autoDjIgnoreTimeEdit">
+       <property name="toolTip">
+        <string>Duration after which a track is eligible for selection by Auto DJ again</string>
+       </property>
+       <property name="displayFormat">
+        <string>hh:mm</string>
+       </property>
+       <property name="timeSpec">
+        <enum>Qt::LocalTime</enum>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="2" column="0">