Index: src/dlgprefcontrols.h
===================================================================
--- src/dlgprefcontrols.h (revision 1904)
+++ src/dlgprefcontrols.h (working copy)
@@ -51,6 +51,7 @@
void slotSetScheme(int);
void slotUpdateSchemes();
void slotSetPositionDisplay(int);
+ void slotSetCueDefault(int);
void slotApply();
private:
/** Pointer to ConfigObject */
@@ -59,6 +60,8 @@
ControlObjectThreadMain *m_pControlRate1, *m_pControlRate2, *m_pControlRateRange1, *m_pControlRateRange2;
/** Pointer to ControlObjects for controlling direction of rate sliders */
ControlObjectThreadMain *m_pControlRateDir1, *m_pControlRateDir2;
+ /** Pointer to ControlObjects for cue behavior */
+ ControlObjectThreadMain *m_pControlCueDefault1, *m_pControlCueDefault2;
/** Pointer to MixxxView */
MixxxView *m_pView;
MixxxApp *m_mixxx;
Index: src/enginebuffercue.h
===================================================================
--- src/enginebuffercue.h (revision 1904)
+++ src/enginebuffercue.h (working copy)
@@ -18,8 +18,10 @@
#define ENGINEBUFFERCUE_H
#include "engineobject.h"
+#include "controlobjectthreadmain.h"
class ControlObject;
+class ControlObjectThreadMain;
class ControlPushButton;
class EngineBuffer;
@@ -38,12 +40,18 @@
void slotControlCuePreview(double);
void slotControlCueSimple(double);
void slotControlPlay(double);
+ void slotControlCueDefault(double v);
+ void slotControlCueCDJ(double v);
private:
/** Controls used to manipulate the cue point */
- ControlPushButton *buttonCueSet, *buttonCueGoto, *buttonCueGotoAndStop, *buttonCuePreview;
+ ControlPushButton *buttonCueSet, *buttonCueGoto, *buttonCueGotoAndStop, *buttonCuePreview, *buttonCueCDJ;
/** A single control to manipulate the cue point (suggested by Thread) */
ControlPushButton *buttonCueSimple;
+ /** Default cue control */
+ ControlPushButton *buttonCueDefault;
+ /** Cue behavior preference */
+ ControlObjectThreadMain *m_pControlCueDefault;
/** Pointer to play button */
ControlObject *playButton;
/** Storage of cue point */
Index: src/enginebuffercue.cpp
===================================================================
--- src/enginebuffercue.cpp (revision 1904)
+++ src/enginebuffercue.cpp (working copy)
@@ -53,6 +53,16 @@
buttonCuePreview = new ControlPushButton(ConfigKey(group, "cue_preview"));
connect(buttonCuePreview, SIGNAL(valueChanged(double)), this, SLOT(slotControlCuePreview(double)));
+ // Cue button CDJ style
+ buttonCueCDJ = new ControlPushButton(ConfigKey(group, "cue_cdj"));
+ connect(buttonCueCDJ, SIGNAL(valueChanged(double)), this, SLOT(slotControlCueCDJ(double)));
+
+ // Cue button generic handler
+ buttonCueDefault = new ControlPushButton(ConfigKey(group, "cue_default"));
+ connect(buttonCueDefault, SIGNAL(valueChanged(double)), this, SLOT(slotControlCueDefault(double)));
+
+ // Cue behavior setting
+ m_pControlCueDefault = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey(group,"cue_simple")));
}
EngineBufferCue::~EngineBufferCue()
@@ -62,6 +72,9 @@
delete buttonCueGotoAndStop;
delete buttonCuePreview;
delete buttonCueSimple;
+ delete buttonCueDefault;
+ delete buttonCueCDJ;
+ delete m_pControlCueDefault;
delete cuePoint;
}
@@ -159,7 +172,51 @@
slotControlCueSet();
}
+void EngineBufferCue::slotControlCueCDJ(double v) {
+ /* This is how CDJ cue buttons work:
+ * If pressed while playing, stop playback at go to cue.
+ * If pressed while stopped and at cue, play while pressed.
+ * If pressed while stopped and not at cue, set new cue point.
+ * TODO: If play is pressed while holding cue, the deck is now playing.
+ */
+
+ if ((v==0. && playButton->get()==1.) || playButton->get()==1.)
+ // If we are previewing on button release, or the track is currently playing
+ // and cue is pressed
+ {
+ // Stop playing (set playbutton to stopped) and seek to cue point
+ playButton->set(0.);
+ m_pEngineBuffer->slotControlSeekAbs(cuePoint->get(), false);
+ }
+ else if (v!=0. && playButton->get()==0.)
+ // On button press, If the track is not playing and we are not previewing
+ {
+ // Get current cue for comparison
+ double cue = math_max(0.,round(m_pEngineBuffer->getAbsPlaypos()));
+ if (!even((int)cue)) cue--;
+
+ if (cue == cuePoint->get()) {
+ // If at cue point, start playing
+ playButton->set(1.);
+ } else {
+ // Set new cue point
+ cuePoint->set(cue);
+ }
+ }
+}
+void EngineBufferCue::slotControlCueDefault(double v)
+{
+ // Deicde which cue implementation to call based on the user preference
+ if (m_pControlCueDefault->get() == 0) {
+ // CDJ Mode
+ slotControlCueCDJ(v);
+ } else {
+ // Simple Mode
+ slotControlCueSimple(v);
+ }
+}
+
void EngineBufferCue::process(const CSAMPLE *, const CSAMPLE *, const int)
{
}
Index: src/dlgprefcontrols.cpp
===================================================================
--- src/dlgprefcontrols.cpp (revision 1904)
+++ src/dlgprefcontrols.cpp (working copy)
@@ -138,6 +138,28 @@
QString qSkinPath(pConfig->getValueString(ConfigKey("[Config]","Path")));
QDir dir(qSkinPath.append("skins/"));
dir.setFilter(QDir::Dirs);
+
+ //
+ // Default Cue Behavior
+ //
+
+ m_pControlCueDefault1 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]","cue_simple")));
+ m_pControlCueDefault2 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]","cue_simple")));
+
+ // Set default value in config file and control objects, if not present
+ if (m_pConfig->getValueString(ConfigKey("[Controls]","CueDefault")).length() == 0) {
+ m_pConfig->set(ConfigKey("[Controls]","CueDefault"), ConfigValue(0));
+ m_pControlCueDefault1->slotSet(0);
+ m_pControlCueDefault1->slotSet(0);
+ }
+
+ // Update combo box
+ ComboBoxCueDefault->addItem("CDJ Mode");
+ ComboBoxCueDefault->addItem("Simple");
+ ComboBoxCueDefault->setCurrentIndex(m_pConfig->getValueString(ConfigKey("[Controls]","CueDefault")).toInt());
+
+ connect(ComboBoxCueDefault, SIGNAL(activated(int)), this, SLOT(slotSetCueDefault(int)));
+
// #ifndef QT3_SUPPORT
// const QFileInfoList * list = dir.entryInfoList();
// if (list!=0)
@@ -313,6 +335,13 @@
textLabel->setText(tr("Restart Mixxx before the change of visuals will take effect."));
}
+void DlgPrefControls::slotSetCueDefault(int)
+{
+ m_pConfig->set(ConfigKey("[Controls]","CueDefault"), ConfigValue(ComboBoxCueDefault->currentIndex()));
+ m_pControlCueDefault1->slotSet(ComboBoxCueDefault->currentIndex());
+ m_pControlCueDefault2->slotSet(ComboBoxCueDefault->currentIndex());
+}
+
void DlgPrefControls::slotSetScaleBpm(int)
{
m_pConfig->set(ConfigKey("[Controls]","ScaleBpm"), ConfigValue((ComboBoxScaleBpm->currentIndex()+1)%2));
Index: src/dlgprefcontrolsdlg.ui
===================================================================
--- src/dlgprefcontrolsdlg.ui (revision 1904)
+++ src/dlgprefcontrolsdlg.ui (working copy)
@@ -5,472 +5,491 @@
0
0
- 440
- 393
+ 441
+ 467
Form1
-
- -
-
-
-
-
-
- true
-
-
-
-
+
+
+
+ 10
+ 12
+ 421
+ 266
+
+
+
+
-
+
+
+ true
+
+
+
+
+
+ Skin
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Scheme
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Waveform display
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Position display
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Scale BPM display
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ Scale BPM display according to playback rate
+
+
-
- Skin
+ Yes
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
-
+
+ -
- Scheme
+ No
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
-
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Tool tips
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
-
- Waveform display
+ On
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
-
+
+ -
- Position display
+ Off
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
-
-
- Scale BPM display
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
- Scale BPM display according to playback rate
-
-
-
-
- Yes
-
-
- -
-
- No
-
-
-
-
- -
-
-
- true
-
-
-
-
-
- Tool tips
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
- On
-
-
- -
-
- Off
-
-
-
-
- -
-
-
- true
-
-
-
-
-
- Pitch/Rate slider range
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
-
-
- Pitch/Rate slider direction
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 16777215
- 20
-
-
-
-
-
-
- true
-
-
-
-
-
- -
-
-
-
-
-
- true
-
-
-
-
-
- Temporary pitch/rate buttons
-
-
- false
-
-
-
- -
-
-
- true
-
-
-
-
-
- Permanent pitch/rate buttons
-
-
- false
-
-
-
- -
-
-
- true
-
-
-
-
-
- Left click
-
-
- false
-
-
-
- -
-
-
- Temporary rate change (between 1 and 8000) when left clicking
-
-
- 1
-
-
- 8000
-
-
-
- -
-
-
- true
-
-
-
-
-
- Left click
-
-
- false
-
-
-
- -
-
-
- Permanent rate change (between 1 and 8000) when left clicking
-
-
- 1
-
-
- 8000
-
-
-
- -
-
-
- true
-
-
-
-
-
- Right click
-
-
- false
-
-
-
- -
-
-
- Temporary rate change (between 1 and 8000) when right clicking
-
-
- 1
-
-
- 8000
-
-
-
- -
-
-
- true
-
-
-
-
-
- Right click
-
-
- false
-
-
-
- -
-
-
- Permanent rate change (between 1 and 8000) when right clicking
-
-
- 1
-
-
- 8000
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 217
- 101
-
-
-
-
-
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Pitch/Rate slider range
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Pitch/Rate slider direction
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ Default cue behavior
+
+
+
+ -
+
+
+
+
+
+
+
+ 10
+ 280
+ 417
+ 19
+
+
+
+ -
+
+
+
+ 16777215
+ 20
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+ 10
+ 300
+ 417
+ 96
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Temporary pitch/rate buttons
+
+
+ false
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Permanent pitch/rate buttons
+
+
+ false
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Left click
+
+
+ false
+
+
+
+ -
+
+
+ Temporary rate change (between 1 and 8000) when left clicking
+
+
+ 1
+
+
+ 8000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Left click
+
+
+ false
+
+
+
+ -
+
+
+ Permanent rate change (between 1 and 8000) when left clicking
+
+
+ 1
+
+
+ 8000
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Right click
+
+
+ false
+
+
+
+ -
+
+
+ Temporary rate change (between 1 and 8000) when right clicking
+
+
+ 1
+
+
+ 8000
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Right click
+
+
+ false
+
+
+
+ -
+
+
+ Permanent rate change (between 1 and 8000) when right clicking
+
+
+ 1
+
+
+ 8000
+
+
+
+
+
qPixmapFromMimeSource
Index: src/skins/outlineSmall/skin.xml
===================================================================
--- src/skins/outlineSmall/skin.xml (revision 1904)
+++ src/skins/outlineSmall/skin.xml (working copy)
@@ -505,11 +505,16 @@
56,50
- [Channel1],cue_simple
+ [Channel1],cue_default
true
LeftButton
+ [Channel1],cue_default
+ false
+ LeftButton
+
+
[Channel1],cue_gotoandstop
true
RightButton
@@ -526,11 +531,16 @@
749,49
- [Channel2],cue_simple
+ [Channel2],cue_default
true
LeftButton
+ [Channel2],cue_default
+ false
+ LeftButton
+
+
[Channel2],cue_gotoandstop
true
RightButton