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

[Daniel Schürmann]

This is an implementation of set log, a playlist filled with all the played songs from last DJ set.

Features:
* add a set log to Auto DJ
* export a setlog as m3u, m3u8, and pls playlist
* export a setlog as readable text and csv
* merge two set logs in case of mixxx restart

[lp:~daschuer/mixxx/features_setlog]

2852. By Daniel Schürmann on 2011-10-12

merged with lp:mixxx

[jus (jus)]

Tested your branch and would like to few notes:
* In the treeview`s set log submenu sort from newest to oldest entry, currently it`s sorted from oldest to newest. The session that is currently running session should be on 1st position.
* The new icons (setlog & running session ) need some work, I can take care of it if you like.

* We had a small user survey about what format Mixxx users would like to generate session playlists in @ http://mixxx.org/forums/viewtopic.php?f=1&t=2463&p=9265 , txt/csv got the most votes. Is it possible with reasonable effort to add txt/csv export to your branch? That would increase setlog`s usability for professional application (think GEMA/ASCAP/BMI set lists).

Thanks for all your work,
jus

[Daniel Schürmann (daschuer)]

Hi Jus, Thank you for testing.

* I have decided to put the most recent setlog to the bottom because the most recent track is also at the bottom. I notice also that its a bit annoying to scroll to bottom. if you have a long list of set logs. If I find time, I will add a sorting option to context menu. Additional sub folder for archived set logs might be also a good idea.

* I will be happy, if you create improved icons.

* Are you able to provide me example GEMA/ASCAP/BMI set lists?

Kind regards,

Daniel

[jus (jus)]

There are various application options for Mixxx (playing live, broadcasting, making DJ tapes..) which may follow different rules for the report of royalties. They likely even differ from country to country.

The assistance we can give with the set log feature is to allow the setlist to be exported in a standard compliant format. I really think we are ok with txt/csv export which includes the important song metadata (like Title,Artist,Album,Composer) + the time/date that any song was played.

[lp:~daschuer/mixxx/features_setlog]

2853. By Daniel Schürmann on 2011-10-22

merged with lp:mixxx

[Sean M. Pappalardo (pegasus-renegadetech)]

Don't forget record label information as well, if present. (Required for US radio reporting.)

[lp:~daschuer/mixxx/features_setlog]

2854. By Daniel Schürmann on 2011-10-31

merged from lp:mixxx

2855. By Daniel Schürmann on 2011-11-06

merged with lp:mixxx

2856. By Daniel Schürmann on 2011-11-22

csv und m3u8 import and export

2857. By Daniel Schürmann on 2011-11-30

Readable text export

2858. By Daniel Schürmann on 2011-12-01

export position in 01. format

2859. By Daniel Schürmann on 2011-12-10

merged with lp:mixxx

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-11-08 20:10:32 +0000
+++ mixxx/build/depends.py	2011-12-10 16:03:24 +0000
@@ -233,23 +233,43 @@
                    '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
                    '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
                    '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
-                   '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
-                   '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]
+                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
 
         # 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)
+
+		# Check if the compiler has SSE extention enabled 
+        # Allways the case on x64 (core instructions)
+        optimize = int(util.get_flags(build.env, 'optimize', 1))
+        if build.machine_is_64bit or \
+                (build.toolchain_is_msvs and optimize > 2) or \
+                (build.toolchain_is_gnu and optimize > 1):
+            sources.extend(
+                 ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+                  '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
+                  ])
+
         return sources
 
+       
     def configure(self, build, conf):
         if build.platform_is_windows:
             # Regardless of the bitwidth, ST checks for WIN32
             build.env.Append(CPPDEFINES = 'WIN32')
         build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
 
+		# Check if the compiler has SSE extention enabled 
+        # Allways the case on x64 (core instructions)
+        optimize = int(util.get_flags(build.env, 'optimize', 1))
+        if build.machine_is_64bit or \
+                (build.toolchain_is_msvs and optimize > 2) or \
+                (build.toolchain_is_gnu and optimize > 1):
+            build.env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
+
 class TagLib(Dependence):
     def configure(self, build, conf):
         if not conf.CheckLib('tag'):
@@ -420,6 +440,7 @@
                    "library/autodjfeature.cpp",
                    "library/mixxxlibraryfeature.cpp",
                    "library/playlistfeature.cpp",
+				   "library/setlogfeature.cpp",
 
                    "library/browse/browsetablemodel.cpp",
                    "library/browse/browsethread.cpp",
@@ -477,6 +498,7 @@
                    "library/parser.cpp",
                    "library/parserpls.cpp",
                    "library/parserm3u.cpp",
+                   "library/parsercsv.cpp",
 
                    "bpm/bpmscheme.cpp",
 

=== modified file 'mixxx/lib/soundtouch-1.6.0/STTypes.h'
--- mixxx/lib/soundtouch-1.6.0/STTypes.h	2011-07-24 21:30:08 +0000
+++ mixxx/lib/soundtouch-1.6.0/STTypes.h	2011-12-10 16:03:24 +0000
@@ -95,7 +95,7 @@
         /// routines compiled for whatever reason, you may disable these optimizations 
         /// to make the library compile.
 
-        #define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS     1
+        // #define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS     1
 
     #endif
 

=== added file 'mixxx/res/html/setlogs.html'
--- mixxx/res/html/setlogs.html	1970-01-01 00:00:00 +0000
+++ mixxx/res/html/setlogs.html	2011-12-10 16:03:24 +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	2011-12-10 16:03:24 +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	2011-12-10 16:03:24 +0000 differ
=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2011-11-01 16:14:41 +0000
+++ mixxx/res/mixxx.qrc	2011-12-10 16:03:24 +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	2011-11-26 06:41:02 +0000
+++ mixxx/src/basetrackplayer.cpp	2011-12-10 16:03:24 +0000
@@ -197,7 +197,7 @@
     if(!m_pLoadedTrack->getHeaderParsed())
         SoundSourceProxy::ParseHeader(m_pLoadedTrack.data());
 
-    m_pLoadedTrack->setPlayed(true);
+    // m_pLoadedTrack->setPlayed(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	2011-12-10 16:03:24 +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);

=== modified file 'mixxx/src/library/cratefeature.cpp'
--- mixxx/src/library/cratefeature.cpp	2011-11-27 06:59:02 +0000
+++ mixxx/src/library/cratefeature.cpp	2011-12-10 16:03:24 +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,10 +23,12 @@
 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_pCreateCrateAction = new QAction(tr("New Crate"),this);
+          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;
+	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,40 +426,61 @@
         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;
     QScopedPointer<CrateTableModel> pCrateTableModel(
         new CrateTableModel(this, m_pTrackCollection));
     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	2011-12-10 16:03:24 +0000
@@ -49,11 +49,14 @@
     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-10-21 00:42:23 +0000
+++ mixxx/src/library/dao/cratedao.cpp	2011-12-10 16:03:24 +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	2011-12-10 16:03:24 +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;

=== modified file 'mixxx/src/library/dao/playlistdao.cpp'
--- mixxx/src/library/dao/playlistdao.cpp	2011-10-21 00:42:23 +0000
+++ mixxx/src/library/dao/playlistdao.cpp	2011-12-10 16:03:24 +0000
@@ -22,7 +22,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, enum hidden_type hidden)
 {
     // qDebug() << "PlaylistDAO::createPlaylist"
     //          << QThread::currentThread()
@@ -38,7 +38,7 @@
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
         m_database.rollback();
-        return false;
+        return -1;
     }
 
     //Get the id of the last playlist.
@@ -50,34 +50,34 @@
 
     //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", (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)
+/** Find out the name of the playlist at the given Id */
+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);
@@ -153,6 +153,9 @@
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
     }
+    else {
+        emit(renamed(playlistId));
+    }
 }
 
 
@@ -169,6 +172,7 @@
         LOG_FAILED_QUERY(query);
         return false;
     }
+    emit(lockChanged(playlistId));
     return true;
 }
 
@@ -249,7 +253,7 @@
     return numRecords;
 }
 
-int PlaylistDAO::getPlaylistId(int position)
+int PlaylistDAO::getPlaylistId(int index)
 {
     // qDebug() << "PlaylistDAO::getPlaylistId"
     //          << QThread::currentThread() << m_database.connectionName();
@@ -260,7 +264,7 @@
     if (query.exec()) {
         int currentRow = 0;
         while(query.next()) {
-            if (currentRow++ == position) {
+            if (currentRow++ == index) {
                 int id = query.value(0).toInt();
                 return id;
             }
@@ -272,22 +276,37 @@
     return -1;
 }
 
+enum PlaylistDAO::hidden_type 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()) {
+        if (query.next()) {
+            return (enum hidden_type)query.value(0).toInt();
+        }
+    } else {
+        LOG_FAILED_QUERY(query);
+    }
+    qDebug() << "PlaylistDAO::hidden_type 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);
+	enum hidden_type ht = getHiddenType(playlistId);
 
-    if (query.exec()) {
-        if (query.next()) {
-            return query.value(0).toBool();
-        }
-    } else {
-        LOG_FAILED_QUERY(query);
-    }
-    return false;
+	if(ht==PLHT_NOT_HIDDEN){
+		return false;
+	}
+	else{
+		return true;
+	}
 }
 
 void PlaylistDAO::removeTrackFromPlaylists(int trackId) {
@@ -396,7 +415,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
@@ -411,7 +430,102 @@
     // 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);
-    }
-}
+
+    int i = 2; // Start at position 2 because position 1 was already loaded to the deck
+
+    while (query.next()) {
+    	if (bTop) {
+    		insertTrackIntoPlaylist(query.value(0).toInt(), autoDJId, i++);
+    	}
+    	else {
+    		appendTrackToPlaylist(query.value(0).toInt(), autoDJId);
+    	}
+    }
+}
+
+int PlaylistDAO::getPreviousPlaylist(int currentPlaylistId, enum hidden_type hidden) {
+    //Start the transaction
+    m_database.transaction();
+
+    //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);
+    query.exec();
+
+    //Print out any SQL error, if there was one.
+    if (query.lastError().isValid()) {
+     	qDebug() << "appendTrackToPlaylist" << query.lastError();
+      // m_database.rollback();
+      // return;
+    }
+
+    // Get the position 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) {
+
+    //Start the transaction
+    m_database.transaction();
+
+    //Find out the highest position existing in the target playlist so we know what
+    //position this track should have.
+    QSqlQuery query(m_database);
+    query.prepare("SELECT max(position) as position FROM PlaylistTracks "
+                  "WHERE playlist_id = :id");
+    query.bindValue(":id", targetPlaylistId);
+    query.exec();
+
+    //Print out any SQL error, if there was one.
+    if (query.lastError().isValid()) {
+     	qDebug() << "appendTrackToPlaylist" << query.lastError();
+      // m_database.rollback();
+      // return;
+    }
+
+    // Get the position of the highest playlist...
+    int position = 0;
+    if (query.next()) {
+        position = query.value(query.record().indexOf("position")).toInt();
+    }
+
+
+    // Query Tracks from the source Playlist
+    query.prepare("SELECT track_id FROM PlaylistTracks "
+                  "WHERE playlist_id = :plid");
+    query.bindValue(":plid", sourcePlaylistID);
+    query.exec();
+
+    //Print out any SQL error, if there was one.
+    if (query.lastError().isValid()) {
+       qDebug() << "addToAutoDJQueue" << query.lastError();
+       return;
+    }
+
+
+    QSqlQuery query2(m_database);
+    //Insert the Tracks into the PlaylistTracks table
+    query2.prepare("INSERT INTO PlaylistTracks (playlist_id, track_id, position)"
+                  "VALUES (:playlist_id, :track_id, :position)");
+    query2.bindValue(":playlist_id", targetPlaylistId);
+
+    while (query.next()) {
+        query2.bindValue(":track_id", query.value(0));
+        query2.bindValue(":position", ++position);
+        query2.exec();
+    }
+
+    //Start the transaction
+    m_database.commit();
+    emit(changed(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	2011-12-10 16:03:24 +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 hidden_type {
+		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, enum hidden_type = PLHT_NOT_HIDDEN);
     /** Delete a playlist */
     void deletePlaylist(int playlistId);
     /** Rename a playlist */
@@ -37,15 +47,17 @@
     /** Find out how many playlists exist. */
     unsigned int playlistCount();
     /** Get the name of the playlist at the given position */
-    QString getPlaylistName(unsigned int position);
+    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
+    /** 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 position);
+    int getPlaylistId(int index);
     // Returns true if the playlist with playlistId is hidden
     bool isHidden(int playlistId);
+    // Returns cause of playlistId is hidden
+    enum hidden_type getHiddenType(int playlistId);
     /** Remove a track from all playlists */
     void removeTrackFromPlaylists(int trackId);
     /** Remove a track from a playlist */
@@ -53,13 +65,19 @@
     /** 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 a playlist from the same hidden type that was created just before
+    int getPreviousPlaylist(int currentPlaylistId, enum hidden_type hidden);
+    // Copy tracks from source to 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	2011-12-10 16:03:24 +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	2011-12-10 16:03:24 +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

=== modified file 'mixxx/src/library/libraryfeature.h'
--- mixxx/src/library/libraryfeature.h	2011-03-10 14:06:26 +0000
+++ mixxx/src/library/libraryfeature.h	2011-12-10 16:03:24 +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 move the selection **/
+    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	2011-12-10 16:03:24 +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	2011-12-10 16:03:24 +0000
@@ -0,0 +1,238 @@
+//
+// 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 "parsercsv.h"
+#include <QUrl>
+
+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	2011-12-10 16:03:24 +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 "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	2011-12-10 16:03:24 +0000
@@ -8,6 +8,7 @@
 #include "library/parser.h"
 #include "library/parserm3u.h"
 #include "library/parserpls.h"
+#include "library/parsercsv.h"
 
 
 #include "widget/wlibrary.h"
@@ -26,8 +27,8 @@
           m_pTrackCollection(pTrackCollection),
           m_playlistDao(pTrackCollection->getPlaylistDAO()),
           m_trackDao(pTrackCollection->getTrackDAO()),
-          m_pConfig(pConfig),
-          m_playlistTableModel(this, pTrackCollection->getDatabase()) {
+          m_playlistTableModel(this, pTrackCollection->getDatabase()),
+          m_pConfig(pConfig) {
     m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection,
                                                    "mixxx.db.model.playlist");
 
@@ -35,10 +36,14 @@
     connect(m_pCreatePlaylistAction, SIGNAL(triggered()),
             this, SLOT(slotCreatePlaylist()));
 
-    m_pAddToAutoDJAction = new QAction(tr("Add to Auto-DJ Queue"),this);
+    m_pAddToAutoDJAction = new QAction(tr("Add to Auto DJ bottom"),this);
     connect(m_pAddToAutoDJAction, SIGNAL(triggered()),
             this, SLOT(slotAddToAutoDJ()));
 
+    m_pAddToAutoDJTopAction = new QAction(tr("Add to Auto DJ top 2"),this);
+    connect(m_pAddToAutoDJTopAction, SIGNAL(triggered()),
+            this, SLOT(slotAddToAutoDJTop()));
+
     m_pDeletePlaylistAction = new QAction(tr("Remove"),this);
     connect(m_pDeletePlaylistAction, SIGNAL(triggered()),
             this, SLOT(slotDeletePlaylist()));
@@ -58,6 +63,18 @@
     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)));
+
     // Setup the sidebar playlist model
     m_playlistTableModel.setTable("Playlists");
     m_playlistTableModel.setFilter("hidden=0");
@@ -68,7 +85,7 @@
     //construct child model
     TreeItem *rootItem = new TreeItem();
     m_childModel.setRootItem(rootItem);
-    constructChildModel();
+    constructChildModel(-1);
 }
 
 PlaylistFeature::~PlaylistFeature() {
@@ -77,6 +94,7 @@
     delete m_pDeletePlaylistAction;
     delete m_pImportPlaylistAction;
     delete m_pAddToAutoDJAction;
+    delete m_pAddToAutoDJTopAction;
     delete m_pRenamePlaylistAction;
     delete m_pLockPlaylistAction;
 }
@@ -93,6 +111,8 @@
 void PlaylistFeature::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&)));
@@ -142,6 +162,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);
@@ -183,17 +204,10 @@
 
     } while (!validNameGiven);
 
-    bool playlistCreated = m_playlistDao.createPlaylist(name);
+    int playlistId = m_playlistDao.createPlaylist(name);
 
-    if (playlistCreated) {
-        clearChildModel();
-        m_playlistTableModel.select();
-        constructChildModel();
+    if (playlistId != -1) {
         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 {
@@ -251,11 +265,7 @@
     } while (!validNameGiven);
 
     m_playlistDao.renamePlaylist(playlistId, newName);
-    clearChildModel();
-    m_playlistTableModel.select();
-    constructChildModel();
-    emit(featureUpdated());
-    m_pPlaylistTableModel->setPlaylist(playlistId);
+	emit(featureUpdated());
 }
 
 
@@ -268,9 +278,6 @@
     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()
@@ -284,20 +291,17 @@
         return;
     }
 
-    if (m_lastRightClickedIndex.isValid() &&
-        !m_playlistDao.isPlaylistLocked(playlistId)) {
+    if (m_lastRightClickedIndex.isValid()) {
         Q_ASSERT(playlistId >= 0);
 
-        clearChildModel();
         m_playlistDao.deletePlaylist(playlistId);
-        m_playlistTableModel.select();
-        constructChildModel();
         emit(featureUpdated());
+        activate();
     }
-
 }
 
 bool PlaylistFeature::dropAccept(QUrl url) {
+    Q_UNUSED(url);
     return false;
 }
 
@@ -334,6 +338,7 @@
 }
 
 bool PlaylistFeature::dragMoveAccept(QUrl url) {
+    Q_UNUSED(url);
     return false;
 }
 
@@ -352,20 +357,21 @@
 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,14 +379,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());
+    if (selected_row == -1) {
+        return QModelIndex();
+    }
+    return m_childModel.index(selected_row, 0);
 }
 
 /**
@@ -398,8 +413,8 @@
         NULL,
         tr("Import Playlist"),
         QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
-        tr("Playlist Files (*.m3u *.m3u8 *.pls)"));
-    // Exit method if user cancelled the open dialog.
+        tr("Playlist Files (*.m3u *.m3u8 *.pls *.csv)"));
+    //Exit method if user cancelled the open dialog.
     if (playlist_file.isNull() || playlist_file.isEmpty()) {
         return;
     }
@@ -411,6 +426,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;
     }
@@ -426,7 +443,9 @@
         delete playlist_parser;
     }
 }
+
 void PlaylistFeature::onLazyChildExpandation(const QModelIndex &index){
+    Q_UNUSED(index);
     //Nothing to do because the childmodel is not of lazy nature.
 }
 
@@ -436,13 +455,13 @@
         NULL,
         tr("Export Playlist"),
         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()) {
         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,
@@ -451,43 +470,80 @@
     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);
+    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 {
-        //default export to M3U if file extension is missing
+        // 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);
+        }
 
-        qDebug() << "Playlist export: No file extension specified. Appending .m3u "
-                 << "and exporting to M3U.";
-        file_location.append(".m3u");
-        ParserM3u::writeM3UFile(file_location, playlist_items, useRelativePath);
+        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 PlaylistFeature::slotAddToAutoDJ() {
     //qDebug() << "slotAddToAutoDJ() row:" << m_lastRightClickedIndex.data();
+    addToAutoDJ(false); // Top = True
+}
+
+void PlaylistFeature::slotAddToAutoDJTop() {
+    //qDebug() << "slotAddToAutoDJTop() row:" << m_lastRightClickedIndex.data();
+    addToAutoDJ(true); // bTop = True
+}
+
+void PlaylistFeature::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) {
-            m_playlistDao.addToAutoDJQueue(playlistId);
+       	    // Insert this playlist
+            m_playlistDao.addToAutoDJQueue(playlistId, bTop);
         }
     }
     emit(featureUpdated());
 }
+
+void PlaylistFeature::slotPlaylistTableChanged(int playlistId) {
+    //qDebug() << "slotPlaylistTableChanged() playlistId:" << playlistId;
+    enum PlaylistDAO::hidden_type type = m_playlistDao.getHiddenType(playlistId);
+    if (   type == PlaylistDAO::PLHT_NOT_HIDDEN
+        || 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));
+        }
+    }
+}

=== modified file 'mixxx/src/library/playlistfeature.h'
--- mixxx/src/library/playlistfeature.h	2011-11-27 06:59:02 +0000
+++ mixxx/src/library/playlistfeature.h	2011-12-10 16:03:24 +0000
@@ -50,15 +50,18 @@
     void slotCreatePlaylist();
     void slotDeletePlaylist();
     void slotAddToAutoDJ();
+    void slotAddToAutoDJTop();
     void slotRenamePlaylist();
     void slotTogglePlaylistLock();
     void slotImportPlaylist();
     void slotExportPlaylist();
 
+    void slotPlaylistTableChanged(int playlistId);
 
  private:
-    void constructChildModel();
+    QModelIndex constructChildModel(int selected_id);
     void clearChildModel();
+    void addToAutoDJ(bool bTop);
 
     TrackCollection* m_pTrackCollection;
     PlaylistTableModel* m_pPlaylistTableModel;
@@ -67,6 +70,7 @@
     QAction *m_pCreatePlaylistAction;
     QAction *m_pDeletePlaylistAction;
     QAction *m_pAddToAutoDJAction;
+    QAction *m_pAddToAutoDJTopAction;
     QAction *m_pRenamePlaylistAction;
     QAction *m_pLockPlaylistAction;
     QAction *m_pImportPlaylistAction;

=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2011-11-30 06:19:47 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2011-12-10 16:03:24 +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?
 
@@ -306,6 +317,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	2011-12-10 16:03:24 +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	2011-12-10 16:03:24 +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) {
-    return false;
+	Q_UNUSED(index);
+	Q_UNUSED(url);
+	return false;
 }
 
 bool PrepareFeature::dragMoveAccept(QUrl url) {
-    return false;
+	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	2011-12-10 16:03:24 +0000
@@ -0,0 +1,571 @@
+#include <QtDebug>
+#include <QMenu>
+#include <QInputDialog>
+#include <QFileDialog>
+#include <QDesktopServices>
+#include <QDateTime>
+
+#include "library/setlogfeature.h"
+#include "library/parser.h"
+#include "library/parserm3u.h"
+#include "library/parserpls.h"
+#include "library/parsercsv.h"
+
+
+#include "widget/wlibrary.h"
+#include "widget/wlibrarysidebar.h"
+#include "widget/wlibrarytextbrowser.h"
+#include "library/trackcollection.h"
+#include "library/playlisttablemodel.h"
+#include "mixxxkeyboard.h"
+#include "treeitem.h"
+#include "soundsourceproxy.h"
+#include "playerinfo.h"
+
+const QString SetlogFeature::m_sSetlogViewName = QString("SETLOGHOME");
+
+SetlogFeature::SetlogFeature(QObject* parent, ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection)
+        : LibraryFeature(parent),
+          m_pTrackCollection(pTrackCollection),
+          m_playlistDao(pTrackCollection->getPlaylistDAO()),
+          m_trackDao(pTrackCollection->getTrackDAO()),
+		  m_pCOPlayPos1(NULL),
+		  m_pCOPlayPos2(NULL),
+          m_pConfig(pConfig),
+		  m_playlistTableModel(this, pTrackCollection->getDatabase())
+{
+    m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection,
+                                                    "mixxx.db.model.setlog");
+
+    m_pAddToAutoDJAction = new QAction(tr("Add to Auto DJ bottom"),this);
+    connect(m_pAddToAutoDJAction, SIGNAL(triggered()),
+            this, SLOT(slotAddToAutoDJ()));
+
+    m_pAddToAutoDJTopAction = new QAction(tr("Add to Auto DJ top 2"),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_pExportPlaylistAction = new QAction(tr("Export Playlist"), this);
+    connect(m_pExportPlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotExportPlaylist()));
+
+    m_pJoinWithPreviousAction = new QAction(tr("Join with previous"), this);
+    connect(m_pJoinWithPreviousAction, SIGNAL(triggered()),
+            this, SLOT(slotJoinWithPrevious()));
+
+    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)));
+
+
+    m_oldTrackIdPlayer[0] = 0;
+    m_oldTrackIdPlayer[1] = 0;
+
+    //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() << tr("Playlist Creation Failed");
+    	qDebug() << tr("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() {
+    delete m_pPlaylistTableModel;
+    delete m_pDeletePlaylistAction;
+    delete m_pAddToAutoDJAction;
+    delete m_pAddToAutoDJTopAction;
+    delete m_pRenamePlaylistAction;
+    delete m_pLockPlaylistAction;
+    if (m_pCOPlayPos1) {
+    	delete m_pCOPlayPos1;
+    }
+    if (m_pCOPlayPos2) {
+    	delete m_pCOPlayPos2;
+    }
+}
+
+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) {
+	Q_UNUSED(keyboard);
+	Q_UNUSED(sidebarWidget);
+    WLibraryTextBrowser* edit = new WLibraryTextBrowser(libraryWidget);
+    connect(this, SIGNAL(showPage(const QUrl&)),
+            edit, SLOT(setSource(const QUrl&)));
+
+    if (!m_pCOPlayPos1) {
+        m_pCOPlayPos1 = new ControlObjectThreadMain(
+                            ControlObject::getControl(ConfigKey("[Channel1]", "playposition")));
+        connect(m_pCOPlayPos1, SIGNAL(valueChanged(double)),
+                this, SLOT(slotPositionChanged(double)));
+    }
+    if (!m_pCOPlayPos2) {
+        m_pCOPlayPos2 = new ControlObjectThreadMain(
+                            ControlObject::getControl(ConfigKey("[Channel2]", "playposition")));
+        connect(m_pCOPlayPos2, SIGNAL(valueChanged(double)),
+                this, SLOT(slotPositionChanged(double)));
+    }
+
+    libraryWidget->registerView(m_sSetlogViewName, edit);
+}
+
+void SetlogFeature::activate() {
+    emit(showPage(QUrl("qrc:/html/setlogs.html")));
+    emit(switchToView(m_sSetlogViewName));
+}
+
+void SetlogFeature::activateChild(const QModelIndex& index) {
+    //qDebug() << "SetlogFeature::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 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);
+}
+
+
+void SetlogFeature::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);
+	emit(featureUpdated());
+}
+
+
+void SetlogFeature::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 SetlogFeature::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 SetlogFeature::dropAccept(QUrl url) {
+    Q_UNUSED(url);
+	return false;
+}
+
+bool SetlogFeature::dropAcceptChild(const QModelIndex& index, QUrl url){
+	Q_UNUSED(url);
+	Q_UNUSED(index);
+	return false;
+}
+
+bool SetlogFeature::dragMoveAccept(QUrl url) {
+	Q_UNUSED(url);
+    return false;
+}
+
+bool SetlogFeature::dragMoveAcceptChild(const QModelIndex& index, QUrl url) {
+	Q_UNUSED(url);
+	Q_UNUSED(index);
+	return false;
+}
+
+
+TreeItemModel* SetlogFeature::getChildModel() {
+    return &m_childModel;
+}
+
+/**lock
+  * 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);
+}
+
+/**
+  * Clears the child model dynamically, but the invisible root item remains
+  */
+void SetlogFeature::clearChildModel()
+{
+    m_childModel.removeRows(0,m_playlistTableModel.rowCount());
+}
+
+void SetlogFeature::onLazyChildExpandation(const QModelIndex &index) {
+	Q_UNUSED(index);
+    //Nothing to do because the childmodel is not of lazy nature.
+}
+
+void SetlogFeature::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);;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 SetlogFeature::slotAddToAutoDJ() {
+    //qDebug() << "slotAddToAutoDJ() row:" << m_lastRightClickedIndex.data();
+	addToAutoDJ(false); // Top = True
+}
+
+void SetlogFeature::slotAddToAutoDJTop() {
+    //qDebug() << "slotAddToAutoDJTop() row:" << m_lastRightClickedIndex.data();
+	addToAutoDJ(true); // bTop = True
+}
+
+void SetlogFeature::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 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);
+        	            	track->restorePlayed(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::slotPositionChanged(double value) {
+	Q_UNUSED(value);	
+	TrackPointer currendPlayingTrack;
+	int currendPlayingTrackId = 0;
+
+    int deck = PlayerInfo::Instance().getCurrentPlayingDeck();
+    if ( deck && deck <= 2) {
+        QString chan = QString("[Channel%1]").arg(deck);
+        currendPlayingTrack = PlayerInfo::Instance().getTrackInfo(chan);
+    	if (currendPlayingTrack) {
+    		currendPlayingTrackId = currendPlayingTrack->getId();
+    	}
+    	if (m_oldTrackIdPlayer[deck-1] != currendPlayingTrackId) {
+    		// The audience listens to a new track
+
+    		qDebug() << "The audience listens to track " << currendPlayingTrackId;
+    		currendPlayingTrack->setPlayed(true); // Here the song is realy played, not only loaded.
+
+    		if (m_pPlaylistTableModel->getPlaylist() == m_playlistId) {
+    			// View needs a refresh
+    			m_pPlaylistTableModel->appendTrack(currendPlayingTrackId);
+    		}
+    		else {
+        		m_playlistDao.appendTrackToPlaylist(currendPlayingTrackId, m_playlistId);
+    		}
+    		m_oldTrackIdPlayer[deck-1] = currendPlayingTrackId;
+    	}
+    }
+}
+
+void SetlogFeature::slotPlaylistTableChanged(int playlistId) {
+	 //qDebug() << "slotPlaylistTableChanged() playlistId:" << playlistId;
+	 enum PlaylistDAO::hidden_type 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/setlogfeature.h'
--- mixxx/src/library/setlogfeature.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/setlogfeature.h	2011-12-10 16:03:24 +0000
@@ -0,0 +1,93 @@
+// setlogfeature.h
+// Created 8/17/09 by RJ Ryan ([e-mail])
+
+#ifndef SETLOGFEATURE_H
+#define SETLOGFEATURE_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 "configobject.h"
+#include "controlobject.h"
+#include "controlobjectthreadmain.h"
+
+
+
+class PlaylistTableModel;
+class TrackCollection;
+
+class SetlogFeature : public LibraryFeature {
+    Q_OBJECT
+public:
+    SetlogFeature(QObject* parent, ConfigObject<ConfigValue>* pConfig, TrackCollection* pTrackCollection);
+    virtual ~SetlogFeature();
+
+    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);
+    void onRightClick(const QPoint& globalPos);
+    void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+    void onLazyChildExpandation(const QModelIndex& index);
+
+    void slotDeletePlaylist();
+    void slotAddToAutoDJ();
+    void slotAddToAutoDJTop();
+    void slotRenamePlaylist();
+    void slotTogglePlaylistLock();
+    void slotExportPlaylist();
+    void slotJoinWithPrevious();
+
+    void slotPositionChanged(double /*value*/);
+    void slotPlaylistTableChanged(int playlistId);
+
+ private:
+    QModelIndex constructChildModel(int selected_id);
+    void clearChildModel();
+    void addToAutoDJ(bool bTop);
+
+    TrackCollection* m_pTrackCollection;
+    PlaylistTableModel* m_pPlaylistTableModel;
+    PlaylistDAO &m_playlistDao;
+    TrackDAO &m_trackDao;
+    QAction *m_pDeletePlaylistAction;
+    QAction *m_pAddToAutoDJAction;
+    QAction *m_pAddToAutoDJTopAction;
+    QAction *m_pRenamePlaylistAction;
+    QAction *m_pLockPlaylistAction;
+    QAction *m_pExportPlaylistAction;
+    QAction *m_pJoinWithPreviousAction;
+    ControlObjectThreadMain* m_pCOPlayPos1;
+    ControlObjectThreadMain* m_pCOPlayPos2;
+    QModelIndex m_lastRightClickedIndex;
+    TreeItemModel m_childModel;
+    ConfigObject<ConfigValue>* m_pConfig;
+    QSqlTableModel m_playlistTableModel;
+    const static QString m_sSetlogViewName;
+    int m_playlistId;
+    int m_oldTrackIdPlayer[2];
+    //int m_oldTrackPlayer2;
+    //int m_oldCurrendPlayingTrack;
+};
+
+#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	2011-12-10 16:03:24 +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,7 +151,8 @@
 }
 
 int SidebarModel::columnCount(const QModelIndex& parent) const {
-    //qDebug() << "SidebarModel::columnCount parent=" << parent;
+    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,13 +340,19 @@
 }
 
 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) {
-    //qDebug() << "slotRowsRemoved" << parent << start << end;
+	Q_UNUSED(parent);
+	Q_UNUSED(start);
+	Q_UNUSED(end);
+	//qDebug() << "slotRowsRemoved" << parent << start << end;
     //QModelIndex newParent = translateSourceIndex(parent);
     endRemoveRows();
 }
@@ -355,16 +371,16 @@
  */
 void SidebarModel::slotFeatureIsLoading(LibraryFeature * feature)
 {
-    featureRenamed(feature);
-    selectFeature(feature);
+	featureRenamed(feature);
+    slotFeatureSelect(feature);
 }
 
 /* Tobias: This slot is somewhat redundant but I decided
  * to leave it for code readability reasons
  */
 void SidebarModel::slotFeatureLoadingFinished(LibraryFeature * feature){
-    featureRenamed(feature);
-    selectFeature(feature);
+	featureRenamed(feature);
+    slotFeatureSelect(feature);
 }
 
 void SidebarModel::featureRenamed(LibraryFeature* pFeature){
@@ -376,11 +392,19 @@
     }
 }
 
-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	2011-12-10 16:03:24 +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-10-21 02:09:53 +0000
+++ mixxx/src/library/trackcollection.cpp	2011-12-10 16:03:24 +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	2011-12-06 02:54:33 +0000
+++ mixxx/src/mixxx.cpp	2011-12-10 16:03:24 +0000
@@ -414,7 +414,7 @@
 
     m_pWidgetParent = NULL;
     // Loads the skin as a child of m_pView
-    // assignment itentional in next line
+    // assignment intentional in next line
     if (!(m_pWidgetParent = m_pSkinLoader->loadDefaultSkin(m_pView,
                                         m_pKeyboard,
                                         m_pPlayerManager,

=== modified file 'mixxx/src/trackinfoobject.cpp'
--- mixxx/src/trackinfoobject.cpp	2011-10-03 22:37:35 +0000
+++ mixxx/src/trackinfoobject.cpp	2011-12-10 16:03:24 +0000
@@ -556,15 +556,24 @@
     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::restorePlayed(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	2011-10-03 22:37:35 +0000
+++ mixxx/src/trackinfoobject.h	2011-12-10 16:03:24 +0000
@@ -186,6 +186,8 @@
     bool getPlayed() const;
     /** Set Played status*/
     void setPlayed(bool);
+    /** To restore the played flag without increment the played counter  */
+    void restorePlayed(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	2011-12-10 16:03:24 +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);
 }