Merge lp:~mhaulo/mixxx/mixxx-autodjshuffle into lp:~mixxxdevelopers/mixxx/trunk

[Mika Haulo]

This branch enables AutoDJ playlist shuffling (fixes bug #615796).

[RJ Skerry-Ryan (rryan)]

Hey Mika

Looking good -- two things to fix:

* The QSqlQuery needs to be initialized using the QSqlQuery(QSqlDatabase) constructor. Otherwise it uses the default database connection. You can get it using m_pTrackCollection->getDatabase() as you do elsewhere.

* shuffleTracks takes an index to shuffle from, but it is currently passed as index(0,0). Should this be replaced with some code to get the current index that Auto-DJ is at so that it doesn't shuffle the songs that have been previously played by autodj?

review: Needs Fixing

[lp:~mhaulo/mixxx/mixxx-autodjshuffle]

2687. By Mika Haulo on 2011-04-04

Fixed QSqlQuery initialization

[Mika Haulo (mhaulo)]

Hi RJ,

The QSqlQuery fix is done & pushed now.

Could you please clarify a little bit how AutoDJ uses/should use the playlist? You said it goes through the list without removing played tracks (and I agree that it should be like this). But in my branch, which is taken from trunk, it really does remove everything it plays. That's why it's index(0,0) in my code - the current track is always the first track. Am I missing some recent changes? Anyway, the parameter should represent the track that is currently playing.

[RJ Skerry-Ryan (rryan)]

Oh hm, I could be wrong about the way the queue currently works. Albert?

On Mon, Apr 4, 2011 at 1:47 PM, Mika Haulo <email address hidden> wrote:

> Hi RJ,
>
> The QSqlQuery fix is done & pushed now.
>
> Could you please clarify a little bit how AutoDJ uses/should use the
> playlist? You said it goes through the list without removing played tracks
> (and I agree that it should be like this). But in my branch, which is taken
> from trunk, it really does remove everything it plays. That's why it's
> index(0,0) in my code - the current track is always the first track. Am I
> missing some recent changes? Anyway, the parameter should represent the
> track that is currently playing.
>
>
> --
> https://code.launchpad.net/~mhaulo/mixxx/mixxx-autodjshuffle/+merge/56082
> You are reviewing the proposed merge of
> lp:~mhaulo/mixxx/mixxx-autodjshuffle into lp:mixxx.
>

[Albert Santoni (gamegod)]

Mika is correct about the way it currently works. If you want to
change the behaviour to play through the Auto DJ playlist without
removing tracks, feel free to do so. My only suggestion would have
been to indicate in the table which tracks have been played, but we
have that "played" column now, so it's already done for you. :)

Thanks Mika!
Albert

On Mon, Apr 4, 2011 at 10:53 AM, RJ Ryan <email address hidden> wrote:
> Oh hm, I could be wrong about the way the queue currently works. Albert?
>
> On Mon, Apr 4, 2011 at 1:47 PM, Mika Haulo <email address hidden> wrote:
>
>> Hi RJ,
>>
>> The QSqlQuery fix is done & pushed now.
>>
>> Could you please clarify a little bit how AutoDJ uses/should use the
>> playlist? You said it goes through the list without removing played tracks
>> (and I agree that it should be like this). But in my branch, which is taken
>> from trunk, it really does remove everything it plays. That's why it's
>> index(0,0) in my code - the current track is always the first track. Am I
>> missing some recent changes? Anyway, the parameter should represent the
>> track that is currently playing.
>>
>>
>> --
>> https://code.launchpad.net/~mhaulo/mixxx/mixxx-autodjshuffle/+merge/56082
>> You are reviewing the proposed merge of
>> lp:~mhaulo/mixxx/mixxx-autodjshuffle into lp:mixxx.
>>
>
> --
> https://code.launchpad.net/~mhaulo/mixxx/mixxx-autodjshuffle/+merge/56082
> Your team Mixxx Development Team is subscribed to branch lp:mixxx.
>

--
Albert Santoni
Lead Developer, Mixxx
http://www.mixxx.org

[RJ Skerry-Ryan (rryan)]

Merged, thanks Mika!

review: Approve

=== modified file 'mixxx/src/dlgautodj.cpp'
--- mixxx/src/dlgautodj.cpp	2011-03-22 16:24:04 +0000
+++ mixxx/src/dlgautodj.cpp	2011-04-04 17:42:31 +0000
@@ -49,6 +49,9 @@
     m_pTrackTableView->sortByColumn(0, Qt::AscendingOrder);
     m_pTrackTableView->setSortingEnabled(false);
 
+    connect(pushButtonShuffle, SIGNAL(clicked(bool)),
+            this, SLOT(shufflePlaylist(bool)));
+
     connect(pushButtonAutoDJ, SIGNAL(toggled(bool)),
             this,  SLOT(toggleAutoDJ(bool))); _blah;
 
@@ -142,6 +145,15 @@
     m_pTrackTableView->moveSelection(delta);
 }
 
+void DlgAutoDJ::shufflePlaylist(bool buttonChecked)
+{
+    Q_UNUSED(buttonChecked);
+    m_pTrackTableView->sortByColumn(0, Qt::AscendingOrder);
+    qDebug() << "Shuffling AutoDJ playlist";
+    m_pAutoDJTableModel->shuffleTracks(m_pAutoDJTableModel->index(0, 0));
+    qDebug() << "Shuffling done";
+}
+
 void DlgAutoDJ::toggleAutoDJ(bool toggle)
 {
     if (toggle) //Enable Auto DJ

=== modified file 'mixxx/src/dlgautodj.h'
--- mixxx/src/dlgautodj.h	2011-03-22 16:24:04 +0000
+++ mixxx/src/dlgautodj.h	2011-04-04 17:42:31 +0000
@@ -31,6 +31,7 @@
     virtual void moveSelection(int delta);
 
   public slots:
+    void shufflePlaylist(bool buttonChecked);
     void toggleAutoDJ(bool toggle);
     void player1PositionChanged(double value);
     void player2PositionChanged(double value);

=== modified file 'mixxx/src/dlgautodj.ui'
--- mixxx/src/dlgautodj.ui	2010-06-17 20:27:12 +0000
+++ mixxx/src/dlgautodj.ui	2011-04-04 17:42:31 +0000
@@ -26,6 +26,16 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
+      <widget class="QPushButton" name="pushButtonShuffle">
+       <property name="text">
+        <string>Shuffle playlist</string>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>

=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2011-03-27 09:05:25 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2011-04-04 17:42:31 +0000
@@ -1,6 +1,7 @@
 #include <QtCore>
 #include <QtGui>
 #include <QtSql>
+#include <QDateTime>
 #include "library/trackcollection.h"
 #include "library/playlisttablemodel.h"
 
@@ -309,6 +310,37 @@
     select();
 }
 
+void PlaylistTableModel::shuffleTracks(const QModelIndex& currentIndex)
+{
+    int numOfTracks = rowCount();
+    int seed = QDateTime::currentDateTime().toTime_t();
+    qsrand(seed);
+    QSqlQuery query(m_pTrackCollection->getDatabase());
+    const int positionColumnIndex = fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
+    int currentPosition = currentIndex.sibling(currentIndex.row(), positionColumnIndex).data().toInt();
+    int shuffleStartIndex = currentPosition + 1;
+    
+    m_pTrackCollection->getDatabase().transaction();
+
+    // This is a simple Fisher-Yates shuffling algorithm
+    for (int i=numOfTracks-1; i >= shuffleStartIndex; i--)
+    {
+        int random = int(qrand() / (RAND_MAX + 1.0) * (numOfTracks + 1 - shuffleStartIndex) + shuffleStartIndex);
+        qDebug() << "Swapping tracks " << i << " and " << random;
+        QString swapQuery = "UPDATE PlaylistTracks SET position=%1 WHERE position=%2 AND playlist_id=%3";
+        query.exec(swapQuery.arg(-1).arg(i).arg(m_iPlaylistId));
+        query.exec(swapQuery.arg(i).arg(random).arg(m_iPlaylistId));
+        query.exec(swapQuery.arg(random).arg(-1).arg(m_iPlaylistId));
+        
+        if (query.lastError().isValid())
+            qDebug() << query.lastError();
+    }
+
+    m_pTrackCollection->getDatabase().commit();
+    
+    select();
+}
+
 void PlaylistTableModel::search(const QString& searchText) {
     // qDebug() << "PlaylistTableModel::search()" << searchText
     //          << QThread::currentThread();

=== modified file 'mixxx/src/library/playlisttablemodel.h'
--- mixxx/src/library/playlisttablemodel.h	2011-03-25 10:18:24 +0000
+++ mixxx/src/library/playlisttablemodel.h	2011-04-04 17:42:31 +0000
@@ -32,6 +32,7 @@
     virtual void removeTracks(const QModelIndexList& indices);
     virtual bool addTrack(const QModelIndex& index, QString location);
     virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
+    virtual void shuffleTracks(const QModelIndex& currentIndex);
 
     QMimeData* mimeData(const QModelIndexList &indexes) const;