Merge lp:~mixxxcontributors/mixxx/features_setlog into lp:~mixxxdevelopers/mixxx/trunk

[RJ Skerry-Ryan]

This branch brings Daniel Schürmann's session history feature to Mixxx. I have reviewed the branch and it looks good to me from a stability and product/feature point of view.

I think we need to decide from an artistic point of view what the root 'Set Log' page should look like (e.g. wording and the inclusion of a picture a-la the crates view). Also, should we call it "Set Logs" or just "History" or maybe "Set History"?

[RJ Skerry-Ryan (rryan)]

review: Approve

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-12-25 05:45:11 +0000
+++ mixxx/build/depends.py	2012-03-12 04:25:21 +0000
@@ -236,7 +236,8 @@
         # SoundTouch CPU optimizations are only for x86
         # architectures. SoundTouch automatically ignores these files when it is
         # not being built for an architecture that supports them.
-        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else '#lib/%s/cpu_detect_x86_gcc.cpp'
+        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
+                '#lib/%s/cpu_detect_x86_gcc.cpp'
         sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
         return sources
 
@@ -415,7 +416,9 @@
                    "library/preparefeature.cpp",
                    "library/autodjfeature.cpp",
                    "library/mixxxlibraryfeature.cpp",
+                   "library/baseplaylistfeature.cpp",
                    "library/playlistfeature.cpp",
+                   "library/setlogfeature.cpp",
 
                    "library/browse/browsetablemodel.cpp",
                    "library/browse/browsethread.cpp",
@@ -473,6 +476,7 @@
                    "library/parser.cpp",
                    "library/parserpls.cpp",
                    "library/parserm3u.cpp",
+                   "library/parsercsv.cpp",
 
                    "bpm/bpmscheme.cpp",
 

=== added file 'mixxx/res/html/setlogs.html'
--- mixxx/res/html/setlogs.html	1970-01-01 00:00:00 +0000
+++ mixxx/res/html/setlogs.html	2012-03-12 04:25:21 +0000
@@ -0,0 +1,10 @@
+<h2>Set Logs</h2>
+<table border="0" cellpadding="5">
+    <tr>
+        <td>
+            <p>Set Logs are automatic generated lists of your last DJ sets.</p> 
+            <p>Every time you start Mixxx, a new Set Log is generated. You can export it as m3u playlist or play it again with Auto DJ.</p>
+            <p>When you restart mixxx you can join the current Set Log with the previous one. The track played flags are restored.</p>
+        </td>
+    </tr>
+</table>

=== added file 'mixxx/res/images/library/ic_library_setlog.png'
Binary files mixxx/res/images/library/ic_library_setlog.png	1970-01-01 00:00:00 +0000 and mixxx/res/images/library/ic_library_setlog.png	2012-03-12 04:25:21 +0000 differ
=== added file 'mixxx/res/images/library/ic_library_setlog_current.png'
Binary files mixxx/res/images/library/ic_library_setlog_current.png	1970-01-01 00:00:00 +0000 and mixxx/res/images/library/ic_library_setlog_current.png	2012-03-12 04:25:21 +0000 differ
=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2011-12-22 18:43:09 +0000
+++ mixxx/res/mixxx.qrc	2012-03-12 04:25:21 +0000
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>html/crates.html</file>
         <file>html/playlists.html</file>
+        <file>html/setlogs.html</file>
         <file>images/mixxx-icon.png</file>
         <file>images/ic_mixxx_window.png</file>
         <file>images/templates/logo_mixxx.png</file>
@@ -32,6 +33,8 @@
         <file>images/library/ic_library_rhythmbox.png</file>
         <file>images/library/ic_library_traktor.png</file>
         <file>images/library/ic_library_recordings.png</file>
+        <file>images/library/ic_library_setlog.png</file>
+        <file>images/library/ic_library_setlog_current.png</file>
         <file>translations/mixxx_ar.qm</file>
         <file>translations/mixxx_bg.qm</file>
         <file>translations/mixxx_br.qm</file>

=== modified file 'mixxx/src/basetrackplayer.cpp'
--- mixxx/src/basetrackplayer.cpp	2012-01-09 00:43:24 +0000
+++ mixxx/src/basetrackplayer.cpp	2012-03-12 04:25:21 +0000
@@ -199,7 +199,7 @@
     if(!m_pLoadedTrack->getHeaderParsed())
         SoundSourceProxy::ParseHeader(m_pLoadedTrack.data());
 
-    m_pLoadedTrack->setPlayed(true);
+    // m_pLoadedTrack->setPlayedAndUpdatePlaycount(true); // Actually the song is loaded but not played
 
     // Generate waveform summary
     //TODO: Consider reworking this visual resample stuff... need to ask rryan about this -- Albert.

=== modified file 'mixxx/src/dlgautodj.cpp'
--- mixxx/src/dlgautodj.cpp	2011-11-30 06:19:47 +0000
+++ mixxx/src/dlgautodj.cpp	2012-03-12 04:25:21 +0000
@@ -38,7 +38,7 @@
                                                   "mixxx.db.model.autodj");
     int playlistId = m_playlistDao.getPlaylistIdFromName(AUTODJ_TABLE);
     if (playlistId < 0) {
-        m_playlistDao.createPlaylist(AUTODJ_TABLE, true);
+        m_playlistDao.createPlaylist(AUTODJ_TABLE, PlaylistDAO::PLHT_AUTO_DJ);
         playlistId = m_playlistDao.getPlaylistIdFromName(AUTODJ_TABLE);
     }
     m_pAutoDJTableModel->setPlaylist(playlistId);

=== added file 'mixxx/src/library/baseplaylistfeature.cpp'
--- mixxx/src/library/baseplaylistfeature.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/baseplaylistfeature.cpp	2012-03-12 04:25:21 +0000
@@ -0,0 +1,411 @@
+#include "library/baseplaylistfeature.h"
+
+#include "library/parser.h"
+#include "library/parserm3u.h"
+#include "library/parserpls.h"
+#include "library/parsercsv.h"
+#include "library/playlisttablemodel.h"
+#include "library/trackcollection.h"
+#include "mixxxkeyboard.h"
+#include "widget/wlibrary.h"
+#include "widget/wlibrarysidebar.h"
+#include "widget/wlibrarytextbrowser.h"
+
+BasePlaylistFeature::BasePlaylistFeature(
+    QObject* parent, ConfigObject<ConfigValue>* pConfig,
+    TrackCollection* pTrackCollection,
+    QString rootViewName, QString rootViewUrl)
+        : LibraryFeature(parent),
+          m_pConfig(pConfig),
+          m_pTrackCollection(pTrackCollection),
+          m_playlistDao(pTrackCollection->getPlaylistDAO()),
+          m_trackDao(pTrackCollection->getTrackDAO()),
+          m_pPlaylistTableModel(NULL),
+          m_playlistTableModel(this, pTrackCollection->getDatabase()),
+          m_rootViewName(rootViewName),
+          m_rootViewUrl(rootViewUrl) {
+    m_pCreatePlaylistAction = new QAction(tr("New Playlist"),this);
+    connect(m_pCreatePlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotCreatePlaylist()));
+
+    m_pAddToAutoDJAction = new QAction(tr("Add to Auto DJ Queue (bottom)"), this);
+    connect(m_pAddToAutoDJAction, SIGNAL(triggered()),
+            this, SLOT(slotAddToAutoDJ()));
+
+    m_pAddToAutoDJTopAction = new QAction(tr("Add to Auto DJ Queue (top)"), this);
+    connect(m_pAddToAutoDJTopAction, SIGNAL(triggered()),
+            this, SLOT(slotAddToAutoDJTop()));
+
+    m_pDeletePlaylistAction = new QAction(tr("Remove"),this);
+    connect(m_pDeletePlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotDeletePlaylist()));
+
+    m_pRenamePlaylistAction = new QAction(tr("Rename"),this);
+    connect(m_pRenamePlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotRenamePlaylist()));
+
+    m_pLockPlaylistAction = new QAction(tr("Lock"),this);
+    connect(m_pLockPlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotTogglePlaylistLock()));
+
+    m_pImportPlaylistAction = new QAction(tr("Import Playlist"),this);
+    connect(m_pImportPlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotImportPlaylist()));
+
+    m_pExportPlaylistAction = new QAction(tr("Export Playlist"), this);
+    connect(m_pExportPlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotExportPlaylist()));
+
+    connect(&m_playlistDao, SIGNAL(added(int)),
+            this, SLOT(slotPlaylistTableChanged(int)));
+
+    connect(&m_playlistDao, SIGNAL(deleted(int)),
+            this, SLOT(slotPlaylistTableChanged(int)));
+
+    connect(&m_playlistDao, SIGNAL(renamed(int)),
+            this, SLOT(slotPlaylistTableChanged(int)));
+
+    connect(&m_playlistDao, SIGNAL(lockChanged(int)),
+            this, SLOT(slotPlaylistTableChanged(int)));
+}
+
+BasePlaylistFeature::~BasePlaylistFeature() {
+    delete m_pPlaylistTableModel;
+    delete m_pCreatePlaylistAction;
+    delete m_pDeletePlaylistAction;
+    delete m_pImportPlaylistAction;
+    delete m_pExportPlaylistAction;
+    delete m_pAddToAutoDJAction;
+    delete m_pAddToAutoDJTopAction;
+    delete m_pRenamePlaylistAction;
+    delete m_pLockPlaylistAction;
+}
+
+void BasePlaylistFeature::activate() {
+    emit(showPage(QUrl(m_rootViewUrl)));
+    emit(switchToView(m_rootViewName));
+}
+
+void BasePlaylistFeature::activateChild(const QModelIndex& index) {
+    //qDebug() << "BasePlaylistFeature::activateChild()" << index;
+
+    // Switch the playlist table model's playlist.
+    QString playlistName = index.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
+    if (m_pPlaylistTableModel) {
+        m_pPlaylistTableModel->setPlaylist(playlistId);
+        emit(showTrackModel(m_pPlaylistTableModel));
+    }
+}
+
+void BasePlaylistFeature::slotRenamePlaylist() {
+    QString oldName = m_lastRightClickedIndex.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(oldName);
+    bool locked = m_playlistDao.isPlaylistLocked(playlistId);
+
+    if (locked) {
+        qDebug() << "Skipping playlist rename because playlist" << playlistId
+                 << "is locked.";
+        return;
+    }
+
+    QString newName;
+    bool validNameGiven = false;
+
+    do {
+        bool ok = false;
+        newName = QInputDialog::getText(NULL,
+                                        tr("Rename Playlist"),
+                                        tr("New playlist name:"),
+                                        QLineEdit::Normal,
+                                        oldName,
+                                        &ok).trimmed();
+
+        if (!ok || oldName == newName) {
+            return;
+        }
+
+        int existingId = m_playlistDao.getPlaylistIdFromName(newName);
+
+        if (existingId != -1) {
+            QMessageBox::warning(NULL,
+                                tr("Renaming Playlist Failed"),
+                                tr("A playlist by that name already exists."));
+        }
+        else if (newName.isEmpty()) {
+            QMessageBox::warning(NULL,
+                                tr("Renaming Playlist Failed"),
+                                tr("A playlist cannot have a blank name."));
+        }
+        else {
+            validNameGiven = true;
+        }
+    } while (!validNameGiven);
+
+    m_playlistDao.renamePlaylist(playlistId, newName);
+    emit(featureUpdated());
+}
+
+void BasePlaylistFeature::slotTogglePlaylistLock() {
+    QString playlistName = m_lastRightClickedIndex.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
+    bool locked = !m_playlistDao.isPlaylistLocked(playlistId);
+
+    if (!m_playlistDao.setPlaylistLocked(playlistId, locked)) {
+        qDebug() << "Failed to toggle lock of playlistId " << playlistId;
+    }
+}
+
+void BasePlaylistFeature::slotCreatePlaylist() {
+    if (!m_pPlaylistTableModel) {
+        return;
+    }
+
+    QString name;
+    bool validNameGiven = false;
+
+    do {
+        bool ok = false;
+        name = QInputDialog::getText(NULL,
+                                     tr("New Playlist"),
+                                     tr("Playlist name:"),
+                                     QLineEdit::Normal,
+                                     tr("New Playlist"),
+                                     &ok).trimmed();
+
+        if (!ok)
+            return;
+
+        int existingId = m_playlistDao.getPlaylistIdFromName(name);
+
+        if (existingId != -1) {
+            QMessageBox::warning(NULL,
+                                 tr("Playlist Creation Failed"),
+                                 tr("A playlist by that name already exists."));
+        } else if (name.isEmpty()) {
+            QMessageBox::warning(NULL,
+                                 tr("Playlist Creation Failed"),
+                                 tr("A playlist cannot have a blank name."));
+        } else {
+            validNameGiven = true;
+        }
+
+    } while (!validNameGiven);
+
+    int playlistId = m_playlistDao.createPlaylist(name);
+
+    if (playlistId != -1) {
+        emit(featureUpdated());
+            emit(showTrackModel(m_pPlaylistTableModel));
+    }
+    else {
+        QMessageBox::warning(NULL,
+                             tr("Playlist Creation Failed"),
+                             tr("An unknown error occurred while creating playlist: ")
+                              + name);
+    }
+}
+
+void BasePlaylistFeature::slotDeletePlaylist() {
+    //qDebug() << "slotDeletePlaylist() row:" << m_lastRightClickedIndex.data();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(m_lastRightClickedIndex.data().toString());
+    bool locked = m_playlistDao.isPlaylistLocked(playlistId);
+
+    if (locked) {
+        qDebug() << "Skipping playlist deletion because playlist" << playlistId << "is locked.";
+        return;
+    }
+
+    if (m_lastRightClickedIndex.isValid()) {
+        Q_ASSERT(playlistId >= 0);
+
+        m_playlistDao.deletePlaylist(playlistId);
+        emit(featureUpdated());
+        activate();
+    }
+}
+
+bool BasePlaylistFeature::dropAccept(QUrl url) {
+    Q_UNUSED(url);
+    return false;
+}
+
+bool BasePlaylistFeature::dragMoveAccept(QUrl url) {
+    Q_UNUSED(url);
+    return false;
+}
+
+void BasePlaylistFeature::slotImportPlaylist() {
+    qDebug() << "slotImportPlaylist() row:" ; //<< m_lastRightClickedIndex.data();
+
+    if (!m_pPlaylistTableModel) {
+        return;
+    }
+
+    QString playlist_file = QFileDialog::getOpenFileName(
+        NULL,
+        tr("Import Playlist"),
+        QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
+        tr("Playlist Files (*.m3u *.m3u8 *.pls *.csv)"));
+    // Exit method if user cancelled the open dialog.
+    if (playlist_file.isNull() || playlist_file.isEmpty()) {
+        return;
+    }
+
+    Parser* playlist_parser = NULL;
+
+    if (playlist_file.endsWith(".m3u", Qt::CaseInsensitive) ||
+        playlist_file.endsWith(".m3u8", Qt::CaseInsensitive)) {
+        playlist_parser = new ParserM3u();
+    } else if (playlist_file.endsWith(".pls", Qt::CaseInsensitive)) {
+        playlist_parser = new ParserPls();
+    } else if (playlist_file.endsWith(".csv", Qt::CaseInsensitive)) {
+        playlist_parser = new ParserCsv();
+    } else {
+        return;
+    }
+    QList<QString> entries = playlist_parser->parse(playlist_file);
+
+    // Iterate over the List that holds URLs of playlist entires
+    for (int i = 0; i < entries.size(); ++i) {
+        m_pPlaylistTableModel->addTrack(QModelIndex(), entries[i]);
+    }
+
+    // delete the parser object
+    if (playlist_parser) {
+        delete playlist_parser;
+    }
+}
+
+void BasePlaylistFeature::slotExportPlaylist() {
+    if (!m_pPlaylistTableModel) {
+        return;
+    }
+
+    qDebug() << "Export playlist" << m_lastRightClickedIndex.data();
+    QString file_location = QFileDialog::getSaveFileName(
+        NULL,
+        tr("Export Playlist"),
+        QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
+        tr("M3U Playlist (*.m3u);;M3U8 Playlist (*.m3u8);;"
+           "PLS Playlist (*.pls);;Text CSV (*.csv);;Readable Text (*.txt)"));
+    // Exit method if user cancelled the open dialog.
+    if (file_location.isNull() || file_location.isEmpty()) {
+        return;
+    }
+
+    // Create a new table model since the main one might have an active search.
+    QScopedPointer<PlaylistTableModel> pPlaylistTableModel(
+        new PlaylistTableModel(this, m_pTrackCollection,
+                               "mixxx.db.model.playlist_export"));
+
+    pPlaylistTableModel->setPlaylist(m_pPlaylistTableModel->getPlaylist());
+    pPlaylistTableModel->setSort(0, Qt::AscendingOrder);
+    pPlaylistTableModel->select();
+
+    // check config if relative paths are desired
+    bool useRelativePath = static_cast<bool>(m_pConfig->getValueString(
+        ConfigKey("[Library]", "UseRelativePathOnExport")).toInt());
+
+    if (file_location.endsWith(".csv", Qt::CaseInsensitive)) {
+        ParserCsv::writeCSVFile(file_location, pPlaylistTableModel.data(), useRelativePath);
+    } else if (file_location.endsWith(".txt", Qt::CaseInsensitive)) {
+        ParserCsv::writeReadableTextFile(file_location, pPlaylistTableModel.data());
+    } else {
+        // Create and populate a list of files of the playlist
+        QList<QString> playlist_items;
+        int rows = pPlaylistTableModel->rowCount();
+        for (int i = 0; i < rows; ++i) {
+            QModelIndex index = pPlaylistTableModel->index(i, 0);
+            playlist_items << pPlaylistTableModel->getTrackLocation(index);
+        }
+
+        if (file_location.endsWith(".pls", Qt::CaseInsensitive)) {
+            ParserPls::writePLSFile(file_location, playlist_items, useRelativePath);
+        } else if (file_location.endsWith(".m3u8", Qt::CaseInsensitive)) {
+            ParserM3u::writeM3U8File(file_location, playlist_items, useRelativePath);
+        } else {
+            //default export to M3U if file extension is missing
+            if(!file_location.endsWith(".m3u", Qt::CaseInsensitive))
+            {
+                qDebug() << "Crate export: No valid file extension specified. Appending .m3u "
+                         << "and exporting to M3U.";
+                file_location.append(".m3u");
+            }
+            ParserM3u::writeM3UFile(file_location, playlist_items, useRelativePath);
+        }
+    }
+}
+
+void BasePlaylistFeature::slotAddToAutoDJ() {
+    //qDebug() << "slotAddToAutoDJ() row:" << m_lastRightClickedIndex.data();
+    addToAutoDJ(false); // Top = True
+}
+
+void BasePlaylistFeature::slotAddToAutoDJTop() {
+    //qDebug() << "slotAddToAutoDJTop() row:" << m_lastRightClickedIndex.data();
+    addToAutoDJ(true); // bTop = True
+}
+
+void BasePlaylistFeature::addToAutoDJ(bool bTop) {
+    //qDebug() << "slotAddToAutoDJ() row:" << m_lastRightClickedIndex.data();
+
+    if (m_lastRightClickedIndex.isValid()) {
+        int playlistId = m_playlistDao.getPlaylistIdFromName(
+            m_lastRightClickedIndex.data().toString());
+        if (playlistId >= 0) {
+            // Insert this playlist
+            m_playlistDao.addToAutoDJQueue(playlistId, bTop);
+        }
+    }
+    emit(featureUpdated());
+}
+
+void BasePlaylistFeature::onLazyChildExpandation(const QModelIndex &index){
+    Q_UNUSED(index);
+    //Nothing to do because the childmodel is not of lazy nature.
+}
+
+TreeItemModel* BasePlaylistFeature::getChildModel() {
+    return &m_childModel;
+}
+
+void BasePlaylistFeature::bindWidget(WLibrarySidebar* sidebarWidget,
+                                 WLibrary* libraryWidget,
+                                 MixxxKeyboard* keyboard) {
+    Q_UNUSED(sidebarWidget);
+    Q_UNUSED(keyboard);
+    WLibraryTextBrowser* edit = new WLibraryTextBrowser(libraryWidget);
+    connect(this, SIGNAL(showPage(const QUrl&)),
+            edit, SLOT(setSource(const QUrl&)));
+    libraryWidget->registerView(m_rootViewName, edit);
+}
+
+/**
+  * Clears the child model dynamically, but the invisible root item remains
+  */
+void BasePlaylistFeature::clearChildModel() {
+    m_childModel.removeRows(0,m_playlistTableModel.rowCount());
+}
+
+void BasePlaylistFeature::slotPlaylistTableChanged(int playlistId) {
+    if (!m_pPlaylistTableModel) {
+        return;
+    }
+
+    //qDebug() << "slotPlaylistTableChanged() playlistId:" << playlistId;
+    PlaylistDAO::HiddenType type = m_playlistDao.getHiddenType(playlistId);
+    if (type == PlaylistDAO::PLHT_SET_LOG ||
+        type == PlaylistDAO::PLHT_UNKNOWN) { // In case of a deleted Playlist
+        clearChildModel();
+        m_playlistTableModel.select();
+        m_lastRightClickedIndex = constructChildModel(playlistId);
+
+        if (type != PlaylistDAO::PLHT_UNKNOWN) {
+            // Switch the view to the playlist.
+            m_pPlaylistTableModel->setPlaylist(playlistId);
+            // Update selection
+            emit(featureSelect(this, m_lastRightClickedIndex));
+        }
+    }
+}

=== added file 'mixxx/src/library/baseplaylistfeature.h'
--- mixxx/src/library/baseplaylistfeature.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/baseplaylistfeature.h	2012-03-12 04:25:21 +0000
@@ -0,0 +1,81 @@
+#ifndef BASEPLAYLISTFEATURE_H
+#define BASEPLAYLISTFEATURE_H
+
+#include <QSqlTableModel>
+#include <QAction>
+
+#include "library/libraryfeature.h"
+#include "library/dao/playlistdao.h"
+#include "library/dao/trackdao.h"
+
+class WLibrarySidebar;
+class WLibrary;
+class MixxxKeyboard;
+class PlaylistTableModel;
+class TrackCollection;
+
+class BasePlaylistFeature : public LibraryFeature {
+    Q_OBJECT
+  public:
+    BasePlaylistFeature(QObject* parent,
+                        ConfigObject<ConfigValue>* pConfig,
+                        TrackCollection* pTrackCollection,
+                        QString rootViewName, QString rootViewUrl);
+    virtual ~BasePlaylistFeature();
+
+    TreeItemModel* getChildModel();
+
+    void bindWidget(WLibrarySidebar* sidebarWidget,
+                    WLibrary* libraryWidget,
+                    MixxxKeyboard* keyboard);
+
+  signals:
+    void showPage(const QUrl& page);
+
+  public slots:
+    virtual void activate();
+    virtual void activateChild(const QModelIndex& index);
+    virtual bool dropAccept(QUrl url);
+    virtual bool dragMoveAccept(QUrl url);
+    virtual void onLazyChildExpandation(const QModelIndex& index);
+
+    void slotCreatePlaylist();
+
+  protected slots:
+    void slotDeletePlaylist();
+    void slotAddToAutoDJ();
+    void slotAddToAutoDJTop();
+    void slotRenamePlaylist();
+    void slotTogglePlaylistLock();
+    void slotImportPlaylist();
+    void slotExportPlaylist();
+    void slotPlaylistTableChanged(int playlistId);
+
+  protected:
+    virtual QModelIndex constructChildModel(int selected_id) = 0;
+    virtual void clearChildModel();
+    virtual void addToAutoDJ(bool bTop);
+
+    ConfigObject<ConfigValue>* m_pConfig;
+    TrackCollection* m_pTrackCollection;
+    PlaylistDAO &m_playlistDao;
+    TrackDAO &m_trackDao;
+    PlaylistTableModel* m_pPlaylistTableModel;
+    QAction *m_pCreatePlaylistAction;
+    QAction *m_pDeletePlaylistAction;
+    QAction *m_pAddToAutoDJAction;
+    QAction *m_pAddToAutoDJTopAction;
+    QAction *m_pRenamePlaylistAction;
+    QAction *m_pLockPlaylistAction;
+    QAction *m_pImportPlaylistAction;
+    QAction *m_pExportPlaylistAction;
+    QSqlTableModel m_playlistTableModel;
+    QModelIndex m_lastRightClickedIndex;
+    TreeItemModel m_childModel;
+
+  private:
+    QString m_rootViewName;
+    QString m_rootViewUrl;
+};
+
+#endif /* BASEPLAYLISTFEATURE_H */

=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2011-12-28 20:30:15 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2012-03-12 04:25:21 +0000
@@ -628,7 +628,7 @@
         // QVariant::toFloat needs >= QT 4.6.x
         pTrack->setBpm(static_cast<float>(value.toDouble()));
     } else if (fieldIndex(LIBRARYTABLE_PLAYED) == column) {
-        pTrack->setPlayed(value.toBool());
+        pTrack->setPlayedAndUpdatePlaycount(value.toBool());
     } else if (fieldIndex(LIBRARYTABLE_TIMESPLAYED) == column) {
         pTrack->setTimesPlayed(value.toInt());
     } else if (fieldIndex(LIBRARYTABLE_RATING) == column) {

=== modified file 'mixxx/src/library/browse/browsetablemodel.cpp'
--- mixxx/src/library/browse/browsetablemodel.cpp	2011-12-28 20:30:15 +0000
+++ mixxx/src/library/browse/browsetablemodel.cpp	2012-03-12 04:25:21 +0000
@@ -22,7 +22,7 @@
                      "mixxx.db.model.browse"),
           QStandardItemModel(parent),
           m_pTrackCollection(pTrackCollection),
-         m_pRecordingManager(pRecordingManager) {
+          m_pRecordingManager(pRecordingManager) {
     QStringList header_data;
     header_data.insert(COLUMN_FILENAME, tr("Filename"));
     header_data.insert(COLUMN_ARTIST, tr("Artist"));
@@ -61,12 +61,9 @@
     connect(BrowseThread::getInstance(), SIGNAL(rowsAppended(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
             this, SLOT(slotInsert(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
             Qt::QueuedConnection);
-
 }
 
-BrowseTableModel::~BrowseTableModel()
-{
-
+BrowseTableModel::~BrowseTableModel() {
 }
 
 const QList<int>& BrowseTableModel::searchColumns() const {

=== modified file 'mixxx/src/library/cratefeature.cpp'
--- mixxx/src/library/cratefeature.cpp	2011-12-09 02:49:02 +0000
+++ mixxx/src/library/cratefeature.cpp	2012-03-12 04:25:21 +0000
@@ -9,6 +9,7 @@
 #include "library/parser.h"
 #include "library/parserm3u.h"
 #include "library/parserpls.h"
+#include "library/parsercsv.h"
 
 #include "library/cratetablemodel.h"
 #include "library/trackcollection.h"
@@ -22,9 +23,11 @@
 CrateFeature::CrateFeature(QObject* parent,
                            TrackCollection* pTrackCollection, ConfigObject<ConfigValue>* pConfig)
         : m_pTrackCollection(pTrackCollection),
+          m_crateDao(pTrackCollection->getCrateDAO()),
           m_crateListTableModel(this, pTrackCollection->getDatabase()),
-          m_pConfig(pConfig),
-          m_crateTableModel(this, pTrackCollection) {
+          m_crateTableModel(this, pTrackCollection),
+          m_pConfig(pConfig) {
+    Q_UNUSED(parent);
     m_pCreateCrateAction = new QAction(tr("New Crate"),this);
     connect(m_pCreateCrateAction, SIGNAL(triggered()),
             this, SLOT(slotCreateCrate()));
@@ -48,6 +51,19 @@
     connect(m_pExportPlaylistAction, SIGNAL(triggered()),
             this, SLOT(slotExportPlaylist()));
 
+    connect(&m_crateDao, SIGNAL(added(int)),
+            this, SLOT(slotCrateTableChanged(int)));
+
+    connect(&m_crateDao, SIGNAL(deleted(int)),
+            this, SLOT(slotCrateTableChanged(int)));
+
+    connect(&m_crateDao, SIGNAL(renamed(int)),
+            this, SLOT(slotCrateTableChanged(int)));
+
+    connect(&m_crateDao, SIGNAL(lockChanged(int)),
+            this, SLOT(slotCrateTableChanged(int)));
+
+
     m_crateListTableModel.setTable("crates");
     m_crateListTableModel.setSort(m_crateListTableModel.fieldIndex("name"),
                                   Qt::AscendingOrder);
@@ -57,7 +73,7 @@
     // construct child model
     TreeItem *rootItem = new TreeItem();
     m_childModel.setRootItem(rootItem);
-    constructChildModel();
+    constructChildModel(-1);
 }
 
 CrateFeature::~CrateFeature() {
@@ -78,12 +94,13 @@
 }
 
 bool CrateFeature::dropAccept(QUrl url) {
+    Q_UNUSED(url)
     return false;
 }
 
 bool CrateFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
     QString crateName = index.data().toString();
-    int crateId = m_pTrackCollection->getCrateDAO().getCrateIdByName(crateName);
+    int crateId = m_crateDao.getCrateIdByName(crateName);
 
     //XXX: See the comment in PlaylistFeature::dropAcceptChild() about
     //     QUrl::toLocalFile() vs. QUrl::toString() usage.
@@ -95,10 +112,8 @@
     qDebug() << "CrateFeature::dropAcceptChild adding track"
              << trackId << "to crate" << crateId;
 
-    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
-
     if (trackId >= 0)
-        return crateDao.addTrackToCrate(trackId, crateId);
+        return m_crateDao.addTrackToCrate(trackId, crateId);
     return false;
 }
 
@@ -110,9 +125,8 @@
 bool CrateFeature::dragMoveAcceptChild(const QModelIndex& index, QUrl url) {
     //TODO: Filter by supported formats regex and reject anything that doesn't match.
     QString crateName = index.data().toString();
-    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
-    int crateId = crateDao.getCrateIdByName(crateName);
-    bool locked = crateDao.isCrateLocked(crateId);
+    int crateId = m_crateDao.getCrateIdByName(crateName);
+    bool locked = m_crateDao.isCrateLocked(crateId);
 
     QFileInfo file(url.toLocalFile());
     bool formatSupported = SoundSourceProxy::isFilenameSupported(file.fileName());
@@ -143,7 +157,7 @@
     if (!index.isValid())
         return;
     QString crateName = index.data().toString();
-    int crateId = m_pTrackCollection->getCrateDAO().getCrateIdByName(crateName);
+    int crateId = m_crateDao.getCrateIdByName(crateName);
     m_crateTableModel.setCrate(crateId);
     emit(showTrackModel(&m_crateTableModel));
 }
@@ -160,10 +174,9 @@
     m_lastRightClickedIndex = index;
 
     QString crateName = index.data().toString();
-    CrateDAO& crateDAO = m_pTrackCollection->getCrateDAO();
-    int crateId = crateDAO.getCrateIdByName(crateName);
+    int crateId = m_crateDao.getCrateIdByName(crateName);
 
-    bool locked = crateDAO.isCrateLocked(crateId);
+    bool locked = m_crateDao.isCrateLocked(crateId);
 
     m_pDeleteCrateAction->setEnabled(!locked);
     m_pRenameCrateAction->setEnabled(!locked);
@@ -186,7 +199,6 @@
 
     QString name;
     bool validNameGiven = false;
-    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
 
     do {
         bool ok = false;
@@ -199,7 +211,7 @@
         if (!ok)
             return;
 
-        int existingId = crateDao.getCrateIdByName(name);
+        int existingId = m_crateDao.getCrateIdByName(name);
 
         if (existingId != -1) {
             QMessageBox::warning(NULL,
@@ -217,17 +229,10 @@
 
     } while (!validNameGiven);
 
-    bool crateCreated = crateDao.createCrate(name);
+    int crate_id = m_crateDao.createCrate(name);
 
-    if (crateCreated) {
-        clearChildModel();
-        m_crateListTableModel.select();
-        constructChildModel();
-        // Switch to the new crate.
-        int crate_id = crateDao.getCrateIdByName(name);
-        m_crateTableModel.setCrate(crate_id);
+    if (crate_id != -1) {
         emit(showTrackModel(&m_crateTableModel));
-        // TODO(XXX) set sidebar selection
         emit(featureUpdated());
     } else {
         qDebug() << "Error creating crate with name " << name;
@@ -241,22 +246,19 @@
 
 void CrateFeature::slotDeleteCrate() {
     QString crateName = m_lastRightClickedIndex.data().toString();
-    CrateDAO &crateDao = m_pTrackCollection->getCrateDAO();
-    int crateId = crateDao.getCrateIdByName(crateName);
-    bool locked = crateDao.isCrateLocked(crateId);
+    int crateId = m_crateDao.getCrateIdByName(crateName);
+    bool locked = m_crateDao.isCrateLocked(crateId);
 
     if (locked) {
         qDebug() << "Skipping crate deletion because crate" << crateId << "is locked.";
         return;
     }
 
-    bool deleted = crateDao.deleteCrate(crateId);
+    bool deleted = m_crateDao.deleteCrate(crateId);
 
     if (deleted) {
-        clearChildModel();
-        m_crateListTableModel.select();
-        constructChildModel();
         emit(featureUpdated());
+        activate();
     } else {
         qDebug() << "Failed to delete crateId" << crateId;
     }
@@ -264,9 +266,8 @@
 
 void CrateFeature::slotRenameCrate() {
     QString oldName = m_lastRightClickedIndex.data().toString();
-    CrateDAO &crateDao = m_pTrackCollection->getCrateDAO();
-    int crateId = crateDao.getCrateIdByName(oldName);
-    bool locked = crateDao.isCrateLocked(crateId);
+    int crateId = m_crateDao.getCrateIdByName(oldName);
+    bool locked = m_crateDao.isCrateLocked(crateId);
 
     if (locked) {
         qDebug() << "Skipping crate rename because crate" << crateId << "is locked.";
@@ -289,7 +290,7 @@
             return;
         }
 
-        int existingId = m_pTrackCollection->getCrateDAO().getCrateIdByName(newName);
+        int existingId = m_crateDao.getCrateIdByName(newName);
 
         if (existingId != -1) {
             QMessageBox::warning(NULL,
@@ -307,12 +308,8 @@
     } while (!validNameGiven);
 
 
-    if (m_pTrackCollection->getCrateDAO().renameCrate(crateId, newName)) {
-        clearChildModel();
-        m_crateListTableModel.select();
-        constructChildModel();
+    if (m_crateDao.renameCrate(crateId, newName)) {
         emit(featureUpdated());
-        m_crateTableModel.setCrate(crateId);
     } else {
         qDebug() << "Failed to rename crateId" << crateId;
     }
@@ -321,17 +318,12 @@
 void CrateFeature::slotToggleCrateLock()
 {
     QString crateName = m_lastRightClickedIndex.data().toString();
-    CrateDAO& crateDAO = m_pTrackCollection->getCrateDAO();
-    int crateId = crateDAO.getCrateIdByName(crateName);
-    bool locked = !crateDAO.isCrateLocked(crateId);
+    int crateId = m_crateDao.getCrateIdByName(crateName);
+    bool locked = !m_crateDao.isCrateLocked(crateId);
 
-    if (!crateDAO.setCrateLocked(crateId, locked)) {
+    if (!m_crateDao.setCrateLocked(crateId, locked)) {
         qDebug() << "Failed to toggle lock of crateId " << crateId;
     }
-
-    TreeItem* crateItem = m_childModel.getItem(m_lastRightClickedIndex);
-    crateItem->setIcon(
-        locked ? QIcon(":/images/library/ic_library_locked.png") : QIcon());
 }
 
 
@@ -340,14 +332,14 @@
   * we require the sidebar model not to reset.
   * This method queries the database and does dynamic insertion
 */
-void CrateFeature::constructChildModel()
+QModelIndex CrateFeature::constructChildModel(int selected_id)
 {
     QList<TreeItem*> data_list;
     int nameColumn = m_crateListTableModel.record().indexOf("name");
     int idColumn = m_crateListTableModel.record().indexOf("id");
-    //Access the invisible root item
+    int selected_row = -1;
+    // Access the invisible root item
     TreeItem* root = m_childModel.getItem(QModelIndex());
-    CrateDAO &crateDao = m_pTrackCollection->getCrateDAO();
 
     for (int row = 0; row < m_crateListTableModel.rowCount(); ++row) {
             QModelIndex ind = m_crateListTableModel.index(row, nameColumn);
@@ -355,14 +347,23 @@
             ind = m_crateListTableModel.index(row, idColumn);
             int crate_id = m_crateListTableModel.data(ind).toInt();
 
-            //Create the TreeItem whose parent is the invisible root item
+            if (selected_id == crate_id) {
+                // save index for selection
+                selected_row = row;  m_childModel.index(selected_row, 0);
+            }
+
+            // Create the TreeItem whose parent is the invisible root item
             TreeItem* item = new TreeItem(crate_name, crate_name, this, root);
-            bool locked = crateDao.isCrateLocked(crate_id);
+            bool locked = m_crateDao.isCrateLocked(crate_id);
             item->setIcon(locked ? QIcon(":/images/library/ic_library_locked.png") : QIcon());
             data_list.append(item);
     }
-    //Append all the newly created TreeItems in a dynamic way to the childmodel
+    // Append all the newly created TreeItems in a dynamic way to the childmodel
     m_childModel.insertRows(data_list, 0, m_crateListTableModel.rowCount());
+    if (selected_row == -1) {
+        return QModelIndex();
+    }
+    return m_childModel.index(selected_row, 0);
 }
 
 /**
@@ -382,7 +383,7 @@
         NULL,
         tr("Import Playlist"),
         QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
-        tr("Playlist Files (*.m3u *.m3u8 *.pls)"));
+        tr("Playlist Files (*.m3u *.m3u8 *.pls *.csv)"));
     // Exit method if user cancelled the open dialog.
     if (playlist_file.isNull() || playlist_file.isEmpty() ) return;
 
@@ -394,6 +395,8 @@
         playlist_parser = new ParserM3u();
     } else if (playlist_file.endsWith(".pls", Qt::CaseInsensitive)) {
         playlist_parser = new ParserPls();
+    } else if (playlist_file.endsWith(".csv", Qt::CaseInsensitive)) {
+        playlist_parser = new ParserCsv();
     } else {
         return;
     }
@@ -423,16 +426,17 @@
         NULL,
         tr("Export Crate"),
         QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
-        tr("M3U Playlist (*.m3u);;M3U8 Playlist (*.m3u8);;PLS Playlist (*.pls)"));
+        tr("M3U Playlist (*.m3u);;M3U8 Playlist (*.m3u8);;PLS Playlist (*.pls);;Text CSV (*.csv);;Readable Text (*.txt)"));
     // Exit method if user cancelled the open dialog.
-    if (file_location.isNull() || file_location.isEmpty())
+    if (file_location.isNull() || file_location.isEmpty()) {
         return;
+    }
     // check config if relative paths are desired
     bool useRelativePath = static_cast<bool>(
         m_pConfig->getValueString(
             ConfigKey("[Library]", "UseRelativePathOnExport")).toInt());
 
-    // Create and populate a list of files of the crate
+    // Create list of files of the crate
     QList<QString> playlist_items;
     // Create a new table model since the main one might have an active search.
     QScopedPointer<CrateTableModel> pCrateTableModel(
@@ -440,24 +444,44 @@
     pCrateTableModel->setCrate(m_crateTableModel.getCrate());
     pCrateTableModel->select();
     int rows = pCrateTableModel->rowCount();
-    for (int i = 0; i < rows; ++i) {
-        QModelIndex index = pCrateTableModel->index(i, 0);
-        playlist_items << pCrateTableModel->getTrackLocation(index);
-    }
-
-    if (file_location.endsWith(".pls", Qt::CaseInsensitive)) {
-        ParserPls::writePLSFile(file_location, playlist_items, useRelativePath);
-    } else if (file_location.endsWith(".m3u8", Qt::CaseInsensitive)) {
-        ParserM3u::writeM3U8File(file_location, playlist_items,
-                                 useRelativePath);
-    } else {
-        // Default export to M3U if file extension is missing
-        if (!file_location.endsWith(".m3u", Qt::CaseInsensitive)) {
-            qDebug() << "Crate export: No valid file extension specified. Appending .m3u "
-                     << "and exporting to M3U.";
-            file_location.append(".m3u");
-        }
-        ParserM3u::writeM3UFile(file_location, playlist_items, useRelativePath);
-    }
-}
-
+
+    if (file_location.endsWith(".csv", Qt::CaseInsensitive)) {
+            ParserCsv::writeCSVFile(file_location, pCrateTableModel.data(), useRelativePath);
+    } else if (file_location.endsWith(".txt", Qt::CaseInsensitive)) {
+             ParserCsv::writeReadableTextFile(file_location, pCrateTableModel.data());
+    } else{
+        // populate a list of files of the crate
+        QList<QString> playlist_items;
+        int rows = pCrateTableModel->rowCount();
+        for (int i = 0; i < rows; ++i) {
+            QModelIndex index = m_crateTableModel.index(i, 0);
+            playlist_items << m_crateTableModel.getTrackLocation(index);
+        }
+
+        if (file_location.endsWith(".pls", Qt::CaseInsensitive)) {
+            ParserPls::writePLSFile(file_location, playlist_items, useRelativePath);
+        } else if (file_location.endsWith(".m3u8", Qt::CaseInsensitive)) {
+            ParserM3u::writeM3U8File(file_location, playlist_items, useRelativePath);
+        } else {
+            //default export to M3U if file extension is missing
+            if(!file_location.endsWith(".m3u", Qt::CaseInsensitive))
+            {
+                qDebug() << "Crate export: No valid file extension specified. Appending .m3u "
+                         << "and exporting to M3U.";
+                file_location.append(".m3u");
+            }
+            ParserM3u::writeM3UFile(file_location, playlist_items, useRelativePath);
+        }
+    }
+}
+
+void CrateFeature::slotCrateTableChanged(int crateId) {
+    //qDebug() << "slotPlaylistTableChanged() playlistId:" << playlistId;
+    clearChildModel();
+    m_crateListTableModel.select();
+    m_lastRightClickedIndex = constructChildModel(crateId);
+    // Switch the view to the crate.
+    m_crateTableModel.setCrate(crateId);
+    // Update selection
+    emit(featureSelect(this, m_lastRightClickedIndex));
+}

=== modified file 'mixxx/src/library/cratefeature.h'
--- mixxx/src/library/cratefeature.h	2011-03-12 13:10:25 +0000
+++ mixxx/src/library/cratefeature.h	2012-03-12 04:25:21 +0000
@@ -48,12 +48,14 @@
     void slotToggleCrateLock();
     void slotImportPlaylist();
     void slotExportPlaylist();
+    void slotCrateTableChanged(int playlistId);
 
   private:
-    void constructChildModel();
+    QModelIndex constructChildModel(int selected_id);
     void clearChildModel();
-  
+
     TrackCollection* m_pTrackCollection;
+    CrateDAO& m_crateDao;
     QAction *m_pCreateCrateAction;
     QAction *m_pDeleteCrateAction;
     QAction *m_pRenameCrateAction;

=== modified file 'mixxx/src/library/dao/cratedao.cpp'
--- mixxx/src/library/dao/cratedao.cpp	2011-12-18 20:23:14 +0000
+++ mixxx/src/library/dao/cratedao.cpp	2012-03-12 04:25:21 +0000
@@ -31,19 +31,19 @@
     return query.value(0).toInt();
 }
 
-bool CrateDAO::createCrate(const QString& name) {
+int CrateDAO::createCrate(const QString& name) {
     QSqlQuery query(m_database);
     query.prepare("INSERT INTO " CRATE_TABLE " (name) VALUES (:name)");
     query.bindValue(":name", name);
 
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
-        return false;
+        return -1;
     }
 
     int crateId = query.lastInsertId().toInt();
     emit(added(crateId));
-    return true;
+    return crateId;
 }
 
 bool CrateDAO::renameCrate(int crateId, const QString& newName) {
@@ -56,6 +56,7 @@
         LOG_FAILED_QUERY(query);
         return false;
     }
+    emit(renamed(crateId));
     return true;
 }
 
@@ -71,7 +72,7 @@
         LOG_FAILED_QUERY(query);
         return false;
     }
-
+    emit(lockChanged(crateId));
     return true;
 }
 

=== modified file 'mixxx/src/library/dao/cratedao.h'
--- mixxx/src/library/dao/cratedao.h	2011-10-21 00:42:23 +0000
+++ mixxx/src/library/dao/cratedao.h	2012-03-12 04:25:21 +0000
@@ -28,7 +28,7 @@
     void initialize();
 
     unsigned int crateCount();
-    bool createCrate(const QString& name);
+    int createCrate(const QString& name);
     bool deleteCrate(int crateId);
     bool renameCrate(int crateId, const QString& newName);
     bool setCrateLocked(int crateId, bool locked);
@@ -47,6 +47,8 @@
     void changed(int crateId);
     void trackAdded(int crateId, int trackId);
     void trackRemoved(int crateId, int trackId);
+    void renamed(int crateId);
+    void lockChanged(int crateId);
 
   private:
     QSqlDatabase& m_database;
@@ -54,4 +56,3 @@
 };
 
 #endif /* CRATEDAO_H */
-

=== modified file 'mixxx/src/library/dao/playlistdao.cpp'
--- mixxx/src/library/dao/playlistdao.cpp	2011-12-18 20:23:14 +0000
+++ mixxx/src/library/dao/playlistdao.cpp	2012-03-12 04:25:21 +0000
@@ -1,4 +1,3 @@
-
 #include <QtDebug>
 #include <QtCore>
 #include <QtSql>
@@ -19,10 +18,7 @@
 {
 }
 
-/** Create a playlist with the given name.
-    @param name The name of the playlist to be created.
-*/
-bool PlaylistDAO::createPlaylist(QString name, bool hidden)
+int PlaylistDAO::createPlaylist(QString name, HiddenType hidden)
 {
     // qDebug() << "PlaylistDAO::createPlaylist"
     //          << QThread::currentThread()
@@ -38,7 +34,7 @@
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
         m_database.rollback();
-        return false;
+        return -1;
     }
 
     //Get the id of the last playlist.
@@ -50,34 +46,33 @@
 
     //qDebug() << "Inserting playlist" << name << "at position" << position;
 
-    query.prepare("INSERT INTO Playlists (name, position, hidden) "
-                  "VALUES (:name, :position, :hidden)");
+    query.prepare("INSERT INTO Playlists (name, position, hidden, date_created, date_modified) "
+                  "VALUES (:name, :position, :hidden,  CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)");
     query.bindValue(":name", name);
     query.bindValue(":position", position);
-    query.bindValue(":hidden", hidden ? 1 : 0);
+    query.bindValue(":hidden", static_cast<int>(hidden));
 
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
         m_database.rollback();
-        return false;
+        return -1;
     }
 
     int playlistId = query.lastInsertId().toInt();
     //Commit the transaction
     m_database.commit();
     emit(added(playlistId));
-    return true;
+    return playlistId;
 }
 
-/** Find out the name of the playlist at the given position */
-QString PlaylistDAO::getPlaylistName(unsigned int position)
+QString PlaylistDAO::getPlaylistName(int playlistId)
 {
     // qDebug() << "PlaylistDAO::getPlaylistName" << QThread::currentThread() << m_database.connectionName();
 
     QSqlQuery query(m_database);
     query.prepare("SELECT name FROM Playlists "
-                  "WHERE position = :position");
-    query.bindValue(":position", position);
+                  "WHERE id= :id");
+    query.bindValue(":id", playlistId);
 
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
@@ -108,8 +103,6 @@
     return -1;
 }
 
-
-/** Delete a playlist */
 void PlaylistDAO::deletePlaylist(int playlistId)
 {
     // qDebug() << "PlaylistDAO::deletePlaylist" << QThread::currentThread() << m_database.connectionName();
@@ -144,7 +137,6 @@
     emit(deleted(playlistId));
 }
 
-
 void PlaylistDAO::renamePlaylist(int playlistId, const QString& newName) {
     QSqlQuery query(m_database);
     query.prepare("UPDATE Playlists SET name = :name WHERE id = :id");
@@ -152,23 +144,23 @@
     query.bindValue(":id", playlistId);
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
+        return;
     }
+    emit(renamed(playlistId));
 }
 
-
 bool PlaylistDAO::setPlaylistLocked(int playlistId, bool locked) {
+    QSqlQuery query(m_database);
+    query.prepare("UPDATE Playlists SET locked = :lock WHERE id = :id");
     // SQLite3 doesn't support boolean value. Using integer instead.
-    int lock = locked ? 1 : 0;
-
-    QSqlQuery query(m_database);
-    query.prepare("UPDATE Playlists SET locked = :lock WHERE id = :id");
-    query.bindValue(":lock", lock);
+    query.bindValue(":lock", static_cast<int>(locked));
     query.bindValue(":id", playlistId);
 
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
         return false;
     }
+    emit(lockChanged(playlistId));
     return true;
 }
 
@@ -188,10 +180,8 @@
     return false;
 }
 
-/** Append a track to a playlist */
-void PlaylistDAO::appendTrackToPlaylist(int trackId, int playlistId)
-{
-    // qDebug() << "PlaylistDAO::appendTrackToPlaylist"
+void PlaylistDAO::appendTracksToPlaylist(QList<int> trackIds, int playlistId) {
+    // qDebug() << "PlaylistDAO::appendTracksToPlaylist"
     //          << QThread::currentThread() << m_database.connectionName();
 
     // Start the transaction
@@ -207,32 +197,44 @@
         LOG_FAILED_QUERY(query);
     }
 
-    // Get the position of the highest playlist...
+    // Get the position of the highest track in the playlist.
     int position = 0;
     if (query.next()) {
         position = query.value(query.record().indexOf("position")).toInt();
     }
-    position++; //Append after the last song.
+    // Append after the last song. If no songs or a failed query then 0 becomes
+    // 1.
+    position++;
 
     //Insert the song into the PlaylistTracks table
     query.prepare("INSERT INTO PlaylistTracks (playlist_id, track_id, position)"
                   "VALUES (:playlist_id, :track_id, :position)");
     query.bindValue(":playlist_id", playlistId);
-    query.bindValue(":track_id", trackId);
-    query.bindValue(":position", position);
-
-    if (!query.exec()) {
-        LOG_FAILED_QUERY(query);
+
+
+    foreach (int trackId, trackIds) {
+        query.bindValue(":track_id", trackId);
+        query.bindValue(":position", position++);
+        if (!query.exec()) {
+            LOG_FAILED_QUERY(query);
+        }
     }
 
     // Commit the transaction
     m_database.commit();
 
-    emit(trackAdded(playlistId, trackId, position));
+    foreach (int trackId, trackIds) {
+        emit(trackAdded(playlistId, trackId, position));
+    }
     emit(changed(playlistId));
 }
 
-/** Find out how many playlists exist. */
+void PlaylistDAO::appendTrackToPlaylist(int trackId, int playlistId) {
+    QList<int> tracks;
+    tracks.append(trackId);
+    appendTracksToPlaylist(tracks, playlistId);
+}
+
 unsigned int PlaylistDAO::playlistCount()
 {
     // qDebug() << "PlaylistDAO::playlistCount" << QThread::currentThread() << m_database.connectionName();
@@ -249,7 +251,7 @@
     return numRecords;
 }
 
-int PlaylistDAO::getPlaylistId(int position)
+int PlaylistDAO::getPlaylistId(int index)
 {
     // qDebug() << "PlaylistDAO::getPlaylistId"
     //          << QThread::currentThread() << m_database.connectionName();
@@ -257,37 +259,50 @@
     QSqlQuery query(m_database);
     query.prepare("SELECT id FROM Playlists");
 
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query);
+        return -1;
+    }
+
+    int currentRow = 0;
+    while(query.next()) {
+        if (currentRow++ == index) {
+            int id = query.value(0).toInt();
+            return id;
+        }
+    }
+    return -1;
+}
+
+PlaylistDAO::HiddenType PlaylistDAO::getHiddenType(int playlistId) {
+    // qDebug() << "PlaylistDAO::getHiddenType"
+    //          << QThread::currentThread() << m_database.connectionName();
+
+    QSqlQuery query(m_database);
+    query.prepare("SELECT hidden FROM Playlists WHERE id = :id");
+    query.bindValue(":id", playlistId);
+
     if (query.exec()) {
-        int currentRow = 0;
-        while(query.next()) {
-            if (currentRow++ == position) {
-                int id = query.value(0).toInt();
-                return id;
-            }
+        if (query.next()) {
+            return static_cast<HiddenType>(query.value(0).toInt());
         }
     } else {
         LOG_FAILED_QUERY(query);
     }
-
-    return -1;
+    qDebug() << "PlaylistDAO::getHiddenType returns PLHT_UNKNOWN for playlistId "
+             << playlistId;
+    return PLHT_UNKNOWN;
 }
 
 bool PlaylistDAO::isHidden(int playlistId) {
     // qDebug() << "PlaylistDAO::isHidden"
     //          << QThread::currentThread() << m_database.connectionName();
 
-    QSqlQuery query(m_database);
-    query.prepare("SELECT hidden FROM Playlists WHERE id = :id");
-    query.bindValue(":id", playlistId);
-
-    if (query.exec()) {
-        if (query.next()) {
-            return query.value(0).toBool();
-        }
-    } else {
-        LOG_FAILED_QUERY(query);
+    HiddenType ht = getHiddenType(playlistId);
+    if (ht == PLHT_NOT_HIDDEN) {
+        return false;
     }
-    return false;
+    return true;
 }
 
 void PlaylistDAO::removeTrackFromPlaylists(int trackId) {
@@ -398,7 +413,7 @@
     emit(changed(playlistId));
 }
 
-void PlaylistDAO::addToAutoDJQueue(int playlistId) {
+void PlaylistDAO::addToAutoDJQueue(int playlistId, bool bTop) {
     //qDebug() << "Adding tracks from playlist " << playlistId << " to the Auto-DJ Queue";
 
     // Query the PlaylistTracks database to locate tracks in the selected playlist
@@ -408,12 +423,63 @@
     query.bindValue(":plid", playlistId);
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
+        return;
     }
 
     // Get the ID of the Auto-DJ playlist
     int autoDJId = getPlaylistIdFromName(AUTODJ_TABLE);
-    // Loop through the tracks, adding them to the Auto-DJ Queue
-    while(query.next()) {
-        appendTrackToPlaylist(query.value(0).toInt(), autoDJId);
-    }
+
+    // Loop through the tracks, adding them to the Auto-DJ Queue. Start at
+    // position 2 because position 1 was already loaded to the deck
+    int i = 2;
+
+    while (query.next()) {
+        if (bTop) {
+            insertTrackIntoPlaylist(query.value(0).toInt(), autoDJId, i++);
+        }
+        else {
+            appendTrackToPlaylist(query.value(0).toInt(), autoDJId);
+        }
+    }
+}
+
+int PlaylistDAO::getPreviousPlaylist(int currentPlaylistId, HiddenType hidden) {
+    // Find out the highest position existing in the playlist so we know what
+    // position this track should have.
+    QSqlQuery query(m_database);
+    query.prepare("SELECT max(id) as id FROM Playlists "
+                  "WHERE id < :id AND hidden = :hidden");
+    query.bindValue(":id", currentPlaylistId);
+    query.bindValue(":hidden", hidden);
+
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query);
+        return -1;
+    }
+
+     // Get the id of the highest playlist
+    int previousPlaylistId = -1;
+    if (query.next()) {
+        previousPlaylistId = query.value(query.record().indexOf("id")).toInt();
+    }
+    return previousPlaylistId;
+}
+
+void PlaylistDAO::copyPlaylistTracks(int sourcePlaylistID, int targetPlaylistId) {
+    // Query Tracks from the source Playlist
+    QSqlQuery query(m_database);
+    query.prepare("SELECT track_id FROM PlaylistTracks "
+                  "WHERE playlist_id = :plid");
+    query.bindValue(":plid", sourcePlaylistID);
+
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query);
+        return;
+    }
+
+    QList<int> trackIds;
+    while (query.next()) {
+        trackIds.append(query.value(0).toInt());
+    }
+    appendTracksToPlaylist(trackIds, targetPlaylistId);
 }

=== modified file 'mixxx/src/library/dao/playlistdao.h'
--- mixxx/src/library/dao/playlistdao.h	2011-10-21 00:42:23 +0000
+++ mixxx/src/library/dao/playlistdao.h	2012-03-12 04:25:21 +0000
@@ -13,17 +13,27 @@
 const QString PLAYLISTTRACKSTABLE_TRACKID = "track_id";
 const QString PLAYLISTTRACKSTABLE_POSITION = "position";
 const QString PLAYLISTTRACKSTABLE_PLAYLISTID = "playlist_id";
+const QString PLAYLISTTRACKSTABLE_LOCATION = "location";
+const QString PLAYLISTTRACKSTABLE_ARTIST = "artist";
+const QString PLAYLISTTRACKSTABLE_TITLE = "title";
 
 class PlaylistDAO : public QObject, public virtual DAO {
     Q_OBJECT
   public:
+    enum HiddenType {
+        PLHT_NOT_HIDDEN = 0,
+        PLHT_AUTO_DJ = 1,
+        PLHT_SET_LOG = 2,
+        PLHT_UNKNOWN = -1
+    };
+
     PlaylistDAO(QSqlDatabase& database);
     virtual ~PlaylistDAO();
 
     void initialize();
     void setDatabase(QSqlDatabase& database) { m_database = database; };
     /** Create a playlist */
-    bool createPlaylist(QString name, bool hidden = false);
+    int createPlaylist(QString name, HiddenType type = PLHT_NOT_HIDDEN);
     /** Delete a playlist */
     void deletePlaylist(int playlistId);
     /** Rename a playlist */
@@ -32,20 +42,24 @@
     bool setPlaylistLocked(int playlistId, bool locked);
     /** Find out the state of a playlist lock */
     bool isPlaylistLocked(int playlistId);
-    /** Append a track to a playlist */
+    /** Append a list of tracks to a playlist */
+    void appendTracksToPlaylist(QList<int> trackIds, int playlistId);
+    /** Append a track  to a playlist */
     void appendTrackToPlaylist(int trackId, int playlistId);
     /** Find out how many playlists exist. */
     unsigned int playlistCount();
-    /** Get the name of the playlist at the given position */
-    QString getPlaylistName(unsigned int position);
+    /** Find out the name of the playlist at the given Id */
+    QString getPlaylistName(int playlistId);
     // Get the playlist id by its name
     int getPlaylistIdFromName(QString name);
-    /** Get the id of the playlist at position. Note that the position is the
-     * natural position in the database table, not the display order position
-     * column stored in the database. */
-    int getPlaylistId(int position);
+    // Get the id of the playlist at index. Note that the index is the natural
+    // position in the database table, not the display order position column
+    // stored in the database.
+    int getPlaylistId(int index);
     // Returns true if the playlist with playlistId is hidden
     bool isHidden(int playlistId);
+    // Returns the HiddenType of playlistId
+    HiddenType getHiddenType(int playlistId);
     /** Remove a track from all playlists */
     void removeTrackFromPlaylists(int trackId);
     /** Remove a track from a playlist */
@@ -53,13 +67,20 @@
     /** Insert a track into a specific position in a playlist */
     void insertTrackIntoPlaylist(int trackId, int playlistId, int position);
     /** Add a playlist to the Auto-DJ Queue */
-    void addToAutoDJQueue(int playlistId);
+    void addToAutoDJQueue(int playlistId, bool bTop);
+    // Get the preceding playlist of currentPlaylistId with the HiddenType
+    // hidden. Returns -1 if no such playlist exists.
+    int getPreviousPlaylist(int currentPlaylistId, HiddenType hidden);
+    // Append all the tracks in the source playlist to the target playlist.
+    void copyPlaylistTracks(int sourcePlaylistID, int targetPlaylistId);
   signals:
     void added(int playlistId);
     void deleted(int playlistId);
     void changed(int playlistId);
     void trackAdded(int playlistId, int trackId, int position);
     void trackRemoved(int playlistId, int trackId, int position);
+    void renamed(int playlistId);
+    void lockChanged(int playlistId);
   private:
     QSqlDatabase& m_database;
     DISALLOW_COPY_AND_ASSIGN(PlaylistDAO);

=== modified file 'mixxx/src/library/legacylibraryimporter.cpp'
--- mixxx/src/library/legacylibraryimporter.cpp	2010-11-19 01:54:28 +0000
+++ mixxx/src/library/legacylibraryimporter.cpp	2012-03-12 04:25:21 +0000
@@ -148,8 +148,7 @@
 
             //Create the playlist with the imported name.
             //qDebug() << "Importing playlist:" << current.name;
-            m_playlistDao.createPlaylist(current.name, false);
-            int playlistId = m_playlistDao.getPlaylistIdFromName(current.name);
+            int playlistId = m_playlistDao.createPlaylist(current.name);
 
             //For each track ID in the XML...
             QList<int> trackIDs = current.indexes;

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2011-09-25 06:39:39 +0000
+++ mixxx/src/library/library.cpp	2012-03-12 04:25:21 +0000
@@ -21,6 +21,7 @@
 #include "library/promotracksfeature.h"
 #include "library/traktor/traktorfeature.h"
 #include "library/librarycontrol.h"
+#include "library/setlogfeature.h"
 
 #include "widget/wtracktableview.h"
 #include "widget/wlibrary.h"
@@ -60,6 +61,7 @@
     addFeature(m_pCrateFeature);
     addFeature(new BrowseFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager));
     addFeature(new RecordingFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager));
+    addFeature(new SetlogFeature(this, pConfig, m_pTrackCollection));
     addFeature(new PrepareFeature(this, pConfig, m_pTrackCollection));
     //iTunes and Rhythmbox should be last until we no longer have an obnoxious
     //messagebox popup when you select them. (This forces you to reach for your
@@ -141,7 +143,6 @@
         ->select(m_pSidebarModel->getDefaultSelection(),
                  QItemSelectionModel::SelectCurrent);
     m_pSidebarModel->activateDefaultSelection();
-
 }
 
 void Library::addFeature(LibraryFeature* feature) {

=== modified file 'mixxx/src/library/libraryfeature.h'
--- mixxx/src/library/libraryfeature.h	2011-03-10 14:06:26 +0000
+++ mixxx/src/library/libraryfeature.h	2012-03-12 04:25:21 +0000
@@ -66,7 +66,8 @@
     void featureIsLoading(LibraryFeature*);
     /** emit this signal if the foreign music collection has been imported/parsed. **/
     void featureLoadingFinished(LibraryFeature*s);
-
+    /** emit this signal to select pFeature **/
+    void featureSelect(LibraryFeature* pFeature, const QModelIndex& index);
 
 };
 

=== modified file 'mixxx/src/library/parser.cpp'
--- mixxx/src/library/parser.cpp	2011-11-27 04:30:58 +0000
+++ mixxx/src/library/parser.cpp	2012-03-12 04:25:21 +0000
@@ -87,7 +87,7 @@
     }
 
     const unsigned char* bytes = (const unsigned char *)string;
-    while(*bytes) {
+    while (*bytes) {
         if(     (// ASCII
                         bytes[0] == 0x09 ||
                         bytes[0] == 0x0A ||

=== added file 'mixxx/src/library/parsercsv.cpp'
--- mixxx/src/library/parsercsv.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parsercsv.cpp	2012-03-12 04:25:21 +0000
@@ -0,0 +1,233 @@
+//
+// C++ Implementation: parsercsv
+//
+// Description: module to parse Comma-Separated Values (CSV) formated playlists (rfc4180)
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+// Author: Tobias Rafreider [e-mail], (C) 2011
+// Author: Daniel Schürmann [e-mail], (C) 2011
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#include <QTextStream>
+#include <QDebug>
+#include <QDir>
+#include <QMessageBox>
+#include <QUrl>
+
+#include "library/parsercsv.h"
+
+ParserCsv::ParserCsv() : Parser() {
+}
+
+ParserCsv::~ParserCsv() {
+}
+
+QList<QString> ParserCsv::parse(QString sFilename) {
+    QFile file(sFilename);
+    QString basepath = sFilename.section('/', 0, -2);
+
+    clearLocations();
+    //qDebug() << "ParserCsv: Starting to parse.";
+    if (file.open(QIODevice::ReadOnly) && !isBinary(sFilename)) {
+        QByteArray ba = file.readAll();
+
+        QList<QList<QString> > tokens = tokenize( ba, ',');
+
+        // detect Location column
+        int loc_coll = 0x7fffffff;
+        if (tokens.size()) {
+            for (int i = 0; i < tokens[0].size(); ++i) {
+                if (tokens[0][i] == tr("Location")) {
+                    loc_coll = i;
+                    break;
+                }
+            }
+            for (int i = 1; i < tokens.size(); ++i) {
+                if (loc_coll < tokens[i].size()) {
+                    // Todo: check if path is relative
+                    QFileInfo fi = tokens[i][loc_coll];
+                    if (fi.isRelative()){
+                        // add base path
+                        qDebug() << "is relative" << basepath << fi.filePath();
+                        fi.setFile(basepath,fi.filePath());
+                    }
+                    m_sLocations.append(fi.filePath());
+                }
+            }
+        }
+
+        file.close();
+
+        if(m_sLocations.count() != 0)
+            return m_sLocations;
+        else
+            return QList<QString>(); // NULL pointer returned when no locations were found
+
+    }
+
+    file.close();
+    return QList<QString>(); //if we get here something went wrong
+}
+
+// Code was posted at http://www.qtcentre.org/threads/35511-Parsing-CSV-data
+// by "adzajac" and adapted to use QT Classes
+QList<QList<QString> > ParserCsv::tokenize(const QByteArray& str, char delimiter) {
+    QList<QList<QString> > tokens;
+
+    unsigned int row = 0;
+    bool quotes = false;
+    QByteArray field = "";
+
+    tokens.append(QList<QString>());
+
+    for (int pos = 0; pos < str.length(); ++pos) {
+        char c = str[pos];
+        if (!quotes && c == '"' ){
+            quotes = true;
+        } else if (quotes && c== '"' ){
+            if (pos + 1 < str.length() && str[pos+1]== '"') {
+                field.append(c);
+                pos++;
+            } else {
+                quotes = false;
+            }
+        } else if (!quotes && c == delimiter) {
+            if (isUtf8(field.data())) {
+                tokens[row].append(QString::fromUtf8(field));
+            } else {
+                tokens[row].append(QString::fromLatin1(field));
+            }
+            field.clear();
+        } else if (!quotes && (c == '\r' || c == '\n')) {
+            if (isUtf8(field.data())) {
+                tokens[row].append(QString::fromUtf8(field));
+            } else {
+                tokens[row].append(QString::fromLatin1(field));
+            }
+            field.clear();
+            tokens.append(QList<QString>());
+            row++;
+        } else {
+            field.push_back(c);
+        }
+    }
+    return tokens;
+}
+
+bool ParserCsv::writeCSVFile(const QString &file_str, BaseSqlTableModel* pPlaylistTableModel, bool useRelativePath)
+{
+    /*
+     * Important note:
+     * On Windows \n will produce a <CR><CL> (=\r\n)
+     * On Linux and OS X \n is <CR> (which remains \n)
+     */
+
+    QFile file(file_str);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)){
+        QMessageBox::warning(NULL,tr("Playlist Export Failed"),
+                             tr("Could not create file")+" "+file_str);
+        return false;
+    }
+    //Base folder of file
+    QString base = file_str.section('/', 0, -2);
+    QDir base_dir(base);
+
+    qDebug() << "Basepath: " << base;
+    QTextStream out(&file);
+    out.setCodec("UTF-8"); // rfc4180: Common usage of CSV is US-ASCII ...
+                           // Using UTF-8 to get around codepage issues
+                           // and it's the default encoding in Ooo Calc
+
+    // writing header section
+    bool first = true;
+    int columns = pPlaylistTableModel->columnCount();
+    for (int i = 0; i < columns; ++i) {
+        if (pPlaylistTableModel->isColumnInternal(i)) {
+            continue;
+        }
+        if (!first){
+            out << ",";
+        } else {
+            first = false;
+        }
+        out << "\"";
+        QString field = pPlaylistTableModel->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString();
+        out << field.replace('\"', "\"\"");  // escape "
+        out << "\"";
+    }
+    out << "\r\n"; // CRLF according to rfc4180
+
+
+    int rows = pPlaylistTableModel->rowCount();
+    for (int j = 0; j < rows; j++) {
+        // writing fields section
+        first = true;
+        for(int i = 0; i < columns; ++i){
+            if (pPlaylistTableModel->isColumnInternal(i)) {
+                continue;
+            }
+            if (!first){
+                out << ",";
+            } else {
+                first = false;
+            }
+            out << "\"";
+            QString field = pPlaylistTableModel->data(pPlaylistTableModel->index(j,i)).toString();
+            if (useRelativePath && i == pPlaylistTableModel->fieldIndex(PLAYLISTTRACKSTABLE_LOCATION)) {
+                field = base_dir.relativeFilePath(field);
+            }
+            out << field.replace('\"', "\"\"");  // escape "
+            out << "\"";
+        }
+        out << "\r\n"; // CRLF according to rfc4180
+    }
+    return true;
+}
+
+bool ParserCsv::writeReadableTextFile(const QString &file_str, BaseSqlTableModel* pPlaylistTableModel)
+{
+    /*
+     * Important note:
+     * On Windows \n will produce a <CR><CL> (=\r\n)
+     * On Linux and OS X \n is <CR> (which remains \n)
+     */
+
+    QFile file(file_str);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)){
+        QMessageBox::warning(NULL,tr("Readable text Export Failed"),
+                             tr("Could not create file")+" "+file_str);
+        return false;
+    }
+
+    QTextStream out(&file);
+
+    // export each row as "01. 00:00 Artist - Title"
+
+    int i; // fieldIndex
+    int rows = pPlaylistTableModel->rowCount();
+    for (int j = 0; j < rows; j++) {
+        // writing fields section
+        i = pPlaylistTableModel->fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
+        if (i >= 0){
+            int nr = pPlaylistTableModel->data(pPlaylistTableModel->index(j,i)).toInt();
+            out << QString("%1.").arg(nr,2,10,QLatin1Char('0'));
+        }
+        // TODO(DSC) // Fill in Cue point
+
+        i = pPlaylistTableModel->fieldIndex(PLAYLISTTRACKSTABLE_ARTIST);
+        if (i >= 0){
+            out << " ";
+            out << pPlaylistTableModel->data(pPlaylistTableModel->index(j,i)).toString();
+        }
+        i = pPlaylistTableModel->fieldIndex(PLAYLISTTRACKSTABLE_TITLE);
+        if (i >= 0){
+            out << " - ";
+            out << pPlaylistTableModel->data(pPlaylistTableModel->index(j,i)).toString();;
+        }
+        out << "\n";
+    }
+    return true;
+}

=== added file 'mixxx/src/library/parsercsv.h'
--- mixxx/src/library/parsercsv.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parsercsv.h	2012-03-12 04:25:21 +0000
@@ -0,0 +1,41 @@
+//
+// C++ Interface: parserm3u
+//
+// Description: Interface header parse Comma-Separated Values (CSV) formated playlists (rfc4180)
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+// Author: Tobias Rafreider [e-mail], (C) 2011
+// Author: Daniel Schürmann [e-mail], (C) 2011
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#include "library/parser.h"
+#include "library/basesqltablemodel.h"
+
+#ifndef PARSERCSV_H
+#define PARSERCSV_H
+
+class QTextStream;
+
+class ParserCsv : public Parser
+{
+    Q_OBJECT
+public:
+    ParserCsv();
+    virtual ~ParserCsv();
+    /**Overwriting function parse in class Parser**/
+    QList<QString> parse(QString);
+    // Playlist Export
+    static bool writeCSVFile(const QString &file, BaseSqlTableModel* pPlaylistTableModel, bool useRelativePath);
+    // Readable Text export
+    static bool writeReadableTextFile(const QString &file, BaseSqlTableModel* pPlaylistTableModel);
+private:
+    /**Reads a line from the file and returns filepath if a valid file**/
+    QList<QList<QString> > tokenize(const QByteArray& str, char delimiter);
+
+
+};
+
+#endif

=== modified file 'mixxx/src/library/playlistfeature.cpp'
--- mixxx/src/library/playlistfeature.cpp	2011-11-30 05:27:44 +0000
+++ mixxx/src/library/playlistfeature.cpp	2012-03-12 04:25:21 +0000
@@ -8,7 +8,7 @@
 #include "library/parser.h"
 #include "library/parserm3u.h"
 #include "library/parserpls.h"
-
+#include "library/parsercsv.h"
 
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
@@ -22,42 +22,10 @@
 PlaylistFeature::PlaylistFeature(QObject* parent,
                                  TrackCollection* pTrackCollection,
                                  ConfigObject<ConfigValue>* pConfig)
-        : LibraryFeature(parent),
-          m_pTrackCollection(pTrackCollection),
-          m_playlistDao(pTrackCollection->getPlaylistDAO()),
-          m_trackDao(pTrackCollection->getTrackDAO()),
-          m_pConfig(pConfig),
-          m_playlistTableModel(this, pTrackCollection->getDatabase()) {
+        : BasePlaylistFeature(parent, pConfig, pTrackCollection,
+                              "PLAYLISTHOME", "qrc:/html/playlists.html") {
     m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection,
                                                    "mixxx.db.model.playlist");
-
-    m_pCreatePlaylistAction = new QAction(tr("New Playlist"),this);
-    connect(m_pCreatePlaylistAction, SIGNAL(triggered()),
-            this, SLOT(slotCreatePlaylist()));
-
-    m_pAddToAutoDJAction = new QAction(tr("Add to Auto-DJ Queue"),this);
-    connect(m_pAddToAutoDJAction, SIGNAL(triggered()),
-            this, SLOT(slotAddToAutoDJ()));
-
-    m_pDeletePlaylistAction = new QAction(tr("Remove"),this);
-    connect(m_pDeletePlaylistAction, SIGNAL(triggered()),
-            this, SLOT(slotDeletePlaylist()));
-
-    m_pRenamePlaylistAction = new QAction(tr("Rename"),this);
-    connect(m_pRenamePlaylistAction, SIGNAL(triggered()),
-            this, SLOT(slotRenamePlaylist()));
-
-    m_pLockPlaylistAction = new QAction(tr("Lock"),this);
-    connect(m_pLockPlaylistAction, SIGNAL(triggered()),
-            this, SLOT(slotTogglePlaylistLock()));
-
-    m_pImportPlaylistAction = new QAction(tr("Import Playlist"),this);
-    connect(m_pImportPlaylistAction, SIGNAL(triggered()),
-            this, SLOT(slotImportPlaylist()));
-    m_pExportPlaylistAction = new QAction(tr("Export Playlist"), this);
-    connect(m_pExportPlaylistAction, SIGNAL(triggered()),
-            this, SLOT(slotExportPlaylist()));
-
     // Setup the sidebar playlist model
     m_playlistTableModel.setTable("Playlists");
     m_playlistTableModel.setFilter("hidden=0");
@@ -68,17 +36,10 @@
     //construct child model
     TreeItem *rootItem = new TreeItem();
     m_childModel.setRootItem(rootItem);
-    constructChildModel();
+    constructChildModel(-1);
 }
 
 PlaylistFeature::~PlaylistFeature() {
-    delete m_pPlaylistTableModel;
-    delete m_pCreatePlaylistAction;
-    delete m_pDeletePlaylistAction;
-    delete m_pImportPlaylistAction;
-    delete m_pAddToAutoDJAction;
-    delete m_pRenamePlaylistAction;
-    delete m_pLockPlaylistAction;
 }
 
 QVariant PlaylistFeature::title() {
@@ -89,31 +50,6 @@
     return QIcon(":/images/library/ic_library_playlist.png");
 }
 
-
-void PlaylistFeature::bindWidget(WLibrarySidebar* sidebarWidget,
-                                 WLibrary* libraryWidget,
-                                 MixxxKeyboard* keyboard) {
-    WLibraryTextBrowser* edit = new WLibraryTextBrowser(libraryWidget);
-    connect(this, SIGNAL(showPage(const QUrl&)),
-            edit, SLOT(setSource(const QUrl&)));
-    libraryWidget->registerView("PLAYLISTHOME", edit);
-}
-
-void PlaylistFeature::activate() {
-    emit(showPage(QUrl("qrc:/html/playlists.html")));
-    emit(switchToView("PLAYLISTHOME"));
-}
-
-void PlaylistFeature::activateChild(const QModelIndex& index) {
-    //qDebug() << "PlaylistFeature::activateChild()" << index;
-
-    //Switch the playlist table model's playlist.
-    QString playlistName = index.data().toString();
-    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
-    m_pPlaylistTableModel->setPlaylist(playlistId);
-    emit(showTrackModel(m_pPlaylistTableModel));
-}
-
 void PlaylistFeature::onRightClick(const QPoint& globalPos) {
     m_lastRightClickedIndex = QModelIndex();
 
@@ -142,6 +78,7 @@
     menu.addAction(m_pCreatePlaylistAction);
     menu.addSeparator();
     menu.addAction(m_pAddToAutoDJAction);
+    menu.addAction(m_pAddToAutoDJTopAction);
     menu.addAction(m_pRenamePlaylistAction);
     menu.addAction(m_pDeletePlaylistAction);
     menu.addAction(m_pLockPlaylistAction);
@@ -151,156 +88,6 @@
     menu.exec(globalPos);
 }
 
-void PlaylistFeature::slotCreatePlaylist() {
-    QString name;
-    bool validNameGiven = false;
-
-    do {
-        bool ok = false;
-        name = QInputDialog::getText(NULL,
-                                     tr("New Playlist"),
-                                     tr("Playlist name:"),
-                                     QLineEdit::Normal,
-                                     tr("New Playlist"),
-                                     &ok).trimmed();
-
-        if (!ok)
-            return;
-
-        int existingId = m_playlistDao.getPlaylistIdFromName(name);
-
-        if (existingId != -1) {
-            QMessageBox::warning(NULL,
-                                 tr("Playlist Creation Failed"),
-                                 tr("A playlist by that name already exists."));
-        } else if (name.isEmpty()) {
-            QMessageBox::warning(NULL,
-                                 tr("Playlist Creation Failed"),
-                                 tr("A playlist cannot have a blank name."));
-        } else {
-            validNameGiven = true;
-        }
-
-    } while (!validNameGiven);
-
-    bool playlistCreated = m_playlistDao.createPlaylist(name);
-
-    if (playlistCreated) {
-        clearChildModel();
-        m_playlistTableModel.select();
-        constructChildModel();
-        emit(featureUpdated());
-        //Switch the view to the new playlist.
-        int playlistId = m_playlistDao.getPlaylistIdFromName(name);
-        m_pPlaylistTableModel->setPlaylist(playlistId);
-        // TODO(XXX) set sidebar selection
-        emit(showTrackModel(m_pPlaylistTableModel));
-    }
-    else {
-        QMessageBox::warning(NULL,
-                             tr("Playlist Creation Failed"),
-                             tr("An unknown error occurred while creating playlist: ")
-                              + name);
-    }
-}
-
-void PlaylistFeature::slotRenamePlaylist()
-{
-    qDebug() << "slotRenamePlaylist()";
-
-    QString oldName = m_lastRightClickedIndex.data().toString();
-    int playlistId = m_playlistDao.getPlaylistIdFromName(oldName);
-    bool locked = m_playlistDao.isPlaylistLocked(playlistId);
-
-    if (locked) {
-        qDebug() << "Skipping playlist rename because playlist" << playlistId << "is locked.";
-        return;
-    }
-
-    QString newName;
-    bool validNameGiven = false;
-
-    do {
-        bool ok = false;
-        newName = QInputDialog::getText(NULL,
-                                        tr("Rename Playlist"),
-                                        tr("New playlist name:"),
-                                        QLineEdit::Normal,
-                                        oldName,
-                                        &ok).trimmed();
-
-        if (!ok || oldName == newName) {
-            return;
-        }
-
-        int existingId = m_playlistDao.getPlaylistIdFromName(newName);
-
-        if (existingId != -1) {
-            QMessageBox::warning(NULL,
-                                tr("Renaming Playlist Failed"),
-                                tr("A playlist by that name already exists."));
-        }
-        else if (newName.isEmpty()) {
-            QMessageBox::warning(NULL,
-                                tr("Renaming Playlist Failed"),
-                                tr("A playlist cannot have a blank name."));
-        }
-        else {
-            validNameGiven = true;
-        }
-    } while (!validNameGiven);
-
-    m_playlistDao.renamePlaylist(playlistId, newName);
-    clearChildModel();
-    m_playlistTableModel.select();
-    constructChildModel();
-    emit(featureUpdated());
-    m_pPlaylistTableModel->setPlaylist(playlistId);
-}
-
-
-void PlaylistFeature::slotTogglePlaylistLock()
-{
-    QString playlistName = m_lastRightClickedIndex.data().toString();
-    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
-    bool locked = !m_playlistDao.isPlaylistLocked(playlistId);
-
-    if (!m_playlistDao.setPlaylistLocked(playlistId, locked)) {
-        qDebug() << "Failed to toggle lock of playlistId " << playlistId;
-    }
-
-    TreeItem* playlistItem = m_childModel.getItem(m_lastRightClickedIndex);
-    playlistItem->setIcon(locked ? QIcon(":/images/library/ic_library_locked.png") : QIcon());
-}
-
-void PlaylistFeature::slotDeletePlaylist()
-{
-    //qDebug() << "slotDeletePlaylist() row:" << m_lastRightClickedIndex.data();
-    int playlistId = m_playlistDao.getPlaylistIdFromName(m_lastRightClickedIndex.data().toString());
-    bool locked = m_playlistDao.isPlaylistLocked(playlistId);
-
-    if (locked) {
-        qDebug() << "Skipping playlist deletion because playlist" << playlistId << "is locked.";
-        return;
-    }
-
-    if (m_lastRightClickedIndex.isValid() &&
-        !m_playlistDao.isPlaylistLocked(playlistId)) {
-        Q_ASSERT(playlistId >= 0);
-
-        clearChildModel();
-        m_playlistDao.deletePlaylist(playlistId);
-        m_playlistTableModel.select();
-        constructChildModel();
-        emit(featureUpdated());
-    }
-
-}
-
-bool PlaylistFeature::dropAccept(QUrl url) {
-    return false;
-}
-
 bool PlaylistFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
     //TODO: Filter by supported formats regex and reject anything that doesn't match.
     QString playlistName = index.data().toString();
@@ -333,10 +120,6 @@
     return true;
 }
 
-bool PlaylistFeature::dragMoveAccept(QUrl url) {
-    return false;
-}
-
 bool PlaylistFeature::dragMoveAcceptChild(const QModelIndex& index, QUrl url) {
     //TODO: Filter by supported formats regex and reject anything that doesn't match.
 
@@ -349,23 +132,21 @@
     return !locked && formatSupported;
 }
 
-TreeItemModel* PlaylistFeature::getChildModel() {
-    return &m_childModel;
-}
+
 /**
   * Purpose: When inserting or removing playlists,
   * we require the sidebar model not to reset.
   * This method queries the database and does dynamic insertion
 */
-void PlaylistFeature::constructChildModel()
+QModelIndex PlaylistFeature::constructChildModel(int selected_id)
 {
     QList<TreeItem*> data_list;
     int nameColumn = m_playlistTableModel.record().indexOf("name");
     int idColumn = m_playlistTableModel.record().indexOf("id");
-
-    //Access the invisible root item
+    int selected_row = -1;
+    // Access the invisible root item
     TreeItem* root = m_childModel.getItem(QModelIndex());
-    //Create new TreeItems for the playlists in the database
+    // Create new TreeItems for the playlists in the database
     for (int row = 0; row < m_playlistTableModel.rowCount(); ++row) {
         QModelIndex ind = m_playlistTableModel.index(row, nameColumn);
         QString playlist_name = m_playlistTableModel.data(ind).toString();
@@ -373,121 +154,23 @@
         int playlist_id = m_playlistTableModel.data(ind).toInt();
         bool locked = m_playlistDao.isPlaylistLocked(playlist_id);
 
-        //Create the TreeItem whose parent is the invisible root item
+        if (selected_id == playlist_id) {
+            // save index for selection
+            selected_row = row;
+        }
+
+        // Create the TreeItem whose parent is the invisible root item
         TreeItem* item = new TreeItem(playlist_name, playlist_name, this, root);
         item->setIcon(locked ? QIcon(":/images/library/ic_library_locked.png") : QIcon());
         data_list.append(item);
     }
 
-    //Append all the newly created TreeItems in a dynamic way to the childmodel
+    // Append all the newly created TreeItems in a dynamic way to the childmodel
     m_childModel.insertRows(data_list, 0, m_playlistTableModel.rowCount());
-}
-
-/**
-  * Clears the child model dynamically, but the invisible root item remains
-  */
-void PlaylistFeature::clearChildModel()
-{
-    m_childModel.removeRows(0,m_playlistTableModel.rowCount());
-}
-void PlaylistFeature::slotImportPlaylist()
-{
-    qDebug() << "slotImportPlaylist() row:" ; //<< m_lastRightClickedIndex.data();
-
-    QString playlist_file = QFileDialog::getOpenFileName(
-        NULL,
-        tr("Import Playlist"),
-        QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
-        tr("Playlist Files (*.m3u *.m3u8 *.pls)"));
-    // Exit method if user cancelled the open dialog.
-    if (playlist_file.isNull() || playlist_file.isEmpty()) {
-        return;
-    }
-
-    Parser* playlist_parser = NULL;
-
-    if (playlist_file.endsWith(".m3u", Qt::CaseInsensitive) ||
-        playlist_file.endsWith(".m3u8", Qt::CaseInsensitive)) {
-        playlist_parser = new ParserM3u();
-    } else if (playlist_file.endsWith(".pls", Qt::CaseInsensitive)) {
-        playlist_parser = new ParserPls();
-    } else {
-        return;
-    }
-    QList<QString> entries = playlist_parser->parse(playlist_file);
-
-    // Iterate over the List that holds URLs of playlist entires
-    for (int i = 0; i < entries.size(); ++i) {
-        m_pPlaylistTableModel->addTrack(QModelIndex(), entries[i]);
-    }
-
-    // delete the parser object
-    if (playlist_parser) {
-        delete playlist_parser;
-    }
-}
-void PlaylistFeature::onLazyChildExpandation(const QModelIndex &index){
-    //Nothing to do because the childmodel is not of lazy nature.
-}
-
-void PlaylistFeature::slotExportPlaylist(){
-    qDebug() << "Export playlist" << m_lastRightClickedIndex.data();
-    QString file_location = QFileDialog::getSaveFileName(
-        NULL,
-        tr("Export Playlist"),
-        QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
-        tr("M3U Playlist (*.m3u);;M3U8 Playlist (*.m3u8);;PLS Playlist (*.pls)"));
-    // Exit method if user cancelled the open dialog.
-    if (file_location.isNull() || file_location.isEmpty()) {
-        return;
-    }
-    // Create and populate a list of files of the playlist
-    QList<QString> playlist_items;
-    // Create a new table model since the main one might have an active search.
-    QScopedPointer<PlaylistTableModel> pPlaylistTableModel(
-        new PlaylistTableModel(this, m_pTrackCollection,
-                               "mixxx.db.model.playlist_export"));
-
-    pPlaylistTableModel->setPlaylist(m_pPlaylistTableModel->getPlaylist());
-    pPlaylistTableModel->setSort(0, Qt::AscendingOrder);
-    pPlaylistTableModel->select();
-    int rows = pPlaylistTableModel->rowCount();
-    for (int i = 0; i < rows; ++i) {
-        QModelIndex index = pPlaylistTableModel->index(i, 0);
-        playlist_items << pPlaylistTableModel->getTrackLocation(index);
-    }
-
-    // check config if relative paths are desired
-    bool useRelativePath = static_cast<bool>(m_pConfig->getValueString(
-        ConfigKey("[Library]", "UseRelativePathOnExport")).toInt());
-
-    if (file_location.endsWith(".m3u", Qt::CaseInsensitive)) {
-        ParserM3u::writeM3UFile(file_location, playlist_items, useRelativePath);
-    } else if (file_location.endsWith(".pls", Qt::CaseInsensitive)) {
-        ParserPls::writePLSFile(file_location,playlist_items,
-                                useRelativePath);
-    } else if (file_location.endsWith(".m3u8", Qt::CaseInsensitive)) {
-        ParserM3u::writeM3U8File(file_location, playlist_items,
-                                 useRelativePath);
-    } else {
-        //default export to M3U if file extension is missing
-
-        qDebug() << "Playlist export: No file extension specified. Appending .m3u "
-                 << "and exporting to M3U.";
-        file_location.append(".m3u");
-        ParserM3u::writeM3UFile(file_location, playlist_items, useRelativePath);
-    }
-}
-
-void PlaylistFeature::slotAddToAutoDJ() {
-    //qDebug() << "slotAddToAutoDJ() row:" << m_lastRightClickedIndex.data();
-
-    if (m_lastRightClickedIndex.isValid()) {
-        int playlistId = m_playlistDao.getPlaylistIdFromName(
-            m_lastRightClickedIndex.data().toString());
-        if (playlistId >= 0) {
-            m_playlistDao.addToAutoDJQueue(playlistId);
-        }
-    }
-    emit(featureUpdated());
-}
+    if (selected_row == -1) {
+        return QModelIndex();
+    }
+    return m_childModel.index(selected_row, 0);
+}
+
+

=== modified file 'mixxx/src/library/playlistfeature.h'
--- mixxx/src/library/playlistfeature.h	2011-11-27 06:59:02 +0000
+++ mixxx/src/library/playlistfeature.h	2012-03-12 04:25:21 +0000
@@ -5,76 +5,31 @@
 #define PLAYLISTFEATURE_H
 
 #include <QSqlTableModel>
-#include <QAction>
-#include <QList>
 
-#include "library/libraryfeature.h"
-#include "library/dao/playlistdao.h"
-#include "library/dao/trackdao.h"
-#include "treeitemmodel.h"
+#include "library/baseplaylistfeature.h"
 #include "configobject.h"
 
-
-class PlaylistTableModel;
 class TrackCollection;
 
-class PlaylistFeature : public LibraryFeature {
+class PlaylistFeature : public BasePlaylistFeature {
     Q_OBJECT
-public:
-    PlaylistFeature(QObject* parent, TrackCollection* pTrackCollection, ConfigObject<ConfigValue>* pConfig);
+  public:
+    PlaylistFeature(QObject* parent, TrackCollection* pTrackCollection,
+                    ConfigObject<ConfigValue>* pConfig);
     virtual ~PlaylistFeature();
 
     QVariant title();
     QIcon getIcon();
 
-    bool dropAccept(QUrl url);
     bool dropAcceptChild(const QModelIndex& index, QUrl url);
-    bool dragMoveAccept(QUrl url);
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
 
-    TreeItemModel* getChildModel();
-
-    void bindWidget(WLibrarySidebar* sidebarWidget,
-                    WLibrary* libraryWidget,
-                    MixxxKeyboard* keyboard);
-  signals:
-    void showPage(const QUrl& page);
-
-public slots:
-    void activate();
-    void activateChild(const QModelIndex& index);
+  public slots:
     void onRightClick(const QPoint& globalPos);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
-    void onLazyChildExpandation(const QModelIndex& index);
-
-    void slotCreatePlaylist();
-    void slotDeletePlaylist();
-    void slotAddToAutoDJ();
-    void slotRenamePlaylist();
-    void slotTogglePlaylistLock();
-    void slotImportPlaylist();
-    void slotExportPlaylist();
-
-
- private:
-    void constructChildModel();
-    void clearChildModel();
-
-    TrackCollection* m_pTrackCollection;
-    PlaylistTableModel* m_pPlaylistTableModel;
-    PlaylistDAO &m_playlistDao;
-    TrackDAO &m_trackDao;
-    QAction *m_pCreatePlaylistAction;
-    QAction *m_pDeletePlaylistAction;
-    QAction *m_pAddToAutoDJAction;
-    QAction *m_pRenamePlaylistAction;
-    QAction *m_pLockPlaylistAction;
-    QAction *m_pImportPlaylistAction;
-    QAction *m_pExportPlaylistAction;
-    QSqlTableModel m_playlistTableModel;
-    QModelIndex m_lastRightClickedIndex;
-    TreeItemModel m_childModel;
-    ConfigObject<ConfigValue>* m_pConfig;
+
+ protected:
+    QModelIndex constructChildModel(int selected_id);
 };
 
 #endif /* PLAYLISTFEATURE_H */

=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2011-12-18 20:23:14 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2012-03-12 04:25:21 +0000
@@ -94,6 +94,17 @@
     return true;
 }
 
+bool PlaylistTableModel::appendTrack(int trackId) {
+    if (trackId < 0) {
+        return false;
+    }
+
+    m_playlistDao.appendTrackToPlaylist(trackId, m_iPlaylistId);
+
+    select(); //Repopulate the data model.
+    return true;
+}
+
 TrackPointer PlaylistTableModel::getTrack(const QModelIndex& index) const {
     //FIXME: use position instead of location for playlist tracks?
 
@@ -256,7 +267,7 @@
 
     //Print out any SQL error, if there was one.
     if (query.lastError().isValid()) {
-     	qDebug() << query.lastError();
+        qDebug() << query.lastError();
     }
 
     select();
@@ -326,6 +337,7 @@
 }
 
 QItemDelegate* PlaylistTableModel::delegateForColumn(const int i) {
+    Q_UNUSED(i);
     return NULL;
 }
 

=== modified file 'mixxx/src/library/playlisttablemodel.h'
--- mixxx/src/library/playlisttablemodel.h	2011-11-30 05:27:44 +0000
+++ mixxx/src/library/playlisttablemodel.h	2012-03-12 04:25:21 +0000
@@ -30,6 +30,7 @@
     virtual void removeTrack(const QModelIndex& index);
     virtual void removeTracks(const QModelIndexList& indices);
     virtual bool addTrack(const QModelIndex& index, QString location);
+    virtual bool appendTrack(int trackId);
     virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
     virtual void shuffleTracks(const QModelIndex& currentIndex);
 

=== modified file 'mixxx/src/library/preparefeature.cpp'
--- mixxx/src/library/preparefeature.cpp	2011-03-26 12:29:21 +0000
+++ mixxx/src/library/preparefeature.cpp	2012-03-12 04:25:21 +0000
@@ -78,34 +78,45 @@
 }
 
 void PrepareFeature::activateChild(const QModelIndex& index) {
+    Q_UNUSED(index);
 }
 
 void PrepareFeature::onRightClick(const QPoint& globalPos) {
+    Q_UNUSED(globalPos);
 }
 
 void PrepareFeature::onRightClickChild(const QPoint& globalPos,
                                             QModelIndex index) {
+    Q_UNUSED(globalPos);
+    Q_UNUSED(index);
 }
 
 bool PrepareFeature::dropAccept(QUrl url) {
+    Q_UNUSED(url);
     return false;
 }
 
 bool PrepareFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
+    Q_UNUSED(index);
+    Q_UNUSED(url);
     return false;
 }
 
 bool PrepareFeature::dragMoveAccept(QUrl url) {
+    Q_UNUSED(url);
     return false;
 }
 
 bool PrepareFeature::dragMoveAcceptChild(const QModelIndex& index,
                                               QUrl url) {
+    Q_UNUSED(index);
+    Q_UNUSED(url);
     return false;
 }
 
 void PrepareFeature::onLazyChildExpandation(const QModelIndex &index){
     //Nothing to do because the childmodel is not of lazy nature.
+    Q_UNUSED(index);
 }
 
 void PrepareFeature::analyzeTracks(QList<int> trackIds) {

=== added file 'mixxx/src/library/setlogfeature.cpp'
--- mixxx/src/library/setlogfeature.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/setlogfeature.cpp	2012-03-12 04:25:21 +0000
@@ -0,0 +1,263 @@
+#include <QtDebug>
+#include <QMenu>
+#include <QInputDialog>
+#include <QFileDialog>
+#include <QDesktopServices>
+#include <QDateTime>
+
+#include "library/setlogfeature.h"
+
+#include "controlobject.h"
+#include "library/playlisttablemodel.h"
+#include "library/trackcollection.h"
+#include "playerinfo.h"
+#include "treeitem.h"
+
+SetlogFeature::SetlogFeature(QObject* parent,
+                             ConfigObject<ConfigValue>* pConfig,
+                             TrackCollection* pTrackCollection)
+        : BasePlaylistFeature(parent, pConfig, pTrackCollection,
+                              "SETLOGHOME", "qrc:/html/setlogs.html") {
+    m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection,
+                                                   "mixxx.db.model.setlog");
+    m_pJoinWithPreviousAction = new QAction(tr("Join with previous"), this);
+    connect(m_pJoinWithPreviousAction, SIGNAL(triggered()),
+            this, SLOT(slotJoinWithPrevious()));
+
+    //create a new playlist for today
+    QString set_log_name_format;
+    QString set_log_name;
+
+    set_log_name = QDate::currentDate().toString(Qt::ISODate);
+    set_log_name_format = set_log_name + " (%1)";
+    int i = 1;
+
+    // calculate name of the todays setlog
+    while (m_playlistDao.getPlaylistIdFromName(set_log_name) != -1) {
+        set_log_name = set_log_name_format.arg(++i);
+    }
+
+    m_playlistId = m_playlistDao.createPlaylist(set_log_name,
+                                                PlaylistDAO::PLHT_SET_LOG);
+
+    if (m_playlistId == -1) {
+        qDebug() << "Playlist Creation Failed";
+        qDebug() << "An unknown error occurred while creating playlist: " << set_log_name;
+    }
+
+    // Setup the sidebar playlist model
+    m_playlistTableModel.setTable("Playlists");
+    m_playlistTableModel.setFilter("hidden=2"); // PLHT_SET_LOG
+    m_playlistTableModel.setSort(m_playlistTableModel.fieldIndex("id"),
+                                 Qt::AscendingOrder);
+    m_playlistTableModel.select();
+
+    //construct child model
+    TreeItem *rootItem = new TreeItem();
+    m_childModel.setRootItem(rootItem);
+    constructChildModel(-1);
+}
+
+SetlogFeature::~SetlogFeature() {
+}
+
+QVariant SetlogFeature::title() {
+    return tr("Set Logs");
+}
+
+QIcon SetlogFeature::getIcon() {
+    return QIcon(":/images/library/ic_library_setlog.png");
+}
+
+void SetlogFeature::bindWidget(WLibrarySidebar* sidebarWidget,
+                               WLibrary* libraryWidget,
+                               MixxxKeyboard* keyboard) {
+    BasePlaylistFeature::bindWidget(sidebarWidget,
+                                    libraryWidget,
+                                    keyboard);
+    connect(&PlayerInfo::Instance(), SIGNAL(currentPlayingDeckChanged(int)),
+            this, SLOT(slotPlayingDeckChanged(int)));
+}
+
+void SetlogFeature::onRightClick(const QPoint& globalPos) {
+    Q_UNUSED(globalPos);
+    m_lastRightClickedIndex = QModelIndex();
+
+    // Create the right-click menu
+    // QMenu menu(NULL);
+    // menu.addAction(m_pCreatePlaylistAction);
+    // TODO(DASCHUER) add something like disable logging
+    // menu.exec(globalPos);
+}
+
+void SetlogFeature::onRightClickChild(const QPoint& globalPos, QModelIndex index) {
+    //Save the model index so we can get it in the action slots...
+    m_lastRightClickedIndex = index;
+    QString playlistName = index.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
+
+
+    bool locked = m_playlistDao.isPlaylistLocked(playlistId);
+    m_pDeletePlaylistAction->setEnabled(!locked);
+    m_pRenamePlaylistAction->setEnabled(!locked);
+
+    m_pLockPlaylistAction->setText(locked ? tr("Unlock") : tr("Lock"));
+
+
+    //Create the right-click menu
+    QMenu menu(NULL);
+    //menu.addAction(m_pCreatePlaylistAction);
+    //menu.addSeparator();
+    menu.addAction(m_pAddToAutoDJAction);
+    menu.addAction(m_pAddToAutoDJTopAction);
+    menu.addAction(m_pRenamePlaylistAction);
+    if (playlistId != m_playlistId) {
+        // Todays playlist should not be locked or deleted
+        menu.addAction(m_pDeletePlaylistAction);
+        menu.addAction(m_pLockPlaylistAction);
+    }
+    if (index.row() > 0) {
+        // The very first setlog cannot be joint
+        menu.addAction(m_pJoinWithPreviousAction);
+    }
+    menu.addSeparator();
+    menu.addAction(m_pExportPlaylistAction);
+    menu.exec(globalPos);
+}
+
+bool SetlogFeature::dropAcceptChild(const QModelIndex& index, QUrl url){
+    Q_UNUSED(url);
+    Q_UNUSED(index);
+    return false;
+}
+
+bool SetlogFeature::dragMoveAcceptChild(const QModelIndex& index, QUrl url) {
+    Q_UNUSED(url);
+    Q_UNUSED(index);
+    return false;
+}
+
+/**
+  * Purpose: When inserting or removing playlists,
+  * we require the sidebar model not to reset.
+  * This method queries the database and does dynamic insertion
+*/
+QModelIndex SetlogFeature::constructChildModel(int selected_id)
+{
+    QList<TreeItem*> data_list;
+    int nameColumn = m_playlistTableModel.record().indexOf("name");
+    int idColumn = m_playlistTableModel.record().indexOf("id");
+    int selected_row = -1;
+    // Access the invisible root item
+    TreeItem* root = m_childModel.getItem(QModelIndex());
+
+    // Create new TreeItems for the playlists in the database
+    for (int row = 0; row < m_playlistTableModel.rowCount(); ++row) {
+        QModelIndex ind = m_playlistTableModel.index(row, nameColumn);
+        QString playlist_name = m_playlistTableModel.data(ind).toString();
+        ind = m_playlistTableModel.index(row, idColumn);
+        int playlist_id = m_playlistTableModel.data(ind).toInt();
+
+        if ( selected_id == playlist_id) {
+            // save index for selection
+            selected_row = row;
+        }
+
+        // Create the TreeItem whose parent is the invisible root item
+        TreeItem* item = new TreeItem(playlist_name, playlist_name, this, root);
+        if (playlist_id == m_playlistId) {
+            item->setIcon(QIcon(":/images/library/ic_library_setlog_current.png"));
+        } else if (m_playlistDao.isPlaylistLocked(playlist_id)) {
+            item->setIcon(QIcon(":/images/library/ic_library_locked.png"));
+        } else {
+            item->setIcon(QIcon());
+        }
+        data_list.append(item);
+    }
+
+    // Append all the newly created TreeItems in a dynamic way to the childmodel
+    m_childModel.insertRows(data_list, 0, m_playlistTableModel.rowCount());
+    if (selected_row == -1) {
+        return QModelIndex();
+    }
+    return m_childModel.index(selected_row, 0);
+}
+
+void SetlogFeature::slotJoinWithPrevious() {
+    //qDebug() << "slotJoinWithPrevious() row:" << m_lastRightClickedIndex.data();
+
+    if (m_lastRightClickedIndex.isValid()) {
+        int currentPlaylistId = m_playlistDao.getPlaylistIdFromName(
+            m_lastRightClickedIndex.data().toString());
+
+        if (currentPlaylistId >= 0) {
+
+            bool locked = m_playlistDao.isPlaylistLocked(currentPlaylistId);
+
+            if (locked) {
+                qDebug() << "Skipping playlist deletion because playlist" << currentPlaylistId << "is locked.";
+                return;
+            }
+
+            // Add every track from right klicked playlist to that with the next smaller ID
+            int previousPlaylistId = m_playlistDao.getPreviousPlaylist(currentPlaylistId, PlaylistDAO::PLHT_SET_LOG);
+            if (previousPlaylistId >= 0) {
+
+                m_pPlaylistTableModel->setPlaylist(previousPlaylistId);
+
+                if (currentPlaylistId == m_playlistId) {
+                    // mark all the Tracks in the previous Playlist as played
+
+                    m_pPlaylistTableModel->select();
+                    int rows = m_pPlaylistTableModel->rowCount();
+                    for(int i = 0; i < rows; ++i){
+                        QModelIndex index = m_pPlaylistTableModel->index(i,0);
+                        if (index.isValid()) {
+                            TrackPointer track = m_pPlaylistTableModel->getTrack(index);
+                            // Do not update the playcount, just set played
+                            // status.
+                            track->setPlayed(true);
+                        }
+                    }
+
+                    // Change current setlog
+                    m_playlistId = previousPlaylistId;
+                }
+                qDebug() << "slotJoinWithPrevious() current:" << currentPlaylistId << " previous:" << previousPlaylistId;
+                m_playlistDao.copyPlaylistTracks(currentPlaylistId, previousPlaylistId);
+                m_playlistDao.deletePlaylist(currentPlaylistId);
+                slotPlaylistTableChanged(previousPlaylistId); // For moving selection
+                emit(showTrackModel(m_pPlaylistTableModel));
+                emit(featureUpdated());
+            }
+        }
+    }
+}
+
+void SetlogFeature::slotPlayingDeckChanged(int deck) {
+    if (deck > 0) {
+        QString chan = QString("[Channel%1]").arg(deck);
+        TrackPointer currentPlayingTrack =
+                PlayerInfo::Instance().getTrackInfo(chan);
+        if (!currentPlayingTrack) {
+            return;
+        }
+        int currentPlayingTrackId = currentPlayingTrack->getId();
+        // We can only add tracks that are Mixxx library tracks, not external
+        // sources.
+        if (currentPlayingTrackId < 0) {
+            return;
+        }
+
+        // Here the song is realy played, not only loaded.
+        currentPlayingTrack->setPlayedAndUpdatePlaycount(true);
+
+        if (m_pPlaylistTableModel->getPlaylist() == m_playlistId) {
+            // View needs a refresh
+            m_pPlaylistTableModel->appendTrack(currentPlayingTrackId);
+        } else {
+            m_playlistDao.appendTrackToPlaylist(currentPlayingTrackId,
+                                                m_playlistId);
+        }
+    }
+}

=== added file 'mixxx/src/library/setlogfeature.h'
--- mixxx/src/library/setlogfeature.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/setlogfeature.h	2012-03-12 04:25:21 +0000
@@ -0,0 +1,48 @@
+// setlogfeature.h
+
+#ifndef SETLOGFEATURE_H
+#define SETLOGFEATURE_H
+
+#include <QSqlTableModel>
+#include <QAction>
+
+#include "library/baseplaylistfeature.h"
+#include "configobject.h"
+#include "controlobjectthreadmain.h"
+
+class TrackCollection;
+
+class SetlogFeature : public BasePlaylistFeature {
+    Q_OBJECT
+public:
+    SetlogFeature(QObject* parent, ConfigObject<ConfigValue>* pConfig,
+                  TrackCollection* pTrackCollection);
+    virtual ~SetlogFeature();
+
+    QVariant title();
+    QIcon getIcon();
+
+    bool dropAcceptChild(const QModelIndex& index, QUrl url);
+    bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
+
+    virtual void bindWidget(WLibrarySidebar* sidebarWidget,
+                    WLibrary* libraryWidget,
+                    MixxxKeyboard* keyboard);
+
+  public slots:
+    void onRightClick(const QPoint& globalPos);
+    void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+    void slotJoinWithPrevious();
+
+  protected:
+    QModelIndex constructChildModel(int selected_id);
+
+  private slots:
+    void slotPlayingDeckChanged(int deck);
+
+  private:
+    QAction *m_pJoinWithPreviousAction;
+    int m_playlistId;
+};
+
+#endif /* SETLOGFEATURE_H */

=== modified file 'mixxx/src/library/sidebarmodel.cpp'
--- mixxx/src/library/sidebarmodel.cpp	2011-10-21 02:26:31 +0000
+++ mixxx/src/library/sidebarmodel.cpp	2012-03-12 04:25:21 +0000
@@ -17,11 +17,14 @@
 
 void SidebarModel::addLibraryFeature(LibraryFeature* feature) {
     m_sFeatures.push_back(feature);
-    connect(feature, SIGNAL(featureUpdated()), this, SLOT(refreshData()));
+    connect(feature, SIGNAL(featureUpdated()),
+            this, SLOT(refreshData()));
     connect(feature, SIGNAL(featureIsLoading(LibraryFeature*)),
             this, SLOT(slotFeatureIsLoading(LibraryFeature*)));
     connect(feature, SIGNAL(featureLoadingFinished(LibraryFeature*)),
-            this,SLOT(slotFeatureLoadingFinished(LibraryFeature*)));
+            this, SLOT(slotFeatureLoadingFinished(LibraryFeature*)));
+    connect(feature, SIGNAL(featureSelect(LibraryFeature*, const QModelIndex&)),
+            this, SLOT(slotFeatureSelect(LibraryFeature*, const QModelIndex&)));
 
     QAbstractItemModel* model = feature->getChildModel();
 
@@ -108,19 +111,23 @@
             return QModelIndex();
         } else {
             TreeItem* tree_item = (TreeItem*)index.internalPointer();
+            TreeItem* tree_item_parent = tree_item->parent();
             // if we have selected an item at the first level of a childnode
-            if (tree_item->parent()->data() == "$root"){
-                LibraryFeature* feature = tree_item->getFeature();
-                for (int i = 0; i < m_sFeatures.size(); ++i) {
-                    if (feature == m_sFeatures[i]) {
-                         // create a ModelIndex for parent 'this' having a
-                         // library feature at position 'i'
-                        return createIndex(i, 0, (void*)this);
+
+            if (tree_item_parent) {
+                if (tree_item_parent->data() == "$root"){
+                    LibraryFeature* feature = tree_item->getFeature();
+                    for (int i = 0; i < m_sFeatures.size(); ++i) {
+                        if (feature == m_sFeatures[i]) {
+                            // create a ModelIndex for parent 'this' having a
+                            // library feature at position 'i'
+                            return createIndex(i, 0, (void*)this);
+                        }
                     }
                 }
+                // if we have selected an item at some deeper level of a childnode
+                return createIndex(tree_item_parent->row(), 0 , tree_item_parent);
             }
-            // if we have selected an item at some deeper level of a childnode
-            return createIndex(tree_item->parent()->row(), 0 , tree_item->parent());
         }
     }
     return QModelIndex();
@@ -144,6 +151,7 @@
 }
 
 int SidebarModel::columnCount(const QModelIndex& parent) const {
+    Q_UNUSED(parent);
     //qDebug() << "SidebarModel::columnCount parent=" << parent;
     // TODO(rryan) will we ever have columns? I don't think so.
     return 1;
@@ -312,6 +320,8 @@
 }
 
 void SidebarModel::slotDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) {
+    Q_UNUSED(topLeft);
+    Q_UNUSED(bottomRight);
     //qDebug() << "slotDataChanged topLeft:" << topLeft << "bottomRight:" << bottomRight;
 }
 
@@ -330,12 +340,18 @@
 }
 
 void SidebarModel::slotRowsInserted(const QModelIndex& parent, int start, int end) {
-   // qDebug() << "slotRowsInserted" << parent << start << end;
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
+    // qDebug() << "slotRowsInserted" << parent << start << end;
     //QModelIndex newParent = translateSourceIndex(parent);
     endInsertRows();
 }
 
 void SidebarModel::slotRowsRemoved(const QModelIndex& parent, int start, int end) {
+    Q_UNUSED(parent);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
     //qDebug() << "slotRowsRemoved" << parent << start << end;
     //QModelIndex newParent = translateSourceIndex(parent);
     endRemoveRows();
@@ -356,7 +372,7 @@
 void SidebarModel::slotFeatureIsLoading(LibraryFeature * feature)
 {
     featureRenamed(feature);
-    selectFeature(feature);
+    slotFeatureSelect(feature);
 }
 
 /* Tobias: This slot is somewhat redundant but I decided
@@ -364,7 +380,7 @@
  */
 void SidebarModel::slotFeatureLoadingFinished(LibraryFeature * feature){
     featureRenamed(feature);
-    selectFeature(feature);
+    slotFeatureSelect(feature);
 }
 
 void SidebarModel::featureRenamed(LibraryFeature* pFeature){
@@ -376,11 +392,18 @@
     }
 }
 
-void SidebarModel::selectFeature(LibraryFeature* pFeature) {
-    for (int i=0; i < m_sFeatures.size(); ++i) {
-        if (m_sFeatures[i] == pFeature) {
-            QModelIndex ind = index(i, 0);
-            emit(selectIndex(ind));
+void SidebarModel::slotFeatureSelect(LibraryFeature* pFeature, const QModelIndex& featureIndex) {
+    QModelIndex ind;
+    if (featureIndex.isValid()) {
+        TreeItem* item = (TreeItem*)featureIndex.internalPointer();
+        ind = createIndex(featureIndex.row(), featureIndex.column(), item);
+    } else {
+        for (int i=0; i < m_sFeatures.size(); ++i) {
+            if (m_sFeatures[i] == pFeature) {
+                ind = index(i, 0);
+                break;
+            }
         }
     }
+    emit(selectIndex(ind));
 }

=== modified file 'mixxx/src/library/sidebarmodel.h'
--- mixxx/src/library/sidebarmodel.h	2011-03-27 20:12:33 +0000
+++ mixxx/src/library/sidebarmodel.h	2012-03-12 04:25:21 +0000
@@ -39,7 +39,7 @@
     void doubleClicked(const QModelIndex& index);
     void rightClicked(const QPoint& globalPos, const QModelIndex& index);
     void refreshData();
-    void selectFeature(LibraryFeature* pFeature);
+    void slotFeatureSelect(LibraryFeature* pFeature, const QModelIndex& index = QModelIndex());
 
     // Slots for every single QAbstractItemModel signal
     // void slotColumnsAboutToBeInserted(const QModelIndex& parent, int start, int end);

=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2011-12-28 20:30:15 +0000
+++ mixxx/src/library/trackcollection.cpp	2012-03-12 04:25:21 +0000
@@ -15,9 +15,9 @@
 TrackCollection::TrackCollection(ConfigObject<ConfigValue>* pConfig)
         : m_pConfig(pConfig),
           m_db(QSqlDatabase::addDatabase("QSQLITE")), // defaultConnection
-          m_cueDao(m_db),
           m_playlistDao(m_db),
           m_crateDao(m_db),
+          m_cueDao(m_db),
           m_trackDao(m_db, m_cueDao, m_playlistDao, m_crateDao, pConfig),
           m_supportedFileExtensionsRegex(
               SoundSourceProxy::supportedFileExtensionsRegex(),

=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2012-01-16 03:04:52 +0000
+++ mixxx/src/mixxx.cpp	2012-03-12 04:25:21 +0000
@@ -263,8 +263,6 @@
         QDir().mkpath(QDir::homePath().append("/").append(SETTINGS_PATH));
     }
 
-
-
     m_pLibrary = new Library(this, m_pConfig,
                              bFirstRun || bUpgraded,
                              m_pRecordingManager);
@@ -432,12 +430,9 @@
 
     m_pWidgetParent = NULL;
     // Loads the skin as a child of m_pView
-    // assignment itentional in next line
-    if (!(m_pWidgetParent = m_pSkinLoader->loadDefaultSkin(m_pView,
-                                        m_pKeyboard,
-                                        m_pPlayerManager,
-                                        m_pLibrary,
-                                        m_pVCManager))) {
+    // assignment intentional in next line
+    if (!(m_pWidgetParent = m_pSkinLoader->loadDefaultSkin(
+        m_pView, m_pKeyboard, m_pPlayerManager, m_pLibrary, m_pVCManager))) {
         qDebug() << "Could not load default skin.";
     }
 

=== modified file 'mixxx/src/playerinfo.cpp'
--- mixxx/src/playerinfo.cpp	2011-03-25 05:31:57 +0000
+++ mixxx/src/playerinfo.cpp	2012-03-12 04:25:21 +0000
@@ -22,7 +22,7 @@
 #include "engine/enginexfader.h"
 
 PlayerInfo::PlayerInfo()
-{
+        : m_currentlyPlayingDeck(0) {
     int i;
     m_iNumDecks = ControlObject::getControl(ConfigKey("[Master]","num_decks"))->get();
 
@@ -36,13 +36,12 @@
     }
 
     m_COxfader = new ControlObjectThread(ControlObject::getControl(ConfigKey("[Master]","crossfader")));
+
+    startTimer(2000);
 }
 
-PlayerInfo::~PlayerInfo()
-{
+PlayerInfo::~PlayerInfo() {
     int i;
-
-
     m_loadedTrackMap.clear();
 
     for (i = 1; i <= m_iNumDecks; i++) {
@@ -57,14 +56,12 @@
     delete m_COxfader;
 }
 
-PlayerInfo &PlayerInfo::Instance()
-{
+PlayerInfo &PlayerInfo::Instance() {
     static PlayerInfo playerInfo;
     return playerInfo;
 }
 
-TrackPointer PlayerInfo::getTrackInfo(QString group)
-{
+TrackPointer PlayerInfo::getTrackInfo(QString group) {
     QMutexLocker locker(&m_mutex);
 
     if (m_loadedTrackMap.contains(group)) {
@@ -80,13 +77,15 @@
     m_loadedTrackMap[group] = track;
 }
 
-int PlayerInfo::getCurrentPlayingDeck()
-{
+void PlayerInfo::timerEvent(QTimerEvent* pTimerEvent) {
+    updateCurrentPlayingDeck();
+}
+
+void PlayerInfo::updateCurrentPlayingDeck() {
     QMutexLocker locker(&m_mutex);
     int MaxVolume = 0;
     int MaxDeck = 0;
     int i;
-    
 
     for (i = 1; i <= m_iNumDecks; i++) {
         QString chan = QString("[Channel%1]").arg(i);
@@ -95,10 +94,10 @@
         float dvol;
         int orient;
 
-        if ( m_listCOPlay[chan]->get() == 0.0 )
+        if (m_listCOPlay[chan]->get() == 0.0 )
             continue;
 
-        if ( m_listCOpregain[chan]->get() <= 0.5 )
+        if (m_listCOpregain[chan]->get() <= 0.5 )
             continue;
 
         if ((fvol = m_listCOVolume[chan]->get()) == 0.0 )
@@ -106,7 +105,7 @@
 
         EngineXfader::getXfadeGains(xfl, xfr, m_COxfader->get(), 1.0, 0.0);
 
-        // Orientation goes: left is 0, center is 1, right is 2. 
+        // Orientation goes: left is 0, center is 1, right is 2.
         // Leave math out of it...
         orient = m_listCOOrientation[chan]->get();
         if ( orient == 0 )
@@ -117,23 +116,30 @@
             xfvol = 1;
 
         dvol = fvol * xfvol;
-        if ( dvol > MaxVolume ) {
+        if (dvol > MaxVolume ) {
             MaxDeck = i;
             MaxVolume = dvol;
         }
     }
 
-    return MaxDeck;
-}
-
-TrackPointer PlayerInfo::getCurrentPlayingTrack()
-{
+    if (MaxDeck != m_currentlyPlayingDeck) {
+        m_currentlyPlayingDeck = MaxDeck;
+        m_mutex.unlock();
+        emit(currentPlayingDeckChanged(MaxDeck));
+    }
+}
+
+int PlayerInfo::getCurrentPlayingDeck() {
+    QMutexLocker locker(&m_mutex);
+    return m_currentlyPlayingDeck;
+}
+
+TrackPointer PlayerInfo::getCurrentPlayingTrack() {
     int deck = getCurrentPlayingDeck();
-    if ( deck ) {
+    if (deck) {
         QString chan = QString("[Channel%1]").arg(deck);
         return getTrackInfo(chan);
     }
-
     return TrackPointer();
 }
 

=== modified file 'mixxx/src/playerinfo.h'
--- mixxx/src/playerinfo.h	2011-03-23 09:20:56 +0000
+++ mixxx/src/playerinfo.h	2012-03-12 04:25:21 +0000
@@ -20,7 +20,7 @@
 #include <QObject>
 #include <QMutex>
 #include <QMap>
-
+#include <QTimerEvent>
 
 class ControlObjectThread;
 
@@ -35,7 +35,14 @@
     void setTrackInfo(QString group, TrackPointer trackInfoObj);
     int getCurrentPlayingDeck();
     TrackPointer getCurrentPlayingTrack();
+
+  signals:
+    void currentPlayingDeckChanged(int deck);
+
   private:
+    void timerEvent(QTimerEvent* pTimerEvent);
+    void updateCurrentPlayingDeck();
+
     PlayerInfo();
     ~PlayerInfo();
     PlayerInfo(PlayerInfo const&);
@@ -48,6 +55,8 @@
     QMap<QString, ControlObjectThread*> m_listCOVolume;
     QMap<QString, ControlObjectThread*> m_listCOOrientation;
     QMap<QString, ControlObjectThread*> m_listCOpregain;
+
+    int m_currentlyPlayingDeck;
 };
 
 #endif

=== modified file 'mixxx/src/trackinfoobject.cpp'
--- mixxx/src/trackinfoobject.cpp	2011-12-28 20:30:15 +0000
+++ mixxx/src/trackinfoobject.cpp	2012-03-12 04:25:21 +0000
@@ -557,7 +557,7 @@
 
 void TrackInfoObject::incTimesPlayed()
 {
-    setPlayed(true); //setPlayed increases play count
+    setPlayedAndUpdatePlaycount(true);
 }
 
 bool TrackInfoObject::getPlayed() const
@@ -567,20 +567,29 @@
     return bPlayed;
 }
 
-void TrackInfoObject::setPlayed(bool bPlayed)
+void TrackInfoObject::setPlayedAndUpdatePlaycount(bool bPlayed)
 {
     QMutexLocker lock(&m_qMutex);
     if (bPlayed) {
         ++m_iTimesPlayed;
-	setDirty(true);
+        setDirty(true);
     }
     else if (m_bPlayed && !bPlayed) {
         --m_iTimesPlayed;
-	setDirty(true);
+        setDirty(true);
     }
     m_bPlayed = bPlayed;
 }
 
+void TrackInfoObject::setPlayed(bool bPlayed)
+{
+    QMutexLocker lock(&m_qMutex);
+    if (bPlayed != m_bPlayed) {
+        m_bPlayed = bPlayed;
+        setDirty(true);
+    }
+}
+
 QString TrackInfoObject::getComment() const
 {
     QMutexLocker lock(&m_qMutex);

=== modified file 'mixxx/src/trackinfoobject.h'
--- mixxx/src/trackinfoobject.h	2012-01-07 05:48:41 +0000
+++ mixxx/src/trackinfoobject.h	2012-03-12 04:25:21 +0000
@@ -189,8 +189,10 @@
     void incTimesPlayed();
     /** Returns true if track has been played this instance*/
     bool getPlayed() const;
-    /** Set Played status*/
-    void setPlayed(bool);
+    /** Set played status and increment or decrement playcount. */
+    void setPlayedAndUpdatePlaycount(bool);
+    /** Set played status without affecting the playcount */
+    void setPlayed(bool bPlayed);
 
     int getId() const;
 

=== modified file 'mixxx/src/widget/wlibrarysidebar.cpp'
--- mixxx/src/widget/wlibrarysidebar.cpp	2011-03-27 21:15:15 +0000
+++ mixxx/src/widget/wlibrarysidebar.cpp	2012-03-12 04:25:21 +0000
@@ -199,4 +199,9 @@
     QItemSelectionModel* pModel = new QItemSelectionModel(model());
     pModel->select(index, QItemSelectionModel::Select);
     setSelectionModel(pModel);
+
+    if (index.parent().isValid()) {
+        expand(index.parent());
+    }
+    scrollTo(index);
 }