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

[RAFFI TEA]

This a rework of my former Traktor branch which resolves merge conflicts. I have implemented a Traktor library feature. It has been successfully tested on Windows and OS X 10.6.

Here is a detailed enumeration of what I did:
* Implemented a Traktor library parser
* Massive changes in SidebarModel to support n-level tree structures
  (needed for Traktor and prospective Serator feature)
  - Implemented TreeItemModel.cpp/h that operates on tree structures
  - From now on, all child models of a library feature must return an
    TreeItemModel
* Auto-detection of Traktor library file on Windows via registry
* Implemented search

Based on this branch, we can improve the library further. For instance, it would be possible
to show drive letters within the Browse feature. We could also allow users to have sub playlists and crates.

[lp:~mixxxdevelopers/mixxx/traktor_library]

2621. By Raffitea on 2010-12-23

Implemented drag 'n' drop from Traktor playlists * Hide key column and bitrate by default

2622. By Raffitea on 2010-12-29

* Merging from lp:~mhaulo/mixxx/validate_playlist_and_crate_creation

2623. By Raffitea on 2010-12-29

Merging from lp:~mhaulo/mixxx/allow-playlist-and-crate-renaming
* Crates and Playlists ca now be renamed.

2624. By Raffitea on 2010-12-30

Merging from trunk (1.10)

2625. By Raffitea on 2010-12-30

Moved M3U and PLS parser to library folder.
Fix: Don't show Traktor feature in sidebar if Traktor is not installed.

2626. By Raffitea on 2010-12-31

M3U playlists can now be imported partially.

2627. By Raffitea on 2010-12-31

Fix: M3U playlists from iTunes can now be imported

2628. By Raffitea on 2011-01-01

Improved PLS parser such it works on all platforms.

2629. By Raffitea on 2011-01-01

* Added playlist import for crates, too.
* Added some delete statements for QActions in destructor.
* Removed debugs

[Albert Santoni (gamegod)]

- Fix indentation in CrateFeature

- in CrateFeature::slotRenameCrate, we're probably resetting the selection model because we call m_crateListTableModel.select(). Can we instead tell the model that that particular row has changed so it tells the view to update it? Otherwise, I think when you rename a crate, you will lose your position in the sidebar. (This could be really annoying at some point if you're trying to rename subcrates.)

- I see you did some magic with CrateFeature::constructChildModel() to deal with this problem in the case of inserting or deleting playlists though, which is awesome! :)

- It's also awesome that you can import playlists into both crates and playlists.

- I have not tested the Traktor feature, but based on the code:
   - In TraktorFeature::getTraktorMusicDatabase(), should we look for registry entries for older versions of Traktor if we don't find the Traktor Pro entry? Do you know if the XML schema changed from Traktor 3 to Traktor Pro?
   - There's some more tabs in traktorfeature.h for indents instead of spaces!
   - Change the #ifndef at the top of treeitemmodel.h? (you'll see what I mean)

Great work overall though Tobias! There are some cool, polished features in here and the code is high quality.

review: Needs Fixing

[Albert Santoni (gamegod)]

- Fix indentation in CrateFeature

- in CrateFeature::slotRenameCrate, we're probably resetting the selection model because we call m_crateListTableModel.select(). Can we instead tell the model that that particular row has changed so it tells the view to update it? Otherwise, I think when you rename a crate, you will lose your position in the sidebar. (This could be really annoying at some point if you're trying to rename subcrates.)

- I see you did some magic with CrateFeature::constructChildModel() to deal with this problem in the case of inserting or deleting playlists though, which is awesome! :)

- It's also awesome that you can import playlists into both crates and playlists.

- I have not tested the Traktor feature, but based on the code:
   - In TraktorFeature::getTraktorMusicDatabase(), should we look for registry entries for older versions of Traktor if we don't find the Traktor Pro entry? Do you know if the XML schema changed from Traktor 3 to Traktor Pro?
   - There's some more tabs in traktorfeature.h for indents instead of spaces!
   - Change the #ifndef at the top of treeitemmodel.h? (you'll see what I mean)

Great work overall though Tobias! There are some cool, polished features in here and the code is high quality.

review: Needs Fixing

[lp:~mixxxdevelopers/mixxx/traktor_library]

2630. By Raffitea on 2011-01-03

Hopfully fixed identation in CrateFeature

2631. By Raffitea on 2011-01-03

fixed identation in traktorfeature.h

2632. By Raffitea on 2011-01-03

Again fixed identation in traktorfeature.h

2633. By Raffitea on 2011-01-03

Finally fixed identation in traktorfeature.h

[RAFFI TEA (raffitea)]

Thanks for your review Albert.

>
> - Fix indentation in CrateFeature

Done! Don't know why I always have indentation problems. My editor is set up correctly. Whenever I press <tab> it should create 4 spaces.

> - in CrateFeature::slotRenameCrate, we're probably resetting the selection
> model because we call m_crateListTableModel.select(). Can we instead tell the
> model that that particular row has changed so it tells the view to update it?
> Otherwise, I think when you rename a crate, you will lose your position in the
> sidebar. (This could be really annoying at some point if you're trying to
> rename subcrates.)

I've addressed this issue with some magic code as you noticed in your comment below. There's no reset in the sidebar model (the tree won't collapse) but you'll loose focus. I'll try to improve that behavior.

> - I see you did some magic with CrateFeature::constructChildModel() to deal
> with this problem in the case of inserting or deleting playlists though, which
> is awesome! :)
>
> - It's also awesome that you can import playlists into both crates and
> playlists.

The code was already there, I added only some improvements.

> - I have not tested the Traktor feature, but based on the code:
> - In TraktorFeature::getTraktorMusicDatabase(), should we look for registry
> entries for older versions of Traktor if we don't find the Traktor Pro entry?
> Do you know if the XML schema changed from Traktor 3 to Traktor Pro?
> - There's some more tabs in traktorfeature.h for indents instead of spaces!

Done.

> - Change the #ifndef at the top of treeitemmodel.h? (you'll see what I
> mean)

Done.

I've only tested with the latest 1.2.x series. I don't know where to get an older Traktor 3. But I've never seen Traktor 3 in German clubs. All DJs I know use either Serato or a one of the current Traktor 1.2.x releases.

The registry key to look up the library path should be the same for all Traktor 1.2.x products, i.e., Traktor LE, Traktor (Scratch) Duo, Traktor (Scratch) Pro.

> Great work overall though Tobias! There are some cool, polished features in
> here and the code is high quality.

[Albert Santoni (gamegod)]

Thanks for your thoroughness Tobias!

review: Approve

[lp:~mixxxdevelopers/mixxx/traktor_library]

2634. By Raffitea on 2011-01-05

Fixed idents in depends.py

2635. By Raffitea on 2011-01-05

Fixed various idents and typos

2636. By Raffitea on 2011-01-05

Fixed various idents

2637. By Raffitea on 2011-01-05

Fixed various idents in TrakorPlaylistModel

2638. By Raffitea on 2011-01-05

Again fixed various idents in TrakorPlaylistModel

2639. By Raffitea on 2011-01-05

Again fixed various idents in TrakorTableModel

2640. By Raffitea on 2011-01-05

Fixed a bug in TreeItemModel preventing unsorted playlists and crates after renaming and insertions.

2641. By Raffitea on 2011-01-06

Fix: Traktor playlists can have duplicate songs * Fix: Ratings can be 0

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2010-12-05 09:59:50 +0000
+++ mixxx/build/depends.py	2011-01-06 15:28:44 +0000
@@ -480,11 +480,17 @@
                    "library/stardelegate.cpp",
                    "library/stareditor.cpp",
                    "audiotagger.cpp",
+                   
+                   "library/treeitemmodel.cpp",
+                   "library/treeitem.cpp",
+                   "library/traktorfeature.cpp",
+                   "library/traktortablemodel.cpp",
+                   "library/traktorplaylistmodel.cpp",
 
                    "xmlparse.cpp",
-                   "parser.cpp",
-                   "parserpls.cpp",
-                   "parserm3u.cpp",
+                   "library/parser.cpp",
+                   "library/parserpls.cpp",
+                   "library/parserm3u.cpp",
 
                    "bpm/bpmscheme.cpp",
 

=== added file 'mixxx/res/images/library/ic_library_traktor.png'
Binary files mixxx/res/images/library/ic_library_traktor.png	1970-01-01 00:00:00 +0000 and mixxx/res/images/library/ic_library_traktor.png	2011-01-06 15:28:44 +0000 differ
=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2010-11-22 15:24:51 +0000
+++ mixxx/res/mixxx.qrc	2011-01-06 15:28:44 +0000
@@ -28,5 +28,6 @@
         <file>images/library/ic_library_prepare.png</file>
         <file>images/library/ic_library_promotracks.png</file>
         <file>images/library/ic_library_rhythmbox.png</file>
+        <file>images/library/ic_library_traktor.png</file>
     </qresource>
 </RCC>

=== modified file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2010-12-03 19:32:01 +0000
+++ mixxx/res/schema.xml	2011-01-06 15:28:44 +0000
@@ -199,4 +199,33 @@
         track_id INTEGER REFERENCES itunes_library(id));
     </sql>
   </revision>
+  <revision version="9" min_compatible="3">
+    <description>
+      Tables for Traktor library feature
+    </description>
+    <sql>
+     CREATE TABLE IF NOT EXISTS traktor_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 traktor_playlists (
+        id INTEGER primary key,
+        name varchar(100) UNIQUE
+        );
+      CREATE TABLE IF NOT EXISTS traktor_playlist_tracks (
+        id INTEGER primary key AUTOINCREMENT,
+        playlist_id INTEGER REFERENCES traktor_playlist(id),
+        track_id INTEGER REFERENCES traktor_library(id)
+        );
+    </sql>
+  </revision>
 </schema>

=== modified file 'mixxx/src/library/autodjfeature.cpp'
--- mixxx/src/library/autodjfeature.cpp	2010-10-24 09:50:11 +0000
+++ mixxx/src/library/autodjfeature.cpp	2011-01-06 15:28:44 +0000
@@ -50,8 +50,8 @@
             this, SIGNAL(loadTrackToPlayer(TrackPointer, QString)));
 }
 
-QAbstractItemModel* AutoDJFeature::getChildModel() {
-    return &m_childModel;
+TreeItemModel* AutoDJFeature::getChildModel() {
+	return &m_childModel;
 }
 
 void AutoDJFeature::activate() {

=== modified file 'mixxx/src/library/autodjfeature.h'
--- mixxx/src/library/autodjfeature.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/autodjfeature.h	2011-01-06 15:28:44 +0000
@@ -10,6 +10,7 @@
 #include "library/libraryfeature.h"
 #include "library/dao/playlistdao.h"
 #include "configobject.h"
+#include "treeitemmodel.h"
 
 class PlaylistTableModel;
 class TrackCollection;
@@ -34,7 +35,7 @@
                     WLibrary* libraryWidget,
                     MixxxKeyboard* keyboard);
 
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
 
 public slots:
     void activate();
@@ -47,7 +48,7 @@
     TrackCollection* m_pTrackCollection;
     PlaylistDAO& m_playlistDao;
     const static QString m_sAutoDJViewName;
-    QStringListModel m_childModel;
+    TreeItemModel m_childModel;
 };
 
 

=== modified file 'mixxx/src/library/browsefeature.cpp'
--- mixxx/src/library/browsefeature.cpp	2010-12-02 21:52:18 +0000
+++ mixxx/src/library/browsefeature.cpp	2011-01-06 15:28:44 +0000
@@ -42,7 +42,7 @@
     return QIcon(":/images/library/ic_library_browse.png");
 }
 
-QAbstractItemModel* BrowseFeature::getChildModel() {
+TreeItemModel* BrowseFeature::getChildModel() {
     return &m_childModel;
 }
 

=== modified file 'mixxx/src/library/browsefeature.h'
--- mixxx/src/library/browsefeature.h	2010-10-24 09:50:11 +0000
+++ mixxx/src/library/browsefeature.h	2011-01-06 15:28:44 +0000
@@ -11,6 +11,7 @@
 #include "library/browsefilter.h"
 #include "library/browsetablemodel.h"
 #include "library/libraryfeature.h"
+#include "treeitemmodel.h"
 
 class TrackCollection;
 
@@ -33,7 +34,7 @@
     virtual void bindWidget(WLibrarySidebar* sidebarWidget,
                             WLibrary* libraryWidget,
                             MixxxKeyboard* keyboard);
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
 
   public slots:
     void activate();
@@ -55,7 +56,7 @@
     BrowseTableModel m_browseModel;
     BrowseFilter m_proxyModel;
     TrackCollection* m_pTrackCollection;
-    QStringListModel m_childModel;
+    TreeItemModel m_childModel;
     QString m_currentSearch;
 };
 

=== modified file 'mixxx/src/library/cratefeature.cpp'
--- mixxx/src/library/cratefeature.cpp	2010-11-25 01:03:57 +0000
+++ mixxx/src/library/cratefeature.cpp	2011-01-06 15:28:44 +0000
@@ -6,6 +6,9 @@
 #include <QLineEdit>
 
 #include "library/cratefeature.h"
+#include "library/parser.h"
+#include "library/parserm3u.h"
+#include "library/parserpls.h"
 
 #include "library/cratetablemodel.h"
 #include "library/trackcollection.h"
@@ -13,6 +16,7 @@
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
 #include "mixxxkeyboard.h"
+#include "treeitem.h"
 
 CrateFeature::CrateFeature(QObject* parent,
                            TrackCollection* pTrackCollection)
@@ -27,6 +31,14 @@
     connect(m_pDeleteCrateAction, SIGNAL(triggered()),
             this, SLOT(slotDeleteCrate()));
 
+    m_pRenameCrateAction = new QAction(tr("Rename"),this);
+    connect(m_pRenameCrateAction, SIGNAL(triggered()),
+			this, SLOT(slotRenameCrate()));
+
+    m_pImportPlaylistAction = new QAction(tr("Import Playlist"),this);
+    connect(m_pImportPlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotImportPlaylist()));
+
     m_crateListTableModel.setTable("crates");
     m_crateListTableModel.removeColumn(m_crateListTableModel.fieldIndex("id"));
     m_crateListTableModel.removeColumn(m_crateListTableModel.fieldIndex("show"));
@@ -34,9 +46,29 @@
                               Qt::AscendingOrder);
     m_crateListTableModel.setFilter("show = 1");
     m_crateListTableModel.select();
+    
+    //construct child model
+    TreeItem *rootItem = new TreeItem("$root","$root", this);
+
+    int idColumn = m_crateListTableModel.record().indexOf("name");
+    for (int row = 0; row < m_crateListTableModel.rowCount(); ++row) {
+            QModelIndex ind = m_crateListTableModel.index(row, idColumn);
+            QString crate_name = m_crateListTableModel.data(ind).toString();
+            TreeItem *playlist_item = new TreeItem(crate_name, crate_name, this, rootItem);
+            rootItem->appendChild(playlist_item);
+            
+    }
+    m_childModel.setRootItem(rootItem);
+
 }
 
 CrateFeature::~CrateFeature() {
+    //delete QActions
+    delete m_pCreateCrateAction;
+    delete m_pDeleteCrateAction;
+    delete m_pRenameCrateAction;
+    delete m_pImportPlaylistAction;
+
 }
 
 QVariant CrateFeature::title() {
@@ -92,8 +124,8 @@
     libraryWidget->registerView("CRATEHOME", edit);
 }
 
-QAbstractItemModel* CrateFeature::getChildModel() {
-    return &m_crateListTableModel;
+TreeItemModel* CrateFeature::getChildModel() {
+    return &m_childModel;
 }
 
 void CrateFeature::activate() {
@@ -124,31 +156,54 @@
     QMenu menu(NULL);
     menu.addAction(m_pCreateCrateAction);
     menu.addSeparator();
+    menu.addAction(m_pRenameCrateAction);
     menu.addAction(m_pDeleteCrateAction);
+    menu.addSeparator();
+    menu.addAction(m_pImportPlaylistAction);
     menu.exec(globalPos);
 }
 
 void CrateFeature::slotCreateCrate() {
 
-    bool ok = false;
-    QString name = QInputDialog::getText(NULL,
-                                         tr("New Crate"),
-                                         tr("Crate name:"),
-                                         QLineEdit::Normal, tr("New Crate"),
-                                         &ok);
-
-    if (!ok)
-        return;
-
+    QString name;
+    bool validNameGiven = false;
     CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
-
-    if (name == "") {
-        QMessageBox::warning(NULL,
-                             tr("Crate Creation Failed"),
-                             tr("A crate cannot have a blank name."));
-        return;
-    } else if (crateDao.createCrate(name)) {
+    
+    do {
+        bool ok = false;
+        name = QInputDialog::getText(NULL,
+                                     tr("New Crate"),
+                                     tr("Crate name:"),
+                                     QLineEdit::Normal, tr("New Crate"),
+                                     &ok).trimmed();
+
+        if (!ok)
+            return;
+
+        int existingId = crateDao.getCrateIdByName(name);
+        
+        if (existingId != -1) {
+            QMessageBox::warning(NULL,
+                                 tr("Creating Crate Failed"),
+                                 tr("A crate by that name already exists."));
+        }
+        else if (name.isEmpty()) {
+            QMessageBox::warning(NULL,
+                                 tr("Creating Crate Failed"),
+                                 tr("A crate cannot have a blank name."));
+        }
+        else {
+            validNameGiven = true;
+        }
+        
+    } while (!validNameGiven);
+
+    bool crateCreated = crateDao.createCrate(name);
+    
+    if (crateCreated) {
+        clearChildModel();
         m_crateListTableModel.select();
+        constructChildModel();
         // Switch to the new crate.
         int crate_id = crateDao.getCrateIdByName(name);
         m_crateTableModel.setCrate(crate_id);
@@ -156,10 +211,11 @@
         // TODO(XXX) set sidebar selection
         emit(featureUpdated());
     } else {
-        qDebug() << "Error creating crate (may already exist) with name " << name;
+        qDebug() << "Error creating crate with name " << name;
         QMessageBox::warning(NULL,
                              tr("Creating Crate Failed"),
-                             tr("A crate by that name already exists."));
+                             tr("An unknown error occurred while creating crate: ")
+                             + name);
 
     }
 }
@@ -169,9 +225,127 @@
     int crateId = m_pTrackCollection->getCrateDAO().getCrateIdByName(crateName);
 
     if (m_pTrackCollection->getCrateDAO().deleteCrate(crateId)) {
+        clearChildModel();
         m_crateListTableModel.select();
+        constructChildModel();
         emit(featureUpdated());
     } else {
         qDebug() << "Failed to delete crateId" << crateId;
     }
 }
+
+void CrateFeature::slotRenameCrate() {
+    QString oldName = m_lastRightClickedIndex.data().toString();
+    int crateId = m_pTrackCollection->getCrateDAO().getCrateIdByName(oldName);
+
+    QString newName;
+    bool validNameGiven = false;
+    
+    do {
+        bool ok = false;
+        newName = QInputDialog::getText(NULL,
+                                        tr("Rename Crate"),
+                                        tr("New crate name:"),
+                                        QLineEdit::Normal,
+                                        oldName,
+                                        &ok).trimmed();
+                                        
+        if (!ok || newName == oldName) {
+            return;
+        }
+
+        int existingId = m_pTrackCollection->getCrateDAO().getCrateIdByName(newName);
+
+        if (existingId != -1) {
+            QMessageBox::warning(NULL,
+                                tr("Renaming Crate Failed"),
+                                tr("A crate by that name already exists."));
+        }
+        else if (newName.isEmpty()) {
+            QMessageBox::warning(NULL,
+                                tr("Renaming Crate Failed"),
+                                tr("A crate cannot have a blank name."));
+        }
+        else {
+            validNameGiven = true;
+        }
+    } while (!validNameGiven);
+
+
+    if (m_pTrackCollection->getCrateDAO().renameCrate(crateId, newName)) {
+        clearChildModel();
+        m_crateListTableModel.select();
+        constructChildModel();
+        emit(featureUpdated());
+        m_crateTableModel.setCrate(crateId);
+    } else {
+        qDebug() << "Failed to rename crateId" << crateId;
+    }
+}
+/**
+  * Purpose: When inserting or removing playlists,
+  * we require the sidebar model not to reset.
+  * This method queries the database and does dynamic insertion 
+*/
+void CrateFeature::constructChildModel()
+{
+    QList<QString> data_list;
+    int idColumn = m_crateListTableModel.record().indexOf("name");
+    for (int row = 0; row < m_crateListTableModel.rowCount(); ++row) {
+            QModelIndex ind = m_crateListTableModel.index(row, idColumn);
+            QString crate_name = m_crateListTableModel.data(ind).toString();
+            data_list.append(crate_name);
+    }    
+    m_childModel.insertRows(data_list, 0, m_crateListTableModel.rowCount());  
+}
+/**
+  * Clears the child model dynamically
+  */
+void CrateFeature::clearChildModel()
+{
+    m_childModel.removeRows(0,m_crateListTableModel.rowCount());
+}
+void CrateFeature::slotImportPlaylist()
+{
+    qDebug() << "slotImportPlaylist() row:" ; //<< m_lastRightClickedIndex.data();
+
+
+    QString playlist_file = QFileDialog::getOpenFileName
+            (
+            NULL,
+            tr("Import Playlist"),
+            QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
+            tr("Playlist Files (*.m3u *.pls)") 
+            );
+    //Exit method if user cancelled the open dialog.
+    if (playlist_file.isNull() || playlist_file.isEmpty() ) return;
+
+    Parser* playlist_parser = NULL;
+    
+    if(playlist_file.endsWith(".m3u", Qt::CaseInsensitive))
+    {
+        playlist_parser = new ParserM3u();
+    }
+    else if(playlist_file.endsWith(".pls", Qt::CaseInsensitive))
+    {
+        playlist_parser = new ParserPls();
+    }
+    else
+    {
+        return;
+    }
+    
+    QList<QString> entries = playlist_parser->parse(playlist_file);
+
+    //Iterate over the List that holds URLs of playlist entires
+    for (int i = 0; i < entries.size(); ++i) {
+        m_crateTableModel.addTrack(QModelIndex(), entries[i]);
+        
+    }
+
+    //delete the parser object
+    if(playlist_parser) delete playlist_parser;
+    
+    
+}
+

=== modified file 'mixxx/src/library/cratefeature.h'
--- mixxx/src/library/cratefeature.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/cratefeature.h	2011-01-06 15:28:44 +0000
@@ -8,6 +8,7 @@
 #include "library/libraryfeature.h"
 #include "library/cratetablemodel.h"
 #include "library/proxytrackmodel.h"
+#include "treeitemmodel.h"
 
 class TrackCollection;
 
@@ -29,7 +30,7 @@
                     WLibrary* libraryWidget,
                     MixxxKeyboard* keyboard);
 
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
   signals:
     void showPage(const QUrl& page);
 
@@ -41,14 +42,22 @@
 
     void slotCreateCrate();
     void slotDeleteCrate();
+    void slotRenameCrate();
+    void slotImportPlaylist();
 
   private:
+    void constructChildModel();
+    void clearChildModel();
+  
     TrackCollection* m_pTrackCollection;
     QAction *m_pCreateCrateAction;
     QAction *m_pDeleteCrateAction;
+    QAction *m_pRenameCrateAction;
+    QAction *m_pImportPlaylistAction;
     QSqlTableModel m_crateListTableModel;
     CrateTableModel m_crateTableModel;
     QModelIndex m_lastRightClickedIndex;
+    TreeItemModel m_childModel;
 };
 
 #endif /* CRATEFEATURE_H */

=== modified file 'mixxx/src/library/dao/cratedao.cpp'
--- mixxx/src/library/dao/cratedao.cpp	2010-10-19 01:35:26 +0000
+++ mixxx/src/library/dao/cratedao.cpp	2011-01-06 15:28:44 +0000
@@ -51,6 +51,25 @@
     return false;
 }
 
+bool CrateDAO::renameCrate(int crateId, const QString& newName) {
+    qDebug() << "renameCrate()";
+
+    Q_ASSERT(m_database.transaction());
+    QSqlQuery query;
+    query.prepare("UPDATE " CRATE_TABLE " SET name = :name WHERE id = :id");
+    query.bindValue(":name", newName);
+    query.bindValue(":id", crateId);
+
+    if (!query.exec()) {
+        qDebug() << query.executedQuery() << query.lastError();
+        Q_ASSERT(m_database.rollback());
+        return false;
+    }
+
+    Q_ASSERT(m_database.commit());
+    return true;
+}
+
 bool CrateDAO::deleteCrate(int crateId) {
     Q_ASSERT(m_database.transaction());
 

=== modified file 'mixxx/src/library/dao/cratedao.h'
--- mixxx/src/library/dao/cratedao.h	2010-10-19 01:35:26 +0000
+++ mixxx/src/library/dao/cratedao.h	2011-01-06 15:28:44 +0000
@@ -23,6 +23,7 @@
     unsigned int crateCount();
     bool createCrate(const QString& name);
     bool deleteCrate(int crateId);
+    bool renameCrate(int crateId, const QString& newName);
     int getCrateIdByName(const QString& name);
     int getCrateId(int position);
     QString crateName(int crateId);

=== modified file 'mixxx/src/library/dao/playlistdao.cpp'
--- mixxx/src/library/dao/playlistdao.cpp	2010-10-07 03:05:48 +0000
+++ mixxx/src/library/dao/playlistdao.cpp	2011-01-06 15:28:44 +0000
@@ -145,6 +145,27 @@
     //TODO: Crap, we need to shuffle the positions of all the playlists?
 }
 
+
+void PlaylistDAO::renamePlaylist(int playlistId, const QString& newName)
+{
+    qDebug() << "renamePlaylist()";
+    
+    m_database.transaction();
+    QSqlQuery query(m_database);
+    query.prepare("UPDATE Playlists SET name = :name WHERE id = :id");
+    query.bindValue(":name", newName);
+    query.bindValue(":id", playlistId);
+    
+    if (!query.exec()) {
+        qDebug() << query.executedQuery() << query.lastError();
+        m_database.rollback();
+    }
+    else {
+        m_database.commit();
+    }
+}
+
+
 /** Append a track to a playlist */
 void PlaylistDAO::appendTrackToPlaylist(int trackId, int playlistId)
 {

=== modified file 'mixxx/src/library/dao/playlistdao.h'
--- mixxx/src/library/dao/playlistdao.h	2010-09-12 20:00:07 +0000
+++ mixxx/src/library/dao/playlistdao.h	2011-01-06 15:28:44 +0000
@@ -17,6 +17,8 @@
     bool createPlaylist(QString name, bool hidden = false);
     /** Delete a playlist */
     void deletePlaylist(int playlistId);
+    /** Rename a playlist */
+    void renamePlaylist(int playlistId, const QString& newName);
     /** Append a track to a playlist */
     void appendTrackToPlaylist(int trackId, int playlistId);
     /** Find out how many playlists exist. */

=== modified file 'mixxx/src/library/itunesfeature.cpp'
--- mixxx/src/library/itunesfeature.cpp	2010-12-03 19:07:40 +0000
+++ mixxx/src/library/itunesfeature.cpp	2011-01-06 15:28:44 +0000
@@ -8,6 +8,7 @@
 #include "library/itunesplaylistmodel.h"
 
 
+
 ITunesFeature::ITunesFeature(QObject* parent, TrackCollection* pTrackCollection)
         : LibraryFeature(parent),
           m_pTrackCollection(pTrackCollection),
@@ -15,6 +16,7 @@
     m_pITunesTrackModel = new ITunesTrackModel(this, m_pTrackCollection);
     m_pITunesPlaylistModel = new ITunesPlaylistModel(this, m_pTrackCollection);
     m_isActivated = false;
+    m_rootItem = new TreeItem("$root","$root", this);
 }
 
 ITunesFeature::~ITunesFeature() {
@@ -58,11 +60,8 @@
                 tr("There was an error loading your iTunes library. Some of "
                    "your iTunes tracks or playlists may not have loaded."));
         }
-
-        //Sort the playlists since in iTunes they are sorted, too.
-        //list.sort();
-
-        m_childModel.setStringList(m_playlists);
+        //set the root item for the childmodel.	
+        m_childModel.setRootItem(m_rootItem);
     }
 
     emit(showTrackModel(m_pITunesTrackModel));
@@ -76,7 +75,7 @@
     emit(showTrackModel(m_pITunesPlaylistModel));
 }
 
-QAbstractItemModel* ITunesFeature::getChildModel() {
+TreeItemModel* ITunesFeature::getChildModel() {
     return &m_childModel;
 }
 
@@ -423,8 +422,9 @@
                                  << " " << query_insert_to_playlists.lastError();
                         return;
                     }
-                    //for the child model
-                    m_playlists << playlistname;
+                    //append the playlist to the child model
+                    TreeItem *item = new TreeItem(playlistname, playlistname, this, m_rootItem);
+                    m_rootItem->appendChild(item);
 
                 }
                 /*

=== modified file 'mixxx/src/library/itunesfeature.h'
--- mixxx/src/library/itunesfeature.h	2010-11-21 04:39:36 +0000
+++ mixxx/src/library/itunesfeature.h	2011-01-06 15:28:44 +0000
@@ -9,6 +9,8 @@
 
 #include "library/libraryfeature.h"
 #include "library/trackcollection.h"
+#include "treeitemmodel.h"
+#include "treeitem.h"
 
 //class ITunesPlaylistModel;
 class ITunesTrackModel;
@@ -30,7 +32,7 @@
     bool dragMoveAccept(QUrl url);
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
 
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
 
   public slots:
     void activate();
@@ -49,11 +51,13 @@
 
     ITunesTrackModel* m_pITunesTrackModel;
     ITunesPlaylistModel* m_pITunesPlaylistModel;
-    QStringListModel m_childModel;
+    TreeItemModel m_childModel;
     QStringList m_playlists;
     TrackCollection* m_pTrackCollection;
     QSqlDatabase &m_database;
     bool m_isActivated;
+    //The root of the childmodel
+    TreeItem *m_rootItem;
 };
 
 #endif /* ITUNESFEATURE_H */

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2010-11-18 20:36:13 +0000
+++ mixxx/src/library/library.cpp	2011-01-06 15:28:44 +0000
@@ -18,6 +18,7 @@
 #include "library/playlistfeature.h"
 #include "library/preparefeature.h"
 #include "library/promotracksfeature.h"
+#include "library/traktorfeature.h"
 
 #include "widget/wtracktableview.h"
 #include "widget/wlibrary.h"
@@ -26,6 +27,7 @@
 #include "mixxxkeyboard.h"
 #include "librarymidicontrol.h"
 
+
 // This is is the name which we use to register the WTrackTableView with the
 // WLibrary
 const QString Library::m_sTrackViewName = QString("WTrackTableView");
@@ -63,6 +65,8 @@
         addFeature(new RhythmboxFeature(this));
     if (ITunesFeature::isSupported())
         addFeature(new ITunesFeature(this, m_pTrackCollection));
+    if (TraktorFeature::isSupported())
+        addFeature(new TraktorFeature(this, m_pTrackCollection));
 
     //Show the promo tracks view on first run, otherwise show the library
     if (firstRun) {

=== modified file 'mixxx/src/library/libraryfeature.h'
--- mixxx/src/library/libraryfeature.h	2010-10-24 09:50:11 +0000
+++ mixxx/src/library/libraryfeature.h	2011-01-06 15:28:44 +0000
@@ -14,6 +14,7 @@
 #include <QUrl>
 
 #include "trackinfoobject.h"
+#include "treeitemmodel.h"
 
 class TrackModel;
 class WLibrarySidebar;
@@ -38,7 +39,7 @@
                             WLibrary* /* libraryWidget */,
                             MixxxKeyboard* /* keyboard */) {
     }
-    virtual QAbstractItemModel* getChildModel() = 0;
+    virtual TreeItemModel* getChildModel() = 0;
 
   public slots:
     virtual void activate() = 0;

=== modified file 'mixxx/src/library/mixxxlibraryfeature.cpp'
--- mixxx/src/library/mixxxlibraryfeature.cpp	2010-10-28 19:31:23 +0000
+++ mixxx/src/library/mixxxlibraryfeature.cpp	2011-01-06 15:28:44 +0000
@@ -9,6 +9,7 @@
 #include "library/missingtablemodel.h"
 #include "library/proxytrackmodel.h"
 #include "library/trackcollection.h"
+#include "treeitem.h"
 
 #define CHILD_MISSING "Missing Songs"
 
@@ -17,9 +18,11 @@
     : LibraryFeature(parent),
       m_pLibraryTableModel(new LibraryTableModel(this, pTrackCollection)),
       m_pMissingTableModel(new MissingTableModel(this, pTrackCollection)) {
-    QStringList children;
-    children << tr("Missing Songs"); //Insert michael jackson joke here
-    m_childModel.setStringList(children);
+    
+    TreeItem *rootItem = new TreeItem("$root","$root", this);
+    TreeItem *childItem = new TreeItem(CHILD_MISSING,CHILD_MISSING, this,rootItem);
+    rootItem->appendChild(childItem);
+    m_childModel.setRootItem(rootItem);    
 }
 
 MixxxLibraryFeature::~MixxxLibraryFeature() {
@@ -35,7 +38,7 @@
     return QIcon(":/images/library/ic_library_library.png");
 }
 
-QAbstractItemModel* MixxxLibraryFeature::getChildModel() {
+TreeItemModel* MixxxLibraryFeature::getChildModel() {
     return &m_childModel;
 }
 
@@ -53,7 +56,10 @@
 void MixxxLibraryFeature::activateChild(const QModelIndex& index) {
     QString itemName = index.data().toString();
 
-    if (itemName == m_childModel.stringList().at(0))
+    /*if (itemName == m_childModel.stringList().at(0))
+        emit(showTrackModel(m_pMissingTableModel));
+     */
+    if (itemName == CHILD_MISSING) 
         emit(showTrackModel(m_pMissingTableModel));
 }
 

=== modified file 'mixxx/src/library/mixxxlibraryfeature.h'
--- mixxx/src/library/mixxxlibraryfeature.h	2010-01-29 19:38:32 +0000
+++ mixxx/src/library/mixxxlibraryfeature.h	2011-01-06 15:28:44 +0000
@@ -7,6 +7,7 @@
 #include <QStringListModel>
 
 #include "library/libraryfeature.h"
+#include "treeitemmodel.h"
 
 class LibraryTableModel;
 class MissingTableModel;
@@ -27,7 +28,7 @@
     bool dragMoveAccept(QUrl url);
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
 
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
 
 public slots:
     void activate();
@@ -38,7 +39,7 @@
 private:
     LibraryTableModel* m_pLibraryTableModel;
     MissingTableModel* m_pMissingTableModel;
-    QStringListModel m_childModel;
+    TreeItemModel m_childModel;
 };
 
 

=== added file 'mixxx/src/library/parser.cpp'
--- mixxx/src/library/parser.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parser.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,76 @@
+//
+// C++ Implementation: parser
+//
+// Description: superclass for external formats parsers
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+#include <QtDebug>
+#include "parser.h"
+
+/**
+   @author Ingo Kossyk ([e-mail])
+ **/
+
+
+Parser::Parser() : QObject()
+{
+}
+
+Parser::~Parser()
+{
+
+
+}
+
+void Parser::clearLocations()
+{
+    while(!m_sLocations.isEmpty())
+        m_sLocations.removeFirst();
+}
+
+long Parser::countParsed()
+{
+    return (long)m_sLocations.count();
+}
+
+bool Parser::isFilepath(QString sFilepath){
+    QFile file(sFilepath);
+    bool exists = file.exists();
+    file.close();
+    return exists;
+}
+
+bool Parser::isBinary(QString filename){
+    QFile file(filename);
+
+    if(file.open(QIODevice::ReadOnly)){
+        char c;
+        unsigned char uc;
+        
+        if(!file.getChar(&c))
+        {
+          qDebug() << "Parser: Error reading stream on " << filename;
+          return true; //should this raise an exception?
+        }
+        
+        uc = uchar(c);
+        
+        if(!(33<=uc && uc<=127))  //Starting byte is no character
+        {
+            file.close();
+            return true;
+        }
+
+    } else{
+        qDebug() << "Parser: Could not open file: " << filename;
+    }
+    //qDebug(QString("Parser: textstream starting character is: %1").arg(i));
+    file.close();
+    return false;
+}

=== added file 'mixxx/src/library/parser.h'
--- mixxx/src/library/parser.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parser.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,53 @@
+//
+// C++ Interface: parser
+//
+// Description: Interface header for the parser Parser
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+#ifndef PARSER_H
+#define PARSER_H
+
+/**Developer Information:
+This is the rootclass for all parser classes for the Importer class.
+It can be used to write a new type-specific parser by deriving a new class
+from it and overwrite the parse function and add class specific functions to 
+it afterwards fro proper functioning
+**/
+
+#include <qobject.h>
+#include <qstring.h>
+#include <qfile.h>
+
+
+class Parser : public QObject
+{
+public:
+    Parser();
+    ~Parser();
+    /**Can be called to parse a pls file
+    Note for developers:
+    This function should return an empty PtrList
+     or 0 in order for the trackimporter to function**/
+    virtual QList<QString> parse(QString) = 0;
+
+
+protected:
+    /**Pointer to the parsed Filelocations**/
+    QList<QString> m_sLocations;
+    /**Returns the number of parsed locations**/
+    long countParsed();
+    /**Clears m_psLocations**/
+    void clearLocations();
+    /**Checks if the file does contain binary content**/
+    bool isBinary(QString);
+    /**Checks if the given string represents a local filepath**/
+    bool isFilepath(QString );
+};
+
+#endif

=== added file 'mixxx/src/library/parserm3u.cpp'
--- mixxx/src/library/parserm3u.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parserm3u.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,122 @@
+//
+// C++ Implementation: parserm3u
+//
+// Description: module to parse m3u(plaintext) formated playlists
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#include <QTextStream>
+#include <QDebug>
+#include "parserm3u.h"
+#include <QUrl>
+
+/**
+   @author Ingo Kossyk ([e-mail])
+ **/
+
+/**
+   ToDo:
+    - parse ALL informations from the pls file if available ,
+          not only the filepath;
+
+          Userinformation :
+          The M3U format is just a headerless plaintext format
+          where every line of text either represents
+          a file location or a comment. comments are being
+          preceeded by a '#'. This parser will try to parse all
+          file information from the given file and add the filepaths
+          to the locations ptrlist when the file is existing locally
+          or on a mounted harddrive.
+ **/
+
+ParserM3u::ParserM3u() : Parser()
+{
+}
+
+ParserM3u::~ParserM3u()
+{
+
+}
+
+
+QList<QString> ParserM3u::parse(QString sFilename)
+{
+    QFile file(sFilename);
+    QString basepath = sFilename.section('/', 0, -2);
+
+    clearLocations();
+    //qDebug() << "ParserM3u: Starting to parse.";
+    if (file.open(QIODevice::ReadOnly) && !isBinary(sFilename)) {
+    	/* Unfortunately, QT 4.7 does not handle <CR> line breaks.
+    	 * This is important on OS X where iTunes, e.g., exports M3U playlists using <CR>
+    	 *
+    	 * Using QFile::readAll() we obtain the complete content of the playlist as a ByteArray.
+    	 * We replace any '\r' with '\n' if applicaple
+    	 * This ensures that playlists from iTunes on OS X can be parsed
+    	 */
+    	QByteArray ba = file.readAll();
+    	ba.replace('\r',"\n");
+        QTextStream textstream(ba.data());
+        
+        while(!textstream.atEnd()) {
+            QString sLine = getFilepath(&textstream, basepath);
+            if(sLine.isEmpty())
+                break;
+
+            //qDebug) << ("ParserM3u: parsed: " << (sLine);
+            m_sLocations.append(sLine);
+        }
+
+        file.close();
+
+        if(m_sLocations.count() != 0)
+            return m_sLocations;
+        else
+            return QList<QString>(); // NULL pointer returned when no locations were found
+
+    }
+
+    file.close();
+    return QList<QString>(); //if we get here something went wrong
+}
+
+
+QString ParserM3u::getFilepath(QTextStream *stream, QString basepath)
+{
+    QString textline,filename = "";
+
+    textline = stream->readLine();
+    qDebug() << textline;
+    while(!textline.isEmpty()){
+        if(textline.isNull())
+            break;
+
+        if(!textline.contains("#") && !textline.isEmpty()){
+            filename = textline;
+            filename.remove("file://");
+            QByteArray strlocbytes = filename.toUtf8();
+            QUrl location = QUrl::fromEncoded(strlocbytes);
+            QString trackLocation = location.toLocalFile();
+            //qDebug() << trackLocation;
+            if(isFilepath(trackLocation)) {
+                return trackLocation;
+            } else {
+                // Try relative to m3u dir
+                QString rel = basepath + "/" + trackLocation;
+                if (isFilepath(rel)) {
+                    return rel;
+                }
+                // We couldn't match this to a real file so ignore it
+            }
+        }
+        textline = stream->readLine();
+    }
+
+    // Signal we reached the end
+    return 0;
+
+}

=== added file 'mixxx/src/library/parserm3u.h'
--- mixxx/src/library/parserm3u.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parserm3u.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,35 @@
+//
+// C++ Interface: parserm3u
+//
+// Description: Interface header for the example parser ParserM3u
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#include "parser.h"
+
+#ifndef PARSERM3U_H
+#define PARSERM3U_H
+
+class QTextStream;
+
+class ParserM3u : public Parser
+{
+    Q_OBJECT
+public:
+    ParserM3u();
+    ~ParserM3u();
+    /**Overwriting function parse in class Parser**/
+    QList<QString> parse(QString);
+
+private:
+    /**Reads a line from the file and returns filepath if a valid file**/
+    QString getFilepath(QTextStream *, QString);
+
+
+};
+
+#endif

=== added file 'mixxx/src/library/parserpls.cpp'
--- mixxx/src/library/parserpls.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parserpls.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,143 @@
+//
+// C++ Implementation: parserpls
+//
+// Description: module to parse pls formated playlists
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#include "parser.h"
+#include "parserpls.h"
+#include <QDebug>
+#include <QTextStream>
+#include <QFile>
+#include <QUrl>
+
+/**
+   @author Ingo Kossyk ([e-mail])
+ **/
+
+/**
+   ToDo:
+    - parse ALL informations from the pls file if available ,
+          not only the filepath;
+ **/
+
+ParserPls::ParserPls() : Parser()
+{
+}
+
+ParserPls::~ParserPls()
+{
+}
+
+QList<QString> ParserPls::parse(QString sFilename)
+{
+    //long numEntries =0;
+    QFile file(sFilename);
+    QString basepath = sFilename.section('/', 0, -2);
+
+    clearLocations();
+
+    if (file.open(QIODevice::ReadOnly) && !isBinary(sFilename) ) {
+
+        /* Unfortunately, QT 4.7 does not handle <CR> line breaks.
+    	 * This is important on OS X where iTunes, e.g., exports M3U playlists using <CR>
+    	 *
+    	 * Using QFile::readAll() we obtain the complete content of the playlist as a ByteArray.
+    	 * We replace any '\r' with '\n' if applicaple
+    	 * This ensures that playlists from iTunes on OS X can be parsed
+    	 */
+    	QByteArray ba = file.readAll();
+    	ba.replace('\r',"\n");
+        QTextStream textstream(ba.data());
+
+        while(!textstream.atEnd()) {
+            QString psLine = getFilepath(&textstream, basepath);
+            if(psLine.isNull()) {
+                break;
+            } else {
+                m_sLocations.append(psLine);
+            }
+
+            //--numEntries;
+        }
+
+        file.close();
+
+        if(m_sLocations.count() != 0)
+            return m_sLocations;
+        else
+            return QList<QString>(); // NULL pointer returned when no locations were found
+    }
+
+    file.close();
+    return QList<QString>(); //if we get here something went wrong :D
+}
+
+long ParserPls::getNumEntries(QTextStream *stream)
+{
+
+    QString textline;
+    textline = stream->readLine();
+
+    if(textline.contains("[playlist]")){
+
+        while(!textline.contains("NumberOfEntries"))
+            textline = stream->readLine();
+
+        QString temp = textline.section("=",-1,-1);
+
+        return temp.toLong();
+
+    } else{
+        qDebug() << "ParserPls: pls file is not a playlist! \n";
+        return 0;
+    }
+
+}
+
+
+QString ParserPls::getFilepath(QTextStream *stream, QString basepath)
+{
+    QString textline,filename = "";
+    textline = stream->readLine();
+    while(!textline.isEmpty()){
+        if(textline.isNull())
+            break;
+
+        if(textline.contains("File")) {
+            int iPos = textline.indexOf("=",0);
+            ++iPos;
+
+            filename = textline.right(textline.length()-iPos);
+           
+            //Rythmbox playlists starts with file://<path>
+            //We remove the file protocol if found. 
+            filename.remove("file://");
+            QByteArray strlocbytes = filename.toUtf8();
+            QUrl location = QUrl::fromEncoded(strlocbytes);
+            QString trackLocation = location.toLocalFile();
+            //qDebug() << trackLocation;
+
+            if(isFilepath(trackLocation)) {
+                return trackLocation;
+            } else {
+                // Try relative to m3u dir
+                QString rel = basepath + "/" + trackLocation;
+                if (isFilepath(rel)) {
+                    return rel;
+                }
+                // We couldn't match this to a real file so ignore it
+            }
+        }
+        textline = stream->readLine();
+    }
+
+    // Signal we reached the end
+    return 0;
+
+}

=== added file 'mixxx/src/library/parserpls.h'
--- mixxx/src/library/parserpls.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/parserpls.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,38 @@
+//
+// C++ Interface: parserpls
+//
+// Description: Interface header for the example parser PlsParser
+//
+//
+// Author: Ingo Kossyk <[e-mail]>, (C) 2004
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+
+#ifndef PARSERPLS_H
+#define PARSERPLS_H
+
+#include "parser.h"
+
+class QTextStream;
+
+class ParserPls : public Parser
+{
+    Q_OBJECT
+public:
+    ParserPls();
+    ~ParserPls();
+    /**Can be called to parse a pls file**/
+    QList<QString> parse(QString);
+
+private:
+    /**Returns the Number of entries in the pls file**/
+    long getNumEntries(QTextStream * );
+    /**Reads a line from the file and returns filepath**/
+    QString getFilepath(QTextStream *, QString);
+
+};
+
+#endif

=== modified file 'mixxx/src/library/playlistfeature.cpp'
--- mixxx/src/library/playlistfeature.cpp	2010-11-25 01:06:46 +0000
+++ mixxx/src/library/playlistfeature.cpp	2011-01-06 15:28:44 +0000
@@ -1,8 +1,14 @@
 #include <QtDebug>
 #include <QMenu>
 #include <QInputDialog>
+#include <QFileDialog>
+#include <QDesktopServices>
 
 #include "library/playlistfeature.h"
+#include "library/parser.h"
+#include "library/parserm3u.h"
+#include "library/parserpls.h"
+
 
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
@@ -10,6 +16,7 @@
 #include "library/trackcollection.h"
 #include "library/playlisttablemodel.h"
 #include "mixxxkeyboard.h"
+#include "treeitem.h"
 
 PlaylistFeature::PlaylistFeature(QObject* parent, TrackCollection* pTrackCollection)
         : LibraryFeature(parent),
@@ -27,6 +34,14 @@
     connect(m_pDeletePlaylistAction, SIGNAL(triggered()),
             this, SLOT(slotDeletePlaylist()));
 
+    m_pRenamePlaylistAction = new QAction(tr("Rename"),this);
+    connect(m_pRenamePlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotRenamePlaylist()));
+
+    m_pImportPlaylistAction = new QAction(tr("Import Playlist"),this);
+    connect(m_pImportPlaylistAction, SIGNAL(triggered()),
+            this, SLOT(slotImportPlaylist()));
+
     // Setup the sidebar playlist model
     m_playlistTableModel.setTable("Playlists");
     m_playlistTableModel.setFilter("hidden=0");
@@ -34,15 +49,30 @@
     m_playlistTableModel.removeColumn(m_playlistTableModel.fieldIndex("position"));
     m_playlistTableModel.removeColumn(m_playlistTableModel.fieldIndex("date_created"));
     m_playlistTableModel.removeColumn(m_playlistTableModel.fieldIndex("date_modified"));
-    m_playlistTableModel.setSort(m_playlistTableModel.fieldIndex("position"),
+    m_playlistTableModel.setSort(m_playlistTableModel.fieldIndex("name"),
                                  Qt::AscendingOrder);
     m_playlistTableModel.select();
+    
+	//construct child model
+    TreeItem *rootItem = new TreeItem("$root","$root", this);
+
+    int idColumn = m_playlistTableModel.record().indexOf("name");
+    for (int row = 0; row < m_playlistTableModel.rowCount(); ++row) {
+            QModelIndex ind = m_playlistTableModel.index(row, idColumn);
+            QString playlist_name = m_playlistTableModel.data(ind).toString();
+            TreeItem *playlist_item = new TreeItem(playlist_name, playlist_name, this, rootItem);
+            rootItem->appendChild(playlist_item);
+            
+    }
+    m_childModel.setRootItem(rootItem);
 }
 
 PlaylistFeature::~PlaylistFeature() {
     delete m_pPlaylistTableModel;
     delete m_pCreatePlaylistAction;
     delete m_pDeletePlaylistAction;
+    delete m_pImportPlaylistAction;
+    delete m_pRenamePlaylistAction;
 }
 
 QVariant PlaylistFeature::title() {
@@ -95,52 +125,114 @@
     QMenu menu(NULL);
     menu.addAction(m_pCreatePlaylistAction);
     menu.addSeparator();
+    menu.addAction(m_pRenamePlaylistAction);
     menu.addAction(m_pDeletePlaylistAction);
+    menu.addSeparator();
+    menu.addAction(m_pImportPlaylistAction);
     menu.exec(globalPos);
 }
 
 void PlaylistFeature::slotCreatePlaylist() {
-    int err = 0;
-    bool ok = false;
-    QString name = QInputDialog::getText(
-        NULL, tr("New Playlist"), tr("Playlist name:"),
-        QLineEdit::Normal, tr("New Playlist"), &ok);
-
-    if (!ok)
-        return;
-
-    //Ensure the name isn't blank
-    if (name == "") {
-        QMessageBox::warning(NULL,
-                             tr("Playlist Creation Failed"),
-                             tr("A playlist cannot have a blank name."));
-        return;
-    }
-    //Ensure that a playlist with this name doesn't exist already
-    if (m_playlistDao.getPlaylistIdFromName(name) == -1) {
-        //Ensure the creation works at the DAO level...
-        if (!m_playlistDao.createPlaylist(name))
-        {
-            QMessageBox::warning(NULL,
-                                 tr("Playlist Creation Failed"),
-                                 tr("An unknown error occurred while creating playlist: ")
-                                 + name);
+    QString name;
+    bool validNameGiven = false;
+
+    do {
+        bool ok = false;
+        name = QInputDialog::getText(NULL,
+                                     tr("New Playlist"),
+                                     tr("Playlist name:"),
+                                     QLineEdit::Normal,
+                                     tr("New Playlist"),
+                                     &ok).trimmed();
+                                             
+        if (!ok)
             return;
-        }
-
+
+        int existingId = m_playlistDao.getPlaylistIdFromName(name);
+        
+        if (existingId != -1) {
+            QMessageBox::warning(NULL,
+                                 tr("Playlist Creation Failed"),
+                                 tr("A playlist by that name already exists."));
+        }
+        else if (name.isEmpty()) {
+            QMessageBox::warning(NULL,
+                                 tr("Playlist Creation Failed"),
+                                 tr("A playlist cannot have a blank name."));
+        }
+        else {
+            validNameGiven = true;
+        }
+                                             
+    } while (!validNameGiven);
+
+    bool playlistCreated = m_playlistDao.createPlaylist(name);
+
+    if (playlistCreated) {
+        clearChildModel();
         m_playlistTableModel.select();
+        constructChildModel();
         emit(featureUpdated());
-
         //Switch the view to the new playlist.
         int playlistId = m_playlistDao.getPlaylistIdFromName(name);
         m_pPlaylistTableModel->setPlaylist(playlistId);
         // TODO(XXX) set sidebar selection
         emit(showTrackModel(m_pPlaylistTableModel));
-    } else {
-            QMessageBox::warning(NULL,
-                                 tr("Playlist Creation Failed"),
-                                 tr("A playlist by that name already exists."));
-    }
+    }
+    else {
+        QMessageBox::warning(NULL,
+                             tr("Playlist Creation Failed"),
+                             tr("An unknown error occurred while creating playlist: ")
+                              + name);
+    }
+}
+
+void PlaylistFeature::slotRenamePlaylist()
+{
+    qDebug() << "slotRenamePlaylist()";
+
+    QString oldName = m_lastRightClickedIndex.data().toString();
+    int playlistId = m_playlistDao.getPlaylistIdFromName(oldName);
+    
+    QString newName;
+    bool validNameGiven = false;
+    
+    do {
+        bool ok = false;
+        newName = QInputDialog::getText(NULL,
+                                        tr("Rename Playlist"),
+                                        tr("New playlist name:"),
+                                        QLineEdit::Normal,
+                                        oldName,
+                                        &ok).trimmed();
+  
+        if (!ok || oldName == newName) {
+            return;
+        }
+
+        int existingId = m_playlistDao.getPlaylistIdFromName(newName);
+        
+        if (existingId != -1) {
+            QMessageBox::warning(NULL,
+                                tr("Renaming Playlist Failed"),
+                                tr("A playlist by that name already exists."));
+        }
+        else if (newName.isEmpty()) {
+            QMessageBox::warning(NULL,
+                                tr("Renaming Playlist Failed"),
+                                tr("A playlist cannot have a blank name."));
+        }
+        else {
+            validNameGiven = true;
+        }
+    } while (!validNameGiven);
+
+    m_playlistDao.renamePlaylist(playlistId, newName);
+    clearChildModel();
+    m_playlistTableModel.select();
+    constructChildModel();
+    emit(featureUpdated());
+    m_pPlaylistTableModel->setPlaylist(playlistId);
 }
 
 void PlaylistFeature::slotDeletePlaylist()
@@ -149,8 +241,11 @@
     if (m_lastRightClickedIndex.isValid()) {
         int playlistId = m_playlistDao.getPlaylistIdFromName(m_lastRightClickedIndex.data().toString());
         Q_ASSERT(playlistId >= 0);
+        
+        clearChildModel();
         m_playlistDao.deletePlaylist(playlistId);
         m_playlistTableModel.select();
+        constructChildModel();
     }
 
     emit(featureUpdated());
@@ -203,6 +298,70 @@
     return true;
 }
 
-QAbstractItemModel* PlaylistFeature::getChildModel() {
-    return &m_playlistTableModel;
+TreeItemModel* PlaylistFeature::getChildModel() {
+    return &m_childModel;
+}
+/**
+  * Purpose: When inserting or removing playlists,
+  * we require the sidebar model not to reset.
+  * This method queries the database and does dynamic insertion 
+*/
+void PlaylistFeature::constructChildModel()
+{
+    QList<QString> data_list;
+    int idColumn = m_playlistTableModel.record().indexOf("name");
+    for (int row = 0; row < m_playlistTableModel.rowCount(); ++row) {
+            QModelIndex ind = m_playlistTableModel.index(row, idColumn);
+            QString playlist_name = m_playlistTableModel.data(ind).toString();
+            data_list.insert(row,playlist_name);
+    }
+    
+    m_childModel.insertRows(data_list, 0, m_playlistTableModel.rowCount());  
+}
+/**
+  * Clears the child model dynamically
+  */
+void PlaylistFeature::clearChildModel()
+{
+    m_childModel.removeRows(0,m_playlistTableModel.rowCount());
+}
+void PlaylistFeature::slotImportPlaylist()
+{
+    qDebug() << "slotImportPlaylist() row:" ; //<< m_lastRightClickedIndex.data();
+
+
+    QString playlist_file = QFileDialog::getOpenFileName
+            (
+            NULL,
+            tr("Import Playlist"),
+            QDesktopServices::storageLocation(QDesktopServices::MusicLocation),
+            tr("Playlist Files (*.m3u *.pls)") 
+            );
+    //Exit method if user cancelled the open dialog.
+    if (playlist_file.isNull() || playlist_file.isEmpty() ) return;
+
+    Parser* playlist_parser = NULL;
+    
+    if(playlist_file.endsWith(".m3u", Qt::CaseInsensitive))
+    {
+        playlist_parser = new ParserM3u();
+    }
+    else if(playlist_file.endsWith(".pls", Qt::CaseInsensitive))
+    {
+        playlist_parser = new ParserPls();
+    }
+    else
+    {
+        return;
+    }
+    QList<QString> entries = playlist_parser->parse(playlist_file);
+    
+    //Iterate over the List that holds URLs of playlist entires
+    for (int i = 0; i < entries.size(); ++i) {
+        m_pPlaylistTableModel->addTrack(QModelIndex(), entries[i]);
+        
+    }
+ 
+    //delete the parser object
+    if(playlist_parser) delete playlist_parser;  
 }

=== modified file 'mixxx/src/library/playlistfeature.h'
--- mixxx/src/library/playlistfeature.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/playlistfeature.h	2011-01-06 15:28:44 +0000
@@ -11,6 +11,8 @@
 #include "library/libraryfeature.h"
 #include "library/dao/playlistdao.h"
 #include "library/dao/trackdao.h"
+#include "treeitemmodel.h"
+
 
 class PlaylistTableModel;
 class TrackCollection;
@@ -29,8 +31,8 @@
     bool dragMoveAccept(QUrl url);
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
 
-    QAbstractItemModel* getChildModel();
-
+    TreeItemModel* getChildModel();
+ 
     void bindWidget(WLibrarySidebar* sidebarWidget,
                     WLibrary* libraryWidget,
                     MixxxKeyboard* keyboard);
@@ -45,15 +47,23 @@
 
     void slotCreatePlaylist();
     void slotDeletePlaylist();
+	void slotRenamePlaylist();
+    void slotImportPlaylist();
 
  private:
+ 	void constructChildModel();
+    void clearChildModel();
+    
     PlaylistTableModel* m_pPlaylistTableModel;
     PlaylistDAO &m_playlistDao;
     TrackDAO &m_trackDao;
     QAction *m_pCreatePlaylistAction;
     QAction *m_pDeletePlaylistAction;
+    QAction *m_pRenamePlaylistAction;
+    QAction *m_pImportPlaylistAction;
     QSqlTableModel m_playlistTableModel;
     QModelIndex m_lastRightClickedIndex;
+    TreeItemModel m_childModel;
 };
 
 #endif /* PLAYLISTFEATURE_H */

=== modified file 'mixxx/src/library/preparefeature.cpp'
--- mixxx/src/library/preparefeature.cpp	2010-10-24 09:50:11 +0000
+++ mixxx/src/library/preparefeature.cpp	2011-01-06 15:28:44 +0000
@@ -50,7 +50,7 @@
     libraryWidget->registerView(m_sPrepareViewName, pPrepareView);
 }
 
-QAbstractItemModel* PrepareFeature::getChildModel() {
+TreeItemModel* PrepareFeature::getChildModel() {
     return &m_childModel;
 }
 

=== modified file 'mixxx/src/library/preparefeature.h'
--- mixxx/src/library/preparefeature.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/preparefeature.h	2011-01-06 15:28:44 +0000
@@ -8,6 +8,7 @@
 #include <QStringListModel>
 #include "library/libraryfeature.h"
 #include "configobject.h"
+#include "treeitemmodel.h"
 
 class LibraryTableModel;
 class TrackCollection;
@@ -32,7 +33,7 @@
                     WLibrary* libraryWidget,
                     MixxxKeyboard* keyboard);
 
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
 
 public slots:
     void activate();
@@ -43,7 +44,7 @@
 private:
     ConfigObject<ConfigValue>* m_pConfig;
     TrackCollection* m_pTrackCollection;
-    QStringListModel m_childModel;
+    TreeItemModel m_childModel;
     const static QString m_sPrepareViewName;
 };
 

=== modified file 'mixxx/src/library/promotracksfeature.cpp'
--- mixxx/src/library/promotracksfeature.cpp	2010-10-27 06:51:37 +0000
+++ mixxx/src/library/promotracksfeature.cpp	2011-01-06 15:28:44 +0000
@@ -161,7 +161,7 @@
     */
 }
 
-QAbstractItemModel* PromoTracksFeature::getChildModel() {
+TreeItemModel* PromoTracksFeature::getChildModel() {
     //XXX Promo 3.0:
     //return NULL;
     return &m_childModel;

=== modified file 'mixxx/src/library/promotracksfeature.h'
--- mixxx/src/library/promotracksfeature.h	2010-10-26 08:02:18 +0000
+++ mixxx/src/library/promotracksfeature.h	2011-01-06 15:28:44 +0000
@@ -20,12 +20,14 @@
 
 #include <QStringListModel>
 
+#include "treeitemmodel.h"
 #include "trackinfoobject.h"
 #include "library/libraryfeature.h"
 #include "library/dao/playlistdao.h"
 #include "library/cratetablemodel.h"
 #include "configobject.h"
 
+
 class PlaylistTableModel;
 class ProxyTrackModel;
 class TrackCollection;
@@ -57,7 +59,7 @@
                     WLibrary* libraryWidget,
                     MixxxKeyboard* keyboard);
 
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
 
 public slots:
     void activate();
@@ -76,7 +78,7 @@
     const static QString m_sFeaturedArtistsViewName;
     const static QString m_sBundledSongsViewName;
     const static QString m_sMyDownloadsViewName;
-    QStringListModel m_childModel;
+    TreeItemModel m_childModel;
     CrateTableModel m_downloadsTableModel;
     SongDownloader* m_pSongDownloader;
     bool m_bFirstRun;

=== modified file 'mixxx/src/library/rhythmboxfeature.cpp'
--- mixxx/src/library/rhythmboxfeature.cpp	2010-08-08 05:08:23 +0000
+++ mixxx/src/library/rhythmboxfeature.cpp	2011-01-06 15:28:44 +0000
@@ -6,6 +6,7 @@
 #include "library/rhythmboxtrackmodel.h"
 #include "library/rhythmboxplaylistmodel.h"
 #include "library/rhythmboxfeature.h"
+#include "treeitem.h"
 
 RhythmboxFeature::RhythmboxFeature(QObject* parent)
     : LibraryFeature(parent) {
@@ -34,7 +35,7 @@
     return QIcon(":/images/library/ic_library_rhythmbox.png");
 }
 
-QAbstractItemModel* RhythmboxFeature::getChildModel() {
+TreeItemModel* RhythmboxFeature::getChildModel() {
     return &m_childModel;
 }
 
@@ -62,11 +63,14 @@
         m_pPlaylistModelProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
         m_pPlaylistModelProxy->setSortCaseSensitivity(Qt::CaseInsensitive);
 
-        QStringList list;
+        TreeItem *rootItem = new TreeItem("$root","$root", this);
         for (int i = 0; i < m_pRhythmboxPlaylistModel->numPlaylists(); ++i) {
-            list << m_pRhythmboxPlaylistModel->playlistTitle(i);
+            QString playlist_name = m_pRhythmboxPlaylistModel->playlistTitle(i);
+            TreeItem *item = new TreeItem(playlist_name, playlist_name, this,rootItem);
+            
+            rootItem->appendChild(item);
         }
-        m_childModel.setStringList(list);
+        m_childModel.setRootItem(rootItem);
     }
     emit(showTrackModel(m_pTrackModelProxy));
 }

=== modified file 'mixxx/src/library/rhythmboxfeature.h'
--- mixxx/src/library/rhythmboxfeature.h	2009-12-02 19:24:04 +0000
+++ mixxx/src/library/rhythmboxfeature.h	2011-01-06 15:28:44 +0000
@@ -7,6 +7,7 @@
 #include <QStringListModel>
 
 #include "library/libraryfeature.h"
+#include "treeitemmodel.h"
 
 class RhythmboxPlaylistModel;
 class RhythmboxTrackModel;
@@ -27,7 +28,7 @@
     bool dragMoveAccept(QUrl url);
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
 
-    QAbstractItemModel* getChildModel();
+    TreeItemModel* getChildModel();
 
 public slots:
     void activate();
@@ -40,7 +41,7 @@
     RhythmboxPlaylistModel* m_pRhythmboxPlaylistModel;
     ProxyTrackModel* m_pTrackModelProxy;
     ProxyTrackModel* m_pPlaylistModelProxy;
-    QStringListModel m_childModel;
+    TreeItemModel m_childModel;
 };
 
 #endif /* RHYTHMBOXFEATURE_H */

=== modified file 'mixxx/src/library/sidebarmodel.cpp'
--- mixxx/src/library/sidebarmodel.cpp	2010-09-14 19:05:04 +0000
+++ mixxx/src/library/sidebarmodel.cpp	2011-01-06 15:28:44 +0000
@@ -4,6 +4,7 @@
 
 #include "library/libraryfeature.h"
 #include "library/sidebarmodel.h"
+#include "library/treeitem.h"
 
 SidebarModel::SidebarModel(QObject* parent)
         : QAbstractItemModel(parent),
@@ -23,6 +24,7 @@
             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)),
@@ -31,6 +33,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() {
@@ -63,53 +66,84 @@
 QModelIndex SidebarModel::index(int row, int column,
                                 const QModelIndex& parent) const {
     // qDebug() << "SidebarModel::index row=" << row
-    //          << "column=" << column << "parent=" << parent;
+      //       << "column=" << column << "parent=" << parent.data();
     if (parent.isValid()) {
-        const QAbstractItemModel* childModel;
+        /* If we have selected the root of a library feature at position 'row'
+         * its internal pointer is the current sidebar object model
+         * we return its associated childmodel
+         */
         if (parent.internalPointer() == this) {
-            childModel = m_sFeatures[parent.row()]->getChildModel();
-        } else {
-            childModel = (QAbstractItemModel*)parent.internalPointer();
-        }
-        QModelIndex childIndex = childModel->index(row, column);
-
-        if (childIndex.isValid()) {
-            return createIndex(childIndex.row(), childIndex.column(),
-                               (void*)childModel);
-        } else {
-            return QModelIndex();
+            const QAbstractItemModel* childModel = m_sFeatures[parent.row()]->getChildModel();
+            QModelIndex childIndex = childModel->index(row, column);
+            TreeItem* tree_item = (TreeItem*)childIndex.internalPointer();
+            if (childIndex.isValid()) 
+            {
+     
+                return createIndex(childIndex.row(), childIndex.column(), (void*)tree_item);
+            } 
+            else 
+            {
+               
+                return QModelIndex();
+            }
+        } 
+        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();
+            return createIndex(row, column, (void*) tree_item->child(row));
         }
     }
     return createIndex(row, column, (void*)this);
 }
 
 QModelIndex SidebarModel::parent(const QModelIndex& index) const {
-    //qDebug() << "SidebarModel::parent index=" << index;
+    //qDebug() << "SidebarModel::parent index=" << index.data();
     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 
+         * an invalid QModelIndex
+         */
         if (index.internalPointer() == this) {
-            // Top level, no parent
+            
             return QModelIndex();
-        } else {
-            const QAbstractItemModel* childModel = (QAbstractItemModel*)index.internalPointer();
-
-            for (int i = 0; i < m_sFeatures.size(); ++i) {
-                if (childModel == m_sFeatures[i]->getChildModel()) {
-                    return createIndex(i, 0, (void*)this);
+        } 
+        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";
+                LibraryFeature* feature = tree_item->getFeature();
+                for (int i = 0; i < m_sFeatures.size(); ++i) 
+                {
+                    if (feature == m_sFeatures[i]) {
+                         //create a ModelIndex for parent 'this' having a library feature at position 'i' 
+                        return createIndex(i, 0, (void*)this);
+                    }
                 }
             }
+            //if we have selected an item at some deeper level of a childnode
+            return createIndex(tree_item->parent()->row(), 0 , tree_item->parent());
         }
     }
     return QModelIndex();
 }
 
 int SidebarModel::rowCount(const QModelIndex& parent) const {
-    //qDebug() << "SidebarModel::rowCount parent=" << parent;
+    //qDebug() << "SidebarModel::rowCount parent=" << parent.data();
     if (parent.isValid()) {
         if (parent.internalPointer() == this) {
+     
             return m_sFeatures[parent.row()]->getChildModel()->rowCount();
-        } else {
-            // We don't support feature models any deeper than 1 level.
-            return 0;
+        } 
+        else {
+            //We support tree models deeper than 1 level
+            TreeItem* tree_item = (TreeItem*)parent.internalPointer();
+            
+            return tree_item->childCount();
         }
     }
     return m_sFeatures.size();
@@ -125,22 +159,28 @@
     // qDebug("SidebarModel::data row=%d column=%d pointer=%8x, role=%d",
     //        index.row(), index.column(), index.internalPointer(), role);
     if (index.isValid()) {
-        if (this == index.internalPointer()) {
+        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 {
-            QAbstractItemModel* childModel = (QAbstractItemModel*)index.internalPointer();
-            return childModel->data(childModel->index(index.row(), index.column()), role);
+        } 
+        else {
+            if (role == Qt::DisplayRole) {
+                TreeItem* tree_item = (TreeItem*)index.internalPointer();
+                return tree_item->data();
+            } 
+            
         }
     }
     return QVariant();
 }
 
 void SidebarModel::clicked(const QModelIndex& index) {
-    qDebug() << "SidebarModel::clicked() index=" << index;
+    //qDebug() << "SidebarModel::clicked() index=" << index;
 
 
     //We use clicked() for keyboard and mouse control, and the
@@ -152,33 +192,32 @@
     if (index.isValid()) {
         if (index.internalPointer() == this) {
             m_sFeatures[index.row()]->activate();
-        } else {
-            QAbstractItemModel* childModel = (QAbstractItemModel*)index.internalPointer();
-            QModelIndex childIndex = childModel->index(index.row(), index.column());
-            for (int i = 0; i < m_sFeatures.size(); ++i) {
-                if (m_sFeatures[i]->getChildModel() == childModel) {
-                    m_sFeatures[i]->activateChild(childIndex);
-                }
-            }
+        } 
+        else 
+        {
+            TreeItem* tree_item = (TreeItem*)index.internalPointer();
+            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.internalPointer() == this) {
+    //qDebug() << "SidebarModel::rightClicked() index=" << index;
+    if (index.isValid()) 
+    {
+        if (index.internalPointer() == this) 
+        {
             m_sFeatures[index.row()]->activate();
             m_sFeatures[index.row()]->onRightClick(globalPos);
-        } else {
-            QAbstractItemModel* childModel = (QAbstractItemModel*)index.internalPointer();
-            QModelIndex childIndex = childModel->index(index.row(), index.column());
-            for (int i = 0; i < m_sFeatures.size(); ++i) {
-                if (m_sFeatures[i]->getChildModel() == childModel) {
-                    m_sFeatures[i]->activateChild(childIndex);
-                    m_sFeatures[i]->onRightClickChild(globalPos, childIndex);
-                }
-            }
+        }
+        else 
+        {
+            TreeItem* tree_item = (TreeItem*)index.internalPointer();
+            LibraryFeature* feature = tree_item->getFeature();
+            feature->activateChild(index);
+            feature->onRightClickChild(globalPos, index);
+           
         }
     }
 }
@@ -187,16 +226,16 @@
 {
     //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 {
-            QAbstractItemModel* childModel = (QAbstractItemModel*)index.internalPointer();
-            QModelIndex childIndex = childModel->index(index.row(), index.column());
-            for (int i = 0; i < m_sFeatures.size(); ++i) {
-                if (m_sFeatures[i]->getChildModel() == childModel) {
-                    return m_sFeatures[i]->dropAcceptChild(childIndex, url);
-                }
-            }
+        } 
+        else 
+        {
+            TreeItem* tree_item = (TreeItem*)index.internalPointer();
+            LibraryFeature* feature = tree_item->getFeature();
+            return feature->dropAcceptChild(index, url);
+            
         }
     }
 
@@ -207,16 +246,16 @@
 {
     //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 {
-            QAbstractItemModel* childModel = (QAbstractItemModel*)index.internalPointer();
-            QModelIndex childIndex = childModel->index(index.row(), index.column());
-            for (int i = 0; i < m_sFeatures.size(); ++i) {
-                if (m_sFeatures[i]->getChildModel() == childModel) {
-                    return m_sFeatures[i]->dragMoveAcceptChild(childIndex, url);
-                }
-            }
+        } 
+        else 
+        {
+            
+            TreeItem* tree_item = (TreeItem*)index.internalPointer();
+            LibraryFeature* feature = tree_item->getFeature();
+            return feature->dragMoveAcceptChild(index, url);
         }
     }
     return false;
@@ -245,18 +284,20 @@
 
 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);
 }
 
 void SidebarModel::slotRowsInserted(const QModelIndex& parent, int start, int end) {
-    //qDebug() << "slotRowsInserted" << parent << start << end;
+   // qDebug() << "slotRowsInserted" << parent << start << end;
     //QModelIndex newParent = translateSourceIndex(parent);
     endInsertRows();
 }

=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2010-11-21 04:39:36 +0000
+++ mixxx/src/library/trackcollection.cpp	2011-01-06 15:28:44 +0000
@@ -68,7 +68,7 @@
         return false;
     }
 
-    int requiredSchemaVersion = 8;
+    int requiredSchemaVersion = 9;
     if (!SchemaManager::upgradeToSchemaVersion(m_pConfig, m_db,
                                                requiredSchemaVersion)) {
         QMessageBox::warning(0, tr("Cannot upgrade database schema"),

=== added file 'mixxx/src/library/traktorfeature.cpp'
--- mixxx/src/library/traktorfeature.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/traktorfeature.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,571 @@
+// traktorfeature.cpp
+// Created 9/26/2010 by Tobias Rafreider
+
+#include <QtDebug>
+#include <QMessageBox>
+#include <QXmlStreamReader>
+#include <QMap>
+#include <QSettings>
+
+#include "library/traktorfeature.h"
+
+#include "library/librarytablemodel.h"
+#include "library/missingtablemodel.h"
+#include "library/proxytrackmodel.h"
+#include "library/trackcollection.h"
+#include "treeitem.h"
+
+
+TraktorFeature::TraktorFeature(QObject* parent, TrackCollection* pTrackCollection):
+        m_pTrackCollection(pTrackCollection),
+        m_database(m_pTrackCollection->getDatabase())
+{
+    
+    m_isActivated =  false;
+    m_pTraktorTableModel = new TraktorTableModel(this, m_pTrackCollection);
+    m_pTraktorPlaylistModel = new TraktorPlaylistModel(this, m_pTrackCollection);
+    
+}
+
+TraktorFeature::~TraktorFeature() {
+    if(m_pTraktorTableModel)
+        delete m_pTraktorTableModel;
+    if(m_pTraktorPlaylistModel)
+        delete m_pTraktorPlaylistModel;
+}
+
+QVariant TraktorFeature::title() {
+    return tr("Traktor");
+}
+
+QIcon TraktorFeature::getIcon() {
+    return QIcon(":/images/library/ic_library_traktor.png");
+}
+bool TraktorFeature::isSupported() {
+    return (QFile::exists(getTraktorMusicDatabase()));
+    
+}
+TreeItemModel* TraktorFeature::getChildModel() {
+    return &m_childModel;
+}
+
+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));
+  
+}
+
+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) {
+}
+
+void TraktorFeature::onRightClickChild(const QPoint& globalPos,
+                                            QModelIndex index) {
+}
+
+bool TraktorFeature::dropAccept(QUrl url) {
+    return false;
+}
+
+bool TraktorFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
+    return false;
+}
+
+bool TraktorFeature::dragMoveAccept(QUrl url) {
+    return false;
+}
+
+bool TraktorFeature::dragMoveAcceptChild(const QModelIndex& index,
+                                              QUrl url) {
+    return false;
+}
+bool TraktorFeature::importLibrary(QString file){
+
+    //Delete all table entries of Traktor feature
+    m_database.transaction();
+    clearTable("traktor_playlist_tracks");
+    clearTable("traktor_library");
+    clearTable("traktor_playlists");
+    m_database.commit();
+
+    m_database.transaction();
+    QSqlQuery query(m_database);
+    query.prepare("INSERT INTO traktor_library (artist, title, album, year, genre,comment," 
+                   "tracknumber,"
+                   "bpm, bitrate,"
+                   "duration, location,"
+                   "rating,"
+                   "key) "
+                   "VALUES (:artist, :title, :album, :year, :genre,:comment, :tracknumber,"
+                   ":bpm, :bitrate,"
+                   ":duration, :location,"
+                   ":rating,"
+                   ":key)");
+    
+    //Parse Trakor XML file using SAX (for performance)
+    QFile traktor_file(file);
+    if (!traktor_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qDebug() << "Cannot open Traktor music collection";
+        return false;
+    }
+    QXmlStreamReader xml(&traktor_file);
+    bool inCollectionTag = false;
+    bool inEntryTag = false;
+    bool inPlaylistsTag = false;
+    bool isRootFolderParsed = false;
+    int nAudioFiles = 0;
+    
+    while (!xml.atEnd()) 
+    {
+        xml.readNext();
+        if(xml.isStartElement())
+        {
+            if(xml.name() == "COLLECTION")
+            {
+                inCollectionTag = true;
+                
+            }
+            /*
+             * Each "ENTRY" tag in <COLLECTION> represents a track
+             */ 
+            if(inCollectionTag && xml.name() == "ENTRY" )
+            {
+                inEntryTag = true;
+                //parse track
+                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"){                
+                    //process all playlists
+                    parsePlaylists(xml);
+                    isRootFolderParsed = true;
+                } 
+            }
+
+        }
+        if(xml.isEndElement())
+        {
+            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";
+         return false;
+    }
+    
+    qDebug() << "Found: " << nAudioFiles << " audio files in Traktor";
+    //initialize TraktorTableModel
+    m_database.commit();
+    m_pTraktorTableModel->select();
+    return true;
+
+}
+void TraktorFeature::parseTrack(QXmlStreamReader &xml, QSqlQuery &query){
+    QString title;
+    QString artist; 
+    QString album; 
+    QString year;
+    QString genre;
+    //drive letter
+    QString volume;
+    QString path;
+    QString filename;
+    QString location;
+    float bpm = 0.0;
+    int bitrate = 0;
+    QString key;
+    //duration of a track
+    int playtime = 0;
+    int rating = 0;
+    QString comment;
+    QString tracknumber;
+
+    //get XML attributes of starting ENTRY tag
+    QXmlStreamAttributes attr = xml.attributes ();
+    title = attr.value("TITLE").toString();
+    artist = attr.value("ARTIST").toString();
+
+    //read all sub tags of ENTRY until we reach the closing ENTRY tag
+    while(!xml.atEnd())
+    {
+        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")
+            {
+                QXmlStreamAttributes attr = xml.attributes ();
+                volume = attr.value("VOLUME").toString();
+                path = attr.value("DIR").toString();
+                filename = attr.value("FILE").toString();
+                /*compute the location, i.e, combining all the values
+                 * On Windows the volume holds the drive letter e.g., d:
+                 * On OS X, the volume is supposed to be "Macintosh HD" at all times,
+                 * which is a folder in /Volumes/
+                 */
+                #if defined(__APPLE__)
+                location = "/Volumes/"+volume;
+                #else
+                location = volume;
+                #endif
+                location += path.replace(QString(":"), QString(""));
+                location += filename;
+                continue;
+            }
+            if(xml.name() == "INFO")
+            {
+                QXmlStreamAttributes attr = xml.attributes();
+                key = attr.value("KEY").toString();
+                bitrate = attr.value("BITRATE").toString().toInt() / 1000;
+                playtime = attr.value("PLAYTIME").toString().toInt();
+                genre = attr.value("GENRE").toString();
+                year = attr.value("RELEASE_DATE").toString();
+                comment = attr.value("COMMENT").toString();
+                QString ranking_str = attr.value("RANKING").toString();
+                /* A ranking in Traktor has ranges between 0 and 255 internally.
+                 * This is same as the POPULARIMETER tag in IDv2, see http://help.mp3tag.de/main_tags.html
+                 *
+                 * Our rating values range from 1 to 5. The mapping is defined as follow
+                 * ourRatingValue = TraktorRating / 51
+                 */
+                 if(ranking_str != "" && qVariantCanConvert<int>(ranking_str)){
+                    rating = ranking_str.toInt()/51;
+                 }
+                continue;
+            }
+            if(xml.name() == "TEMPO")
+            {
+                QXmlStreamAttributes attr = xml.attributes ();
+                bpm = attr.value("BPM").toString().toFloat();
+                continue;
+            }
+        }
+        //We leave the infinte loop, if twe have the closing tag "ENTRY"
+        if(xml.name() == "ENTRY" && xml.isEndElement()){
+            break;        
+        }
+    }
+    
+    /* If we reach the end of ENTRY within the COLLECTION tag
+     * Save parsed track to database
+     */
+    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(":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();
+        return;
+    }
+
+}
+/*
+ * Purpose: Parsing all the folder and playlists of Traktor
+ * This is a complex operation since Traktor uses the concept of folders and playlist.
+ * A folder can contain folders and playlists. A playlist contains entries but no folders.
+ * In other words, Traktor uses a tree structure to organize music. Inner nodes represent folders while
+ * leaves are playlists.
+ */
+void TraktorFeature::parsePlaylists(QXmlStreamReader &xml){
+
+    qDebug() << "Process RootFolder";
+    //Each playlist is unique and can be identified by a path in the tree structure.
+    QString current_path = "";
+    QMap<QString,QString> map;
+
+    QString delimiter = "-->";
+
+    TreeItem *rootItem = new TreeItem("$root","$root", this);
+    TreeItem * parent = rootItem;
+
+    bool inPlaylistTag = false;
+
+    QSqlQuery query_insert_to_playlists(m_database);
+    query_insert_to_playlists.prepare("INSERT INTO traktor_playlists (name) "
+                  "VALUES (:name)");
+
+    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(); 
+
+        if(xml.isStartElement())
+        {
+            if(xml.name() == "NODE"){
+                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 += 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 += 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.name() == "NODE")
+            {
+                if(map.value(current_path) == "FOLDER"){
+                    parent = parent->parent();                
+                }
+
+                //Whenever we find a closing NODE, remove the last component of the path
+                int lastSlash = current_path.lastIndexOf(delimiter);
+                int path_length = current_path.size();
+
+                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 
+            if(xml.name() == "PLAYLISTS")
+            {
+                break;
+            }
+        }
+
+    }
+    
+
+    m_childModel.setRootItem(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" 
+    query_insert_into_playlist.bindValue(":name", playlist_path);
+    bool success = query_insert_into_playlist.exec();
+    if(!success){
+        qDebug() << "SQL Error in TraktorTableModel.cpp: line" << __LINE__ << " " << query_insert_into_playlist.lastError();
+        return;
+    }
+    //Get playlist id
+    QSqlQuery id_query(m_database);
+    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();
+        while (id_query.next()) {
+            playlist_id = id_query.value(id_query.record().indexOf("id")).toInt();
+        }
+    }
+    else
+        qDebug() << "SQL Error in TraktorTableModel.cpp: line" << __LINE__ << " " << id_query.lastError();
+    
+
+    
+    while(!xml.atEnd())
+    {
+        //read next XML element
+        xml.readNext(); 
+        if(xml.isStartElement())
+        {
+            if(xml.name() == "PRIMARYKEY"){
+                QXmlStreamAttributes attr = xml.attributes();
+                QString key = attr.value("KEY").toString();
+                QString type = attr.value("TYPE").toString();
+                if(type == "TRACK")
+                {
+                    key.replace(QString(":"), QString(""));
+                    //TODO: IFDEF
+                    #if defined(__WINDOWS__)             
+                    key.insert(1,":");
+                    #else
+                    key.prepend("/Volumes/");
+                    #endif
+
+                    //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.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;
+                        qDebug() << "playlistname; " << playlist_path <<" with ID " << playlist_id;
+                        qDebug() << "-----------------";
+
+                    }
+                            
+                }
+                
+            }
+        }
+        if(xml.isEndElement()){
+            //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
+        qDebug() << "Traktor table entries of '" << table_name <<"' have been cleared.";
+}
+QString TraktorFeature::getTraktorMusicDatabase()
+{
+    QString musicFolder;
+#if defined(__APPLE__)
+    musicFolder = QDir::homePath() +"/Documents/Native Instruments/Traktor/collection.nml";
+#elif defined(__WINDOWS__)
+    QSettings settings("HKEY_CURRENT_USER\\Software\\Native Instruments\\Traktor Pro", QSettings::NativeFormat);
+        // if the value method fails it returns QTDir::homePath
+    musicFolder = settings.value("RootDirectory", QDir::homePath()).toString();
+    musicFolder += "collection.nml";
+#elif defined(__LINUX__)
+        musicFolder =  QDir::homePath() + "/collection.nml";
+#else
+        musicFolder = "";
+#endif
+    qDebug() << "Traktor Library Location=[" << musicFolder << "]";
+    return musicFolder;
+
+
+}

=== added file 'mixxx/src/library/traktorfeature.h'
--- mixxx/src/library/traktorfeature.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/traktorfeature.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,68 @@
+// traktorfeature.h
+// Created 9/26/2010 by Tobias Rafreider
+
+#ifndef TRAKTOR_FEATURE_H
+#define TRAKTOR_FEATURE_H
+
+#include <QStringListModel>
+#include <QtSql>
+#include <QXmlStreamReader>
+
+#include "library/libraryfeature.h"
+#include "library/traktortablemodel.h"
+#include "library/traktorplaylistmodel.h"
+#include "treeitemmodel.h"
+
+class LibraryTableModel;
+class MissingTableModel;
+class TrackCollection;
+
+class TraktorFeature : public LibraryFeature {
+    Q_OBJECT
+    public:
+    TraktorFeature(QObject* parent, TrackCollection*);
+    virtual ~TraktorFeature();
+
+    QVariant title();
+    QIcon getIcon();
+    static bool isSupported();
+    bool dropAccept(QUrl url);
+    bool dropAcceptChild(const QModelIndex& index, QUrl url);
+    bool dragMoveAccept(QUrl url);
+    bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
+
+
+    TreeItemModel* getChildModel();
+
+public slots:
+    void activate();
+    void activateChild(const QModelIndex& index);
+    void onRightClick(const QPoint& globalPos);
+    void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+    void refreshLibraryModels();
+private:
+    bool 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);
+    /** processes a particular playlist **/
+    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;
+    TraktorTableModel* m_pTraktorTableModel;
+    TraktorPlaylistModel* m_pTraktorPlaylistModel;
+
+    bool m_isActivated;
+
+   
+};
+
+
+
+#endif /* TRAKTOR_FEATURE_H */

=== added file 'mixxx/src/library/traktorplaylistmodel.cpp'
--- mixxx/src/library/traktorplaylistmodel.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/traktorplaylistmodel.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,229 @@
+#include <QtCore>
+#include <QtGui>
+#include <QtSql>
+#include "library/trackcollection.h"
+#include "library/traktorplaylistmodel.h"
+
+#include "mixxxutils.cpp"
+
+TraktorPlaylistModel::TraktorPlaylistModel(QObject* parent,
+                                       TrackCollection* pTrackCollection)
+        : TrackModel(pTrackCollection->getDatabase(),
+                     "mixxx.db.model.traktor.playlistmodel"),
+          BaseSqlTableModel(parent, pTrackCollection, pTrackCollection->getDatabase()),
+          m_pTrackCollection(pTrackCollection),
+          m_database(m_pTrackCollection->getDatabase())
+          
+{
+    connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&)));
+    
+    
+    
+    
+}
+
+TraktorPlaylistModel::~TraktorPlaylistModel() {
+}
+
+bool TraktorPlaylistModel::addTrack(const QModelIndex& index, QString location)
+{
+
+    return false;
+}
+
+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);
+    pTrack->setAlbum(album);
+    pTrack->setYear(year);
+    pTrack->setGenre(genre);
+    pTrack->setBpm(bpm);
+	
+
+    return TrackPointer(pTrack, &QObject::deleteLater);
+}
+
+QString TraktorPlaylistModel::getTrackLocation(const QModelIndex& index) const
+{
+    QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
+    return location;
+}
+
+void TraktorPlaylistModel::removeTrack(const QModelIndex& index)
+{
+    
+}
+
+void TraktorPlaylistModel::removeTracks(const QModelIndexList& indices) {
+
+}
+void TraktorPlaylistModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex)
+{
+   
+}
+
+void TraktorPlaylistModel::search(const QString& searchText) {
+    // qDebug() << "TraktorPlaylistModel::search()" << searchText
+    //          << QThread::currentThread();
+    emit(doSearch(searchText));
+}
+
+void TraktorPlaylistModel::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 TraktorPlaylistModel::currentSearch() {
+    return m_currentSearch;
+}
+
+bool TraktorPlaylistModel::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* TraktorPlaylistModel::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* TraktorPlaylistModel::delegateForColumn(const int i) {
+    return NULL;
+}
+
+TrackModel::CapabilitiesFlags TraktorPlaylistModel::getCapabilities() const
+{
+  
+    return NULL;
+}
+
+Qt::ItemFlags TraktorPlaylistModel::flags(const QModelIndex &index) const
+{
+    return readOnlyFlags(index);
+}
+void TraktorPlaylistModel::setPlaylist(QString playlist_path)
+{
+    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(); 
+   
+
+    QString playlistID = "TraktorPlaylist_" + 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 " 
+                  "traktor_library.id,"
+                  "traktor_library.artist," 
+                  "traktor_library.title,"
+                  "traktor_library.album,"
+                  "traktor_library.year,"
+                  "traktor_library.genre,"
+                  "traktor_library.tracknumber,"
+                  "traktor_library.location,"
+                  "traktor_library.comment,"
+                  "traktor_library.rating,"
+                  "traktor_library.duration,"
+                  "traktor_library.bitrate,"
+                  "traktor_library.bpm,"
+                  "traktor_library.key,"
+                  "traktor_playlist_tracks.track_id, "
+                  "traktor_playlists.name "
+                  "FROM traktor_library "
+                  "INNER JOIN traktor_playlist_tracks "
+                  "ON traktor_playlist_tracks.track_id = traktor_library.id "
+                  "INNER JOIN traktor_playlists "
+                  "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"));
+
+    slotSearch("");
+
+    select(); //Populate the data model.
+    initHeaderData();
+}
+bool TraktorPlaylistModel::isColumnHiddenByDefault(int column) {
+    if (column == fieldIndex(LIBRARYTABLE_KEY))    
+        return true;
+    if(column == fieldIndex(LIBRARYTABLE_BITRATE))
+    	return true;
+    
+    return false;
+}
\ No newline at end of file

=== added file 'mixxx/src/library/traktorplaylistmodel.h'
--- mixxx/src/library/traktorplaylistmodel.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/traktorplaylistmodel.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,55 @@
+#ifndef TRAKTOR_PLAYLIST_MODEL_H
+#define TRAKTOR_PLAYLIST_MODEL_H
+
+#include <QtSql>
+#include <QItemDelegate>
+#include <QtCore>
+#include "trackmodel.h"
+#include "library/basesqltablemodel.h"
+#include "library/librarytablemodel.h"
+#include "library/dao/playlistdao.h"
+#include "library/dao/trackdao.h"
+
+class TrackCollection;
+
+class TraktorPlaylistModel : public BaseSqlTableModel, public virtual TrackModel
+{
+    Q_OBJECT
+  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);
+    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 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 **/    
+    void setPlaylist(QString path_name);
+
+  private slots:
+    void slotSearch(const QString& searchText);
+
+  signals:
+    void doSearch(const QString& searchText);
+
+  private:
+    TrackCollection* m_pTrackCollection;
+	QSqlDatabase &m_database;
+    
+    
+    QString m_currentSearch;
+};
+
+#endif /* TRAKTOR_TABLE_MODEL_H */

=== added file 'mixxx/src/library/traktortablemodel.cpp'
--- mixxx/src/library/traktortablemodel.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/traktortablemodel.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,160 @@
+#include <QtCore>
+#include <QtGui>
+#include <QtSql>
+#include "library/trackcollection.h"
+#include "library/traktortablemodel.h"
+
+#include "mixxxutils.cpp"
+
+TraktorTableModel::TraktorTableModel(QObject* parent,
+                                       TrackCollection* pTrackCollection)
+        : TrackModel(pTrackCollection->getDatabase(),
+                     "mixxx.db.model.traktor_tablemodel"),
+          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();
+}
+
+TraktorTableModel::~TraktorTableModel() {
+}
+
+bool TraktorTableModel::addTrack(const QModelIndex& index, QString location)
+{
+
+    return false;
+}
+
+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);
+    pTrack->setAlbum(album);
+    pTrack->setYear(year);
+    pTrack->setGenre(genre);
+    pTrack->setBpm(bpm);
+    
+
+    return TrackPointer(pTrack, &QObject::deleteLater);
+}
+
+QString TraktorTableModel::getTrackLocation(const QModelIndex& index) const
+{
+    QString location = index.sibling(index.row(), fieldIndex("location")).data().toString();
+    return location;
+}
+
+void TraktorTableModel::removeTrack(const QModelIndex& index)
+{
+    
+}
+
+void TraktorTableModel::removeTracks(const QModelIndexList& indices) {
+
+}
+void TraktorTableModel::moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex)
+{
+   
+}
+
+void TraktorTableModel::search(const QString& searchText) {
+    // qDebug() << "TraktorTableModel::search()" << searchText
+    //          << QThread::currentThread();
+    emit(doSearch(searchText));
+}
+
+void TraktorTableModel::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 TraktorTableModel::currentSearch() {
+    return m_currentSearch;
+}
+
+bool TraktorTableModel::isColumnInternal(int column) {
+    if (column == fieldIndex(LIBRARYTABLE_ID) ||
+        column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
+        column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED))
+        return true;
+    return false;
+}
+
+QMimeData* TraktorTableModel::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* TraktorTableModel::delegateForColumn(const int i) {
+    return NULL;
+}
+
+TrackModel::CapabilitiesFlags TraktorTableModel::getCapabilities() const
+{
+  
+    return NULL;
+}
+
+Qt::ItemFlags TraktorTableModel::flags(const QModelIndex &index) const
+{
+    return readOnlyFlags(index);
+}
+bool TraktorTableModel::isColumnHiddenByDefault(int column) {
+    if (column == fieldIndex(LIBRARYTABLE_KEY))    
+        return true;
+    if(column == fieldIndex(LIBRARYTABLE_BITRATE))
+        return true;
+    
+    return false;        
+}
\ No newline at end of file

=== added file 'mixxx/src/library/traktortablemodel.h'
--- mixxx/src/library/traktortablemodel.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/traktortablemodel.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,53 @@
+#ifndef TRAKTOR_TABLE_MODEL_H
+#define TRAKTOR_TABLE_MODEL_H
+
+#include <QtSql>
+#include <QItemDelegate>
+#include <QtCore>
+#include "trackmodel.h"
+#include "library/basesqltablemodel.h"
+#include "library/librarytablemodel.h"
+#include "library/dao/playlistdao.h"
+#include "library/dao/trackdao.h"
+
+class TrackCollection;
+
+class TraktorTableModel : public BaseSqlTableModel, public virtual TrackModel
+{
+    Q_OBJECT
+  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);
+    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 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 /* TRAKTOR_TABLE_MODEL_H */

=== added file 'mixxx/src/library/treeitem.cpp'
--- mixxx/src/library/treeitem.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/treeitem.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,97 @@
+// TreeItem.cpp
+// Created 10/02/2010 by Tobias Rafreider
+
+#include <QStringList>
+#include "treeitem.h"
+
+TreeItem::TreeItem(const QString &data, const QString &data_path, LibraryFeature* feature, TreeItem* parent)
+ {
+     m_data = data;
+     m_dataPath = data_path;
+     m_parentItem = parent;
+     m_feature = feature;
+ }
+
+ TreeItem::~TreeItem()
+ {
+     qDeleteAll(m_childItems);
+ }
+
+ void TreeItem::appendChild(TreeItem *item)
+ {
+     m_childItems.append(item);
+ }
+
+ TreeItem *TreeItem::child(int row)
+ {
+     return m_childItems.value(row);
+ }
+
+ int TreeItem::childCount() const
+ {
+     return m_childItems.count();
+ }
+
+
+ QVariant TreeItem::data() const
+ {
+     return m_data;
+ }
+ QVariant TreeItem::dataPath() const
+ {
+     return m_dataPath;
+ }
+ bool TreeItem::isPlaylist() const
+ {
+     return (m_childItems.count() == 0);
+ }
+bool TreeItem::isFolder() const
+ {
+     return (m_childItems.count() != 0);
+ }
+
+ TreeItem *TreeItem::parent()
+ {
+     return m_parentItem;
+ }
+
+ int TreeItem::row() const
+ {
+     if (m_parentItem)
+         return m_parentItem->m_childItems.indexOf(const_cast<TreeItem*>(this));
+
+     return 0;
+ }
+ LibraryFeature* TreeItem::getFeature()
+ {
+     return m_feature;
+ }
+bool TreeItem::insertChildren(QList<QString>& data, int position, int count)
+ {
+     if (position < 0 || position > m_childItems.size())
+         return false;
+
+     for (int row = 0; row < count; ++row) {
+         TreeItem *item = new TreeItem(data.at(row), data.at(row), m_feature, this);
+         m_childItems.insert(row, item);
+     }
+
+     return true;
+ }
+bool TreeItem::removeChildren(int position, int count)
+ {
+    if (position < 0 || position + count > m_childItems.size())
+         return false;
+
+     for (int row = 0; row < count; ++row)
+         delete m_childItems.takeAt(position);
+
+     return true;
+ }
+
+bool TreeItem::setData(const QVariant &data, const QVariant &data_path)
+ {
+    m_data = data.toString();
+    m_dataPath = data_path.toString();
+    return true;
+ }

=== added file 'mixxx/src/library/treeitem.h'
--- mixxx/src/library/treeitem.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/treeitem.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,55 @@
+// TreeItem.h
+// Created 10/02/2010 by Tobias Rafreider
+
+#ifndef TREEITEM_H
+#define TREEITEM_H
+
+#include <QList>
+#include <QString>
+#include <QVariant>
+#include "libraryfeature.h"
+
+ class TreeItem
+ {
+ public:
+     TreeItem(const QString &data, const QString &data_path, LibraryFeature* feature = 0, TreeItem* parent = 0);
+     ~TreeItem();
+     /** appends a child item to this object **/ 
+     void appendChild(TreeItem *child);
+     /** returns the tree item at position 'row' in the childlist **/
+     TreeItem *child(int row);
+     /** returns the number of childs of this tree item **/
+     int childCount() const;
+     /** Returns the position of this object within its parent **/
+     int row() const;
+     /** returns the parent **/
+     TreeItem *parent();
+     
+    /** for dynamic resizing models **/
+     bool insertChildren(QList<QString>& data, int position, int count);
+     bool removeChildren(int position, int count);
+    
+     /** sets data **/ 
+     bool setData(const QVariant &data, const QVariant &data_path);
+     /** simple name of the playlist **/
+     QVariant data() const;
+     /** Full path of the playlist **/
+     QVariant dataPath() const;
+     /** Returns true if we have a leaf node **/
+     bool isPlaylist() const;
+     /** returns true if we have an inner node **/
+     bool isFolder() const;
+     
+     /* Returns the Library feature object to which an item belongs to */ 
+     LibraryFeature* getFeature();
+
+ private:
+     QList<TreeItem*> m_childItems;
+     QString m_dataPath;
+     QString m_data;
+     LibraryFeature* m_feature;
+
+     TreeItem *m_parentItem;
+ };
+
+ #endif

=== added file 'mixxx/src/library/treeitemmodel.cpp'
--- mixxx/src/library/treeitemmodel.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/treeitemmodel.cpp	2011-01-06 15:28:44 +0000
@@ -0,0 +1,151 @@
+#include <QtGui>
+
+ #include "treeitem.h"
+ #include "treeitemmodel.h"
+
+  TreeItemModel::TreeItemModel(QObject *parent)
+     : QAbstractItemModel(parent)
+ {
+    
+     m_rootItem = new TreeItem("$root","$root");
+     
+ }
+
+ TreeItemModel::~TreeItemModel()
+ {
+     delete m_rootItem;
+ }
+//Our Treeview Model supports exactly a single column
+ int TreeItemModel::columnCount(const QModelIndex &parent) const
+ {
+     return 1;
+ }
+
+ QVariant TreeItemModel::data(const QModelIndex &index, int role) const
+ {
+     if (!index.isValid())
+         return QVariant();
+
+     if (role != Qt::DisplayRole)
+         return QVariant();
+
+     TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+
+     return item->data();
+ }
+
+ Qt::ItemFlags TreeItemModel::flags(const QModelIndex &index) const
+ {
+     if (!index.isValid())
+         return 0;
+
+     return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+ }
+
+ QVariant TreeItemModel::headerData(int section, Qt::Orientation orientation, int role) const
+ {
+     return QVariant();
+ }
+
+ QModelIndex TreeItemModel::index(int row, int column, const QModelIndex &parent)
+             const
+ {
+     if (!hasIndex(row, column, parent))
+         return QModelIndex();
+
+     TreeItem *parentItem = NULL;
+
+     if (!parent.isValid())
+         parentItem = m_rootItem;
+     else
+         parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+     TreeItem *childItem = parentItem->child(row);
+     if (childItem)
+         return createIndex(row, column, childItem);
+     else
+         return QModelIndex();
+ }
+
+ QModelIndex TreeItemModel::parent(const QModelIndex &index) const
+ {
+     if (!index.isValid())
+         return QModelIndex();
+
+     TreeItem *childItem = static_cast<TreeItem*>(index.internalPointer());
+     TreeItem *parentItem = childItem->parent();
+
+     if (parentItem == m_rootItem)
+         return QModelIndex();
+
+     return createIndex(parentItem->row(), 0, parentItem);
+ }
+
+ int TreeItemModel::rowCount(const QModelIndex &parent) const
+ {
+    if (parent.column() > 0)
+         return 0;
+
+
+    TreeItem *parentItem = NULL;
+    //qDebug() << "parent data: " << parent.data();
+     if (!parent.isValid()){
+         parentItem = m_rootItem;
+    }
+     else{
+         parentItem = static_cast<TreeItem*>(parent.internalPointer());
+
+    }
+ 
+    //qDebug() << "TreeItem data: " << parent.internalPointer();
+
+     return parentItem->childCount();
+ }
+/**
+  * Populates the model and notifies the view.
+  * Call this method first, before you do call any other methods.
+*/
+ void TreeItemModel::setRootItem(TreeItem *item)
+ {
+    if(m_rootItem) delete m_rootItem;
+        
+    m_rootItem = item;
+    reset();
+ }
+/**
+  * Before you can resize the data model dynamically by using 'insertRows' and 'removeRows' 
+  * make sure you have initialized 
+  */ 
+bool TreeItemModel::insertRows(QList<QString>& data, int position, int rows, const QModelIndex &parent)
+ {  
+     TreeItem *parentItem = getItem(parent);
+     bool success;
+
+     beginInsertRows(parent, position, position + rows - 1);
+     success = parentItem->insertChildren(data, position, rows);
+     endInsertRows();
+
+     return success;
+ }
+ bool TreeItemModel::removeRows(int position, int rows, const QModelIndex &parent)
+ {
+     TreeItem *parentItem = getItem(parent);
+     bool success = true;
+
+     beginRemoveRows(parent, position, position + rows - 1);
+     success = parentItem->removeChildren(position, rows);
+     endRemoveRows();
+
+     return success;
+ }
+TreeItem* TreeItemModel::getItem(const QModelIndex &index) const
+ {
+     if (index.isValid()) {
+         TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
+         if (item) return item;
+     }
+     return m_rootItem;
+ }
+
+
+

=== added file 'mixxx/src/library/treeitemmodel.h'
--- mixxx/src/library/treeitemmodel.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/treeitemmodel.h	2011-01-06 15:28:44 +0000
@@ -0,0 +1,41 @@
+#ifndef TREE_ITEM_MODEL_H
+ #define TREE_ITEM_MODEL_H
+
+ #include <QAbstractItemModel>
+ #include <QModelIndex>
+ #include <QVariant>
+ #include <QList>
+
+
+
+ class TreeItem;
+
+ class TreeItemModel : public QAbstractItemModel
+ {
+     Q_OBJECT
+
+ public:
+     TreeItemModel(QObject *parent = 0);
+     ~TreeItemModel();
+
+     QVariant data(const QModelIndex &index, int role) const;
+     Qt::ItemFlags flags(const QModelIndex &index) const;
+     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+     QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+     QModelIndex parent(const QModelIndex &index) const;
+
+     bool insertRows(QList<QString>& data, int position, int rows, const QModelIndex &parent = QModelIndex());
+     bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex());
+
+     int rowCount(const QModelIndex &parent = QModelIndex()) const;
+     int columnCount(const QModelIndex &parent = QModelIndex()) const;
+     void setRootItem(TreeItem *item);
+     TreeItem* getItem(const QModelIndex &index) const;
+    
+
+ private:
+     TreeItem *m_rootItem;
+     
+ };
+
+ #endif

=== removed file 'mixxx/src/parser.cpp'
--- mixxx/src/parser.cpp	2010-06-22 18:39:04 +0000
+++ mixxx/src/parser.cpp	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-//
-// C++ Implementation: parser
-//
-// Description: superclass for external formats parsers
-//
-//
-// Author: Ingo Kossyk <[e-mail]>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#include <QtDebug>
-#include "parser.h"
-
-/**
-   @author Ingo Kossyk ([e-mail])
- **/
-
-
-Parser::Parser() : QObject()
-{
-}
-
-Parser::~Parser()
-{
-
-
-}
-
-void Parser::clearLocations()
-{
-    while(!m_sLocations.isEmpty())
-        m_sLocations.removeFirst();
-}
-
-long Parser::countParsed()
-{
-    return (long)m_sLocations.count();
-}
-
-bool Parser::isFilepath(QString sFilepath){
-    QFile file(sFilepath);
-    bool exists = file.exists();
-    file.close();
-    return exists;
-}
-
-bool Parser::isBinary(QString filename){
-    QFile file(filename);
-
-    if(file.open(QIODevice::ReadOnly)){
-        char c;
-        unsigned char uc;
-        
-        if(!file.getChar(&c))
-        {
-          qDebug() << "Parser: Error reading stream on " << filename;
-          return true; //should this raise an exception?
-        }
-        
-        uc = uchar(c);
-        
-        if(!(33<=uc && uc<=127))  //Starting byte is no character
-        {
-            file.close();
-            return true;
-        }
-
-    } else{
-        qDebug() << "Parser: Could not open file: " << filename;
-    }
-    //qDebug(QString("Parser: textstream starting character is: %1").arg(i));
-    file.close();
-    return false;
-}

=== removed file 'mixxx/src/parser.h'
--- mixxx/src/parser.h	2010-06-22 18:39:04 +0000
+++ mixxx/src/parser.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-//
-// C++ Interface: parser
-//
-// Description: Interface header for the parser Parser
-//
-//
-// Author: Ingo Kossyk <[e-mail]>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#ifndef PARSER_H
-#define PARSER_H
-
-/**Developer Information:
-This is the rootclass for all parser classes for the Importer class.
-It can be used to write a new type-specific parser by deriving a new class
-from it and overwrite the parse function and add class specific functions to 
-it afterwards fro proper functioning
-**/
-
-#include <qobject.h>
-#include <qstring.h>
-#include <qfile.h>
-
-
-class Parser : public QObject
-{
-public:
-    Parser();
-    ~Parser();
-    /**Can be called to parse a pls file
-    Note for developers:
-    This function should return an empty PtrList
-     or 0 in order for the trackimporter to function**/
-    virtual QList<QString> parse(QString) = 0;
-
-
-protected:
-    /**Pointer to the parsed Filelocations**/
-    QList<QString> m_sLocations;
-    /**Returns the number of parsed locations**/
-    long countParsed();
-    /**Clears m_psLocations**/
-    void clearLocations();
-    /**Checks if the file does contain binary content**/
-    bool isBinary(QString);
-    /**Checks if the given string represents a local filepath**/
-    bool isFilepath(QString );
-};
-
-#endif

=== removed file 'mixxx/src/parserm3u.cpp'
--- mixxx/src/parserm3u.cpp	2010-06-22 18:39:04 +0000
+++ mixxx/src/parserm3u.cpp	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-//
-// C++ Implementation: parserm3u
-//
-// Description: module to parse m3u(plaintext) formated playlists
-//
-//
-// Author: Ingo Kossyk <[e-mail]>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-#include <QTextStream>
-#include "parserm3u.h"
-
-/**
-   @author Ingo Kossyk ([e-mail])
- **/
-
-/**
-   ToDo:
-    - parse ALL informations from the pls file if available ,
-          not only the filepath;
-
-          Userinformation :
-          The M3U format is just a headerless plaintext format
-          where every line of text either represents
-          a file location or a comment. comments are being
-          preceeded by a '#'. This parser will try to parse all
-          file information from the given file and add the filepaths
-          to the locations ptrlist when the file is existing locally
-          or on a mounted harddrive.
- **/
-
-ParserM3u::ParserM3u() : Parser()
-{
-}
-
-ParserM3u::~ParserM3u()
-{
-
-}
-
-
-QList<QString> ParserM3u::parse(QString sFilename)
-{
-    QFile file(sFilename);
-    QString basepath = sFilename.section('/', 0, -2);
-
-    clearLocations();
-    //qDebug() << "ParserM3u: Starting to parse.";
-    if (file.open(QIODevice::ReadOnly) && !isBinary(sFilename)) {
-        QTextStream textstream(&file);
-        
-        while(!textstream.atEnd()) {
-            QString sLine = getFilepath(&textstream, basepath);
-            if(sLine.isEmpty())
-                break;
-
-            //qDebug) << ("ParserM3u: parsed: " << (sLine);
-            m_sLocations.append(sLine);
-        }
-
-        file.close();
-
-        if(m_sLocations.count() != 0)
-            return m_sLocations;
-        else
-            return QList<QString>(); // NULL pointer returned when no locations were found
-
-    }
-
-    file.close();
-    return QList<QString>(); //if we get here something went wrong
-}
-
-
-QString ParserM3u::getFilepath(QTextStream *stream, QString basepath)
-{
-    QString textline,filename = "";
-
-    textline = stream->readLine();
-    while(!textline.isEmpty()){
-        if(textline.isNull())
-            break;
-
-        if(!textline.contains("#") && !textline.isEmpty()){
-            filename = textline;
-            if(isFilepath(filename)) {
-                return filename;
-            } else {
-                // Try relative to m3u dir
-                QString rel = basepath + "/" + filename;
-                if (isFilepath(rel)) {
-                    return rel;
-                }
-                // We couldn't match this to a real file so ignore it
-            }
-        }
-        textline = stream->readLine();
-    }
-
-    // Signal we reached the end
-    return 0;
-
-}

=== removed file 'mixxx/src/parserm3u.h'
--- mixxx/src/parserm3u.h	2010-06-22 18:39:04 +0000
+++ mixxx/src/parserm3u.h	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-//
-// C++ Interface: parserm3u
-//
-// Description: Interface header for the example parser ParserM3u
-//
-//
-// Author: Ingo Kossyk <[e-mail]>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-#include "parser.h"
-
-#ifndef PARSERM3U_H
-#define PARSERM3U_H
-
-class QTextStream;
-
-class ParserM3u : public Parser
-{
-    Q_OBJECT
-public:
-    ParserM3u();
-    ~ParserM3u();
-    /**Overwriting function parse in class Parser**/
-    QList<QString> parse(QString);
-
-private:
-    /**Reads a line from the file and returns filepath if a valid file**/
-    QString getFilepath(QTextStream *, QString);
-
-
-};
-
-#endif

=== removed file 'mixxx/src/parserpls.cpp'
--- mixxx/src/parserpls.cpp	2010-06-22 18:39:04 +0000
+++ mixxx/src/parserpls.cpp	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-//
-// C++ Implementation: parserpls
-//
-// Description: module to parse pls formated playlists
-//
-//
-// Author: Ingo Kossyk <[e-mail]>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-#include "parser.h"
-#include "parserpls.h"
-#include <QDebug>
-#include <QTextStream>
-#include <QFile>
-
-/**
-   @author Ingo Kossyk ([e-mail])
- **/
-
-/**
-   ToDo:
-    - parse ALL informations from the pls file if available ,
-          not only the filepath;
- **/
-
-ParserPls::ParserPls() : Parser()
-{
-}
-
-ParserPls::~ParserPls()
-{
-}
-
-QList<QString> ParserPls::parse(QString sFilename)
-{
-    //long numEntries =0;
-    QFile file(sFilename);
-    QString basepath = sFilename.section('/', 0, -2);
-
-    clearLocations();
-
-    if (file.open(QIODevice::ReadOnly) && !isBinary(sFilename) ) {
-
-        QTextStream textstream(&file);
-
-        while(!textstream.atEnd()) {
-            QString psLine = getFilepath(&textstream, basepath);
-            if(psLine.isNull()) {
-                break;
-            } else {
-                m_sLocations.append(psLine);
-            }
-
-            //--numEntries;
-        }
-
-        file.close();
-
-        if(m_sLocations.count() != 0)
-            return m_sLocations;
-        else
-            return QList<QString>(); // NULL pointer returned when no locations were found
-    }
-
-    file.close();
-    return QList<QString>(); //if we get here something went wrong :D
-}
-
-long ParserPls::getNumEntries(QTextStream *stream)
-{
-
-    QString textline;
-    textline = stream->readLine();
-
-    if(textline.contains("[playlist]")){
-
-        while(!textline.contains("NumberOfEntries"))
-            textline = stream->readLine();
-
-        QString temp = textline.section("=",-1,-1);
-
-        return temp.toLong();
-
-    } else{
-        qDebug() << "ParserPls: pls file is not a playlist! \n";
-        return 0;
-    }
-
-}
-
-
-QString ParserPls::getFilepath(QTextStream *stream, QString basepath)
-{
-    QString textline,filename = "";
-    textline = stream->readLine();
-    while(!textline.isEmpty()){
-        if(textline.isNull())
-            break;
-
-        if(textline.contains("File")) {
-            int iPos = textline.indexOf("=",0);
-            ++iPos;
-
-            filename = textline.right(textline.length()-iPos);
-
-            if(isFilepath(filename)) {
-                return filename;
-            } else {
-                // Try relative to m3u dir
-                QString rel = basepath + "/" + filename;
-                if (isFilepath(rel)) {
-                    return rel;
-                }
-                // We couldn't match this to a real file so ignore it
-            }
-        }
-        textline = stream->readLine();
-    }
-
-    // Signal we reached the end
-    return 0;
-
-}

=== removed file 'mixxx/src/parserpls.h'
--- mixxx/src/parserpls.h	2010-06-22 18:39:04 +0000
+++ mixxx/src/parserpls.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-//
-// C++ Interface: parserpls
-//
-// Description: Interface header for the example parser PlsParser
-//
-//
-// Author: Ingo Kossyk <[e-mail]>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-
-#ifndef PARSERPLS_H
-#define PARSERPLS_H
-
-#include "parser.h"
-
-class QTextStream;
-
-class ParserPls : public Parser
-{
-    Q_OBJECT
-public:
-    ParserPls();
-    ~ParserPls();
-    /**Can be called to parse a pls file**/
-    QList<QString> parse(QString);
-
-private:
-    /**Returns the Number of entries in the pls file**/
-    long getNumEntries(QTextStream * );
-    /**Reads a line from the file and returns filepath**/
-    QString getFilepath(QTextStream *, QString);
-
-};
-
-#endif