=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2010-06-19 20:08:35 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2010-07-14 15:00:50 +0000
@@ -76,6 +76,8 @@
             return QVariant(pTrack->getYear());
         } else if (fieldIndex(LIBRARYTABLE_GENRE) == col) {
             return QVariant(pTrack->getGenre());
+        } else if (fieldIndex(LIBRARYTABLE_FILETYPE) == col) {
+            return QVariant(pTrack->getType());
         } else if (fieldIndex(LIBRARYTABLE_TRACKNUMBER) == col) {
             return QVariant(pTrack->getTrackNumber());
         } else if (fieldIndex(LIBRARYTABLE_LOCATION) == col) {

=== modified file 'mixxx/src/library/cratetablemodel.cpp'
--- mixxx/src/library/cratetablemodel.cpp	2010-07-11 05:05:32 +0000
+++ mixxx/src/library/cratetablemodel.cpp	2010-07-14 14:53:02 +0000
@@ -39,6 +39,7 @@
                                   LIBRARYTABLE_YEAR + "," +
                                   LIBRARYTABLE_DURATION + "," +
                                   LIBRARYTABLE_GENRE + "," +
+                                  LIBRARYTABLE_FILETYPE + "," +
                                   LIBRARYTABLE_TRACKNUMBER + "," +
                                   LIBRARYTABLE_BPM + "," +
                                   LIBRARYTABLE_DATETIMEADDED + ","
@@ -79,6 +80,8 @@
                   Qt::Horizontal, tr("Genre"));
     setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
                   Qt::Horizontal, tr("Year"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
+                  Qt::Horizontal, tr("Type"));
     setHeaderData(fieldIndex("location"),
                   Qt::Horizontal, tr("Location"));
     setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),

=== modified file 'mixxx/src/library/dao/trackdao.cpp'
--- mixxx/src/library/dao/trackdao.cpp	2010-07-11 05:45:01 +0000
+++ mixxx/src/library/dao/trackdao.cpp	2010-07-14 15:01:13 +0000
@@ -211,6 +211,7 @@
     query.bindValue(":album", pTrack->getAlbum());
     query.bindValue(":year", pTrack->getYear());
     query.bindValue(":genre", pTrack->getGenre());
+    query.bindValue(":filetype", pTrack->getType());
     query.bindValue(":tracknumber", pTrack->getTrackNumber());
     query.bindValue(":location", trackLocationId);
     query.bindValue(":comment", pTrack->getComment());
@@ -431,6 +432,7 @@
     query.bindValue(":album", pTrack->getAlbum());
     query.bindValue(":year", pTrack->getYear());
     query.bindValue(":genre", pTrack->getGenre());
+    query.bindValue(":filetype", pTrack->getType());
     query.bindValue(":tracknumber", pTrack->getTrackNumber());
     query.bindValue(":comment", pTrack->getComment());
     query.bindValue(":url", pTrack->getURL());

=== modified file 'mixxx/src/library/dao/trackdao.h'
--- mixxx/src/library/dao/trackdao.h	2010-07-11 05:45:01 +0000
+++ mixxx/src/library/dao/trackdao.h	2010-07-14 14:51:18 +0000
@@ -18,6 +18,7 @@
 const QString LIBRARYTABLE_YEAR = "year";
 const QString LIBRARYTABLE_GENRE = "genre";
 const QString LIBRARYTABLE_TRACKNUMBER = "tracknumber";
+const QString LIBRARYTABLE_FILETYPE = "filetype";
 const QString LIBRARYTABLE_LOCATION = "location";
 const QString LIBRARYTABLE_COMMENT = "comment";
 const QString LIBRARYTABLE_DURATION = "duration";

=== modified file 'mixxx/src/library/legacylibraryimporter.cpp'
--- mixxx/src/library/legacylibraryimporter.cpp	2010-07-11 05:05:32 +0000
+++ mixxx/src/library/legacylibraryimporter.cpp	2010-07-14 15:02:33 +0000
@@ -107,6 +107,7 @@
                 trackInfo17.setGenre(trackInfoNew.getGenre());
                 trackInfo17.setAlbum(trackInfoNew.getAlbum());
                 trackInfo17.setYear(trackInfoNew.getYear());
+                trackInfo17.setType(trackInfoNew.getType());
                 trackInfo17.setTrackNumber(trackInfoNew.getTrackNumber());
 
                 // Import the track's saved cue point if it is non-zero.

=== modified file 'mixxx/src/library/librarytablemodel.cpp'
--- mixxx/src/library/librarytablemodel.cpp	2010-07-11 05:05:32 +0000
+++ mixxx/src/library/librarytablemodel.cpp	2010-07-14 14:57:26 +0000
@@ -26,6 +26,7 @@
                   "library." + LIBRARYTABLE_YEAR + "," +
                   "library." + LIBRARYTABLE_DURATION + "," +
                   "library." + LIBRARYTABLE_GENRE + "," +
+                  "library." + LIBRARYTABLE_FILETYPE + "," +
                   "library." + LIBRARYTABLE_TRACKNUMBER + "," +
                   "library." + LIBRARYTABLE_DATETIMEADDED + "," +
                   "library." + LIBRARYTABLE_BPM + "," +
@@ -66,6 +67,8 @@
                   Qt::Horizontal, tr("Genre"));
     setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
                   Qt::Horizontal, tr("Year"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
+                  Qt::Horizontal, tr("Type"));
     setHeaderData(fieldIndex(LIBRARYTABLE_LOCATION),
                   Qt::Horizontal, tr("Location"));
     setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),

=== modified file 'mixxx/src/library/missingtablemodel.cpp'
--- mixxx/src/library/missingtablemodel.cpp	2010-06-18 09:07:12 +0000
+++ mixxx/src/library/missingtablemodel.cpp	2010-07-14 14:56:11 +0000
@@ -29,6 +29,7 @@
                   "library." + LIBRARYTABLE_YEAR + "," +
                   "library." + LIBRARYTABLE_DURATION + "," +
                   "library." + LIBRARYTABLE_GENRE + "," +
+                  "library." + LIBRARYTABLE_FILETYPE + "," +
                   "library." + LIBRARYTABLE_TRACKNUMBER + "," +
                   "library." + LIBRARYTABLE_DATETIMEADDED + "," +
                   "library." + LIBRARYTABLE_BPM + "," +
@@ -68,6 +69,8 @@
                   Qt::Horizontal, tr("Genre"));
     setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
                   Qt::Horizontal, tr("Year"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
+                  Qt::Horizontal, tr("Type"));
     setHeaderData(fieldIndex(LIBRARYTABLE_LOCATION),
                   Qt::Horizontal, tr("Location"));
     setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),

=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2010-07-11 05:05:32 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2010-07-14 14:54:43 +0000
@@ -50,6 +50,7 @@
                   "library." + LIBRARYTABLE_YEAR + "," +
                   "library." + LIBRARYTABLE_DURATION + "," +
                   "library." + LIBRARYTABLE_GENRE + "," +
+                  "library." + LIBRARYTABLE_FILETYPE + "," +
                   "library." + LIBRARYTABLE_TRACKNUMBER + "," +
                   "library." + LIBRARYTABLE_DATETIMEADDED + "," +
                   "library." + LIBRARYTABLE_BPM + ","
@@ -91,6 +92,8 @@
                   Qt::Horizontal, tr("Genre"));
     setHeaderData(fieldIndex(LIBRARYTABLE_YEAR),
                   Qt::Horizontal, tr("Year"));
+    setHeaderData(fieldIndex(LIBRARYTABLE_FILETYPE),
+                  Qt::Horizontal, tr("Type"));
     setHeaderData(fieldIndex("location"),
                   Qt::Horizontal, tr("Location"));
     setHeaderData(fieldIndex(LIBRARYTABLE_COMMENT),