Merge lp:~khyew/mixxx/fixes-1.9 into lp:mixxx/1.9

[Qifan Xi]

fixes shit. I think I'm getting the hang of this Launchpad stuff finally.

[Albert Santoni (gamegod)]

Looks good, thanks Qifan!

review: Approve

[Albert Santoni (gamegod)]

Also - Tests good with the SCS.3d.

The cue+play behaviour is slightly different with the SCS.3d compared to the keyboard, but I don't think it's a big deal for now. At some point the custom .js that implements this cue+play feature for the SCS.3d should be removed, now that it's in the Mixxx core.

For the record, the current behaviours are:

SCS.3d - to get cue+play to continue the song, you must press both cue and play down, then release cue first. If you release play first, it will not continue the song upon releasing cue.

Keyboard - to get cue+play to continue the song, you just need to tap play while cue is depressed. It doesn't matter what order you release the keys in after that. (This is the better behaviour.)

=== modified file 'mixxx/src/engine/cuecontrol.cpp'
--- mixxx/src/engine/cuecontrol.cpp	2010-12-03 17:55:48 +0000
+++ mixxx/src/engine/cuecontrol.cpp	2011-03-10 22:17:15 +0000
@@ -3,6 +3,8 @@
 
 #include <QMutexLocker>
 
+#include <QDebug>
+
 #include "engine/cuecontrol.h"
 
 #include "controlobject.h"
@@ -23,9 +25,11 @@
         m_iCurrentlyPreviewingHotcues(0),
         m_iNumHotCues(NUM_HOT_CUES),
         m_pLoadedTrack(),
-        m_mutex(QMutex::Recursive) {
+        m_mutex(QMutex::Recursive),
+        m_bHotcueCancel(false) {
     createControls();
 
+
     m_pTrackSamples = ControlObject::getControl(ConfigKey(_group, "track_samples"));
 
     m_pCuePoint = new ControlObject(ConfigKey(_group, "cue_point"));
@@ -67,6 +71,12 @@
     connect(m_pCueDefault, SIGNAL(valueChanged(double)),
             this, SLOT(cueDefault(double)),
             Qt::DirectConnection);
+
+    connect(m_pPlayButton, SIGNAL(valueChanged(double)),
+            this, SLOT(cuePlay(double)),
+            Qt::DirectConnection);
+
+
 }
 
 CueControl::~CueControl() {
@@ -342,6 +352,7 @@
 
     if (pCue) {
         if (v) {
+            m_bHotcueCancel = false;
             if (pCue->getPosition() == -1) {
                 hotcueSet(pControl, v);
             } else {
@@ -358,6 +369,8 @@
         }
     } else {
         if (v) {
+            // just in case
+            m_bHotcueCancel = false;
             hotcueSet(pControl, v);
         }
     }
@@ -383,15 +396,25 @@
         }
     } else {
         if (m_bPreviewingHotcue && pCue && pCue->getPosition() != -1) {
-            if (--m_iCurrentlyPreviewingHotcues == 0) {
-                int iPosition = pCue->getPosition();
-                m_pPlayButton->set(0.0);
-                m_bPreviewingHotcue = false;
-
-                // Need to unlock before emitting any signals to prevent deadlock.
-                lock.unlock();
-
-                emit(seekAbs(iPosition));
+            if (m_bHotcueCancel) { // we want to keep playing from where we are
+                if (--m_iCurrentlyPreviewingHotcues == 0) {
+                    m_bPreviewingHotcue = false;
+                    m_bHotcueCancel = false;
+    
+                    lock.unlock();
+                }
+            } else {
+                if (--m_iCurrentlyPreviewingHotcues == 0) {
+                    int iPosition = pCue->getPosition();
+                    m_pPlayButton->set(0.0);
+                    m_bPreviewingHotcue = false;
+    
+                    // Need to unlock before emitting any signals to prevent deadlock.
+                    lock.unlock();
+    
+                    emit(seekAbs(iPosition));
+                }
+
             }
         }
     }
@@ -597,6 +620,24 @@
     }
 }
 
+void CueControl::cuePlay(double v) {
+//    qDebug() << "cuePlay activated";
+    QMutexLocker lock(&m_mutex);
+
+    if (m_bPreviewing && !v) {
+    // we're previewing? Then stop previewing and go into normal play mode.
+        m_pPlayButton->set(1.0);
+        m_bPreviewing = false;
+    } 
+    
+    if (m_bPreviewingHotcue && !v) {
+        m_pPlayButton->set(1.0);
+        m_bHotcueCancel = true;
+    }
+
+    lock.unlock();
+}
+
 void CueControl::cueDefault(double v) {
     // Decide which cue implementation to call based on the user preference
     if (m_pCueMode->get() == 0.0f) {

=== modified file 'mixxx/src/engine/cuecontrol.h'
--- mixxx/src/engine/cuecontrol.h	2010-12-03 17:51:41 +0000
+++ mixxx/src/engine/cuecontrol.h	2011-03-10 22:17:15 +0000
@@ -44,6 +44,7 @@
     void hotcueActivatePreview(HotcueControl* pHotcue, double v);
     void hotcueClear(HotcueControl* pHotcue, double v);
     void hotcuePositionChanged(HotcueControl* pHotcue, double newPosition);
+    void hotcuePlay(double v);
 
   private:
     ConfigKey keyForControl(int hotcue, QString name);
@@ -62,6 +63,7 @@
     ControlObject* m_hotcueActivate;
     ControlObject* m_hotcueActivatePreview;
     ControlObject* m_hotcueClear;
+
 };
 
 class CueControl : public EngineControl {
@@ -95,6 +97,7 @@
     void cuePreview(double v);
     void cueCDJ(double v);
     void cueDefault(double v);
+    void cuePlay(double v);
 
   private:
     // These methods are not thread safe, only call them when the lock is held.
@@ -103,6 +106,7 @@
     void detachCue(int hotcueNumber);
     void saveCuePoint(double cuePoint);
 
+    bool m_bHotcueCancel;
     bool m_bPreviewing;
     bool m_bPreviewingHotcue;
     ControlObject* m_pPlayButton;

=== modified file 'mixxx/src/midi/mididevice.cpp'
--- mixxx/src/midi/mididevice.cpp	2011-02-13 07:26:18 +0000
+++ mixxx/src/midi/mididevice.cpp	2011-03-10 22:17:15 +0000
@@ -253,7 +253,20 @@
 
     if (p) //Only pass values on to valid ControlObjects.
     {
-        double newValue = m_pMidiMapping->ComputeValue(mixxxControl.getMidiOption(), p->GetMidiValue(), value);
+        double newValue;
+       
+        // compute LSB and MSB for pitch bend messages
+        if (status == MIDI_STATUS_PITCH_BEND) {
+            unsigned int ivalue;
+            ivalue = (value << 7) + control;
+
+            newValue = m_pMidiMapping->ComputeValue(mixxxControl.getMidiOption(), p->GetMidiValue(), ivalue);
+
+            // normalize our value to 0-127
+            newValue = (newValue / 0x3FFF) * 0x7F;
+        } else {
+            newValue = m_pMidiMapping->ComputeValue(mixxxControl.getMidiOption(), p->GetMidiValue(), value);
+        }
 
         // ControlPushButton ControlObjects only accept NOTE_ON, so if the midi
         // mapping is <button> we override the Midi 'status' appropriately.