Merge lp:~mixxxdevelopers/mixxx/features_rhythmbox into lp:~mixxxdevelopers/mixxx/trunk

[RAFFI TEA]

This is a rewrite of the Rhythmbox feature which is sql-powered.

I have removed the files "abstractxmltrackmodel.*" and "proxytablemodel.*". They are not longer used and were introduced previously to support sorting iTunes and rhythmbox XML models.

[RJ Skerry-Ryan (rryan)]

Hey Tobias,

Everything looks good except for this one issue:

The Mixxx library and Rhythmbox both share BaseSqlTableModel now.

In BaseSqlTableModel::select(), every returned result is added to a map from the row to a track ID and vice-versa. This combined with Mixxx-library trackChanged updates from the TrackDAO allow the BaseSqlTableModel to automatically update results in the table that are changed, and to return cached results on new queries if the mixxx-library tracks haven't been written to the database yet.

The problem with Rhythmbox now using BaseSqlTableModel is that if Rhythmbox tracks and Mixxx tracks share the same ID, then an updated Mixxx track will cause the Rhythmbox track of the same ID to be changed to show the Mixxx track. You can easily reproduce this by deleting your library, rescanning and loading your RB library. In the Mixxx Library, right-click and edit the #1 track in the list to haev a different name. Now switch to the RB view and you'll see the Row 1 result is now showing all the data from row 1 in your Mixxx library.

I think this could be fixed by one of two methods:

1) adding a protected method setCaching(bool) to BaseSqlTableModel which is default on. The RB trackmodels will set this to false. All the caching logic in BaseSqlTableModel will check this before executing their logic.

2) Split BaseSqlTableModel into 2 pieces, BaseSqlTableModel and CachingBaseSqlTableModel, where CachingBSTM inherits from BSTM. The RB models will only inherit from plain BSTM while the reset inherit from CachingBSTM.

Apart from that, there are a couple minor fixes:

1) Please return TRACKMODELCAPS_NONE instead of NULL in RhythmboxPlaylistModel::getCapabilities, same goes for the TrackModel

2) In RhythmboxPlaylistModel::setPlaylist, it looks like you've got an "ITunes" mention in the playlist ID string. Probably should have a rhythmbox-ish name.

This is awesome work -- RB is really fast now. Thanks Tobias!

Also, sorry for taking so long to get back to you on these code reviews.

review: Needs Fixing

[RAFFI TEA (raffitea)]

Thanks RJ fort your review.

I have anticipated the issue with BaseSqlTableModel::select(). The sql-based iTunesFeature in 1.8.2 will have same issues, but also the upcoming Traktor feature. Though, good catch. Your ideas of solving the issue cover my ideas.

I'll fix the problem soon.

[lp:~mixxxdevelopers/mixxx/features_rhythmbox]

2627. By Raffitea on 2011-02-12

Merging from trunk.

2628. By Raffitea on 2011-02-19

* Merging from trunk manually.
*Readded ProxyTrackModel. Thought it was useless but the revised BrowseFeature makes use of them.

2629. By Raffitea on 2011-02-19

added setCaching(bool) method to BaseSqlModel.
disabled caching for iTunes, Traktor and Rhythmbox
-->disconnectes SIGNAL(trackChaged)

2630. By Raffitea on 2011-02-19

* Added to worker thread to parse Rhythmbox XML.

2631. By Raffitea on 2011-02-20

* Change Rhythmbox title to 'Rhythmbox (loading)' when worker thread imports music collection.

2632. By Raffitea on 2011-02-20

Added a worker thread for iTunes parsing

2633. By Raffitea on 2011-02-20

Removed a comment

2634. By Raffitea on 2011-02-20

Added a worker thread for Traktor parsing.

[RAFFI TEA (raffitea)]

Hey RJ,

I have addressed the problems. Can you confirm that your problems have gone?

From now on Mixxx uses a worker thread to parse iTunes, Traktor and Rhythmbox. This keeps the GUI responsive especially on large music collections. While the worker thread is active the sidebar item of the feature has '(loading)' appended. I have removed the 'activate' message boxes. They are not usefully at all especially when navigating through the sidebar with MIDI.

[lp:~mixxxdevelopers/mixxx/features_rhythmbox]

2635. By Raffitea on 2011-02-20

Make sure ThreadPool provides enough Threads slots

[RJ Skerry-Ryan (rryan)]

Things are looking good. I'm confused about the thread-pool issues you ran into. I asked in #qt on FreeNode and they said that the GUI thread does not count as a thread in the global ThreadPool. I'm not sure what would be taking up that extra slot in the thread pool such that the importer would only run on Mixxx shutdown.

I think since you set the thread pool size to the same thing in different places, maybe we should add that to the main Mixxx startup sequence instead and just add comments there that indicate that it's related to these library features.

I ran into another issue, when I click Rhythmbox, it switches to 'Loading' and then when it's done the Rhythmbox view doesn't load. I experimented with adding a showTrackModel signal to Rhythmbox as if the view was activated after-load in trunk and that switched the track table, but the sidebar didn't show Rhythmbox as selected. I'm working on adding a fix for this in the branch now.

review: Needs Fixing

[lp:~mixxxdevelopers/mixxx/features_rhythmbox]

2636. By RJ Skerry-Ryan on 2011-02-21

Adding support to switch the sidebar selection after Rhythmbox/iTunes/Traktor models are finished loading. Update RhythmBox/iTunes/Traktor features to activate() themselves after loading.

2637. By RJ Skerry-Ryan on 2011-02-21

Merging from lp:mixxx. Increment RB table version to 11 in schema.xml and min-version to 11 since the recent merge to trunk used version 10.

[RJ Skerry-Ryan (rryan)]

OK, I fixed the issue with the selection not highlighting once the loading process is done. I tested RhythmBox but not iTunes/Traktor, though I don't see why the fixes I made for those wouldn't work.

[RAFFI TEA (raffitea)]

> Things are looking good. I'm confused about the thread-pool issues you ran
> into. I asked in #qt on FreeNode and they said that the GUI thread does not
> count as a thread in the global ThreadPool. I'm not sure what would be taking
> up that extra slot in the thread pool such that the importer would only run on
> Mixxx shutdown.

I think I know the reason. The old "BrowseThread" was realized by QtConcurrent::run(). I used a while(1) loop in that. A ThreadPool of size 1 will never provide free slots because BrowseThread will only exit on shutdown. You've already merged the revised treeitem branch where I used QThreads rather than QtConcurrent::run(). I think we can remove the lines.

>
> I ran into another issue, when I click Rhythmbox, it switches to 'Loading' and
> then when it's done the Rhythmbox view doesn't load.

hmmm. It should work on. Is there a emit(showTrackModel) in onTrackCollectionLoaded()

I experimented with
> adding a showTrackModel signal to Rhythmbox as if the view was activated
> after-load in trunk and that switched the track table, but the sidebar didn't
> show Rhythmbox as selected. I'm working on adding a fix for this in the branch
> now.

RJ, this can be solved very quickly. Rather than resetting the model in onTrackCollectionLoaded() you'll need to iterate over the TreeItem* root object and do m_childModel.insertRows(QList<TreeItem*>, ...) operations. This will populate the model incrementally with no reset.

[RJ Skerry-Ryan (rryan)]

Everything looks good -- merge away Tobias!

review: Approve

[lp:~mixxxdevelopers/mixxx/features_rhythmbox]

2638. By RJ Skerry-Ryan on 2011-02-21

Update comment

2639. By RJ Skerry-Ryan on 2011-02-21

Move Rhythmbox, iTunes, and Traktor feature files into their own sub-folders within mixxx/src/library

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-02-21 03:59:46 +0000
+++ mixxx/build/depends.py	2011-02-21 23:55:30 +0000
@@ -188,7 +188,7 @@
                                       '$QTDIR/include/QtWebKit',
                                       '$QTDIR/include/Qt'])
 
-        # Set the rpath for linux/bsd/osx. 
+        # Set the rpath for linux/bsd/osx.
         # This is not support on OS X before the 10.5 SDK.
         using_104_sdk = (str(build.env["CCFLAGS"]).find("10.4") >= 0)
         compiling_on_104 = False
@@ -451,20 +451,30 @@
                    "library/preparelibrarytablemodel.cpp",
                    "library/browsetablemodel.cpp",
                    "library/missingtablemodel.cpp",
+
                    "library/proxytrackmodel.cpp",
-                   "library/abstractxmltrackmodel.cpp",
-                   "library/rhythmboxtrackmodel.cpp",
-                   "library/rhythmboxplaylistmodel.cpp",
-                   "library/itunestrackmodel.cpp",
-                   "library/itunesplaylistmodel.cpp",
+
+
                    "library/playlisttablemodel.cpp",
                    "library/libraryfeature.cpp",
                    "library/preparefeature.cpp",
                    "library/autodjfeature.cpp",
                    "library/mixxxlibraryfeature.cpp",
                    "library/playlistfeature.cpp",
-                   "library/rhythmboxfeature.cpp",
-                   "library/itunesfeature.cpp",
+
+                   # External Library Features
+                   "library/rhythmbox/rhythmboxfeature.cpp",
+                   "library/rhythmbox/rhythmboxtrackmodel.cpp",
+                   "library/rhythmbox/rhythmboxplaylistmodel.cpp",
+
+                   "library/itunes/itunesfeature.cpp",
+                   "library/itunes/itunestrackmodel.cpp",
+                   "library/itunes/itunesplaylistmodel.cpp",
+
+                   "library/traktor/traktorfeature.cpp",
+                   "library/traktor/traktortablemodel.cpp",
+                   "library/traktor/traktorplaylistmodel.cpp",
+
                    "library/browsefeature.cpp",
                    "library/cratefeature.cpp",
                    "library/sidebarmodel.cpp",
@@ -491,13 +501,10 @@
                    "library/stardelegate.cpp",
                    "library/stareditor.cpp",
                    "audiotagger.cpp",
-                   
+
                    "library/treeitemmodel.cpp",
                    "library/treeitem.cpp",
                    "library/foldertreemodel.cpp",
-                   "library/traktorfeature.cpp",
-                   "library/traktortablemodel.cpp",
-                   "library/traktorplaylistmodel.cpp",
                    "library/browsethread.cpp",
 
                    "xmlparse.cpp",

=== modified file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2011-01-20 19:50:26 +0000
+++ mixxx/res/schema.xml	2011-02-21 23:55:30 +0000
@@ -237,4 +237,33 @@
       ALTER TABLE playlists ADD COLUMN locked integer DEFAULT 0;
     </sql>
   </revision>
+  <revision version="11" min_compatible="3">
+    <description>
+      Tables for Rhythmbox library feature
+    </description>
+    <sql>
+      CREATE TABLE IF NOT EXISTS rhythmbox_library (
+        id INTEGER primary key AUTOINCREMENT,
+        artist varchar(48), title varchar(48),
+        album varchar(48), year varchar(16),
+        genre varchar(32), tracknumber varchar(3),
+        location varchar(512) UNIQUE,
+        comment varchar(60),
+        duration integer,
+        bitrate integer,
+        bpm float,
+        key varchar(6),
+        rating integer
+        );
+      CREATE TABLE IF NOT EXISTS rhythmbox_playlists (
+        id INTEGER primary key AUTOINCREMENT,
+        name varchar(100) UNIQUE
+        );
+      CREATE TABLE IF NOT EXISTS rhythmbox_playlist_tracks (
+        id INTEGER primary key AUTOINCREMENT,
+        playlist_id INTEGER REFERENCES rhythmbox_playlist(id),
+        track_id INTEGER REFERENCES rhythmbox_library(id)
+        );
+    </sql>
+  </revision>
 </schema>

=== removed file 'mixxx/src/library/abstractxmltrackmodel.cpp'
--- mixxx/src/library/abstractxmltrackmodel.cpp	2010-10-28 06:41:43 +0000
+++ mixxx/src/library/abstractxmltrackmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,218 +0,0 @@
-/***************************************************************************
-                           abstractxmltrackmodel.h
-                              -------------------
-     begin                : 8/23/2009
-     copyright            : (C) 2009 Phillip Whelan
-     email                : [e-mail]
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- * This is the class implementation for the base utility class used for    *
- * parsing external XML track and playlist databases.                      *
- *                                                                         *
- ***************************************************************************/
-
-
-#include <QtCore>
-#include <QtGui>
-#include <QtSql>
-#include <QtDebug>
-#include <QtXmlPatterns/QXmlQuery>
-
-
-#include "abstractxmltrackmodel.h"
-#include "xmlparse.h"
-#include "trackinfoobject.h"
-#include "defs.h"
-
-
-AbstractXmlTrackModel::AbstractXmlTrackModel(QString settingsNamespace)
-        : TrackModel(QSqlDatabase::database("QSQLITE"),
-                     settingsNamespace) {
-}
-
-AbstractXmlTrackModel::~AbstractXmlTrackModel()
-{
-}
-
-Qt::ItemFlags AbstractXmlTrackModel::flags ( const QModelIndex & index ) const
-{
-    Qt::ItemFlags defaultFlags = QAbstractTableModel::flags(index);
-
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    defaultFlags |= Qt::ItemIsDragEnabled;
-
-    return defaultFlags;
-}
-
-QMimeData* AbstractXmlTrackModel::mimeData(const QModelIndexList &indexes) const {
-    QMimeData *mimeData = new QMimeData();
-    QList<QUrl> urls;
-
-    //Ok, so the list of indexes we're given contains separates indexes for
-    //each column, so even if only one row is selected, we'll have like 7 indexes.
-    //We need to only count each row once:
-    QList<int> rows;
-
-    foreach (QModelIndex index, indexes) {
-        if (index.isValid()) {
-            if (!rows.contains(index.row())) {
-                rows.push_back(index.row());
-                QUrl url = QUrl::fromLocalFile(getTrackLocation(index));
-                if (!url.isValid())
-                    qDebug() << "ERROR invalid url\n";
-                else
-                    urls.append(url);
-            }
-        }
-    }
-    mimeData->setUrls(urls);
-    return mimeData;
-}
-
-
-QVariant AbstractXmlTrackModel::data ( const QModelIndex & index, int role ) const
-{
-    if (!index.isValid())
-        return QVariant();
-
-    if (m_trackNodes.size() < index.row())
-        return QVariant();
-
-    QDomNode songNode = m_trackNodes.at(index.row());
-
-    // tooltips and the display role should be the same thing.
-    if (role == Qt::DisplayRole || role == Qt::ToolTipRole) {
-        if ( index.column() > m_ColumnNames.size())
-            return QVariant();
-
-        return getTrackColumnData(songNode, index);
-    }
-
-    return QVariant();
-}
-
-QVariant AbstractXmlTrackModel::headerData ( int section, Qt::Orientation orientation, int role ) const
-{
-    /* Only respond to requests for column header display names */
-    if ( role != Qt::DisplayRole )
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-    {
-        if ( section > m_ColumnNames.size())
-            return QVariant();
-
-        return m_ColumnNames[section];
-    }
-
-    return QVariant();
-}
-
-int AbstractXmlTrackModel::rowCount ( const QModelIndex & parent ) const
-{
-    return m_trackNodes.count();
-}
-
-int AbstractXmlTrackModel::columnCount(const QModelIndex& parent) const
-{
-    if (parent != QModelIndex()) //Some weird thing for table-based models.
-        return 0;
-
-    return m_ColumnNames.size();
-}
-
-bool AbstractXmlTrackModel::addTrack(const QModelIndex& index, QString location)
-{
-    //Should do nothing... hmmm
-    return false;
-}
-
-/** Removes a track from the library track collection. */
-void AbstractXmlTrackModel::removeTrack(const QModelIndex& index)
-{
-    //Should do nothing... hmmm
-}
-
-void AbstractXmlTrackModel::removeTracks(const QModelIndexList& indices)
-{
-}
-
-void AbstractXmlTrackModel::moveTrack(const QModelIndex& sourceIndex,
-                                      const QModelIndex& destIndex)
-{
-    //Should do nothing... hmmm
-}
-
-QString AbstractXmlTrackModel::getTrackLocation(const QModelIndex& index) const
-{
-    TrackPointer track = getTrack(index);
-    QString location = track->getLocation();
-    // track is auto-deleted
-    return location;
-}
-
-TrackPointer AbstractXmlTrackModel::getTrack(const QModelIndex& index) const
-{
-    QDomNode songNode = m_trackNodes.at(index.row());
-    return parseTrackNode(songNode);
-}
-
-TrackPointer AbstractXmlTrackModel::getTrackByLocation(const QString& location) const
-{
-    if ( !m_mTracksByLocation.contains(location))
-        return TrackPointer();
-
-    QDomNode songNode = m_mTracksByLocation[location];
-    return parseTrackNode(songNode);
-}
-
-/*
-TrackPointer AbstractXmlTrackModel::parseTrackNode(QDomNode node)
-{
-    qDebug() << "Child class has not implemented parseTrackNode";
-    return NULL;
-}
-*/
-
-void AbstractXmlTrackModel::search(const QString& searchText)
-{
-    m_currentSearch = searchText;
-    // TODO(XXX) Implement searching
-}
-
-const QList<int>& AbstractXmlTrackModel::searchColumns() const {
-    return m_searchColumns;
-}
-
-const QString AbstractXmlTrackModel::currentSearch()
-{
-    return m_currentSearch;
-}
-
-void AbstractXmlTrackModel::addColumnName(int index, QString name)
-{
-    m_ColumnNames.insert(index, name);
-}
-
-void AbstractXmlTrackModel::addSearchColumn(int index) {
-    m_searchColumns.push_back(index);
-}
-
-TrackModel::CapabilitiesFlags AbstractXmlTrackModel::getCapabilities() const {
-    return TRACKMODELCAPS_ADDTOPLAYLIST | TRACKMODELCAPS_ADDTOCRATE |
-            TRACKMODELCAPS_ADDTOAUTODJ;
-}
-

=== removed file 'mixxx/src/library/abstractxmltrackmodel.h'
--- mixxx/src/library/abstractxmltrackmodel.h	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/abstractxmltrackmodel.h	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/***************************************************************************
-                           abstractxmltrackmodel.h
-                              -------------------
-     begin                : 8/23/2009
-     copyright            : (C) 2009 Phillip Whelan
-     email                : [e-mail]
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- * This is the class definition for a base utility class used for parsing  *
- * external XML track and playlist databases. The abstract implementation  *
- * includes helper methods and default implementations to help reduce code *
- * rewriting.                                                              *
- *                                                                         *
- * This class also assumes that the constructor loads the track nodes as a *
- * QDomeNodesList. The Class must implement parseTrackNode to convert the  *
- * QDomNode into a TrackInfoObject.                                        *
- ***************************************************************************/
-
-
-#ifndef TRACKMODELXML_H
-#define TRACKMODELXML_H
-
-#include <QtSql>
-#include <QtXml>
-#include "trackmodel.h"
-
-class AbstractXmlTrackModel : public QAbstractTableModel, public TrackModel
-{
-    Q_OBJECT
-    public:
-    AbstractXmlTrackModel(QString settingsNamespace);
-    virtual ~AbstractXmlTrackModel();
-
-    //QAbstractTableModel stuff
-    virtual Qt::ItemFlags flags ( const QModelIndex & index ) const;
-    virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
-    virtual QMimeData* mimeData(const QModelIndexList &indexes) const;
-    virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
-    virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
-    virtual int columnCount(const QModelIndex& parent) const;
-
-    //Track Model stuff
-    virtual TrackPointer getTrack(const QModelIndex& index) const;
-    virtual QString getTrackLocation(const QModelIndex& index) const;
-    virtual TrackPointer getTrackByLocation(const QString& location) const;
-    virtual void search(const QString& searchText);
-    virtual const QList<int>& searchColumns() const;
-    virtual const QString currentSearch();
-    virtual bool isColumnInternal(int column) = 0;
-    virtual bool isColumnHiddenByDefault(int column) = 0;
-    virtual void removeTrack(const QModelIndex& index);
-    virtual void removeTracks(const QModelIndexList& indices);
-    virtual bool addTrack(const QModelIndex& index, QString location);
-    virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
-    virtual TrackModel::CapabilitiesFlags getCapabilities() const;
-
-public slots:
-
-
-signals:
- 	void startedLoading();
- 	void progressLoading(QString path);
- 	void finishedLoading();
-
-private:
-    QList<QString> m_ColumnNames;
-
-protected:
-    /* Implemented by AbstractXmlTrackModel implementations to parse the DOM Node into a TrackInfoObject */
-    virtual TrackPointer parseTrackNode(QDomNode node) const = 0;
-    /* Implemented by AbstractXmlTrackModel implementations to return the data for song columns */
-    virtual QVariant getTrackColumnData(QDomNode node, const QModelIndex& index) const = 0;
-    /* Called by AbstractXmlTrackModel implementations to enumerate their columns */
-    void addColumnName(int index, QString name);
-
-    // Add a column to be searched when searching occurs
-    void addSearchColumn(int index);
-
-    /* The list of song nodes */
-    QDomNodeList m_trackNodes;
-    /* A map of the song DOM nodes by track location */
-    QMap <QString, QDomNode> m_mTracksByLocation;
-    // A list of columns that the implementation wants searched
-    QList<int> m_searchColumns;
-    // The most recent search executed.
-    QString m_currentSearch;
-};
-
-#endif

=== modified file 'mixxx/src/library/autodjfeature.cpp'
--- mixxx/src/library/autodjfeature.cpp	2010-12-23 18:55:54 +0000
+++ mixxx/src/library/autodjfeature.cpp	2011-02-21 23:55:30 +0000
@@ -6,7 +6,7 @@
 
 #include "library/autodjfeature.h"
 #include "library/playlisttablemodel.h"
-#include "library/proxytrackmodel.h"
+
 #include "library/trackcollection.h"
 #include "dlgautodj.h"
 #include "widget/wlibrary.h"

=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2010-11-17 21:02:24 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2011-02-21 23:55:30 +0000
@@ -18,6 +18,7 @@
         m_trackDAO(m_pTrackCollection->getTrackDAO()) {
     connect(&m_trackDAO, SIGNAL(trackChanged(int)),
             this, SLOT(trackChanged(int)));
+    m_isCachedModel = true;
     m_iSortColumn = 0;
     m_eSortOrder = Qt::AscendingOrder;
 }
@@ -100,10 +101,13 @@
     int col = index.column();
 
     Q_ASSERT(m_rowToTrackId.contains(row));
-    if (!m_rowToTrackId.contains(row)) {
+    if (!m_isCachedModel // iTunes and Rhythmbox are not cached
+                || !m_rowToTrackId.contains(row)) {
+        //look-up data from the database directly
         return QSqlTableModel::data(index, role);
     }
-
+    // This is only ececuted for cached models where
+    // view and underlying database have diverged
     int trackId = m_rowToTrackId[row];
 
     /*
@@ -377,3 +381,10 @@
 {
     return readWriteFlags(index);
 }
+void BaseSqlTableModel::setCaching(bool isCachedModel){
+    m_isCachedModel = isCachedModel;
+    if(!m_isCachedModel){
+        disconnect(&m_trackDAO, SIGNAL(trackChanged(int)),
+                this, SLOT(trackChanged(int)));
+    }
+}

=== modified file 'mixxx/src/library/basesqltablemodel.h'
--- mixxx/src/library/basesqltablemodel.h	2010-10-19 01:28:00 +0000
+++ mixxx/src/library/basesqltablemodel.h	2011-02-21 23:55:30 +0000
@@ -33,11 +33,14 @@
   protected:
     virtual QString orderByClause() const;
     virtual void initHeaderData();
+    void setCaching(bool isActive);
   private slots:
     void trackChanged(int trackId);
   private:
     QVariant getBaseValue(const QModelIndex& index, int role = Qt::DisplayRole) const;
 
+
+    bool m_isCachedModel;
     QString m_qTableName;
     int m_iSortColumn;
     Qt::SortOrder m_eSortOrder;

=== modified file 'mixxx/src/library/cratefeature.h'
--- mixxx/src/library/cratefeature.h	2011-01-26 16:29:42 +0000
+++ mixxx/src/library/cratefeature.h	2011-02-21 23:55:30 +0000
@@ -7,7 +7,7 @@
 
 #include "library/libraryfeature.h"
 #include "library/cratetablemodel.h"
-#include "library/proxytrackmodel.h"
+
 #include "treeitemmodel.h"
 
 class TrackCollection;

=== added directory 'mixxx/src/library/itunes'
=== renamed file 'mixxx/src/library/itunesfeature.cpp' => 'mixxx/src/library/itunes/itunesfeature.cpp'
--- mixxx/src/library/itunesfeature.cpp	2011-02-11 18:36:31 +0000
+++ mixxx/src/library/itunes/itunesfeature.cpp	2011-02-21 23:55:30 +0000
@@ -5,10 +5,11 @@
 #include <QFileDialog>
 #include <QMenu>
 #include <QAction>
-#include "library/itunesfeature.h"
-
-#include "library/itunestrackmodel.h"
-#include "library/itunesplaylistmodel.h"
+
+#include "library/itunes/itunesfeature.h"
+
+#include "library/itunes/itunestrackmodel.h"
+#include "library/itunes/itunesplaylistmodel.h"
 #include "library/dao/settingsdao.h"
 
 const QString ITunesFeature::ITDB_PATH_KEY = "mixxx.itunesfeature.itdbpath";
@@ -16,13 +17,26 @@
 
 ITunesFeature::ITunesFeature(QObject* parent, TrackCollection* pTrackCollection)
         : LibraryFeature(parent),
-          m_pTrackCollection(pTrackCollection),
-          m_database(pTrackCollection->getDatabase()) {
+          m_pTrackCollection(pTrackCollection) {
     m_pITunesTrackModel = new ITunesTrackModel(this, m_pTrackCollection);
     m_pITunesPlaylistModel = new ITunesPlaylistModel(this, m_pTrackCollection);
     m_isActivated = false;
-    
-    m_rootItem = new TreeItem();
+    m_title = tr("iTunes");
+
+    if (!m_database.isOpen()) {
+        m_database = QSqlDatabase::addDatabase("QSQLITE", "ITUNES_SCANNER");
+        m_database.setHostName("localhost");
+        m_database.setDatabaseName(MIXXX_DB_PATH);
+        m_database.setUserName("mixxx");
+        m_database.setPassword("mixxx");
+
+        //Open the database connection in this thread.
+        if (!m_database.open()) {
+            qDebug() << "Failed to open database for iTunes scanner." << m_database.lastError();
+        }
+    }
+
+    connect(&m_future_watcher, SIGNAL(finished()), this, SLOT(onTrackCollectionLoaded()));
 }
 
 ITunesFeature::~ITunesFeature() {
@@ -45,7 +59,7 @@
 
 
 QVariant ITunesFeature::title() {
-    return tr("iTunes");
+    return m_title;
 }
 
 QIcon ITunesFeature::getIcon() {
@@ -56,53 +70,53 @@
     activate(false);
 }
 
-void ITunesFeature::activate(bool forceReload, bool askToLoad /* = true */) {
+void ITunesFeature::activate(bool forceReload) {
     //qDebug("ITunesFeature::activate()");
 
     if (!m_isActivated || forceReload) {
-        if (askToLoad && QMessageBox::question(
-            NULL,
-            tr("Load iTunes Library?"),
-            tr("Would you like to load your iTunes library?"),
-            QMessageBox::Ok,
-            QMessageBox::Cancel)
-            == QMessageBox::Cancel) {
-            return;
-        }
 
         // first, assume we should use the default
-        QString dbfile = getiTunesMusicPath();
-        SettingsDAO settings(m_database);
+        m_dbfile = getiTunesMusicPath();
+
+        SettingsDAO settings(m_pTrackCollection->getDatabase());
         QString dbSetting(settings.getValue(ITDB_PATH_KEY));
         // if a path exists in the database, use it
         if (!dbSetting.isEmpty() && QFile::exists(dbSetting)) {
-            dbfile = dbSetting;
+            m_dbfile = dbSetting;
         }
         // if the path we got between the default and the database doesn't
         // exist, ask for a new one and use/save it if it exists
-        if (!QFile::exists(dbfile)) {
-            dbfile = QFileDialog::getOpenFileName(NULL,
+        if (!QFile::exists(m_dbfile)) {
+            m_dbfile = QFileDialog::getOpenFileName(NULL,
                 tr("Select your iTunes library"),
                 QDir::homePath(), "*.xml");
-            if (dbfile.isEmpty() || !QFile::exists(dbfile)) {
+            if (m_dbfile.isEmpty() || !QFile::exists(m_dbfile)) {
                 return;
             }
-            settings.setValue(ITDB_PATH_KEY, dbfile);
-        }
-        if (importLibrary(dbfile)) {
-            m_isActivated =  true;
-        } else {
-            QMessageBox::warning(
-                NULL,
-                tr("Error Loading iTunes Library"),
-                tr("There was an error loading your iTunes library. Some of "
-                   "your iTunes tracks or playlists may not have loaded."));
-        }
-        //set the root item for the childmodel.	
-        m_childModel.setRootItem(m_rootItem);
+            settings.setValue(ITDB_PATH_KEY, m_dbfile);
+        }
+        m_isActivated =  true;
+        /* Ususally the maximum number of threads
+         * is > 2 depending on the CPU cores
+         * Unfortunately, within VirtualBox
+         * the maximum number of allowed threads
+         * is 1 at all times We'll need to increase
+         * the number to > 1, otherwise importing the music collection
+         * takes place when the GUI threads terminates, i.e., on
+         * Mixxx shutdown.
+         */
+        QThreadPool::globalInstance()->setMaxThreadCount(4); //Tobias decided to use 4
+        // Let a worker thread do the XML parsing
+        m_future = QtConcurrent::run(this, &ITunesFeature::importLibrary);
+        m_future_watcher.setFuture(m_future);
+        m_title = tr("iTunes (loading)");
+        //calls a slot in the sidebar model such that 'iTunes (isLoading)' is displayed.
+        emit (featureIsLoading(this));
+    }
+    else{
+        emit(showTrackModel(m_pITunesTrackModel));
     }
 
-    emit(showTrackModel(m_pITunesTrackModel));
 }
 
 void ITunesFeature::activateChild(const QModelIndex& index) {
@@ -127,7 +141,7 @@
     if (chosen == &useDefault) {
         SettingsDAO settings(m_database);
         settings.setValue(ITDB_PATH_KEY, QString());
-        activate(true, false); // clears tables before parsing
+        activate(true); // clears tables before parsing
     } else if (chosen == &chooseNew) {
         SettingsDAO settings(m_database);
         QString dbfile = QFileDialog::getOpenFileName(NULL,
@@ -137,7 +151,7 @@
             return;
         }
         settings.setValue(ITDB_PATH_KEY, dbfile);
-        activate(true, false); // clears tables before parsing
+        activate(true); // clears tables before parsing
     }
 }
 
@@ -174,7 +188,15 @@
     qDebug() << "ITunesLibrary=[" << musicFolder << "]";
     return musicFolder;
 }
-bool ITunesFeature::importLibrary(QString file) {
+/*
+ * This method is executed in a separate thread
+ * via QtConcurrent::run
+ */
+TreeItem* ITunesFeature::importLibrary() {
+    //Give thread a low priority
+    QThread* thisThread = QThread::currentThread();
+    thisThread->setPriority(QThread::LowestPriority);
+
     //Delete all table entries of iTunes feature
     m_database.transaction();
     clearTable("itunes_playlist_tracks");
@@ -182,28 +204,27 @@
     clearTable("itunes_playlists");
     m_database.commit();
 
-    qDebug() << "Import iTunes library";
+    qDebug() << "ITunesFeature::importLibrary() ";
+
 
     m_database.transaction();
 
     //Parse iTunes XML file using SAX (for performance)
-    QFile itunes_file(file);
+    QFile itunes_file(m_dbfile);
     if (!itunes_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         qDebug() << "Cannot open iTunes music collection";
         return false;
     }
     QXmlStreamReader xml(&itunes_file);
-
+    TreeItem* playlist_root = NULL;
     while (!xml.atEnd()) {
         xml.readNext();
         if (xml.isStartElement()) {
             if (xml.name() == "key") {
                 if (xml.readElementText() == "Tracks") {
                     parseTracks(xml);
-                    qDebug() << "Finished Parsing TrackList";
-					parsePlaylists(xml);
-                    qDebug() << "Finished Parsing Playlists";
-				}
+                    playlist_root = parsePlaylists(xml);
+                }
             }
         }
     }
@@ -213,15 +234,17 @@
     // Even if an error occured, commit the transaction. The file may have been
     // half-parsed.
     m_database.commit();
-    m_pITunesTrackModel->select();
 
     if (xml.hasError()) {
         // do error handling
         qDebug() << "Cannot process iTunes music collection";
         qDebug() << "XML ERROR: " << xml.errorString();
+        if(playlist_root)
+            delete playlist_root;
+        playlist_root = NULL;
         return false;
     }
-    return true;
+    return playlist_root;
 }
 
 void ITunesFeature::parseTracks(QXmlStreamReader &xml) {
@@ -238,7 +261,7 @@
     bool in_container_dictionary = false;
     bool in_track_dictionary = false;
 
-    qDebug() << "Parse Tracks";
+    qDebug() << "Parse iTunes music collection";
 
     //read all sunsequent <dict> until we reach the closing ENTRY tag
     while (!xml.atEnd()) {
@@ -399,9 +422,9 @@
     }
 }
 
-void ITunesFeature::parsePlaylists(QXmlStreamReader &xml) {
-    qDebug() << "Parse Playlists";
-
+TreeItem* ITunesFeature::parsePlaylists(QXmlStreamReader &xml) {
+    qDebug() << "Parse iTunes playlists";
+    TreeItem* rootItem = new TreeItem();
     QSqlQuery query_insert_to_playlists(m_database);
     query_insert_to_playlists.prepare("INSERT INTO itunes_playlists (id, name) "
                                       "VALUES (:id, :name)");
@@ -414,7 +437,10 @@
         xml.readNext();
         //We process and iterate the <dict> tags holding playlist summary information here
         if (xml.isStartElement() && xml.name() == "dict") {
-            parsePlaylist(xml, query_insert_to_playlists, query_insert_to_playlist_tracks);
+            parsePlaylist(xml,
+                          query_insert_to_playlists,
+                          query_insert_to_playlist_tracks,
+                          rootItem);
             continue;
         }
         if (xml.isEndElement()) {
@@ -422,6 +448,7 @@
                 break;
         }
     }
+    return rootItem;
 }
 
 bool ITunesFeature::readNextStartElement(QXmlStreamReader& xml) {
@@ -436,7 +463,7 @@
 }
 
 void ITunesFeature::parsePlaylist(QXmlStreamReader &xml, QSqlQuery &query_insert_to_playlists,
-                                  QSqlQuery &query_insert_to_playlist_tracks) {
+                                  QSqlQuery &query_insert_to_playlist_tracks, TreeItem* root) {
     //qDebug() << "Parse Playlist";
 
     QString playlistname;
@@ -493,8 +520,8 @@
                         return;
                     }
                     //append the playlist to the child model
-                    TreeItem *item = new TreeItem(playlistname, playlistname, this, m_rootItem);
-                    m_rootItem->appendChild(item);
+                    TreeItem *item = new TreeItem(playlistname, playlistname, this, root);
+                    root->appendChild(item);
 
                 }
                 /*
@@ -539,3 +566,24 @@
     else
         qDebug() << "iTunes table entries of '" << table_name <<"' have been cleared.";
 }
+void ITunesFeature::onTrackCollectionLoaded(){
+    TreeItem* root = m_future.result();
+    if(root){
+        m_childModel.setRootItem(root);
+        m_pITunesTrackModel->select();
+        emit(showTrackModel(m_pITunesTrackModel));
+        qDebug() << "Itunes library loaded: success";
+    }
+    else{
+        QMessageBox::warning(
+            NULL,
+            tr("Error Loading iTunes Library"),
+            tr("There was an error loading your iTunes library. Some of "
+               "your iTunes tracks or playlists may not have loaded."));
+    }
+    //calls a slot in the sidebarmodel such that 'isLoading' is removed from the feature title.
+    m_title = tr("iTunes");
+    emit(featureLoadingFinished(this));
+    activate();
+}
+

=== renamed file 'mixxx/src/library/itunesfeature.h' => 'mixxx/src/library/itunes/itunesfeature.h'
--- mixxx/src/library/itunesfeature.h	2011-02-05 07:35:15 +0000
+++ mixxx/src/library/itunes/itunesfeature.h	2011-02-21 23:55:30 +0000
@@ -1,16 +1,19 @@
-// rhythmboxfeature.h
+// itunesfeaturefeature.h
 // Created 8/23/2009 by RJ Ryan ([e-mail])
 
 #ifndef ITUNESFEATURE_H
-#define ITUNESBOXFEATURE_H
+#define ITUNESFEATURE_H
 
 #include <QStringListModel>
 #include <QtSql>
+#include <QFuture>
+#include <QtConcurrentRun>
+#include <QFutureWatcher>
 
 #include "library/libraryfeature.h"
 #include "library/trackcollection.h"
-#include "treeitemmodel.h"
-#include "treeitem.h"
+#include "library/treeitemmodel.h"
+#include "library/treeitem.h"
 
 //class ITunesPlaylistModel;
 class ITunesTrackModel;
@@ -36,18 +39,20 @@
 
   public slots:
     void activate();
-    void activate(bool forceReload, bool askToLoad = true);
+    void activate(bool forceReload);
     void activateChild(const QModelIndex& index);
     void onRightClick(const QPoint& globalPos);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+    void onTrackCollectionLoaded();
 
   private:
     static QString getiTunesMusicPath();
-    bool importLibrary(QString file);
+    //returns the invisible rootItem for the sidebar model
+    TreeItem* importLibrary();
     void parseTracks(QXmlStreamReader &xml);
     void parseTrack(QXmlStreamReader &xml, QSqlQuery &query);
-    void parsePlaylists(QXmlStreamReader &xml);
-    void parsePlaylist(QXmlStreamReader &xml, QSqlQuery &query1, QSqlQuery &query2);
+    TreeItem* parsePlaylists(QXmlStreamReader &xml);
+    void parsePlaylist(QXmlStreamReader &xml, QSqlQuery &query1, QSqlQuery &query2, TreeItem*);
     void clearTable(QString table_name);
     bool readNextStartElement(QXmlStreamReader& xml);
 
@@ -56,10 +61,14 @@
     TreeItemModel m_childModel;
     QStringList m_playlists;
     TrackCollection* m_pTrackCollection;
-    QSqlDatabase &m_database;
+    //a new DB connection for the worker thread
+    QSqlDatabase m_database;
     bool m_isActivated;
-    //The root of the childmodel
-    TreeItem *m_rootItem;
+    QString m_dbfile;
+
+    QFutureWatcher<TreeItem*> m_future_watcher;
+    QFuture<TreeItem*> m_future;
+    QString m_title;
 
     static const QString ITDB_PATH_KEY;
 };

=== renamed file 'mixxx/src/library/itunesplaylistmodel.cpp' => 'mixxx/src/library/itunes/itunesplaylistmodel.cpp'
--- mixxx/src/library/itunesplaylistmodel.cpp	2010-12-03 19:07:40 +0000
+++ mixxx/src/library/itunes/itunesplaylistmodel.cpp	2011-02-21 23:55:30 +0000
@@ -2,7 +2,7 @@
 #include <QtGui>
 #include <QtSql>
 #include "library/trackcollection.h"
-#include "library/itunesplaylistmodel.h"
+#include "library/itunes/itunesplaylistmodel.h"
 
 #include "mixxxutils.cpp"
 
@@ -15,6 +15,7 @@
           m_database(m_pTrackCollection->getDatabase())
 {
     connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&)));
+    setCaching(false);
 }
 
 ITunesPlaylistModel::~ITunesPlaylistModel() {
@@ -131,7 +132,7 @@
 }
 
 TrackModel::CapabilitiesFlags ITunesPlaylistModel::getCapabilities() const {
-    return NULL;
+    return TRACKMODELCAPS_NONE;
 }
 
 Qt::ItemFlags ITunesPlaylistModel::flags(const QModelIndex &index) const {

=== renamed file 'mixxx/src/library/itunesplaylistmodel.h' => 'mixxx/src/library/itunes/itunesplaylistmodel.h'
--- mixxx/src/library/itunesplaylistmodel.h	2010-11-21 05:05:14 +0000
+++ mixxx/src/library/itunes/itunesplaylistmodel.h	2011-02-21 23:55:30 +0000
@@ -4,7 +4,7 @@
 #include <QtSql>
 #include <QItemDelegate>
 #include <QtCore>
-#include "trackmodel.h"
+#include "library/trackmodel.h"
 #include "library/basesqltablemodel.h"
 #include "library/librarytablemodel.h"
 #include "library/dao/playlistdao.h"

=== renamed file 'mixxx/src/library/itunestrackmodel.cpp' => 'mixxx/src/library/itunes/itunestrackmodel.cpp'
--- mixxx/src/library/itunestrackmodel.cpp	2010-12-03 19:07:40 +0000
+++ mixxx/src/library/itunes/itunestrackmodel.cpp	2011-02-21 23:55:30 +0000
@@ -2,7 +2,7 @@
 #include <QtGui>
 #include <QtSql>
 #include "library/trackcollection.h"
-#include "library/itunestrackmodel.h"
+#include "library/itunes/itunestrackmodel.h"
 
 #include "mixxxutils.cpp"
 
@@ -15,6 +15,7 @@
           m_database(m_pTrackCollection->getDatabase()) {
     connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&)));
     setTable("itunes_library");
+    setCaching(false);
     initHeaderData();
 }
 
@@ -128,7 +129,7 @@
 }
 
 TrackModel::CapabilitiesFlags ITunesTrackModel::getCapabilities() const {
-    return NULL;
+    return TRACKMODELCAPS_NONE;
 }
 
 Qt::ItemFlags ITunesTrackModel::flags(const QModelIndex &index) const {

=== renamed file 'mixxx/src/library/itunestrackmodel.h' => 'mixxx/src/library/itunes/itunestrackmodel.h'
--- mixxx/src/library/itunestrackmodel.h	2010-11-21 05:05:14 +0000
+++ mixxx/src/library/itunes/itunestrackmodel.h	2011-02-21 23:55:30 +0000
@@ -4,7 +4,7 @@
 #include <QtSql>
 #include <QItemDelegate>
 #include <QtCore>
-#include "trackmodel.h"
+#include "library/trackmodel.h"
 #include "library/basesqltablemodel.h"
 #include "library/librarytablemodel.h"
 #include "library/dao/playlistdao.h"

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2011-02-12 19:25:05 +0000
+++ mixxx/src/library/library.cpp	2011-02-21 23:55:30 +0000
@@ -11,14 +11,14 @@
 #include "library/trackmodel.h"
 #include "library/browsefeature.h"
 #include "library/cratefeature.h"
-#include "library/rhythmboxfeature.h"
-#include "library/itunesfeature.h"
+#include "library/rhythmbox/rhythmboxfeature.h"
+#include "library/itunes/itunesfeature.h"
 #include "library/mixxxlibraryfeature.h"
 #include "library/autodjfeature.h"
 #include "library/playlistfeature.h"
 #include "library/preparefeature.h"
 #include "library/promotracksfeature.h"
-#include "library/traktorfeature.h"
+#include "library/traktor/traktorfeature.h"
 
 #include "widget/wtracktableview.h"
 #include "widget/wlibrary.h"
@@ -62,7 +62,7 @@
     //messagebox popup when you select them. (This forces you to reach for your
     //mouse or keyboard if you're using MIDI control and you scroll through them...)
     if (RhythmboxFeature::isSupported())
-        addFeature(new RhythmboxFeature(this));
+        addFeature(new RhythmboxFeature(this, m_pTrackCollection));
     if (ITunesFeature::isSupported())
         addFeature(new ITunesFeature(this, m_pTrackCollection));
     if (TraktorFeature::isSupported())
@@ -116,6 +116,8 @@
 
     // Setup the sources view
     pSidebarWidget->setModel(m_pSidebarModel);
+    connect(m_pSidebarModel, SIGNAL(selectIndex(const QModelIndex&)),
+            pSidebarWidget, SLOT(selectIndex(const QModelIndex&)));
     connect(pSidebarWidget, SIGNAL(pressed(const QModelIndex&)),
             m_pSidebarModel, SLOT(clicked(const QModelIndex&)));
     // Lazy model: Let triange symbol increment the model

=== modified file 'mixxx/src/library/libraryfeature.cpp'
--- mixxx/src/library/libraryfeature.cpp	2009-10-24 09:07:58 +0000
+++ mixxx/src/library/libraryfeature.cpp	2011-02-21 23:55:30 +0000
@@ -8,3 +8,4 @@
 LibraryFeature::LibraryFeature(QObject* parent)
     : QObject(parent) {
 }
+

=== modified file 'mixxx/src/library/libraryfeature.h'
--- mixxx/src/library/libraryfeature.h	2010-12-23 18:55:54 +0000
+++ mixxx/src/library/libraryfeature.h	2011-02-21 23:55:30 +0000
@@ -53,6 +53,10 @@
     void loadTrack(TrackPointer pTrack);
     void loadTrackToPlayer(TrackPointer pTrack, QString group);
     void restoreSearch(const QString&);
+    void featureIsLoading(LibraryFeature*);
+    void featureLoadingFinished(LibraryFeature*s);
+
+
 };
 
 #endif /* LIBRARYFEATURE_H */

=== modified file 'mixxx/src/library/mixxxlibraryfeature.cpp'
--- mixxx/src/library/mixxxlibraryfeature.cpp	2011-01-13 18:40:56 +0000
+++ mixxx/src/library/mixxxlibraryfeature.cpp	2011-02-21 23:55:30 +0000
@@ -7,7 +7,7 @@
 
 #include "library/librarytablemodel.h"
 #include "library/missingtablemodel.h"
-#include "library/proxytrackmodel.h"
+
 #include "library/trackcollection.h"
 #include "treeitem.h"
 

=== modified file 'mixxx/src/library/promotracksfeature.cpp'
--- mixxx/src/library/promotracksfeature.cpp	2010-12-23 18:55:54 +0000
+++ mixxx/src/library/promotracksfeature.cpp	2011-02-21 23:55:30 +0000
@@ -21,7 +21,6 @@
 #include "library/promotracksfeature.h"
 #include "library/bundledsongswebview.h"
 #include "library/featuredartistswebview.h"
-#include "library/proxytrackmodel.h"
 #include "library/trackcollection.h"
 #include "library/dao/cratedao.h"
 #include "trackinfoobject.h"

=== added file 'mixxx/src/library/proxytrackmodel.cpp'
--- mixxx/src/library/proxytrackmodel.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/proxytrackmodel.cpp	2011-02-21 23:55:30 +0000
@@ -0,0 +1,130 @@
+// proxytrackmodel.cpp
+// Created 10/22/2009 by RJ Ryan ([e-mail])
+
+#include <QtCore>
+#include <QVariant>
+
+#include "library/proxytrackmodel.h"
+
+ProxyTrackModel::ProxyTrackModel(QAbstractItemModel* pTrackModel,
+                                 bool bHandleSearches)
+        // ProxyTrackModel proxies settings requests to the composed TrackModel,
+        // don't initialize its TrackModel with valid parameters.
+        : TrackModel(QSqlDatabase(), ""),
+          m_bHandleSearches(bHandleSearches) {
+    m_pTrackModel = dynamic_cast<TrackModel*>(pTrackModel);
+    Q_ASSERT(m_pTrackModel && pTrackModel);
+    setSourceModel(pTrackModel);
+}
+
+ProxyTrackModel::~ProxyTrackModel() {
+}
+
+TrackPointer ProxyTrackModel::getTrack(const QModelIndex& index) const {
+    QModelIndex indexSource = mapToSource(index);
+    return m_pTrackModel->getTrack(indexSource);
+}
+
+QString ProxyTrackModel::getTrackLocation(const QModelIndex& index) const {
+    QModelIndex indexSource = mapToSource(index);
+    return m_pTrackModel->getTrackLocation(indexSource);
+}
+
+void ProxyTrackModel::search(const QString& searchText) {
+    if (m_bHandleSearches) {
+        m_currentSearch = searchText;
+        setFilterFixedString(searchText);
+    } else {
+        m_pTrackModel->search(searchText);
+    }
+}
+
+const QString ProxyTrackModel::currentSearch() {
+    if (m_bHandleSearches) {
+        return m_currentSearch;
+    }
+    return m_pTrackModel->currentSearch();
+}
+
+bool ProxyTrackModel::isColumnInternal(int column) {
+    return m_pTrackModel->isColumnInternal(column);
+}
+
+bool ProxyTrackModel::isColumnHiddenByDefault(int column) {
+    return m_pTrackModel->isColumnHiddenByDefault(column);
+}
+
+
+void ProxyTrackModel::removeTrack(const QModelIndex& index) {
+    QModelIndex indexSource = mapToSource(index);
+    m_pTrackModel->removeTrack(indexSource);
+}
+
+void ProxyTrackModel::removeTracks(const QModelIndexList& indices) {
+    QModelIndexList translatedList;
+    foreach (QModelIndex index, indices) {
+        QModelIndex indexSource = mapToSource(index);
+        translatedList.append(indexSource);
+    }
+    m_pTrackModel->removeTracks(translatedList);
+}
+
+bool ProxyTrackModel::addTrack(const QModelIndex& index, QString location) {
+    QModelIndex indexSource = mapToSource(index);
+    return m_pTrackModel->addTrack(indexSource, location);
+}
+
+void ProxyTrackModel::moveTrack(const QModelIndex& sourceIndex,
+                                const QModelIndex& destIndex) {
+    QModelIndex sourceIndexSource = mapToSource(sourceIndex);
+    QModelIndex destIndexSource = mapToSource(destIndex);
+    m_pTrackModel->moveTrack(sourceIndexSource, destIndexSource);
+}
+
+QItemDelegate* ProxyTrackModel::delegateForColumn(const int i) {
+    return m_pTrackModel->delegateForColumn(i);
+}
+
+TrackModel::CapabilitiesFlags ProxyTrackModel::getCapabilities() const {
+    return m_pTrackModel->getCapabilities();
+}
+
+bool ProxyTrackModel::filterAcceptsRow(int sourceRow,
+                                       const QModelIndex& sourceParent) const {
+
+    if (!m_bHandleSearches)
+        return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
+
+    const QList<int>& filterColumns = m_pTrackModel->searchColumns();
+    QAbstractItemModel* itemModel =
+            dynamic_cast<QAbstractItemModel*>(m_pTrackModel);
+    bool rowMatches = false;
+
+    QRegExp filter = filterRegExp();
+    QListIterator<int> iter(filterColumns);
+
+    while (!rowMatches && iter.hasNext()) {
+        int i = iter.next();
+        QModelIndex index = itemModel->index(sourceRow, i, sourceParent);
+        QVariant data = itemModel->data(index);
+        if (qVariantCanConvert<QString>(data)) {
+            QString strData = qVariantValue<QString>(data);
+            if (strData.contains(filter))
+                rowMatches = true;
+        }
+    }
+
+    return rowMatches;
+}
+
+QString ProxyTrackModel::getModelSetting(QString name) {
+    if (!m_pTrackModel)
+        return QString();
+    return m_pTrackModel->getModelSetting(name);
+}
+
+bool ProxyTrackModel::setModelSetting(QString name, QVariant value) {
+    if (!m_pTrackModel)
+        return false;
+    return m_pTrackModel->setModelSetting(name, value);
+}

=== removed file 'mixxx/src/library/proxytrackmodel.cpp'
--- mixxx/src/library/proxytrackmodel.cpp	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/proxytrackmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-// proxytrackmodel.cpp
-// Created 10/22/2009 by RJ Ryan ([e-mail])
-
-#include <QtCore>
-#include <QVariant>
-
-#include "library/proxytrackmodel.h"
-
-ProxyTrackModel::ProxyTrackModel(QAbstractItemModel* pTrackModel,
-                                 bool bHandleSearches)
-        // ProxyTrackModel proxies settings requests to the composed TrackModel,
-        // don't initialize its TrackModel with valid parameters.
-        : TrackModel(QSqlDatabase(), ""),
-          m_bHandleSearches(bHandleSearches) {
-    m_pTrackModel = dynamic_cast<TrackModel*>(pTrackModel);
-    Q_ASSERT(m_pTrackModel && pTrackModel);
-    setSourceModel(pTrackModel);
-}
-
-ProxyTrackModel::~ProxyTrackModel() {
-}
-
-TrackPointer ProxyTrackModel::getTrack(const QModelIndex& index) const {
-    QModelIndex indexSource = mapToSource(index);
-    return m_pTrackModel->getTrack(indexSource);
-}
-
-QString ProxyTrackModel::getTrackLocation(const QModelIndex& index) const {
-    QModelIndex indexSource = mapToSource(index);
-    return m_pTrackModel->getTrackLocation(indexSource);
-}
-
-void ProxyTrackModel::search(const QString& searchText) {
-    if (m_bHandleSearches) {
-        m_currentSearch = searchText;
-        setFilterFixedString(searchText);
-    } else {
-        m_pTrackModel->search(searchText);
-    }
-}
-
-const QString ProxyTrackModel::currentSearch() {
-    if (m_bHandleSearches) {
-        return m_currentSearch;
-    }
-    return m_pTrackModel->currentSearch();
-}
-
-bool ProxyTrackModel::isColumnInternal(int column) {
-    return m_pTrackModel->isColumnInternal(column);
-}
-
-bool ProxyTrackModel::isColumnHiddenByDefault(int column) {
-    return m_pTrackModel->isColumnHiddenByDefault(column);
-}
-
-
-void ProxyTrackModel::removeTrack(const QModelIndex& index) {
-    QModelIndex indexSource = mapToSource(index);
-    m_pTrackModel->removeTrack(indexSource);
-}
-
-void ProxyTrackModel::removeTracks(const QModelIndexList& indices) {
-    QModelIndexList translatedList;
-    foreach (QModelIndex index, indices) {
-        QModelIndex indexSource = mapToSource(index);
-        translatedList.append(indexSource);
-    }
-    m_pTrackModel->removeTracks(translatedList);
-}
-
-bool ProxyTrackModel::addTrack(const QModelIndex& index, QString location) {
-    QModelIndex indexSource = mapToSource(index);
-    return m_pTrackModel->addTrack(indexSource, location);
-}
-
-void ProxyTrackModel::moveTrack(const QModelIndex& sourceIndex,
-                                const QModelIndex& destIndex) {
-    QModelIndex sourceIndexSource = mapToSource(sourceIndex);
-    QModelIndex destIndexSource = mapToSource(destIndex);
-    m_pTrackModel->moveTrack(sourceIndexSource, destIndexSource);
-}
-
-QItemDelegate* ProxyTrackModel::delegateForColumn(const int i) {
-    return m_pTrackModel->delegateForColumn(i);
-}
-
-TrackModel::CapabilitiesFlags ProxyTrackModel::getCapabilities() const {
-    return m_pTrackModel->getCapabilities();
-}
-
-bool ProxyTrackModel::filterAcceptsRow(int sourceRow,
-                                       const QModelIndex& sourceParent) const {
-
-    if (!m_bHandleSearches)
-        return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
-
-    const QList<int>& filterColumns = m_pTrackModel->searchColumns();
-    QAbstractItemModel* itemModel =
-            dynamic_cast<QAbstractItemModel*>(m_pTrackModel);
-    bool rowMatches = false;
-
-    QRegExp filter = filterRegExp();
-    QListIterator<int> iter(filterColumns);
-
-    while (!rowMatches && iter.hasNext()) {
-        int i = iter.next();
-        QModelIndex index = itemModel->index(sourceRow, i, sourceParent);
-        QVariant data = itemModel->data(index);
-        if (qVariantCanConvert<QString>(data)) {
-            QString strData = qVariantValue<QString>(data);
-            if (strData.contains(filter))
-                rowMatches = true;
-        }
-    }
-
-    return rowMatches;
-}
-
-QString ProxyTrackModel::getModelSetting(QString name) {
-    if (!m_pTrackModel)
-        return QString();
-    return m_pTrackModel->getModelSetting(name);
-}
-
-bool ProxyTrackModel::setModelSetting(QString name, QVariant value) {
-    if (!m_pTrackModel)
-        return false;
-    return m_pTrackModel->setModelSetting(name, value);
-}

=== added file 'mixxx/src/library/proxytrackmodel.h'
--- mixxx/src/library/proxytrackmodel.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/proxytrackmodel.h	2011-02-21 23:55:30 +0000
@@ -0,0 +1,53 @@
+// proxytrackmodel.h
+// Created 10/22/2009 by RJ Ryan ([e-mail])
+
+#ifndef PROXYTRACKMODEL_H
+#define PROXYTRACKMODEL_H
+
+#include <QSortFilterProxyModel>
+#include <QAbstractItemModel>
+
+#include "library/trackmodel.h"
+
+// ProxyTrackModel composes a TrackModel inside of a QSortFilterProxyModel so
+// that the sorting and filtering of the QSortFilterProxyModel can be completely
+// transparent to the user of the TrackModel. The ProxyTrackModel will
+// automatically translate any QModelIndex's to their source index before
+// calling the composed TrackModel. If the bHandleSearches flag is set, the
+// TrackModel search calls will not be delivered to the composed TrackModel
+// because filtering is handled by the QSortFilterProxyModel.
+class ProxyTrackModel : public QSortFilterProxyModel, public virtual TrackModel {
+  public:
+    // Construct a new ProxyTrackModel with pTrackModel as the TrackModel it
+    // composes. If bHandleSearches is true, then search signals will not be
+    // delivered to pTrackModel -- instead the ProxyTrackModel will do its own
+    // filtering.
+    ProxyTrackModel(QAbstractItemModel* pTrackModel, bool bHandleSearches=true);
+    virtual ~ProxyTrackModel();
+
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
+    virtual QString getTrackLocation(const QModelIndex& index) const;
+    virtual void search(const QString& searchText);
+    virtual const QString currentSearch();
+    virtual bool isColumnInternal(int column);
+    virtual bool isColumnHiddenByDefault(int column);
+    virtual void removeTrack(const QModelIndex& index);
+    virtual void removeTracks(const QModelIndexList& indices);
+    virtual bool addTrack(const QModelIndex& index, QString location);
+    virtual void moveTrack(const QModelIndex& sourceIndex,
+                           const QModelIndex& destIndex);
+    virtual QItemDelegate* delegateForColumn(const int i);
+    virtual TrackModel::CapabilitiesFlags getCapabilities() const;
+
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const;
+
+    virtual QString getModelSetting(QString name);
+    virtual bool setModelSetting(QString name, QVariant value);
+
+  private:
+    TrackModel* m_pTrackModel;
+    QString m_currentSearch;
+    bool m_bHandleSearches;
+};
+
+#endif /* PROXYTRACKMODEL_H */

=== removed file 'mixxx/src/library/proxytrackmodel.h'
--- mixxx/src/library/proxytrackmodel.h	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/proxytrackmodel.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-// proxytrackmodel.h
-// Created 10/22/2009 by RJ Ryan ([e-mail])
-
-#ifndef PROXYTRACKMODEL_H
-#define PROXYTRACKMODEL_H
-
-#include <QSortFilterProxyModel>
-#include <QAbstractItemModel>
-
-#include "library/trackmodel.h"
-
-// ProxyTrackModel composes a TrackModel inside of a QSortFilterProxyModel so
-// that the sorting and filtering of the QSortFilterProxyModel can be completely
-// transparent to the user of the TrackModel. The ProxyTrackModel will
-// automatically translate any QModelIndex's to their source index before
-// calling the composed TrackModel. If the bHandleSearches flag is set, the
-// TrackModel search calls will not be delivered to the composed TrackModel
-// because filtering is handled by the QSortFilterProxyModel.
-class ProxyTrackModel : public QSortFilterProxyModel, public virtual TrackModel {
-  public:
-    // Construct a new ProxyTrackModel with pTrackModel as the TrackModel it
-    // composes. If bHandleSearches is true, then search signals will not be
-    // delivered to pTrackModel -- instead the ProxyTrackModel will do its own
-    // filtering.
-    ProxyTrackModel(QAbstractItemModel* pTrackModel, bool bHandleSearches=true);
-    virtual ~ProxyTrackModel();
-
-    virtual TrackPointer getTrack(const QModelIndex& index) const;
-    virtual QString getTrackLocation(const QModelIndex& index) const;
-    virtual void search(const QString& searchText);
-    virtual const QString currentSearch();
-    virtual bool isColumnInternal(int column);
-    virtual bool isColumnHiddenByDefault(int column);
-    virtual void removeTrack(const QModelIndex& index);
-    virtual void removeTracks(const QModelIndexList& indices);
-    virtual bool addTrack(const QModelIndex& index, QString location);
-    virtual void moveTrack(const QModelIndex& sourceIndex,
-                           const QModelIndex& destIndex);
-    virtual QItemDelegate* delegateForColumn(const int i);
-    virtual TrackModel::CapabilitiesFlags getCapabilities() const;
-
-    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const;
-
-    virtual QString getModelSetting(QString name);
-    virtual bool setModelSetting(QString name, QVariant value);
-
-  private:
-    TrackModel* m_pTrackModel;
-    QString m_currentSearch;
-    bool m_bHandleSearches;
-};
-
-#endif /* PROXYTRACKMODEL_H */

=== added directory 'mixxx/src/library/rhythmbox'
=== renamed file 'mixxx/src/library/rhythmboxfeature.cpp' => 'mixxx/src/library/rhythmbox/rhythmboxfeature.cpp'
--- mixxx/src/library/rhythmboxfeature.cpp	2011-01-13 18:40:56 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxfeature.cpp	2011-02-21 23:55:30 +0000
@@ -2,33 +2,48 @@
 #include <QtDebug>
 #include <QStringList>
 
-#include "library/proxytrackmodel.h"
-#include "library/rhythmboxtrackmodel.h"
-#include "library/rhythmboxplaylistmodel.h"
-#include "library/rhythmboxfeature.h"
-#include "treeitem.h"
-
-RhythmboxFeature::RhythmboxFeature(QObject* parent)
-    : LibraryFeature(parent) {
-
-    m_pRhythmboxTrackModel = NULL;
-    m_pTrackModelProxy = NULL;
-    m_pRhythmboxPlaylistModel = NULL;
-    m_pPlaylistModelProxy = NULL;
+#include "library/rhythmbox/rhythmboxtrackmodel.h"
+#include "library/rhythmbox/rhythmboxplaylistmodel.h"
+#include "library/rhythmbox/rhythmboxfeature.h"
+#include "library/treeitem.h"
+
+RhythmboxFeature::RhythmboxFeature(QObject* parent, TrackCollection* pTrackCollection)
+    : LibraryFeature(parent),
+      m_pTrackCollection(pTrackCollection) {
+
+    m_pRhythmboxTrackModel = new RhythmboxTrackModel(this, m_pTrackCollection);
+    m_pRhythmboxPlaylistModel = new RhythmboxPlaylistModel(this, m_pTrackCollection);
+    m_isActivated =  false;
+    m_title = tr("Rhythmbox");
+
+    if (!m_database.isOpen()) {
+        m_database = QSqlDatabase::addDatabase("QSQLITE", "RHYTHMBOX_SCANNER");
+        m_database.setHostName("localhost");
+        m_database.setDatabaseName(MIXXX_DB_PATH);
+        m_database.setUserName("mixxx");
+        m_database.setPassword("mixxx");
+
+        //Open the database connection in this thread.
+        if (!m_database.open()) {
+            qDebug() << "Failed to open database for Rhythmbox scanner." << m_database.lastError();
+        }
+    }
+    connect(&m_track_watcher, SIGNAL(finished()), this, SLOT(onTrackCollectionLoaded()), Qt::QueuedConnection);
 
 }
 
 RhythmboxFeature::~RhythmboxFeature() {
-
+    delete m_pRhythmboxTrackModel;
+    delete m_pRhythmboxPlaylistModel;
 }
 
 bool RhythmboxFeature::isSupported() {
-    return (QFile::exists(MIXXX_RHYTHMBOX_DB_LOCATION) ||
-            QFile::exists(MIXXX_RHYTHMBOX_DB_LOCATION_ALT));
+    return (QFile::exists(QDir::homePath() + "/.gnome2/rhythmbox/rhythmdb.xml") ||
+            QFile::exists(QDir::homePath() + "/.local/share/rhythmbox/rhythmdb.xml"));
 }
 
 QVariant RhythmboxFeature::title() {
-    return tr("Rhythmbox");
+    return m_title;
 }
 
 QIcon RhythmboxFeature::getIcon() {
@@ -40,39 +55,29 @@
 }
 
 void RhythmboxFeature::activate() {
-    //qDebug("RhythmboxFeature::activate()");
-
-    if (!m_pRhythmboxTrackModel) {
-        if (QMessageBox::question(
-            NULL,
-            tr("Load Rhythmbox Library?"),
-            tr("Would you like to load your Rhythmbox library?"),
-            QMessageBox::Ok,
-            QMessageBox::Cancel)
-            == QMessageBox::Cancel) {
-            return;
-        }
-
-        m_pRhythmboxTrackModel = new RhythmboxTrackModel();
-        m_pTrackModelProxy = new ProxyTrackModel(m_pRhythmboxTrackModel);
-        m_pTrackModelProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
-        m_pTrackModelProxy->setSortCaseSensitivity(Qt::CaseInsensitive);
-
-        m_pRhythmboxPlaylistModel = new RhythmboxPlaylistModel(m_pRhythmboxTrackModel);
-        m_pPlaylistModelProxy = new ProxyTrackModel(m_pRhythmboxPlaylistModel);
-        m_pPlaylistModelProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
-        m_pPlaylistModelProxy->setSortCaseSensitivity(Qt::CaseInsensitive);
-
-        TreeItem *rootItem = new TreeItem();
-        for (int i = 0; i < m_pRhythmboxPlaylistModel->numPlaylists(); ++i) {
-            QString playlist_name = m_pRhythmboxPlaylistModel->playlistTitle(i);
-            TreeItem *item = new TreeItem(playlist_name, playlist_name, this,rootItem);
-            
-            rootItem->appendChild(item);
-        }
-        m_childModel.setRootItem(rootItem);
+     qDebug() << "RhythmboxFeature::activate()";
+
+    if(!m_isActivated){
+        m_isActivated =  true;
+        /* Ususally the maximum number of threads
+         * is > 2 depending on the CPU cores
+         * Unfortunately, within VirtualBox
+         * the maximum number of allowed threads
+         * is 1 at all times We'll need to increase
+         * the number to > 1, otherwise importing the music collection
+         * takes place when the GUI threads terminates, i.e., on
+         * Mixxx shutdown.
+         */
+        QThreadPool::globalInstance()->setMaxThreadCount(4); //Tobias decided to use 4
+        m_track_future = QtConcurrent::run(this, &RhythmboxFeature::importMusicCollection);
+        m_track_watcher.setFuture(m_track_future);
+        m_title = "Rhythmbox (loading)";
+        //calls a slot in the sidebar model such that 'Rhythmbox (isLoading)' is displayed.
+        emit (featureIsLoading(this));
     }
-    emit(showTrackModel(m_pTrackModelProxy));
+    else
+        emit(showTrackModel(m_pRhythmboxTrackModel));
+
 }
 
 void RhythmboxFeature::activateChild(const QModelIndex& index) {
@@ -80,7 +85,7 @@
     QString playlist = index.data().toString();
     qDebug() << "Activating " << playlist;
     m_pRhythmboxPlaylistModel->setPlaylist(playlist);
-    emit(showTrackModel(m_pPlaylistModelProxy));
+    emit(showTrackModel(m_pRhythmboxPlaylistModel));
 }
 
 void RhythmboxFeature::onRightClick(const QPoint& globalPos) {
@@ -105,4 +110,314 @@
     return false;
 }
 
+TreeItem* RhythmboxFeature::importMusicCollection()
+{
+    qDebug() << "importMusicCollection Thread Id: " << QThread::currentThread();
+    /*
+     * Try and open the Rhythmbox DB. An API call which tells us where
+     * the file is would be nice.
+     */
+    QFile db(QDir::homePath() + "/.gnome2/rhythmbox/rhythmdb.xml");
+    if ( ! db.exists()) {
+        db.setFileName(QDir::homePath() + "/.local/share/rhythmbox/rhythmdb.xml");
+        if ( ! db.exists())
+            return false;
+    }
+
+    if (!db.open(QIODevice::ReadOnly | QIODevice::Text))
+        return false;
+
+    //Delete all table entries of Traktor feature
+    m_database.transaction();
+    clearTable("rhythmbox_playlist_tracks");
+    clearTable("rhythmbox_library");
+    clearTable("rhythmbox_playlists");
+    m_database.commit();
+
+    m_database.transaction();
+    QSqlQuery query(m_database);
+    query.prepare("INSERT INTO rhythmbox_library (artist, title, album, year, genre, comment, tracknumber,"
+                  "bpm, bitrate,"
+                  "duration, location,"
+                  "rating ) "
+                  "VALUES (:artist, :title, :album, :year, :genre, :comment, :tracknumber,"
+                  ":bpm, :bitrate,"
+                  ":duration, :location, :rating )");
+
+
+    QXmlStreamReader xml(&db);
+    while (!xml.atEnd()) {
+        xml.readNext();
+        if (xml.isStartElement() && xml.name() == "entry") {
+            QXmlStreamAttributes attr = xml.attributes();
+            //Check if we really parse a track and not album art information
+            if(attr.value("type").toString() == "song"){
+                importTrack(xml, query);
+
+            }
+        }
+    }
+    m_database.commit();
+
+
+    if (xml.hasError()) {
+        // do error handling
+        qDebug() << "Cannot process Rhythmbox music collection";
+        qDebug() << "XML ERROR: " << xml.errorString();
+        return false;
+    }
+
+
+    db.close();
+    return importPlaylists();
+
+
+}
+
+TreeItem* RhythmboxFeature::importPlaylists()
+{
+    QFile db(QDir::homePath() + "/.gnome2/rhythmbox/playlists.xml");
+    if ( ! db.exists()) {
+        db.setFileName(QDir::homePath() + "/.local/share/rhythmbox/playlists.xml");
+        if (!db.exists())
+            return NULL;
+    }
+    //Open file
+     if (!db.open(QIODevice::ReadOnly | QIODevice::Text))
+        return NULL;
+
+    QSqlQuery query_insert_to_playlists(m_database);
+    query_insert_to_playlists.prepare("INSERT INTO rhythmbox_playlists (id, name) "
+                                      "VALUES (:id, :name)");
+
+    QSqlQuery query_insert_to_playlist_tracks(m_database);
+    query_insert_to_playlist_tracks.prepare("INSERT INTO rhythmbox_playlist_tracks (playlist_id, track_id) "
+                                            "VALUES (:playlist_id, :track_id)");
+    //The tree structure holding the playlists
+    TreeItem* rootItem = new TreeItem();
+
+    QXmlStreamReader xml(&db);
+    while (!xml.atEnd()) {
+        xml.readNext();
+        if (xml.isStartElement() && xml.name() == "playlist") {
+            QXmlStreamAttributes attr = xml.attributes();
+
+            //Only parse non build-in playlists
+            if(attr.value("type").toString() == "static"){
+                QString playlist_name = attr.value("name").toString();
+
+                //Construct the childmodel
+                TreeItem * item = new TreeItem(playlist_name,playlist_name, this, rootItem);
+                rootItem->appendChild(item);
+
+                //Execute SQL statement
+                query_insert_to_playlists.bindValue(":name", playlist_name);
+
+                bool success = query_insert_to_playlists.exec();
+                if(!success){
+                    qDebug() << "SQL Error in RhythmboxFeature.cpp: line" << __LINE__ << " "
+                                    << query_insert_to_playlists.lastError();
+                    return NULL;
+                }
+                //get playlist_id
+                int playlist_id = query_insert_to_playlists.lastInsertId().toInt();
+
+                //Process playlist entries
+                importPlaylist(xml, query_insert_to_playlist_tracks, playlist_id);
+
+            }
+        }
+    }
+
+    m_database.commit();
+
+
+    if (xml.hasError()) {
+        // do error handling
+        qDebug() << "Cannot process Rhythmbox music collection";
+        qDebug() << "XML ERROR: " << xml.errorString();
+        return NULL;
+    }
+    db.close();
+
+    return rootItem;
+
+}
+
+void RhythmboxFeature::importTrack(QXmlStreamReader &xml, QSqlQuery &query)
+{
+    QString title;
+    QString artist;
+    QString album;
+    QString year;
+    QString genre;
+    QString location;
+
+    int bpm = 0;
+    int bitrate = 0;
+
+    //duration of a track
+    int playtime = 0;
+    int rating = 0;
+    QString comment;
+    QString tracknumber;
+
+    while (!xml.atEnd()) {
+        xml.readNext();
+        if (xml.isStartElement()) {
+            if(xml.name() == "title"){
+                title = xml.readElementText();
+                continue;
+            }
+            if(xml.name() == "artist"){
+                artist = xml.readElementText();
+                continue;
+            }
+            if(xml.name() == "genre"){
+                genre = xml.readElementText();
+                continue;
+            }
+            if(xml.name() == "album"){
+                album = xml.readElementText();
+                continue;
+            }
+            if(xml.name() == "track-number"){
+                tracknumber = xml.readElementText();
+                continue;
+            }
+            if(xml.name() == "duration"){
+                playtime = xml.readElementText().toInt();;
+                continue;
+            }
+            if(xml.name() == "bitrate"){
+                bitrate = xml.readElementText().toInt();
+                continue;
+            }
+            if(xml.name() == "beats-per-minute"){
+                bpm = xml.readElementText().toInt();
+                continue;
+            }
+            if(xml.name() == "comment"){
+                comment = xml.readElementText();
+                continue;
+            }
+            if(xml.name() == "location"){
+                location = xml.readElementText();
+                location.remove("file://");
+                QByteArray strlocbytes = location.toUtf8();
+                QUrl locationUrl = QUrl::fromEncoded(strlocbytes);
+                location = locationUrl.toLocalFile();
+                continue;
+            }
+        }
+        //exit the loop if we reach the closing <entry> tag
+        if (xml.isEndElement() && xml.name() == "entry") {
+            break;
+        }
+
+    }
+    query.bindValue(":artist", artist);
+    query.bindValue(":title", title);
+    query.bindValue(":album", album);
+    query.bindValue(":genre", genre);
+    query.bindValue(":year", year);
+    query.bindValue(":duration", playtime);
+    query.bindValue(":location", location);
+    query.bindValue(":rating", rating);
+    query.bindValue(":comment", comment);
+    query.bindValue(":tracknumber", tracknumber);
+    query.bindValue(":bpm", bpm);
+    query.bindValue(":bitrate", bitrate);
+
+    bool success = query.exec();
+
+    if (!success) {
+        qDebug() << "SQL Error in rhythmboxfeature.cpp: line" << __LINE__ << " " << query.lastError();
+        return;
+    }
+
+}
+
+/** reads all playlist entries and executes a SQL statement **/
+void RhythmboxFeature::importPlaylist(QXmlStreamReader &xml, QSqlQuery &query_insert_to_playlist_tracks, int playlist_id)
+{
+    while(!xml.atEnd())
+    {
+        //read next XML element
+        xml.readNext();
+        if(xml.isStartElement() && xml.name() == "location")
+        {
+            QString location = xml.readElementText();
+            location.remove("file://");
+            QByteArray strlocbytes = location.toUtf8();
+            QUrl locationUrl = QUrl::fromEncoded(strlocbytes);
+            location = locationUrl.toLocalFile();
+
+            //get the ID of the file in the rhythmbox_library table
+            int track_id = -1;
+            QSqlQuery finder_query(m_database);
+            finder_query.prepare("select id from rhythmbox_library where location=:path");
+            finder_query.bindValue(":path", location);
+            bool success = finder_query.exec();
+
+
+            if(success){
+                while (finder_query.next()) {
+                    track_id = finder_query.value(finder_query.record().indexOf("id")).toInt();
+                }
+             }
+             else
+                qDebug() << "SQL Error in RhythmboxFeature.cpp: line" << __LINE__ << " " << finder_query.lastError();
+
+            query_insert_to_playlist_tracks.bindValue(":playlist_id", playlist_id);
+            query_insert_to_playlist_tracks.bindValue(":track_id", track_id);
+
+            success = query_insert_to_playlist_tracks.exec();
+
+            if(!success){
+                qDebug() << "SQL Error in RhythmboxFeature.cpp: line" << __LINE__ << " "
+                             << query_insert_to_playlist_tracks.lastError();
+                qDebug() << "trackid" << track_id;
+                qDebug() << "playlis ID " << playlist_id;
+                qDebug() << "-----------------";
+
+            }
+        }
+        //Exit the the loop if we reach the closing <playlist> tag
+        if(xml.isEndElement() && xml.name() == "playlist")
+        {
+            break;
+        }
+    }
+
+}
+
+void RhythmboxFeature::clearTable(QString table_name)
+{
+    qDebug() << "clearTable Thread Id: " << QThread::currentThread();
+    QSqlQuery query(m_database);
+    query.prepare("delete from "+table_name);
+    bool success = query.exec();
+
+    if(!success)
+        qDebug() << "Could not delete remove old entries from table " << table_name << " : " << query.lastError();
+    else
+        qDebug() << "Rhythmbox table entries of '" << table_name <<"' have been cleared.";
+}
+
+void RhythmboxFeature::onTrackCollectionLoaded() {
+    TreeItem* root = m_track_future.result();
+    if (root) {
+        m_childModel.setRootItem(root);
+        m_pRhythmboxTrackModel->select();
+    }
+    else {
+         qDebug() << "Rhythmbox Playlists loaded: false";
+    }
+    //calls a slot in the sidebarmodel such that 'isLoading' is removed from the feature title.
+    m_title = tr("Rhythmbox");
+    emit(featureLoadingFinished(this));
+    activate();
+}
+
 

=== renamed file 'mixxx/src/library/rhythmboxfeature.h' => 'mixxx/src/library/rhythmbox/rhythmboxfeature.h'
--- mixxx/src/library/rhythmboxfeature.h	2010-12-23 18:55:54 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxfeature.h	2011-02-21 23:55:30 +0000
@@ -5,18 +5,24 @@
 #define RHYTHMBOXFEATURE_H
 
 #include <QStringListModel>
+#include <QtSql>
+#include <QXmlStreamReader>
+#include <QFuture>
+#include <QtConcurrentRun>
+#include <QFutureWatcher>
 
 #include "library/libraryfeature.h"
-#include "treeitemmodel.h"
-
-class RhythmboxPlaylistModel;
-class RhythmboxTrackModel;
-class ProxyTrackModel;
+#include "library/treeitemmodel.h"
+#include "library/rhythmbox/rhythmboxtrackmodel.h"
+#include "library/rhythmbox/rhythmboxplaylistmodel.h"
+#include "library/trackcollection.h"
+
+
 
 class RhythmboxFeature : public LibraryFeature {
  Q_OBJECT
  public:
-    RhythmboxFeature(QObject* parent = NULL);
+    RhythmboxFeature(QObject* parent, TrackCollection*);
     virtual ~RhythmboxFeature();
     static bool isSupported();
 
@@ -29,19 +35,39 @@
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
 
     TreeItemModel* getChildModel();
+    /** processes the music collection **/
+    TreeItem* importMusicCollection();
+    /** processes the playlist entries **/
+    TreeItem* importPlaylists();
+private:
+    RhythmboxTrackModel* m_pRhythmboxTrackModel;
+    RhythmboxPlaylistModel* m_pRhythmboxPlaylistModel;
+    TrackCollection* m_pTrackCollection;
+    //new DB object because of threads
+    QSqlDatabase m_database;
+    bool m_isActivated;
+    QString m_title;
+
+    QFutureWatcher<TreeItem*> m_track_watcher;
+    QFuture<TreeItem*> m_track_future;
+
+
+    TreeItemModel m_childModel;
+
+    /**Removes all rows from a given table **/
+    void clearTable(QString table_name);
+    /** reads the properties of a track and executes a SQL statement **/
+    void importTrack(QXmlStreamReader &xml, QSqlQuery &query);
+    /** reads all playlist entries and executes a SQL statement **/
+    void importPlaylist(QXmlStreamReader &xml, QSqlQuery &query, int playlist_id);
 
 public slots:
     void activate();
     void activateChild(const QModelIndex& index);
     void onRightClick(const QPoint& globalPos);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+    void onTrackCollectionLoaded();
 
-private:
-    RhythmboxTrackModel* m_pRhythmboxTrackModel;
-    RhythmboxPlaylistModel* m_pRhythmboxPlaylistModel;
-    ProxyTrackModel* m_pTrackModelProxy;
-    ProxyTrackModel* m_pPlaylistModelProxy;
-    TreeItemModel m_childModel;
 };
 
 #endif /* RHYTHMBOXFEATURE_H */

=== renamed file 'mixxx/src/library/rhythmboxplaylistmodel.cpp' => 'mixxx/src/library/rhythmbox/rhythmboxplaylistmodel.cpp'
--- mixxx/src/library/rhythmboxplaylistmodel.cpp	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxplaylistmodel.cpp	2011-02-21 23:55:30 +0000
@@ -1,99 +1,104 @@
-/***************************************************************************
-                           rhythmboxPlaylistsource.cpp
-                              -------------------
-     begin                : 8/17/2009
-     copyright            : (C) 2009 Phillip Whelan
-     email                : [e-mail]
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #include <QtCore>
 #include <QtGui>
 #include <QtSql>
-#include <QtDebug>
-#include <QtXmlPatterns/QXmlQuery>
-
-#include "library/rhythmboxtrackmodel.h"
-#include "library/rhythmboxplaylistmodel.h"
-#include "xmlparse.h"
-#include "trackinfoobject.h"
-#include "defs.h"
+#include "library/trackcollection.h"
+#include "library/rhythmbox/rhythmboxplaylistmodel.h"
 
 #include "mixxxutils.cpp"
 
-RhythmboxPlaylistModel::RhythmboxPlaylistModel(RhythmboxTrackModel *Rhythhmbox) :
-        TrackModel(QSqlDatabase::database("QSQLITE"),
-                   "mixxx.db.model.rhythmbox_playlist"),
-        m_pRhythmbox(Rhythhmbox),
-        m_sCurrentPlaylist("") {
-    int idx = 0;
-    QDomDocument rhythmplaylistdb;
-    QXmlQuery query;
-    QString res;
-
-    QFile db(MIXXX_RHYTHMBOX_DB_LOCATION);
-    if ( ! db.exists()) {
-        db.setFileName(MIXXX_RHYTHMBOX_DB_LOCATION_ALT);
-        if ( ! db.exists())
-            return;
-    }
-
-    if (!db.open(QIODevice::ReadOnly | QIODevice::Text))
-        return;
-
-    /*
-     * Use QXmlQuery to execute an XPath query. We add the version to
-     * the XPath query to make sure it is the schema we expect.
-     */
-    query.setFocus(&db);
-    query.setQuery("rhythmdb-playlists/playlist[@type='static']");
-    if ( ! query.isValid())
-        return;
-
-    query.evaluateTo(&res);
-    db.close();
-
-    rhythmplaylistdb.setContent("<rhythmdb-playlists>" + res + "</rhythmdb-playlists>");
-    m_playlistNodes = rhythmplaylistdb.elementsByTagName("playlist");
-
-
-    /* Add Playlists to the internal playlist map */
-    while (( idx < m_playlistNodes.count())) {
-        QDomNode n = m_playlistNodes.item(idx);
-        QDomElement e = n.toElement();
-
-        qDebug() << "Adding Rhythmbox Playlist" << e.attribute("name");
-        QString playlist = e.attribute("name");
-
-        m_mPlaylists[playlist] = n.childNodes();
-        m_sCurrentPlaylist = playlist;
-
-        idx++;
-    }
-}
-
-RhythmboxPlaylistModel::~RhythmboxPlaylistModel()
-{
-}
-
-Qt::ItemFlags RhythmboxPlaylistModel::flags ( const QModelIndex & index ) const
-{
-    Qt::ItemFlags defaultFlags = QAbstractTableModel::flags(index);
-
-    if (!index.isValid())
-        return Qt::ItemIsEnabled;
-
-    defaultFlags |= Qt::ItemIsDragEnabled;
-
-    return defaultFlags;
+RhythmboxPlaylistModel::RhythmboxPlaylistModel(QObject* parent,
+                                         TrackCollection* pTrackCollection)
+        : TrackModel(pTrackCollection->getDatabase(),
+                     "mixxx.db.model.rhythmbox_playlist"),
+          BaseSqlTableModel(parent, pTrackCollection, pTrackCollection->getDatabase()),
+          m_pTrackCollection(pTrackCollection),
+          m_database(m_pTrackCollection->getDatabase())
+{
+    connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&)));
+    setCaching(false);
+}
+
+RhythmboxPlaylistModel::~RhythmboxPlaylistModel() {
+}
+
+bool RhythmboxPlaylistModel::addTrack(const QModelIndex& index, QString location)
+{
+
+    return false;
+}
+
+TrackPointer RhythmboxPlaylistModel::getTrack(const QModelIndex& index) const
+{
+    QString artist = index.sibling(index.row(), fieldIndex("artist")).data().toString();
+    QString title = index.sibling(index.row(), fieldIndex("title")).data().toString();
+    QString album = index.sibling(index.row(), fieldIndex("album")).data().toString();
+    QString year = index.sibling(index.row(), fieldIndex("year")).data().toString();
+    QString genre = index.sibling(index.row(), fieldIndex("genre")).data().toString();
+    float bpm = index.sibling(index.row(), fieldIndex("bpm")).data().toString().toFloat();
+
+    QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
+
+    TrackInfoObject* pTrack = new TrackInfoObject(location);
+    pTrack->setArtist(artist);
+    pTrack->setTitle(title);
+    pTrack->setAlbum(album);
+    pTrack->setYear(year);
+    pTrack->setGenre(genre);
+    pTrack->setBpm(bpm);
+
+    return TrackPointer(pTrack, &QObject::deleteLater);
+}
+
+QString RhythmboxPlaylistModel::getTrackLocation(const QModelIndex& index) const {
+    QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
+    return location;
+}
+
+void RhythmboxPlaylistModel::removeTrack(const QModelIndex& index) {
+
+}
+
+void RhythmboxPlaylistModel::removeTracks(const QModelIndexList& indices) {
+
+}
+
+void RhythmboxPlaylistModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex) {
+
+}
+
+void RhythmboxPlaylistModel::search(const QString& searchText) {
+    // qDebug() << "RhythmboxPlaylistModel::search()" << searchText
+    //          << QThread::currentThread();
+    emit(doSearch(searchText));
+}
+
+void RhythmboxPlaylistModel::slotSearch(const QString& searchText) {
+    if (!m_currentSearch.isNull() && m_currentSearch == searchText)
+        return;
+    m_currentSearch = searchText;
+
+    QString filter;
+    QSqlField search("search", QVariant::String);
+    search.setValue("%" + searchText + "%");
+    QString escapedText = database().driver()->formatValue(search);
+    filter = "(artist LIKE " + escapedText + " OR " +
+            "album LIKE " + escapedText + " OR " +
+            "title  LIKE " + escapedText + ")";
+    setFilter(filter);
+}
+
+const QString RhythmboxPlaylistModel::currentSearch() {
+    return m_currentSearch;
+}
+
+bool RhythmboxPlaylistModel::isColumnInternal(int column) {
+    if (column == fieldIndex(LIBRARYTABLE_ID) ||
+        column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
+        column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED) ||
+        column == fieldIndex("name") ||
+        column == fieldIndex("track_id"))
+        return true;
+    return false;
 }
 
 QMimeData* RhythmboxPlaylistModel::mimeData(const QModelIndexList &indexes) const {
@@ -122,173 +127,83 @@
 }
 
 
-QVariant RhythmboxPlaylistModel::data ( const QModelIndex & index, int role ) const
-{
-    if ( m_sCurrentPlaylist == "" )
-        return QVariant();
-
-    if (!index.isValid())
-        return QVariant();
-
-    // OwenB - attempting to make this more efficient, don't create a new
-    // TIO for every row
-	  if (role == Qt::DisplayRole || role == Qt::ToolTipRole) {
-		  // get location string from playlist
-        QString location = getTrackLocation(index);
-
-          // use this to get DOM node from RhythmboxTrackModel
-       QDomNode songNode = m_pRhythmbox->getTrackNodeByLocation(location);
-
-          // return the node's data item that was asked for.
-        return m_pRhythmbox->getTrackColumnData(songNode, index);
-    }
-
-    return QVariant();
-}
-
-bool RhythmboxPlaylistModel::isColumnInternal(int column) {
-    return false;
-}
-bool RhythmboxPlaylistModel::isColumnHiddenByDefault(int column) {
-    return false;
-}
-
-
-QVariant RhythmboxPlaylistModel::headerData ( int section, Qt::Orientation orientation, int role ) const
-{
-    /* Only respond to requests for column header display names */
-    if ( role != Qt::DisplayRole )
-        return QVariant();
-
-    if (orientation == Qt::Horizontal)
-    {
-        switch (section)
-        {
-            case RhythmboxPlaylistModel::COLUMN_ARTIST:
-                return QString(tr("Artist"));
-
-            case RhythmboxPlaylistModel::COLUMN_TITLE:
-                return QString(tr("Title"));
-
-            case RhythmboxPlaylistModel::COLUMN_ALBUM:
-                return QString(tr("Album"));
-
-            case RhythmboxPlaylistModel::COLUMN_DATE:
-                return QString(tr("Year"));
-
-            case RhythmboxPlaylistModel::COLUMN_GENRE:
-                return QString(tr("Genre"));
-
-            case RhythmboxPlaylistModel::COLUMN_LOCATION:
-                return QString(tr("Location"));
-
-            case RhythmboxPlaylistModel::COLUMN_DURATION:
-                return QString(tr("Duration"));
-
-            default:
-                return QString(tr("Unknown"));
-        }
-    }
-
-    return QVariant();
-}
-
-int RhythmboxPlaylistModel::rowCount ( const QModelIndex & parent ) const
-{
-    // FIXME
-    //if ( !m_mPlaylists.containts(m_sCurrentPlaylist))
-    //    return 0;
-
-    if ( m_sCurrentPlaylist == "" )
-        return 0;
-
-    return m_mPlaylists[m_sCurrentPlaylist].size();
-}
-
-int RhythmboxPlaylistModel::columnCount(const QModelIndex& parent) const
-{
-    if (parent != QModelIndex()) //Some weird thing for table-based models.
-        return 0;
-    return RhythmboxPlaylistModel::NUM_COLUMNS;
-}
-
-bool RhythmboxPlaylistModel::addTrack(const QModelIndex& index, QString location)
-{
-    //Should do nothing... hmmm
-    return false;
-}
-
-/** Removes a track from the library track collection. */
-void RhythmboxPlaylistModel::removeTrack(const QModelIndex& index)
-{
-    //Should do nothing... hmmm
-}
-
-void RhythmboxPlaylistModel::removeTracks(const QModelIndexList& indices)
-{
-    //Should do nothing... hmmm
-}
-
-void RhythmboxPlaylistModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex)
-{
-    //Should do nothing... hmmm
-}
-
-
-
-QString RhythmboxPlaylistModel::getTrackLocation(const QModelIndex& index) const
-{
-    QDomNodeList playlistTrackList = m_mPlaylists[m_sCurrentPlaylist];
-    QDomNode pnode = playlistTrackList.at(index.row());
-    QString location = pnode.toElement().text();
-
-    return location;
-}
-
-TrackPointer RhythmboxPlaylistModel::getTrack(const QModelIndex& index) const
-{
-    QString location = getTrackLocation(index);
-
-    return m_pRhythmbox->getTrackByLocation(location);
-}
-
 QItemDelegate* RhythmboxPlaylistModel::delegateForColumn(const int i) {
     return NULL;
 }
 
-QList<QString> RhythmboxPlaylistModel::getPlaylists()
-{
-    return m_mPlaylists.keys();
-}
-
-int RhythmboxPlaylistModel::numPlaylists() {
-    return m_mPlaylists.size();
-}
-
-QString RhythmboxPlaylistModel::playlistTitle(int n) {
-    return m_mPlaylists.keys().at(n);
-}
-
-void RhythmboxPlaylistModel::setPlaylist(QString playlist)
-{
-    if ( m_mPlaylists.contains(playlist))
-        m_sCurrentPlaylist = playlist;
+TrackModel::CapabilitiesFlags RhythmboxPlaylistModel::getCapabilities() const {
+    return TRACKMODELCAPS_NONE;
+}
+
+Qt::ItemFlags RhythmboxPlaylistModel::flags(const QModelIndex &index) const {
+    return readOnlyFlags(index);
+}
+
+void RhythmboxPlaylistModel::setPlaylist(QString playlist_path) {
+    int playlistId = -1;
+    QSqlQuery finder_query(m_database);
+    finder_query.prepare("SELECT id from rhythmbox_playlists where name='"+playlist_path+"'");
+
+    if(finder_query.exec()){
+        while (finder_query.next()) {
+            playlistId = finder_query.value(finder_query.record().indexOf("id")).toInt();
+        }
+    }
     else
-        m_sCurrentPlaylist = "";
-
-    // force the layout to update
-    emit(layoutChanged());
-}
-
-void RhythmboxPlaylistModel::search(const QString& searchText)
-{
-    m_currentSearch = searchText;
-}
-
-const QString RhythmboxPlaylistModel::currentSearch() {
-    return m_currentSearch;
-}
-
-const QList<int>& RhythmboxPlaylistModel::searchColumns() const {
-    return m_pRhythmbox->searchColumns();
+        qDebug() << "SQL Error in RhythmboxPlaylistModel.cpp: line" << __LINE__ << " " << finder_query.lastError();
+
+
+    QString playlistID = "Rhythmboxplaylist_" + QString("%1").arg(playlistId);
+    //Escape the playlist name
+    QSqlDriver* driver = m_pTrackCollection->getDatabase().driver();
+    QSqlField playlistNameField("name", QVariant::String);
+    playlistNameField.setValue(playlistID);
+
+    QSqlQuery query(m_database);
+    query.prepare("CREATE TEMPORARY VIEW IF NOT EXISTS "+ driver->formatValue(playlistNameField) + " AS "
+                  "SELECT "
+                  "rhythmbox_library.id,"
+                  "rhythmbox_library.artist,"
+                  "rhythmbox_library.title,"
+                  "rhythmbox_library.album,"
+                  "rhythmbox_library.year,"
+                  "rhythmbox_library.genre,"
+                  "rhythmbox_library.tracknumber,"
+                  "rhythmbox_library.location,"
+                  "rhythmbox_library.comment,"
+                  "rhythmbox_library.rating,"
+                  "rhythmbox_library.duration,"
+                  "rhythmbox_library.bitrate,"
+                  "rhythmbox_library.bpm,"
+                  "rhythmbox_playlist_tracks.track_id, "
+                  "rhythmbox_playlists.name "
+                  "FROM rhythmbox_library "
+                  "INNER JOIN rhythmbox_playlist_tracks "
+                  "ON rhythmbox_playlist_tracks.track_id = rhythmbox_library.id "
+                  "INNER JOIN rhythmbox_playlists "
+                  "ON rhythmbox_playlist_tracks.playlist_id = rhythmbox_playlists.id "
+                  "where rhythmbox_playlists.name='"+playlist_path+"'"
+                  );
+
+
+    if (!query.exec()) {
+
+        qDebug() << "Error creating temporary view for rhythmbox playlists. RhythmboxPlaylistModel --> line: " << __LINE__ << " " << query.lastError();
+        qDebug() << "Executed Query: " <<  query.executedQuery();
+        return;
+    }
+    setTable(playlistID);
+
+    //removeColumn(fieldIndex("track_id"));
+    //removeColumn(fieldIndex("name"));
+    //removeColumn(fieldIndex("id"));
+
+    slotSearch("");
+
+    select(); //Populate the data model.
+    initHeaderData();
+}
+
+bool RhythmboxPlaylistModel::isColumnHiddenByDefault(int column) {
+    return false;
 }

=== renamed file 'mixxx/src/library/rhythmboxplaylistmodel.h' => 'mixxx/src/library/rhythmbox/rhythmboxplaylistmodel.h'
--- mixxx/src/library/rhythmboxplaylistmodel.h	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxplaylistmodel.h	2011-02-21 23:55:30 +0000
@@ -1,9 +1,9 @@
 /***************************************************************************
-                           rhythmboxPlaylistsource.h
+                           rhythmboxplaylistmodel.h
                               -------------------
-     begin                : 8/17/2009
-     copyright            : (C) 2009 Phillip Whelan
-     email                : [e-mail]
+     begin                : 01/09/2011
+     copyright            : (C) 2011 Tobias Rafreider
+
 ***************************************************************************/
 
 /***************************************************************************
@@ -19,93 +19,51 @@
 #define RHYTHMBOXPLAYLISTMODEL_H
 
 #include <QtSql>
-#include <QtXml>
-#include <QList>
-
-#include "trackmodel.h"
-#include "rhythmboxtrackmodel.h"
-
-
-#define MIXXX_RHYTHMBOX_DB_LOCATION QDir::homePath() + "/.gnome2/rhythmbox/playlists.xml"
-#define MIXXX_RHYTHMBOX_DB_LOCATION_ALT QDir::homePath() + "/.local/share/rhythmbox/playlists.xml"
-
-/**
-   @author Phillip Whelan
-   Code copied originally from RhythmBoxTrackModel
-*/
-class RhythmboxPlaylistModel : public QAbstractTableModel, public TrackModel
+#include <QItemDelegate>
+#include <QtCore>
+#include "library/trackmodel.h"
+#include "library/basesqltablemodel.h"
+#include "library/librarytablemodel.h"
+#include "library/dao/playlistdao.h"
+#include "library/dao/trackdao.h"
+
+class TrackCollection;
+
+class RhythmboxPlaylistModel : public BaseSqlTableModel, public virtual TrackModel
 {
-    enum Columns {
-        COLUMN_ARTIST = 0,
-        COLUMN_TITLE,
-        COLUMN_ALBUM,
-        COLUMN_DATE,
-        COLUMN_GENRE,
-        COLUMN_LOCATION,
-        COLUMN_DURATION,
-        NUM_COLUMNS
-    };
-
     Q_OBJECT
-    public:
-    RhythmboxPlaylistModel(RhythmboxTrackModel*);
+  public:
+    RhythmboxPlaylistModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~RhythmboxPlaylistModel();
 
-    //QAbstractTableModel stuff
-    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
-    QMimeData* mimeData(const QModelIndexList &indexes) const;
-    virtual QVariant data(const QModelIndex & index,
-                          int role = Qt::DisplayRole) const;
-    virtual QVariant headerData(int section,
-                                Qt::Orientation orientation,
-                                int role = Qt::DisplayRole) const;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual int columnCount(const QModelIndex& parent) const;
-
-    //Playlist Model stuff
     virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();
-    virtual const QList<int>& searchColumns() const;
     virtual bool isColumnInternal(int column);
     virtual bool isColumnHiddenByDefault(int column);
     virtual void removeTrack(const QModelIndex& index);
     virtual void removeTracks(const QModelIndexList& indices);
     virtual bool addTrack(const QModelIndex& index, QString location);
-    virtual void moveTrack(const QModelIndex& sourceIndex,
-                           const QModelIndex& destIndex);
+    virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
+
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    QMimeData* mimeData(const QModelIndexList &indexes) const;
+
     QItemDelegate* delegateForColumn(const int i);
-
-    virtual QList<QString> getPlaylists();
-    virtual void setPlaylist(QString playlist);
-
-    int numPlaylists();
-    QString playlistTitle(int n);
-
-
-/*
- 	void scanPath(QString path);
- 	bool trackExistsInDatabase(QString file_location);
-
- 	QList<TrackInfoObject*> dumpDB();
-
- 	QSqlDatabase getDatabase();
- */
-  public slots:
-
+    TrackModel::CapabilitiesFlags getCapabilities() const;
+    /** sets the playlist **/
+    void setPlaylist(QString path_name);
+
+  private slots:
+    void slotSearch(const QString& searchText);
 
   signals:
-    void startedLoading();
-    void progressLoading(QString path);
-    void finishedLoading();
+    void doSearch(const QString& searchText);
 
-private:
-    QDomNodeList m_playlistNodes;
-    RhythmboxTrackModel *m_pRhythmbox;
-    QMap<QString, QDomNodeList> m_mPlaylists;
-    QString m_sCurrentPlaylist;
+  private:
+    TrackCollection* m_pTrackCollection;
+    QSqlDatabase &m_database;
     QString m_currentSearch;
 };
-
 #endif

=== renamed file 'mixxx/src/library/rhythmboxtrackmodel.cpp' => 'mixxx/src/library/rhythmbox/rhythmboxtrackmodel.cpp'
--- mixxx/src/library/rhythmboxtrackmodel.cpp	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxtrackmodel.cpp	2011-02-21 23:55:30 +0000
@@ -1,181 +1,141 @@
 #include <QtCore>
 #include <QtGui>
 #include <QtSql>
-#include <QtDebug>
-#include <QtXmlPatterns/QXmlQuery>
-
-#include "rhythmboxtrackmodel.h"
-#include "xmlparse.h"
-#include "trackinfoobject.h"
-#include "defs.h"
+#include "library/trackcollection.h"
+#include "library/rhythmbox/rhythmboxtrackmodel.h"
 
 #include "mixxxutils.cpp"
 
-RhythmboxTrackModel::RhythmboxTrackModel()
-        : AbstractXmlTrackModel("mixxx.db.model.rhythmbox") {
-
-    QXmlQuery query;
-    QString res;
-    QDomDocument rhythmdb;
-
-
-    /*
-     * Try and open the Rhythmbox DB. An API call which tells us where
-     * the file is would be nice.
-     */
-    QFile db(QDir::homePath() + "/.gnome2/rhythmbox/rhythmdb.xml");
-    if ( ! db.exists()) {
-        db.setFileName(QDir::homePath() + "/.local/share/rhythmbox/rhythmdb.xml");
-        if ( ! db.exists())
-            return;
-    }
-
-    if (!db.open(QIODevice::ReadOnly | QIODevice::Text))
-        return;
-
-    /*
-     * Use QXmlQuery to execute an XPath query. We add the version to
-     * the XPath query to make sure it is the schema we expect.
-     */
-    query.setFocus(&db);
-    query.setQuery("rhythmdb[@version='1.4' or @version='1.6' or @version='1.7']/entry[@type='song']");
-    if ( ! query.isValid())
-        return;
-
-    query.evaluateTo(&res);
-    db.close();
-
-
-    /*
-     * Parse the result as an XML file. These shennanigans actually
-     * reduce the load time from a minute to a matter of seconds.
-     */
-    rhythmdb.setContent("<rhythmdb version='1.6'>" + res + "</rhythmdb>");
-    m_trackNodes = rhythmdb.elementsByTagName("entry");
-
-
-    for (int i = 0; i < m_trackNodes.count(); i++) {
-        QDomNode n = m_trackNodes.at(i);
-        QString location = n.firstChildElement("location").text();
-
-        m_mTracksByLocation[location] = n;
-    }
-    qDebug() << "RhythmboxTrackModel: m_entryNodes size is" << m_trackNodes.size();
-
-
-    addColumnName(RhythmboxTrackModel::COLUMN_ARTIST, tr("Artist"));
-    addColumnName(RhythmboxTrackModel::COLUMN_TITLE, tr("Title"));
-    addColumnName(RhythmboxTrackModel::COLUMN_ALBUM, tr("Album"));
-    addColumnName(RhythmboxTrackModel::COLUMN_DATE, tr("Date"));
-    addColumnName(RhythmboxTrackModel::COLUMN_GENRE, tr("Genre"));
-    addColumnName(RhythmboxTrackModel::COLUMN_LOCATION, tr("Location"));
-    addColumnName(RhythmboxTrackModel::COLUMN_DURATION, tr("Duration"));
-
-    addSearchColumn(RhythmboxTrackModel::COLUMN_ARTIST);
-    addSearchColumn(RhythmboxTrackModel::COLUMN_TITLE);
-    addSearchColumn(RhythmboxTrackModel::COLUMN_ALBUM);
-    addSearchColumn(RhythmboxTrackModel::COLUMN_GENRE);
-    addSearchColumn(RhythmboxTrackModel::COLUMN_LOCATION);
-}
-
-RhythmboxTrackModel::~RhythmboxTrackModel()
-{
-
-}
+RhythmboxTrackModel::RhythmboxTrackModel(QObject* parent,
+                                   TrackCollection* pTrackCollection)
+        : TrackModel(pTrackCollection->getDatabase(),
+                     "mixxx.db.model.rhythmbox"),
+          BaseSqlTableModel(parent, pTrackCollection, pTrackCollection->getDatabase()),
+          m_pTrackCollection(pTrackCollection),
+          m_database(m_pTrackCollection->getDatabase()) {
+    connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&)));
+    setTable("rhythmbox_library");
+    initHeaderData();
+    setCaching(false);
+}
+
+RhythmboxTrackModel::~RhythmboxTrackModel() {
+}
+
+bool RhythmboxTrackModel::addTrack(const QModelIndex& index, QString location) {
+    return false;
+}
+
+TrackPointer RhythmboxTrackModel::getTrack(const QModelIndex& index) const {
+    QString artist = index.sibling(index.row(), fieldIndex("artist")).data().toString();
+    QString title = index.sibling(index.row(), fieldIndex("title")).data().toString();
+    QString album = index.sibling(index.row(), fieldIndex("album")).data().toString();
+    QString year = index.sibling(index.row(), fieldIndex("year")).data().toString();
+    QString genre = index.sibling(index.row(), fieldIndex("genre")).data().toString();
+    float bpm = index.sibling(index.row(), fieldIndex("bpm")).data().toString().toFloat();
+
+    QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
+
+    TrackInfoObject* pTrack = new TrackInfoObject(location);
+    pTrack->setArtist(artist);
+    pTrack->setTitle(title);
+    pTrack->setAlbum(album);
+    pTrack->setYear(year);
+    pTrack->setGenre(genre);
+    pTrack->setBpm(bpm);
+
+    return TrackPointer(pTrack, &QObject::deleteLater);
+}
+
+QString RhythmboxTrackModel::getTrackLocation(const QModelIndex& index) const {
+    QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
+    return location;
+}
+
+void RhythmboxTrackModel::removeTrack(const QModelIndex& index) {
+
+}
+
+void RhythmboxTrackModel::removeTracks(const QModelIndexList& indices) {
+
+}
+
+void RhythmboxTrackModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex) {
+
+}
+
+void RhythmboxTrackModel::search(const QString& searchText) {
+    // qDebug() << "RhythmboxTrackModel::search()" << searchText
+    //          << QThread::currentThread();
+    emit(doSearch(searchText));
+}
+
+void RhythmboxTrackModel::slotSearch(const QString& searchText) {
+    if (!m_currentSearch.isNull() && m_currentSearch == searchText)
+        return;
+    m_currentSearch = searchText;
+
+    QString filter;
+    QSqlField search("search", QVariant::String);
+    search.setValue("%" + searchText + "%");
+    QString escapedText = database().driver()->formatValue(search);
+    filter = "(artist LIKE " + escapedText + " OR " +
+            "album LIKE " + escapedText + " OR " +
+            "title  LIKE " + escapedText + ")";
+    setFilter(filter);
+
+}
+
+const QString RhythmboxTrackModel::currentSearch() {
+    return m_currentSearch;
+}
+
+bool RhythmboxTrackModel::isColumnInternal(int column) {
+    if (column == fieldIndex(LIBRARYTABLE_ID) ||
+        column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
+        column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED))
+        return true;
+    return false;
+}
+
+QMimeData* RhythmboxTrackModel::mimeData(const QModelIndexList &indexes) const {
+    QMimeData *mimeData = new QMimeData();
+    QList<QUrl> urls;
+
+    //Ok, so the list of indexes we're given contains separates indexes for
+    //each column, so even if only one row is selected, we'll have like 7 indexes.
+    //We need to only count each row once:
+    QList<int> rows;
+
+    foreach (QModelIndex index, indexes) {
+        if (index.isValid()) {
+            if (!rows.contains(index.row())) {
+                rows.push_back(index.row());
+                QUrl url = QUrl::fromLocalFile(getTrackLocation(index));
+                if (!url.isValid())
+                    qDebug() << "ERROR invalid url\n";
+                else
+                    urls.append(url);
+            }
+        }
+    }
+    mimeData->setUrls(urls);
+    return mimeData;
+}
+
 
 QItemDelegate* RhythmboxTrackModel::delegateForColumn(const int i) {
     return NULL;
 }
 
-QVariant RhythmboxTrackModel::data(const QModelIndex& item, int role) const {
-    if (!item.isValid())
-        return QVariant();
-
-    QVariant value = AbstractXmlTrackModel::data(item, role);
-
-    if ((role == Qt::DisplayRole || role == Qt::ToolTipRole) &&
-        item.column() == COLUMN_DURATION) {
-
-        if (qVariantCanConvert<int>(value)) {
-            value = MixxxUtils::secondsToMinutes(qVariantValue<int>(value));
-        }
-    }
-    return value;
-}
-
-bool RhythmboxTrackModel::isColumnInternal(int column) {
-    return false;
-}
+TrackModel::CapabilitiesFlags RhythmboxTrackModel::getCapabilities() const {
+    return TRACKMODELCAPS_NONE;
+}
+
+Qt::ItemFlags RhythmboxTrackModel::flags(const QModelIndex &index) const {
+    return readOnlyFlags(index);
+}
+
 bool RhythmboxTrackModel::isColumnHiddenByDefault(int column) {
     return false;
 }
-
-QVariant RhythmboxTrackModel::getTrackColumnData(QDomNode songNode, const QModelIndex& index) const
-{
-    int date;
-    switch (index.column()) {
-        case RhythmboxTrackModel::COLUMN_ARTIST:
-            return songNode.firstChildElement("artist").text();
-        case RhythmboxTrackModel::COLUMN_TITLE:
-            return songNode.firstChildElement("title").text();
-        case RhythmboxTrackModel::COLUMN_ALBUM:
-            return songNode.firstChildElement("album").text();
-        case RhythmboxTrackModel::COLUMN_DATE:
-            date = songNode.firstChildElement("date").text().toInt();
-            // Rhythmbox uses the Rata Die Julian Day system while Qt uses true
-            // Julian Days. It's just a difference in epoch start dates.
-            if (date == 0)
-                return "";
-            return QDate::fromJulianDay(ceil(float(date) + 1721424.5)).year();
-        case RhythmboxTrackModel::COLUMN_GENRE:
-            return songNode.firstChildElement("genre").text();
-        case RhythmboxTrackModel::COLUMN_LOCATION:
-            return songNode.firstChildElement("location").text();
-        case RhythmboxTrackModel::COLUMN_DURATION:
-            return songNode.firstChildElement("duration").text();
-
-        default:
-            return QVariant();
-    }
-}
-
-TrackPointer RhythmboxTrackModel::parseTrackNode(QDomNode songNode) const
-{
-    QString strloc = songNode.firstChildElement("location").text();
-    QByteArray strlocbytes = strloc.toUtf8();
-    QUrl location = QUrl::fromEncoded(strlocbytes);
-    QString trackLocation = location.toLocalFile();
-
-    TrackInfoObject *pTrack = new TrackInfoObject(trackLocation);
-
-    pTrack->setArtist(songNode.firstChildElement("artist").text());
-    pTrack->setTitle(songNode.firstChildElement("title").text());
-    pTrack->setAlbum(songNode.firstChildElement("album").text());
-    int date = songNode.firstChildElement("date").text().toInt();
-    // Rhythmbox uses the Rata Die Julian Day system while Qt uses true
-    // Julian Days. It's just a difference in epoch start dates.
-    if (date == 0) {
-        pTrack->setYear("");
-    } else {
-        date = QDate::fromJulianDay(ceil(float(date) + 1721424.5)).year();
-        pTrack->setYear(QString("%1").arg(date));
-    }
-    pTrack->setGenre(songNode.firstChildElement("genre").text());
-    pTrack->setDuration(songNode.firstChildElement("duration").text().toUInt());
-
-    // TODO(ywwg) why was this added? constructor above does the same -- rryan
-    pTrack->setLocation(trackLocation);
-
-    // Have QObject handle deleting this track
-    return TrackPointer(pTrack, &QObject::deleteLater);
-}
-
-//OwenB - for use by the playlistmodel
-QDomNode RhythmboxTrackModel::getTrackNodeByLocation(const QString& location) const
-{
-    if ( !m_mTracksByLocation.contains(location))
-        return QDomNode();
-
-    QDomNode songNode = m_mTracksByLocation[location];
-    return songNode;
-}

=== renamed file 'mixxx/src/library/rhythmboxtrackmodel.h' => 'mixxx/src/library/rhythmbox/rhythmboxtrackmodel.h'
--- mixxx/src/library/rhythmboxtrackmodel.h	2010-11-16 21:01:45 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxtrackmodel.h	2011-02-21 23:55:30 +0000
@@ -2,7 +2,7 @@
                            rhythmboxtracksource.h
                               -------------------
      begin                : 8/15/2009
-     copyright            : (C) 2009 Albert Santoni
+     copyright            : (C) 2011 Tobias Rafreider
      email                : [e-mail]
 ***************************************************************************/
 
@@ -18,55 +18,52 @@
 #ifndef RHYTHMBOXTRACKMODEL_H
 #define RHYTHMBOXTRACKMODEL_H
 
+
 #include <QtSql>
-#include <QtXml>
-#include "trackmodel.h"
-#include "abstractxmltrackmodel.h"
-
-
-class QSqlDatabase;
-
-
-/**
-   @author Albert Santoni
-*/
-class RhythmboxTrackModel : public AbstractXmlTrackModel
+#include <QItemDelegate>
+#include <QtCore>
+#include "library/trackmodel.h"
+#include "library/basesqltablemodel.h"
+#include "library/librarytablemodel.h"
+#include "library/dao/playlistdao.h"
+#include "library/dao/trackdao.h"
+
+class TrackCollection;
+
+class RhythmboxTrackModel : public BaseSqlTableModel, public virtual TrackModel
 {
-    enum Columns {
-        COLUMN_ARTIST = 0,
-        COLUMN_TITLE,
-        COLUMN_ALBUM,
-        COLUMN_DATE,
-        COLUMN_GENRE,
-        COLUMN_LOCATION,
-        COLUMN_DURATION,
-        NUM_COLUMNS
-    };
-
     Q_OBJECT
-public:
-    RhythmboxTrackModel();
+  public:
+    RhythmboxTrackModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~RhythmboxTrackModel();
-    virtual QItemDelegate* delegateForColumn(const int i);
+
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
+    virtual QString getTrackLocation(const QModelIndex& index) const;
+    virtual void search(const QString& searchText);
+    virtual const QString currentSearch();
     virtual bool isColumnInternal(int column);
     virtual bool isColumnHiddenByDefault(int column);
-    virtual QVariant data(const QModelIndex& item, int role) const;
-    QDomNode getTrackNodeByLocation(const QString& ) const;
-
-protected:
-    virtual TrackPointer parseTrackNode(QDomNode node) const;
-    /* Implemented by AbstractXmlTrackModel implementations to return the data for song columns */
-    virtual QVariant getTrackColumnData(QDomNode node, const QModelIndex& index) const;
-    /* Called by AbstractXmlTrackModel implementations to enumerate their columns */
-
-public slots:
-
-signals:
- 	void startedLoading();
- 	void progressLoading(QString path);
- 	void finishedLoading();
-
- 	friend class RhythmboxPlaylistModel;
+    virtual void removeTrack(const QModelIndex& index);
+    virtual void removeTracks(const QModelIndexList& indices);
+    virtual bool addTrack(const QModelIndex& index, QString location);
+    virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
+
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    QMimeData* mimeData(const QModelIndexList &indexes) const;
+
+    QItemDelegate* delegateForColumn(const int i);
+    TrackModel::CapabilitiesFlags getCapabilities() const;
+
+  private slots:
+    void slotSearch(const QString& searchText);
+
+  signals:
+    void doSearch(const QString& searchText);
+
+  private:
+    TrackCollection* m_pTrackCollection;
+    QSqlDatabase &m_database;
+    QString m_currentSearch;
 };
 
 #endif

=== modified file 'mixxx/src/library/sidebarmodel.cpp'
--- mixxx/src/library/sidebarmodel.cpp	2011-02-20 20:47:37 +0000
+++ mixxx/src/library/sidebarmodel.cpp	2011-02-21 23:55:30 +0000
@@ -19,13 +19,18 @@
 void SidebarModel::addLibraryFeature(LibraryFeature* feature) {
     m_sFeatures.push_back(feature);
     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*)));
+
     QAbstractItemModel* model = feature->getChildModel();
 
     connect(model, SIGNAL(modelReset()),
             this, SLOT(slotModelReset()));
     connect(model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)),
             this, SLOT(slotDataChanged(const QModelIndex&,const QModelIndex&)));
-    
+
     connect(model, SIGNAL(rowsAboutToBeInserted(const QModelIndex&, int, int)),
             this, SLOT(slotRowsAboutToBeInserted(const QModelIndex&, int, int)));
     connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex&, int, int)),
@@ -34,7 +39,7 @@
             this, SLOT(slotRowsInserted(const QModelIndex&, int, int)));
     connect(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
             this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
-    
+
 }
 
 QModelIndex SidebarModel::getDefaultSelection() {
@@ -77,19 +82,12 @@
             const QAbstractItemModel* childModel = m_sFeatures[parent.row()]->getChildModel();
             QModelIndex childIndex = childModel->index(row, column);
             TreeItem* tree_item = (TreeItem*)childIndex.internalPointer();
-            if (childIndex.isValid()) 
-            {
-     
+            if (tree_item && childIndex.isValid()) {
                 return createIndex(childIndex.row(), childIndex.column(), (void*)tree_item);
-            } 
-            else 
-            {
-               
+            } else {
                 return QModelIndex();
             }
-        } 
-        else 
-        {
+        } else {
             // We have selected an item within the childmodel
             // This item has always an internal pointer of (sub)type TreeItem
             TreeItem* tree_item = (TreeItem*)parent.internalPointer();
@@ -104,29 +102,25 @@
     if (index.isValid()) {
         /* If we have selected the root of a library feature
          * its internal pointer is the current sidebar object model
-         * A root library feature has no parent and thus we return 
+         * A root library feature has no parent and thus we return
          * an invalid QModelIndex
          */
         if (index.internalPointer() == this) {
-            
             return QModelIndex();
-        } 
-        else 
-        {
+        } else {
             TreeItem* tree_item = (TreeItem*)index.internalPointer();
-            //if we have selected an item at the first level of a childnode
-            if(tree_item->parent()->data() == "$root"){
-                //qDebug() << "Parent== root";
+            // 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) 
-                {
+                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' 
+                         // 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
+            // if we have selected an item at some deeper level of a childnode
             return createIndex(tree_item->parent()->row(), 0 , tree_item->parent());
         }
     }
@@ -137,14 +131,14 @@
     //qDebug() << "SidebarModel::rowCount parent=" << parent.data();
     if (parent.isValid()) {
         if (parent.internalPointer() == this) {
-     
             return m_sFeatures[parent.row()]->getChildModel()->rowCount();
-        } 
-        else {
-            //We support tree models deeper than 1 level
+        } else {
+            // We support tree models deeper than 1 level
             TreeItem* tree_item = (TreeItem*)parent.internalPointer();
-            
-            return tree_item->childCount();
+            if (tree_item) {
+                return tree_item->childCount();
+            }
+            return 0;
         }
     }
     return m_sFeatures.size();
@@ -155,21 +149,19 @@
     // TODO(rryan) will we ever have columns? I don't think so.
     return 1;
 }
+
 bool SidebarModel::hasChildren(const QModelIndex& parent) const {
-    
-   if (parent.isValid()) {
+    if (parent.isValid()) {
         if (parent.internalPointer() == this) {
             return QAbstractItemModel::hasChildren(parent);
-        } 
-        else 
-        {
+        } else {
             TreeItem* tree_item = (TreeItem*)parent.internalPointer();
-            LibraryFeature* feature = tree_item->getFeature();
-            return feature->getChildModel()->hasChildren(parent);
+            if (tree_item) {
+                LibraryFeature* feature = tree_item->getFeature();
+                return feature->getChildModel()->hasChildren(parent);
+            }
         }
-    }
-    else
-    {
+    } else {
         return QAbstractItemModel::hasChildren(parent);
     }
 }
@@ -178,25 +170,22 @@
     // qDebug("SidebarModel::data row=%d column=%d pointer=%8x, role=%d",
     //        index.row(), index.column(), index.internalPointer(), role);
     if (index.isValid()) {
-        if (index.internalPointer() == this) 
-        {
+        if (index.internalPointer() == this) {
             if (role == Qt::DisplayRole) {
                 return m_sFeatures[index.row()]->title();
-            } 
-            else if (role == Qt::DecorationRole) {
+            } else if (role == Qt::DecorationRole) {
                 return m_sFeatures[index.row()]->getIcon();
             }
-        } 
-        else {
+        } else {
             TreeItem* tree_item = (TreeItem*)index.internalPointer();
-            
-            if (role == Qt::DisplayRole) {
-                return tree_item->data();
-            }
-            else if (role == Qt::DecorationRole) {
-                return tree_item->getIcon();
-            }
-            
+
+            if (tree_item) {
+                if (role == Qt::DisplayRole) {
+                    return tree_item->data();
+                } else if (role == Qt::DecorationRole) {
+                    return tree_item->getIcon();
+                }
+            }
         }
     }
     return QVariant();
@@ -205,9 +194,8 @@
 void SidebarModel::clicked(const QModelIndex& index) {
     //qDebug() << "SidebarModel::clicked() index=" << index;
 
-
-    //We use clicked() for keyboard and mouse control, and the
-    //following code breaks that for us:
+    // We use clicked() for keyboard and mouse control, and the
+    // following code breaks that for us:
     /*if (QApplication::mouseButtons() != Qt::LeftButton) {
         return;
     }*/
@@ -215,50 +203,48 @@
     if (index.isValid()) {
         if (index.internalPointer() == this) {
             m_sFeatures[index.row()]->activate();
-        } 
-        else 
-        {
+        } else {
             TreeItem* tree_item = (TreeItem*)index.internalPointer();
-            LibraryFeature* feature = tree_item->getFeature();
-            feature->activateChild(index);
+            if (tree_item) {
+                LibraryFeature* feature = tree_item->getFeature();
+                feature->activateChild(index);
+            }
         }
     }
 }
 
 void SidebarModel::rightClicked(const QPoint& globalPos, const QModelIndex& index) {
     //qDebug() << "SidebarModel::rightClicked() index=" << index;
-    if (index.isValid()) 
+    if (index.isValid())
     {
-        if (index.internalPointer() == this) 
+        if (index.internalPointer() == this)
         {
             m_sFeatures[index.row()]->activate();
             m_sFeatures[index.row()]->onRightClick(globalPos);
         }
-        else 
+        else
         {
             TreeItem* tree_item = (TreeItem*)index.internalPointer();
-            LibraryFeature* feature = tree_item->getFeature();
-            feature->activateChild(index);
-            feature->onRightClickChild(globalPos, index);
-           
+            if (tree_item) {
+                LibraryFeature* feature = tree_item->getFeature();
+                feature->activateChild(index);
+                feature->onRightClickChild(globalPos, index);
+            }
         }
     }
 }
 
-bool SidebarModel::dropAccept(const QModelIndex& index, QUrl url)
-{
+bool SidebarModel::dropAccept(const QModelIndex& index, QUrl url) {
     //qDebug() << "SidebarModel::dropAccept() index=" << index << url;
     if (index.isValid()) {
-        if (index.internalPointer() == this) 
-        {
+        if (index.internalPointer() == this) {
             return m_sFeatures[index.row()]->dropAccept(url);
-        } 
-        else 
-        {
+        } else {
             TreeItem* tree_item = (TreeItem*)index.internalPointer();
-            LibraryFeature* feature = tree_item->getFeature();
-            return feature->dropAcceptChild(index, url);
-            
+            if (tree_item) {
+                LibraryFeature* feature = tree_item->getFeature();
+                return feature->dropAcceptChild(index, url);
+            }
         }
     }
 
@@ -269,43 +255,41 @@
 {
     //qDebug() << "SidebarModel::dragMoveAccept() index=" << index << url;
     if (index.isValid()) {
-        if (index.internalPointer() == this) 
-        {
+        if (index.internalPointer() == this) {
             return m_sFeatures[index.row()]->dragMoveAccept(url);
-        } 
-        else 
-        {
-            
+        } else {
             TreeItem* tree_item = (TreeItem*)index.internalPointer();
-            LibraryFeature* feature = tree_item->getFeature();
-            return feature->dragMoveAcceptChild(index, url);
+            if (tree_item) {
+                LibraryFeature* feature = tree_item->getFeature();
+                return feature->dragMoveAcceptChild(index, url);
+            }
         }
     }
     return false;
 }
-//Translates an index from the child models to an index of the sidebar models
+
+// Translates an index from the child models to an index of the sidebar models
 QModelIndex SidebarModel::translateSourceIndex(const QModelIndex& index) {
     QModelIndex translatedIndex;
-    
+
     /* These method is called from the slot functions below.
      * QObject::sender() return the object which emitted the signal
      * handled by the slot functions.
-     
+
      * For child models, this always the child models itself
      */
-    
-    const QAbstractItemModel* model = (QAbstractItemModel*)sender();
-    
+
+    const QAbstractItemModel* model = dynamic_cast<QAbstractItemModel*>(sender());
+
     Q_ASSERT(model);
     if (index.isValid()) {
        TreeItem* item = (TreeItem*)index.internalPointer();
        translatedIndex = createIndex(index.row(), index.column(), item);
-       
-    } 
-    else 
+    }
+    else
     {
         //Comment from Tobias Rafreider --> Dead Code????
-        
+
         for (int i = 0; i < m_sFeatures.size(); ++i) {
             if (m_sFeatures[i]->getChildModel() == model) {
                 translatedIndex = createIndex(i, 0, (void*)this);
@@ -314,20 +298,21 @@
     }
     return translatedIndex;
 }
+
 void SidebarModel::slotDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) {
     //qDebug() << "slotDataChanged topLeft:" << topLeft << "bottomRight:" << bottomRight;
 }
 
 void SidebarModel::slotRowsAboutToBeInserted(const QModelIndex& parent, int start, int end) {
     //qDebug() << "slotRowsABoutToBeInserted" << parent << start << end;
-    
-    QModelIndex newParent = translateSourceIndex(parent);        
+
+    QModelIndex newParent = translateSourceIndex(parent);
     beginInsertRows(newParent, start, end);
 }
 
 void SidebarModel::slotRowsAboutToBeRemoved(const QModelIndex& parent, int start, int end) {
     //qDebug() << "slotRowsABoutToBeRemoved" << parent << start << end;
-      
+
     QModelIndex newParent = translateSourceIndex(parent);
     beginRemoveRows(newParent, start, end);
 }
@@ -349,3 +334,41 @@
     // will close any open items.
     reset();
 }
+
+/*
+ * Call this slot whenever the title of the feature has changed.
+ * See RhythmboxFeature for an example.
+ * While the rhythmbox music collection is parsed
+ * the title becomes 'Rhythmbox (loading)'
+ */
+void SidebarModel::slotFeatureIsLoading(LibraryFeature * feature)
+{
+    featureRenamed(feature);
+    selectFeature(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);
+}
+
+void SidebarModel::featureRenamed(LibraryFeature* pFeature){
+    for (int i=0; i < m_sFeatures.size(); ++i) {
+        if (m_sFeatures[i] == pFeature) {
+            QModelIndex ind = index(i, 0);
+            emit(dataChanged(ind, ind));
+        }
+    }
+}
+
+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));
+        }
+    }
+}

=== modified file 'mixxx/src/library/sidebarmodel.h'
--- mixxx/src/library/sidebarmodel.h	2011-02-12 19:25:05 +0000
+++ mixxx/src/library/sidebarmodel.h	2011-02-21 23:55:30 +0000
@@ -33,12 +33,13 @@
     bool dropAccept(const QModelIndex& index, QUrl url);
     bool dragMoveAccept(const QModelIndex& index, QUrl url);
     virtual bool hasChildren ( const QModelIndex & parent = QModelIndex() ) const;
+
   public slots:
     void clicked(const QModelIndex& index);
     void rightClicked(const QPoint& globalPos, const QModelIndex& index);
     void refreshData();
+    void selectFeature(LibraryFeature* pFeature);
 
-  public slots:
     // Slots for every single QAbstractItemModel signal
     // void slotColumnsAboutToBeInserted(const QModelIndex& parent, int start, int end);
     // void slotColumnsAboutToBeRemoved(const QModelIndex & parent, int start, int end);
@@ -55,9 +56,15 @@
     void slotRowsInserted(const QModelIndex& parent, int start, int end);
     void slotRowsRemoved(const QModelIndex& parent, int start, int end);
     void slotModelReset();
+    void slotFeatureIsLoading(LibraryFeature*);
+    void slotFeatureLoadingFinished(LibraryFeature*);
+
+  signals:
+    void selectIndex(const QModelIndex& index);
 
   private:
     QModelIndex translateSourceIndex(const QModelIndex& parent);
+    void featureRenamed(LibraryFeature*);
     QList<LibraryFeature*> m_sFeatures;
     unsigned int m_iDefaultSelectedIndex; /** Index of the item in the sidebar model to select at startup. */
 };

=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2011-01-20 21:52:58 +0000
+++ mixxx/src/library/trackcollection.cpp	2011-02-21 23:55:30 +0000
@@ -68,7 +68,7 @@
         return false;
     }
 
-    int requiredSchemaVersion = 10;
+    int requiredSchemaVersion = 11;
     if (!SchemaManager::upgradeToSchemaVersion(m_pConfig, m_db,
                                                requiredSchemaVersion)) {
         QMessageBox::warning(0, tr("Cannot upgrade database schema"),

=== added directory 'mixxx/src/library/traktor'
=== renamed file 'mixxx/src/library/traktorfeature.cpp' => 'mixxx/src/library/traktor/traktorfeature.cpp'
--- mixxx/src/library/traktorfeature.cpp	2011-01-13 18:40:56 +0000
+++ mixxx/src/library/traktor/traktorfeature.cpp	2011-02-21 23:55:30 +0000
@@ -7,24 +7,33 @@
 #include <QMap>
 #include <QSettings>
 
-#include "library/traktorfeature.h"
+#include "library/traktor/traktorfeature.h"
 
 #include "library/librarytablemodel.h"
 #include "library/missingtablemodel.h"
-#include "library/proxytrackmodel.h"
 #include "library/trackcollection.h"
-#include "treeitem.h"
+#include "library/treeitem.h"
 
 
 TraktorFeature::TraktorFeature(QObject* parent, TrackCollection* pTrackCollection):
-        m_pTrackCollection(pTrackCollection),
-        m_database(m_pTrackCollection->getDatabase())
-{
-    
-    m_isActivated =  false;
+        m_pTrackCollection(pTrackCollection) {
+    m_isActivated = false;
     m_pTraktorTableModel = new TraktorTableModel(this, m_pTrackCollection);
     m_pTraktorPlaylistModel = new TraktorPlaylistModel(this, m_pTrackCollection);
-    
+    m_title = tr("Traktor");
+    if (!m_database.isOpen()) {
+        m_database = QSqlDatabase::addDatabase("QSQLITE", "TRAKTOR_SCANNER");
+        m_database.setHostName("localhost");
+        m_database.setDatabaseName(MIXXX_DB_PATH);
+        m_database.setUserName("mixxx");
+        m_database.setPassword("mixxx");
+
+        //Open the database connection in this thread.
+        if (!m_database.open()) {
+            qDebug() << "Failed to open database for iTunes scanner." << m_database.lastError();
+        }
+    }
+    connect(&m_future_watcher, SIGNAL(finished()), this, SLOT(onTrackCollectionLoaded()));
 }
 
 TraktorFeature::~TraktorFeature() {
@@ -35,7 +44,7 @@
 }
 
 QVariant TraktorFeature::title() {
-    return tr("Traktor");
+    return m_title;
 }
 
 QIcon TraktorFeature::getIcon() {
@@ -43,7 +52,7 @@
 }
 bool TraktorFeature::isSupported() {
     return (QFile::exists(getTraktorMusicDatabase()));
-    
+
 }
 TreeItemModel* TraktorFeature::getChildModel() {
     return &m_childModel;
@@ -51,42 +60,51 @@
 
 void TraktorFeature::refreshLibraryModels()
 {
-    
+
 }
 
 void TraktorFeature::activate() {
     qDebug() << "TraktorFeature::activate()";
-    
+
     if(!m_isActivated){
-        if (QMessageBox::question(
-            NULL,
-            tr("Load Traktor Library?"),
-            tr("Would you like to load your Traktor library?"),
-            QMessageBox::Ok,
-            QMessageBox::Cancel)
-            == QMessageBox::Cancel) {
-            return;
-        }
-        if(importLibrary(getTraktorMusicDatabase()))
-            m_isActivated =  true;
-    }
-    emit(showTrackModel(m_pTraktorTableModel));
-  
+
+        m_isActivated =  true;
+        /* Ususally the maximum number of threads
+         * is > 2 depending on the CPU cores
+         * Unfortunately, within VirtualBox
+         * the maximum number of allowed threads
+         * is 1 at all times We'll need to increase
+         * the number to > 1, otherwise importing the music collection
+         * takes place when the GUI threads terminates, i.e., on
+         * Mixxx shutdown.
+         */
+        QThreadPool::globalInstance()->setMaxThreadCount(4); //Tobias decided to use 4
+        // Let a worker thread do the XML parsing
+        m_future = QtConcurrent::run(this, &TraktorFeature::importLibrary, getTraktorMusicDatabase());
+        m_future_watcher.setFuture(m_future);
+        m_title = tr("Traktor (loading)");
+        //calls a slot in the sidebar model such that 'iTunes (isLoading)' is displayed.
+        emit (featureIsLoading(this));
+    }
+    else{
+        emit(showTrackModel(m_pTraktorTableModel));
+    }
+
+
 }
 
 void TraktorFeature::activateChild(const QModelIndex& index) {
-   
+
     if(!index.isValid()) return;
-    
+
     //access underlying TreeItem object
     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
-    
+
     if(item->isPlaylist()){
         qDebug() << "Activate Traktor Playlist: " << item->dataPath().toString();
         m_pTraktorPlaylistModel->setPlaylist(item->dataPath().toString());
         emit(showTrackModel(m_pTraktorPlaylistModel));
-
-    }    
+    }
 }
 
 void TraktorFeature::onRightClick(const QPoint& globalPos) {
@@ -112,8 +130,12 @@
                                               QUrl url) {
     return false;
 }
-bool TraktorFeature::importLibrary(QString file){
-
+TreeItem* TraktorFeature::importLibrary(QString file){
+    //Give thread a low priority
+    QThread* thisThread = QThread::currentThread();
+    thisThread->setPriority(QThread::LowestPriority);
+    //Invisible root item of Traktor's child model
+    TreeItem* root = NULL;
     //Delete all table entries of Traktor feature
     m_database.transaction();
     clearTable("traktor_playlist_tracks");
@@ -123,7 +145,7 @@
 
     m_database.transaction();
     QSqlQuery query(m_database);
-    query.prepare("INSERT INTO traktor_library (artist, title, album, year, genre,comment," 
+    query.prepare("INSERT INTO traktor_library (artist, title, album, year, genre,comment,"
                    "tracknumber,"
                    "bpm, bitrate,"
                    "duration, location,"
@@ -134,7 +156,7 @@
                    ":duration, :location,"
                    ":rating,"
                    ":key)");
-    
+
     //Parse Trakor XML file using SAX (for performance)
     QFile traktor_file(file);
     if (!traktor_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -147,8 +169,8 @@
     bool inPlaylistsTag = false;
     bool isRootFolderParsed = false;
     int nAudioFiles = 0;
-    
-    while (!xml.atEnd()) 
+
+    while (!xml.atEnd())
     {
         xml.readNext();
         if(xml.isStartElement())
@@ -156,11 +178,11 @@
             if(xml.name() == "COLLECTION")
             {
                 inCollectionTag = true;
-                
+
             }
             /*
              * Each "ENTRY" tag in <COLLECTION> represents a track
-             */ 
+             */
             if(inCollectionTag && xml.name() == "ENTRY" )
             {
                 inEntryTag = true;
@@ -168,22 +190,22 @@
                 parseTrack(xml, query);
 
                 ++nAudioFiles; //increment number of files in the music collection
-            }    
+            }
             if(xml.name() == "PLAYLISTS")
             {
                 inPlaylistsTag = true;
-                
+
             }
             if(inPlaylistsTag && !isRootFolderParsed && xml.name() == "NODE"){
                 QXmlStreamAttributes attr = xml.attributes();
                 QString nodetype = attr.value("TYPE").toString();
                 QString name = attr.value("NAME").toString();
-                
-                if(nodetype == "FOLDER" && name == "$ROOT"){                
+
+                if(nodetype == "FOLDER" && name == "$ROOT"){
                     //process all playlists
-                    parsePlaylists(xml);
+                    root = parsePlaylists(xml);
                     isRootFolderParsed = true;
-                } 
+                }
             }
 
         }
@@ -192,37 +214,39 @@
             if(xml.name() == "COLLECTION")
             {
                 inCollectionTag = false;
-                
+
             }
             if(xml.name() == "ENTRY" && inCollectionTag)
             {
                 inEntryTag = false;
-                
+
             }
             if(xml.name() == "PLAYLISTS" && inPlaylistsTag)
             {
                 inPlaylistsTag = false;
             }
-            
+
         }
     }
     if (xml.hasError()) {
          // do error handling
          qDebug() << "Cannot process Traktor music collection";
+         if(root)
+             delete root;
          return false;
     }
-    
+
     qDebug() << "Found: " << nAudioFiles << " audio files in Traktor";
     //initialize TraktorTableModel
     m_database.commit();
-    m_pTraktorTableModel->select();
-    return true;
+
+    return root;
 
 }
 void TraktorFeature::parseTrack(QXmlStreamReader &xml, QSqlQuery &query){
     QString title;
-    QString artist; 
-    QString album; 
+    QString artist;
+    QString album;
     QString year;
     QString genre;
     //drive letter
@@ -247,14 +271,14 @@
     //read all sub tags of ENTRY until we reach the closing ENTRY tag
     while(!xml.atEnd())
     {
-        xml.readNext();  
+        xml.readNext();
         if(xml.isStartElement()){
             if(xml.name() == "ALBUM")
             {
                 QXmlStreamAttributes attr = xml.attributes ();
                 album = attr.value("TITLE").toString();
                 tracknumber = attr.value("TRACK").toString();
-                
+
                 continue;
             }
             if(xml.name() == "LOCATION")
@@ -307,10 +331,10 @@
         }
         //We leave the infinte loop, if twe have the closing tag "ENTRY"
         if(xml.name() == "ENTRY" && xml.isEndElement()){
-            break;        
+            break;
         }
     }
-    
+
     /* If we reach the end of ENTRY within the COLLECTION tag
      * Save parsed track to database
      */
@@ -327,8 +351,8 @@
     query.bindValue(":key", key);
     query.bindValue(":bpm", bpm);
     query.bindValue(":bitrate", bitrate);
-                
-                
+
+
     bool success = query.exec();
     if(!success){
         qDebug() << "SQL Error in TraktorTableModel.cpp: line" << __LINE__ << " " << query.lastError();
@@ -343,7 +367,7 @@
  * In other words, Traktor uses a tree structure to organize music. Inner nodes represent folders while
  * leaves are playlists.
  */
-void TraktorFeature::parsePlaylists(QXmlStreamReader &xml){
+TreeItem* TraktorFeature::parsePlaylists(QXmlStreamReader &xml){
 
     qDebug() << "Process RootFolder";
     //Each playlist is unique and can be identified by a path in the tree structure.
@@ -364,11 +388,11 @@
     QSqlQuery query_insert_to_playlist_tracks(m_database);
     query_insert_to_playlist_tracks.prepare("INSERT INTO traktor_playlist_tracks (playlist_id, track_id) "
                   "VALUES (:playlist_id, :track_id)");
-                  
+
     while(!xml.atEnd())
     {
         //read next XML element
-        xml.readNext(); 
+        xml.readNext();
 
         if(xml.isStartElement())
         {
@@ -376,49 +400,49 @@
                 QXmlStreamAttributes attr = xml.attributes();
                 QString name = attr.value("NAME").toString();
                 QString type = attr.value("TYPE").toString();
-                
+
                //TODO: What happens if the folder node is a leaf (empty folder)
                // Idea: Hide empty folders :-)
                if(type == "FOLDER")
                {
-                    
-                    current_path += delimiter;                    
+
+                    current_path += delimiter;
                     current_path += name;
                     //qDebug() << "Folder: " +current_path << " has parent " << parent->data().toString();
                     map.insert(current_path, "FOLDER");
-                    
+
                     TreeItem * item = new TreeItem(name,current_path, this, parent);
                     parent->appendChild(item);
                     parent = item;
                }
                if(type == "PLAYLIST")
                {
-                    current_path += delimiter;                      
+                    current_path += delimiter;
                     current_path += name;
                     //qDebug() << "Playlist: " +current_path << " has parent " << parent->data().toString();
                     map.insert(current_path, "PLAYLIST");
-                   
+
                     TreeItem * item = new TreeItem(name,current_path, this, parent);
                     parent->appendChild(item);
                     // process all the entries within the playlist 'name' having path 'current_path'
                     parsePlaylistEntries(xml,current_path, query_insert_to_playlists, query_insert_to_playlist_tracks);
-                    
+
                }
 
             }
             if(xml.name() == "ENTRY" && inPlaylistTag){
-            
+
 
             }
 
         }
-        
-        if(xml.isEndElement()) 
+
+        if(xml.isEndElement())
         {
             if(xml.name() == "NODE")
             {
                 if(map.value(current_path) == "FOLDER"){
-                    parent = parent->parent();                
+                    parent = parent->parent();
                 }
 
                 //Whenever we find a closing NODE, remove the last component of the path
@@ -427,14 +451,14 @@
 
                 current_path.remove(lastSlash, path_length - lastSlash);
 
-                
-                
+
+
             }
              if(xml.name() == "PLAYLIST")
             {
                 inPlaylistTag = false;
             }
-            //We leave the infinte loop, if twe have the closing "PLAYLIST" tag 
+            //We leave the infinte loop, if twe have the closing "PLAYLIST" tag
             if(xml.name() == "PLAYLISTS")
             {
                 break;
@@ -442,15 +466,11 @@
         }
 
     }
-    
-
-    m_childModel.setRootItem(rootItem);
-    
-    
+    return rootItem;
 }
 void TraktorFeature::parsePlaylistEntries(QXmlStreamReader &xml,QString playlist_path, QSqlQuery query_insert_into_playlist, QSqlQuery query_insert_into_playlisttracks)
 {
-    // In the database, the name of a playlist is specified by the unique path, e.g., /someFolderA/someFolderB/playlistA" 
+    // In the database, the name of a playlist is specified by the unique path, e.g., /someFolderA/someFolderB/playlistA"
     query_insert_into_playlist.bindValue(":name", playlist_path);
     bool success = query_insert_into_playlist.exec();
     if(!success){
@@ -459,10 +479,10 @@
     }
     //Get playlist id
     QSqlQuery id_query(m_database);
-    id_query.prepare("select id from traktor_playlists where name=:path"); 
+    id_query.prepare("select id from traktor_playlists where name=:path");
     id_query.bindValue(":path", playlist_path);
     success = id_query.exec();
-    
+
     int playlist_id = -1;
     if(success){
         //playlist_id = id_query.lastInsertId().toInt();
@@ -472,13 +492,13 @@
     }
     else
         qDebug() << "SQL Error in TraktorTableModel.cpp: line" << __LINE__ << " " << id_query.lastError();
-    
-
-    
+
+
+
     while(!xml.atEnd())
     {
         //read next XML element
-        xml.readNext(); 
+        xml.readNext();
         if(xml.isStartElement())
         {
             if(xml.name() == "PRIMARYKEY"){
@@ -489,7 +509,7 @@
                 {
                     key.replace(QString(":"), QString(""));
                     //TODO: IFDEF
-                    #if defined(__WINDOWS__)             
+                    #if defined(__WINDOWS__)
                     key.insert(1,":");
                     #else
                     key.prepend("/Volumes/");
@@ -498,24 +518,24 @@
                     //insert to database
                     int track_id = -1;
                     QSqlQuery finder_query(m_database);
-                    finder_query.prepare("select id from traktor_library where location=:path"); 
+                    finder_query.prepare("select id from traktor_library where location=:path");
                     finder_query.bindValue(":path", key);
                     success = finder_query.exec();
-                    
-                    
+
+
                     if(success){
                         while (finder_query.next()) {
                             track_id = finder_query.value(finder_query.record().indexOf("id")).toInt();
                         }
-                    }   
+                    }
                     else
                         qDebug() << "SQL Error in TraktorTableModel.cpp: line" << __LINE__ << " " << finder_query.lastError();
 
                     query_insert_into_playlisttracks.bindValue(":playlist_id", playlist_id);
                     query_insert_into_playlisttracks.bindValue(":track_id", track_id);
                     success = query_insert_into_playlisttracks.exec();
-    
-          
+
+
                     if(!success){
                         qDebug() << "SQL Error in TraktorFeature.cpp: line" << __LINE__ << " " << query_insert_into_playlisttracks.lastError();
                         qDebug() << "trackid" << track_id << " with path " << key;
@@ -523,27 +543,27 @@
                         qDebug() << "-----------------";
 
                     }
-                            
+
                 }
-                
+
             }
         }
         if(xml.isEndElement()){
-            //We leave the infinte loop, if twe have the closing "PLAYLIST" tag 
+            //We leave the infinte loop, if twe have the closing "PLAYLIST" tag
             if(xml.name() == "PLAYLIST")
             {
                 break;
             }
         }
     }
-    
+
 }
 void TraktorFeature::clearTable(QString table_name)
 {
     QSqlQuery query(m_database);
     query.prepare("delete from "+table_name);
     bool success = query.exec();
-    
+
     if(!success)
         qDebug() << "Could not delete remove old entries from table " << table_name << " : " << query.lastError();
     else
@@ -569,3 +589,23 @@
 
 
 }
+void TraktorFeature::onTrackCollectionLoaded()
+{
+    TreeItem* root = m_future.result();
+    if (root) {
+        m_childModel.setRootItem(root);
+        m_pTraktorTableModel->select();
+        emit(showTrackModel(m_pTraktorTableModel));
+        qDebug() << "Traktor library loaded successfully";
+    } else {
+        QMessageBox::warning(
+            NULL,
+            tr("Error Loading Traktor Library"),
+            tr("There was an error loading your Traktor library. Some of "
+               "your Traktor tracks or playlists may not have loaded."));
+    }
+    //calls a slot in the sidebarmodel such that 'isLoading' is removed from the feature title.
+    m_title = tr("Traktor");
+    emit(featureLoadingFinished(this));
+    activate();
+}

=== renamed file 'mixxx/src/library/traktorfeature.h' => 'mixxx/src/library/traktor/traktorfeature.h'
--- mixxx/src/library/traktorfeature.h	2011-01-03 13:54:29 +0000
+++ mixxx/src/library/traktor/traktorfeature.h	2011-02-21 23:55:30 +0000
@@ -7,11 +7,14 @@
 #include <QStringListModel>
 #include <QtSql>
 #include <QXmlStreamReader>
+#include <QFuture>
+#include <QtConcurrentRun>
+#include <QFutureWatcher>
 
 #include "library/libraryfeature.h"
-#include "library/traktortablemodel.h"
-#include "library/traktorplaylistmodel.h"
-#include "treeitemmodel.h"
+#include "library/traktor/traktortablemodel.h"
+#include "library/traktor/traktorplaylistmodel.h"
+#include "library/treeitemmodel.h"
 
 class LibraryTableModel;
 class MissingTableModel;
@@ -40,27 +43,32 @@
     void onRightClick(const QPoint& globalPos);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
     void refreshLibraryModels();
+    void onTrackCollectionLoaded();
 private:
-    bool importLibrary(QString file);
+    TreeItem* importLibrary(QString file);
     /** parses a track in the music collection **/
     void parseTrack(QXmlStreamReader &xml, QSqlQuery &query);
-    /** Iterates over all playliost and folders and constructs the childmodel **/    
-    void parsePlaylists(QXmlStreamReader &xml);
+    /** Iterates over all playliost and folders and constructs the childmodel **/
+    TreeItem* parsePlaylists(QXmlStreamReader &xml);
     /** processes a particular playlist **/
-    void parsePlaylistEntries(QXmlStreamReader &xml, QString playlist_path, 
+    void parsePlaylistEntries(QXmlStreamReader &xml, QString playlist_path,
     			QSqlQuery query_insert_into_playlist, QSqlQuery query_insert_into_playlisttracks);
     void clearTable(QString table_name);
     static QString getTraktorMusicDatabase();
     //private fields
     TreeItemModel m_childModel;
     TrackCollection* m_pTrackCollection;
-    QSqlDatabase &m_database;
+    //A separate db connection for the worker parsing thread
+    QSqlDatabase m_database;
     TraktorTableModel* m_pTraktorTableModel;
     TraktorPlaylistModel* m_pTraktorPlaylistModel;
 
     bool m_isActivated;
-
-   
+    QFutureWatcher<TreeItem*> m_future_watcher;
+    QFuture<TreeItem*> m_future;
+    QString m_title;
+
+
 };
 
 

=== renamed file 'mixxx/src/library/traktorplaylistmodel.cpp' => 'mixxx/src/library/traktor/traktorplaylistmodel.cpp'
--- mixxx/src/library/traktorplaylistmodel.cpp	2011-01-05 20:46:21 +0000
+++ mixxx/src/library/traktor/traktorplaylistmodel.cpp	2011-02-21 23:55:30 +0000
@@ -2,7 +2,7 @@
 #include <QtGui>
 #include <QtSql>
 #include "library/trackcollection.h"
-#include "library/traktorplaylistmodel.h"
+#include "library/traktor/traktorplaylistmodel.h"
 
 #include "mixxxutils.cpp"
 
@@ -13,13 +13,10 @@
           BaseSqlTableModel(parent, pTrackCollection, pTrackCollection->getDatabase()),
           m_pTrackCollection(pTrackCollection),
           m_database(m_pTrackCollection->getDatabase())
-          
+
 {
     connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&)));
-    
-    
-    
-    
+    setCaching(false);
 }
 
 TraktorPlaylistModel::~TraktorPlaylistModel() {
@@ -34,16 +31,16 @@
 TrackPointer TraktorPlaylistModel::getTrack(const QModelIndex& index) const
 {
 	//qDebug() << "getTraktorTrack";
-	
+
     QString artist = index.sibling(index.row(), fieldIndex("artist")).data().toString();
     QString title = index.sibling(index.row(), fieldIndex("title")).data().toString();
     QString album = index.sibling(index.row(), fieldIndex("album")).data().toString();
     QString year = index.sibling(index.row(), fieldIndex("year")).data().toString();
     QString genre = index.sibling(index.row(), fieldIndex("genre")).data().toString();
     float bpm = index.sibling(index.row(), fieldIndex("bpm")).data().toString().toFloat();
-	
+
     QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
-	
+
     TrackInfoObject* pTrack = new TrackInfoObject(location);
     pTrack->setArtist(artist);
     pTrack->setTitle(title);
@@ -51,7 +48,7 @@
     pTrack->setYear(year);
     pTrack->setGenre(genre);
     pTrack->setBpm(bpm);
-	
+
 
     return TrackPointer(pTrack, &QObject::deleteLater);
 }
@@ -64,7 +61,7 @@
 
 void TraktorPlaylistModel::removeTrack(const QModelIndex& index)
 {
-    
+
 }
 
 void TraktorPlaylistModel::removeTracks(const QModelIndexList& indices) {
@@ -72,7 +69,7 @@
 }
 void TraktorPlaylistModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex)
 {
-   
+
 }
 
 void TraktorPlaylistModel::search(const QString& searchText) {
@@ -112,7 +109,7 @@
 }
 
 QMimeData* TraktorPlaylistModel::mimeData(const QModelIndexList &indexes) const {
-    
+
    QMimeData *mimeData = new QMimeData();
     QList<QUrl> urls;
 
@@ -145,8 +142,8 @@
 
 TrackModel::CapabilitiesFlags TraktorPlaylistModel::getCapabilities() const
 {
-  
-    return NULL;
+
+    return TRACKMODELCAPS_NONE;
 }
 
 Qt::ItemFlags TraktorPlaylistModel::flags(const QModelIndex &index) const
@@ -158,15 +155,15 @@
     int playlistId = -1;
     QSqlQuery finder_query(m_database);
     finder_query.prepare("SELECT id from traktor_playlists where name='"+playlist_path+"'");
-        
+
     if(finder_query.exec()){
         while (finder_query.next()) {
             playlistId = finder_query.value(finder_query.record().indexOf("id")).toInt();
         }
-    }   
+    }
     else
-        qDebug() << "SQL Error in TraktorPlaylistModel.cpp: line" << __LINE__ << " " << finder_query.lastError(); 
-   
+        qDebug() << "SQL Error in TraktorPlaylistModel.cpp: line" << __LINE__ << " " << finder_query.lastError();
+
 
     QString playlistID = "TraktorPlaylist_" + QString("%1").arg(playlistId);
     //Escape the playlist name
@@ -176,9 +173,9 @@
 
     QSqlQuery query(m_database);
     query.prepare("CREATE TEMPORARY VIEW IF NOT EXISTS "+ driver->formatValue(playlistNameField) + " AS "
-                  "SELECT " 
+                  "SELECT "
                   "traktor_library.id,"
-                  "traktor_library.artist," 
+                  "traktor_library.artist,"
                   "traktor_library.title,"
                   "traktor_library.album,"
                   "traktor_library.year,"
@@ -200,16 +197,16 @@
                   "ON traktor_playlist_tracks.playlist_id = traktor_playlists.id "
                   "where traktor_playlists.name='"+playlist_path+"'"
                   );
-    
-      
+
+
     if (!query.exec()) {
-       
+
         qDebug() << "Error creating temporary view for traktor playlists. TraktorPlaylistModel --> line: " << __LINE__ << " " << query.lastError();
         qDebug() << "Executed Query: " <<  query.executedQuery();
         return;
     }
 	setTable(playlistID);
-    
+
 	//removeColumn(fieldIndex("track_id"));
 	//removeColumn(fieldIndex("name"));
 	//removeColumn(fieldIndex("id"));
@@ -220,10 +217,10 @@
     initHeaderData();
 }
 bool TraktorPlaylistModel::isColumnHiddenByDefault(int column) {
-    if (column == fieldIndex(LIBRARYTABLE_KEY))    
+    if (column == fieldIndex(LIBRARYTABLE_KEY))
         return true;
     if(column == fieldIndex(LIBRARYTABLE_BITRATE))
     	return true;
-    
+
     return false;
-}
\ No newline at end of file
+}

=== renamed file 'mixxx/src/library/traktorplaylistmodel.h' => 'mixxx/src/library/traktor/traktorplaylistmodel.h'
--- mixxx/src/library/traktorplaylistmodel.h	2010-12-22 18:57:15 +0000
+++ mixxx/src/library/traktor/traktorplaylistmodel.h	2011-02-21 23:55:30 +0000
@@ -4,7 +4,7 @@
 #include <QtSql>
 #include <QItemDelegate>
 #include <QtCore>
-#include "trackmodel.h"
+#include "library/trackmodel.h"
 #include "library/basesqltablemodel.h"
 #include "library/librarytablemodel.h"
 #include "library/dao/playlistdao.h"
@@ -18,7 +18,7 @@
   public:
     TraktorPlaylistModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~TraktorPlaylistModel();
-    
+
     virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
@@ -29,13 +29,13 @@
     virtual void removeTracks(const QModelIndexList& indices);
     virtual bool addTrack(const QModelIndex& index, QString location);
     virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
-	
+
     virtual Qt::ItemFlags flags(const QModelIndex &index) const;
     QMimeData* mimeData(const QModelIndexList &indexes) const;
-   
+
     QItemDelegate* delegateForColumn(const int i);
     TrackModel::CapabilitiesFlags getCapabilities() const;
-    /** sets the playlist **/    
+    /** sets the playlist **/
     void setPlaylist(QString path_name);
 
   private slots:
@@ -47,8 +47,8 @@
   private:
     TrackCollection* m_pTrackCollection;
 	QSqlDatabase &m_database;
-    
-    
+
+
     QString m_currentSearch;
 };
 

=== renamed file 'mixxx/src/library/traktortablemodel.cpp' => 'mixxx/src/library/traktor/traktortablemodel.cpp'
--- mixxx/src/library/traktortablemodel.cpp	2011-01-05 20:46:21 +0000
+++ mixxx/src/library/traktor/traktortablemodel.cpp	2011-02-21 23:55:30 +0000
@@ -2,7 +2,7 @@
 #include <QtGui>
 #include <QtSql>
 #include "library/trackcollection.h"
-#include "library/traktortablemodel.h"
+#include "library/traktor/traktortablemodel.h"
 
 #include "mixxxutils.cpp"
 
@@ -13,11 +13,12 @@
           BaseSqlTableModel(parent, pTrackCollection, pTrackCollection->getDatabase()),
           m_pTrackCollection(pTrackCollection),
           m_database(m_pTrackCollection->getDatabase())
-          
+
 {
     connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&)));
     setTable("traktor_library");
     initHeaderData();
+    setCaching(false);
 }
 
 TraktorTableModel::~TraktorTableModel() {
@@ -32,16 +33,16 @@
 TrackPointer TraktorTableModel::getTrack(const QModelIndex& index) const
 {
     //qDebug() << "getTraktorTrack";
-    
+
     QString artist = index.sibling(index.row(), fieldIndex("artist")).data().toString();
     QString title = index.sibling(index.row(), fieldIndex("title")).data().toString();
     QString album = index.sibling(index.row(), fieldIndex("album")).data().toString();
     QString year = index.sibling(index.row(), fieldIndex("year")).data().toString();
     QString genre = index.sibling(index.row(), fieldIndex("genre")).data().toString();
     float bpm = index.sibling(index.row(), fieldIndex("bpm")).data().toString().toFloat();
-    
+
     QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
-    
+
     TrackInfoObject* pTrack = new TrackInfoObject(location);
     pTrack->setArtist(artist);
     pTrack->setTitle(title);
@@ -49,7 +50,7 @@
     pTrack->setYear(year);
     pTrack->setGenre(genre);
     pTrack->setBpm(bpm);
-    
+
 
     return TrackPointer(pTrack, &QObject::deleteLater);
 }
@@ -62,7 +63,7 @@
 
 void TraktorTableModel::removeTrack(const QModelIndex& index)
 {
-    
+
 }
 
 void TraktorTableModel::removeTracks(const QModelIndexList& indices) {
@@ -70,7 +71,7 @@
 }
 void TraktorTableModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex)
 {
-   
+
 }
 
 void TraktorTableModel::search(const QString& searchText) {
@@ -93,7 +94,7 @@
                 "album LIKE " + escapedText + " OR " +
                 "title  LIKE " + escapedText + ")";
     setFilter(filter);
-  
+
 }
 
 const QString TraktorTableModel::currentSearch() {
@@ -109,7 +110,7 @@
 }
 
 QMimeData* TraktorTableModel::mimeData(const QModelIndexList &indexes) const {
-    
+
     QMimeData *mimeData = new QMimeData();
     QList<QUrl> urls;
 
@@ -142,8 +143,8 @@
 
 TrackModel::CapabilitiesFlags TraktorTableModel::getCapabilities() const
 {
-  
-    return NULL;
+
+    return TRACKMODELCAPS_NONE;
 }
 
 Qt::ItemFlags TraktorTableModel::flags(const QModelIndex &index) const
@@ -151,10 +152,10 @@
     return readOnlyFlags(index);
 }
 bool TraktorTableModel::isColumnHiddenByDefault(int column) {
-    if (column == fieldIndex(LIBRARYTABLE_KEY))    
+    if (column == fieldIndex(LIBRARYTABLE_KEY))
         return true;
     if(column == fieldIndex(LIBRARYTABLE_BITRATE))
         return true;
-    
-    return false;        
-}
\ No newline at end of file
+
+    return false;
+}

=== renamed file 'mixxx/src/library/traktortablemodel.h' => 'mixxx/src/library/traktor/traktortablemodel.h'
--- mixxx/src/library/traktortablemodel.h	2010-12-22 18:57:15 +0000
+++ mixxx/src/library/traktor/traktortablemodel.h	2011-02-21 23:55:30 +0000
@@ -4,7 +4,8 @@
 #include <QtSql>
 #include <QItemDelegate>
 #include <QtCore>
-#include "trackmodel.h"
+
+#include "library/trackmodel.h"
 #include "library/basesqltablemodel.h"
 #include "library/librarytablemodel.h"
 #include "library/dao/playlistdao.h"
@@ -18,7 +19,7 @@
   public:
     TraktorTableModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~TraktorTableModel();
-    
+
     virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
@@ -29,10 +30,10 @@
     virtual void removeTracks(const QModelIndexList& indices);
     virtual bool addTrack(const QModelIndex& index, QString location);
     virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
-	
+
     virtual Qt::ItemFlags flags(const QModelIndex &index) const;
     QMimeData* mimeData(const QModelIndexList &indexes) const;
-   
+
     QItemDelegate* delegateForColumn(const int i);
     TrackModel::CapabilitiesFlags getCapabilities() const;
 
@@ -45,8 +46,8 @@
   private:
     TrackCollection* m_pTrackCollection;
 	QSqlDatabase &m_database;
-    
-    
+
+
     QString m_currentSearch;
 };
 

=== modified file 'mixxx/src/widget/wlibrarysidebar.cpp'
--- mixxx/src/widget/wlibrarysidebar.cpp	2010-04-09 17:10:43 +0000
+++ mixxx/src/widget/wlibrarysidebar.cpp	2011-02-21 23:55:30 +0000
@@ -1,5 +1,6 @@
 #include <QtCore>
 #include <QtGui>
+
 #include "library/sidebarmodel.h"
 #include "widget/wlibrarysidebar.h"
 
@@ -161,3 +162,9 @@
     else
         QTreeView::keyPressEvent(event);
 }
+
+void WLibrarySidebar::selectIndex(const QModelIndex& index) {
+    QItemSelectionModel* pModel = new QItemSelectionModel(model());
+    pModel->select(index, QItemSelectionModel::Select);
+    setSelectionModel(pModel);
+}

=== modified file 'mixxx/src/widget/wlibrarysidebar.h'
--- mixxx/src/widget/wlibrarysidebar.h	2009-12-11 06:10:55 +0000
+++ mixxx/src/widget/wlibrarysidebar.h	2011-02-21 23:55:30 +0000
@@ -15,6 +15,8 @@
     void dragEnterEvent(QDragEnterEvent * event);
     void dropEvent(QDropEvent * event);
     void keyPressEvent(QKeyEvent* event);
+  public slots:
+    void selectIndex(const QModelIndex&);
 
   signals:
     void rightClicked(const QPoint&, const QModelIndex&);