Merge branch '2.1' of git@github.com:mixxxdj/mixxx.git into 2.2

# Conflicts:
#	src/library/crate/cratetablemodel.cpp
#	src/library/playlisttablemodel.cpp
#	src/library/trackmodel.h
#	src/widget/wtracktableview.cpp

12 files changed, 124 insertions, 81 deletions

diff --git a/src/engine/bpmcontrol.cpp b/src/engine/bpmcontrol.cpp
index 66bd011d00..db9bb5cd29 100644
--- a/src/engine/bpmcontrol.cpp
+++ b/src/engine/bpmcontrol.cpp
@@ -219,10 +219,14 @@ void BpmControl::slotTapFilter(double averageLength, int numSamples) {
     if (numSamples < 4)
         return;
 
+    auto pBeats = m_pBeats;
+    if (!pBeats)
+        return;
+
     // (60 seconds per minute) * (1000 milliseconds per second) / (X millis per
     // beat) = Y beats/minute
     double averageBpm = 60.0 * 1000.0 / averageLength / calcRateRatio();
-    m_pBeats->setBpm(averageBpm);
+    pBeats->setBpm(averageBpm);
 }
 
 void BpmControl::slotControlBeatSyncPhase(double v) {
diff --git a/src/library/banshee/bansheefeature.cpp b/src/library/banshee/bansheefeature.cpp
index e0a6b4c75a..bdb16b58e1 100644
--- a/src/library/banshee/bansheefeature.cpp
+++ b/src/library/banshee/bansheefeature.cpp
@@ -139,6 +139,7 @@ void BansheeFeature::appendTrackIdsFromRightClickIndex(QList<TrackId>* trackIds,
         if (playlistID > 0) {
             BansheePlaylistModel* pPlaylistModelToAdd = new BansheePlaylistModel(this, m_pTrackCollection, &m_connection);
             pPlaylistModelToAdd->setTableModel(playlistID);
+            pPlaylistModelToAdd->select();
 
             // Copy Tracks
             int rows = pPlaylistModelToAdd->rowCount();
diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp
index c871095bd3..d46661b965 100644
--- a/src/library/banshee/bansheeplaylistmodel.cpp
+++ b/src/library/banshee/bansheeplaylistmodel.cpp
@@ -11,6 +11,7 @@
 #include "mixer/playermanager.h"
 
 #define BANSHEE_TABLE "banshee"
+#define CLM_TRACK_ID "track_id"
 #define CLM_VIEW_ORDER "position"
 #define CLM_ARTIST "artist"
 #define CLM_TITLE "title"
@@ -31,39 +32,50 @@
 #define CLM_COMPOSER "composer"
 #define CLM_PREVIEW "preview"
 
+namespace {
+QAtomicInt sTableNumber;
+}
+
 BansheePlaylistModel::BansheePlaylistModel(QObject* pParent, TrackCollection* pTrackCollection, BansheeDbConnection* pConnection)
         : BaseSqlTableModel(pParent, pTrackCollection, "mixxx.db.model.banshee_playlist"),
           m_pConnection(pConnection),
           m_playlistId(-1) {
+    m_tempTableName = BANSHEE_TABLE + QString::number(sTableNumber.fetchAndAddAcquire(1));
 }
 
 BansheePlaylistModel::~BansheePlaylistModel() {
+    dropTempTable();
 }
 
-void BansheePlaylistModel::setTableModel(int playlistId) {
-    //qDebug() << "BansheePlaylistModel::setTableModel" << playlistId;
-    if (m_playlistId == playlistId) {
-        qDebug() << "Already focused on playlist " << playlistId;
-        return;
-    }
-
+void BansheePlaylistModel::dropTempTable() {
     if (m_playlistId >= 0) {
         // Clear old playlist
         m_playlistId = -1;
         QSqlQuery query(m_pTrackCollection->database());
-        QString strQuery("DELETE FROM " BANSHEE_TABLE);
-        if (!query.exec(strQuery)) {
+        QString strQuery("DROP TABLE IF EXISTS %1");
+        if (!query.exec(strQuery.arg(m_tempTableName))) {
             LOG_FAILED_QUERY(query);
         }
     }
+}
+
+void BansheePlaylistModel::setTableModel(int playlistId) {
+    //qDebug() << "BansheePlaylistModel::setTableModel" << this << playlistId;
+    if (m_playlistId == playlistId) {
+        qDebug() << "Already focused on playlist " << playlistId;
+        return;
+    }
+
+    dropTempTable();
 
     if (playlistId >= 0) {
         // setup new playlist
         m_playlistId = playlistId;
 
         QSqlQuery query(m_pTrackCollection->database());
-        QString strQuery("CREATE TEMP TABLE IF NOT EXISTS " BANSHEE_TABLE
-            " (" CLM_VIEW_ORDER " INTEGER, "
+        QString strQuery("CREATE TEMP TABLE IF NOT EXISTS %1"
+            " (" CLM_TRACK_ID " INTEGER, "
+                 CLM_VIEW_ORDER " INTEGER, "
                  CLM_ARTIST " TEXT, "
                  CLM_TITLE " TEXT, "
                  CLM_DURATION " INTEGER, "
@@ -82,12 +94,13 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
                  CLM_PLAYCOUNT" INTEGER, "
                  CLM_COMPOSER " TEXT, "
                  CLM_PREVIEW " TEXT)");
-        if (!query.exec(strQuery)) {
+        if (!query.exec(strQuery.arg(m_tempTableName))) {
             LOG_FAILED_QUERY(query);
         }
 
-        query.prepare("INSERT INTO " BANSHEE_TABLE
-                " (" CLM_VIEW_ORDER ", "
+        QString strQuery2("INSERT INTO %1"
+                " (" CLM_TRACK_ID ", "
+                     CLM_VIEW_ORDER ", "
                      CLM_ARTIST ", "
                      CLM_TITLE ", "
                      CLM_DURATION ", "
@@ -106,6 +119,7 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
                      CLM_PLAYCOUNT ", "
                      CLM_COMPOSER ") "
                      "VALUES (:"
+                     CLM_TRACK_ID ", :"
                      CLM_VIEW_ORDER ", :"
                      CLM_ARTIST ", :"
                      CLM_TITLE ", :"
@@ -125,6 +139,7 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
                      CLM_PLAYCOUNT ", :"
                      CLM_COMPOSER ") ");
 
+        query.prepare(strQuery2.arg(m_tempTableName));
 
         QList<struct BansheeDbConnection::PlaylistEntry> list =
                 m_pConnection->getPlaylistEntries(playlistId);
@@ -133,6 +148,9 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
             beginInsertRows(QModelIndex(), 0, list.size() - 1);
 
             foreach (struct BansheeDbConnection::PlaylistEntry entry, list) {
+                query.bindValue(":" CLM_TRACK_ID, entry.trackId);
+                // Note: entry.viewOrder is 0 for all tracks if they have
+                // never been sorted by the user
                 query.bindValue(":" CLM_VIEW_ORDER, entry.viewOrder + 1);
                 query.bindValue(":" CLM_ARTIST, entry.pArtist->name);
                 query.bindValue(":" CLM_TITLE, entry.pTrack->title);
@@ -165,11 +183,14 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
     }
 
     QStringList tableColumns;
-    tableColumns << CLM_VIEW_ORDER // 0
-         << CLM_PREVIEW;
+    tableColumns
+         << CLM_TRACK_ID // 0
+         << CLM_VIEW_ORDER
+         << CLM_PREVIEW; // 3
 
     QStringList trackSourceColumns;
-    trackSourceColumns << CLM_VIEW_ORDER // 0
+    trackSourceColumns
+         << CLM_TRACK_ID // 0
          << CLM_ARTIST
          << CLM_TITLE
          << CLM_DURATION
@@ -189,10 +210,10 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
          << CLM_COMPOSER;
 
     QSharedPointer<BaseTrackCache> trackSource(
-            new BaseTrackCache(m_pTrackCollection, BANSHEE_TABLE, CLM_VIEW_ORDER,
+            new BaseTrackCache(m_pTrackCollection, m_tempTableName, CLM_TRACK_ID,
                     trackSourceColumns, false));
 
-    setTable(BANSHEE_TABLE, CLM_VIEW_ORDER, tableColumns, trackSource);
+    setTable(m_tempTableName, CLM_TRACK_ID, tableColumns, trackSource);
     setSearch("");
     setDefaultSort(fieldIndex(PLAYLISTTRACKSTABLE_POSITION), Qt::AscendingOrder);
     setSort(defaultSortColumn(), defaultSortOrder());
@@ -327,6 +348,15 @@ TrackPointer BansheePlaylistModel::getTrack(const QModelIndex& index) const {
     return pTrack;
 }
 
+TrackId BansheePlaylistModel::getTrackId(const QModelIndex& index) const {
+    const auto track = getTrack(index);
+    if (track) {
+        return track->getId();
+    } else {
+        return TrackId();
+    }
+}
+
 // Gets the on-disk location of the track at the given location.
 QString BansheePlaylistModel::getTrackLocation(const QModelIndex& index) const {
     if (!index.isValid()) {
@@ -365,6 +395,7 @@ QString BansheePlaylistModel::getTrackLocation(const QModelIndex& index) const {
 }
 
 bool BansheePlaylistModel::isColumnInternal(int column) {
-    Q_UNUSED(column);
-    return false;
+    return (column == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_TRACKID) ||
+            (PlayerManager::numPreviewDecks() == 0 &&
+             column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_PREVIEW)));
 }
diff --git a/src/library/banshee/bansheeplaylistmodel.h b/src/library/banshee/bansheeplaylistmodel.h
index efda77a878..d89fc20a8a 100644
--- a/src/library/banshee/bansheeplaylistmodel.h
+++ b/src/library/banshee/bansheeplaylistmodel.h
@@ -20,6 +20,8 @@ class BansheePlaylistModel : public BaseSqlTableModel {
     void setTableModel(int playlistId);
 
     TrackPointer getTrack(const QModelIndex& index) const final;
+    TrackId getTrackId(const QModelIndex& index) const final;
+
     QString getTrackLocation(const QModelIndex& index) const final;
     bool isColumnInternal(int column) final;
 
@@ -41,9 +43,11 @@ class BansheePlaylistModel : public BaseSqlTableModel {
   private:
     QString getFieldString(const QModelIndex& index, const QString& fieldName) const;
     QVariant getFieldVariant(const QModelIndex& index, const QString& fieldName) const;
+    void dropTempTable();
 
     BansheeDbConnection* m_pConnection;
     int m_playlistId;
+    QString m_tempTableName;
 };
 
 #endif // BANSHEEPLAYLISTMODEL_H
diff --git a/src/library/baseexternallibraryfeature.cpp b/src/library/baseexternallibraryfeature.cpp
index 87807a62e7..b527c119d3 100644
--- a/src/library/baseexternallibraryfeature.cpp
+++ b/src/library/baseexternallibraryfeature.cpp
@@ -56,7 +56,7 @@ void BaseExternalLibraryFeature::slotAddToAutoDJTop() {
 }
 
 void BaseExternalLibraryFeature::addToAutoDJ(bool bTop) {
-    // qDebug() << "slotAddToAutoDJ() row:" << m_lastRightClickedIndex.data();
+    //qDebug() << "slotAddToAutoDJ() row:" << m_lastRightClickedIndex.data();
 
     QList<TrackId> trackIds;
     QString playlist;
@@ -96,15 +96,14 @@ void BaseExternalLibraryFeature::slotImportAsMixxxPlaylist() {
 }
 
 // This is a common function for all external Librarys copied to Mixxx DB
-void BaseExternalLibraryFeature::appendTrackIdsFromRightClickIndex(QList<TrackId>* trackIds, QString* pPlaylist) {
+void BaseExternalLibraryFeature::appendTrackIdsFromRightClickIndex(
+        QList<TrackId>* trackIds, QString* pPlaylist) {
     if (!m_lastRightClickedIndex.isValid()) {
         return;
     }
 
-    // Qt::UserRole asks TreeItemModel for the TreeItem's data. We need to
-    // use the data because models with nested playlists need to use the
-    // full path/name of the playlist.
-    *pPlaylist = m_lastRightClickedIndex.data(Qt::UserRole).toString();
+    DEBUG_ASSERT(pPlaylist);
+    *pPlaylist = m_lastRightClickedIndex.data().toString();
     QScopedPointer<BaseSqlTableModel> pPlaylistModelToAdd(
             getPlaylistModelForPlaylist(*pPlaylist));
 
diff --git a/src/library/baseexternalplaylistmodel.cpp b/src/library/baseexternalplaylistmodel.cpp
index 7529523896..2ba94fe30b 100644
--- a/src/library/baseexternalplaylistmodel.cpp
+++ b/src/library/baseexternalplaylistmodel.cpp
@@ -65,6 +65,15 @@ TrackPointer BaseExternalPlaylistModel::getTrack(const QModelIndex& index) const
     return pTrack;
 }
 
+TrackId BaseExternalPlaylistModel::getTrackId(const QModelIndex& index) const {
+    const auto track = getTrack(index);
+    if (track) {
+        return track->getId();
+    } else {
+        return TrackId();
+    }
+}
+
 bool BaseExternalPlaylistModel::isColumnInternal(int column) {
     if (column == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_TRACKID) ||
             (PlayerManager::numPreviewDecks() == 0 &&
diff --git a/src/library/baseexternalplaylistmodel.h b/src/library/baseexternalplaylistmodel.h
index 0b8cd3e7b4..51cbb9c94f 100644
--- a/src/library/baseexternalplaylistmodel.h
+++ b/src/library/baseexternalplaylistmodel.h
@@ -25,6 +25,7 @@ class BaseExternalPlaylistModel : public BaseSqlTableModel {
     void setPlaylist(QString path_name);
 
     TrackPointer getTrack(const QModelIndex& index) const override;
+    TrackId getTrackId(const QModelIndex& index) const override;
     bool isColumnInternal(int column) override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
     void trackLoaded(QString group, TrackPointer pTrack) override;
diff --git a/src/library/crate/cratetablemodel.cpp b/src/library/crate/cratetablemodel.cpp
index 661ac606a4..ca059ffe10 100644
--- a/src/library/crate/cratetablemodel.cpp
+++ b/src/library/crate/cratetablemodel.cpp
@@ -107,13 +107,11 @@ TrackModel::CapabilitiesFlags CrateTableModel::getCapabilities() const {
             | TRACKMODELCAPS_ADDTOPLAYLIST
             | TRACKMODELCAPS_ADDTOCRATE
             | TRACKMODELCAPS_ADDTOAUTODJ
-            | TRACKMODELCAPS_IMPORTMETADATA
+            | TRACKMODELCAPS_EDITMETADATA
             | TRACKMODELCAPS_LOADTODECK
             | TRACKMODELCAPS_LOADTOSAMPLER
             | TRACKMODELCAPS_LOADTOPREVIEWDECK
             | TRACKMODELCAPS_REMOVE_CRATE
-            | TRACKMODELCAPS_MANIPULATEBEATS
-            | TRACKMODELCAPS_CLEAR_BEATS
             | TRACKMODELCAPS_RESETPLAYED;
     if (m_selectedCrate.isValid()) {
         Crate crate;
diff --git a/src/library/librarytablemodel.cpp b/src/library/librarytablemodel.cpp
index c50a99867b..3d79457bea 100644
--- a/src/library/librarytablemodel.cpp
+++ b/src/library/librarytablemodel.cpp
@@ -101,12 +101,10 @@ TrackModel::CapabilitiesFlags LibraryTableModel::getCapabilities() const {
             | TRACKMODELCAPS_ADDTOPLAYLIST
             | TRACKMODELCAPS_ADDTOCRATE
             | TRACKMODELCAPS_ADDTOAUTODJ
-            | TRACKMODELCAPS_IMPORTMETADATA
+            | TRACKMODELCAPS_EDITMETADATA
             | TRACKMODELCAPS_LOADTODECK
             | TRACKMODELCAPS_LOADTOSAMPLER
             | TRACKMODELCAPS_LOADTOPREVIEWDECK
             | TRACKMODELCAPS_HIDE
-            | TRACKMODELCAPS_MANIPULATEBEATS
-            | TRACKMODELCAPS_CLEAR_BEATS
             | TRACKMODELCAPS_RESETPLAYED;
 }
diff --git a/src/library/playlisttablemodel.cpp b/src/library/playlisttablemodel.cpp
index 8c659f9b93..e1bc686c7d 100644
--- a/src/library/playlisttablemodel.cpp
+++ b/src/library/playlisttablemodel.cpp
@@ -242,12 +242,10 @@ TrackModel::CapabilitiesFlags PlaylistTableModel::getCapabilities() const {
             | TRACKMODELCAPS_REORDER
             | TRACKMODELCAPS_ADDTOCRATE
             | TRACKMODELCAPS_ADDTOPLAYLIST
-            | TRACKMODELCAPS_IMPORTMETADATA
+            | TRACKMODELCAPS_EDITMETADATA
             | TRACKMODELCAPS_LOADTODECK
             | TRACKMODELCAPS_LOADTOSAMPLER
             | TRACKMODELCAPS_LOADTOPREVIEWDECK
-            | TRACKMODELCAPS_MANIPULATEBEATS
-            | TRACKMODELCAPS_CLEAR_BEATS
             | TRACKMODELCAPS_RESETPLAYED;
 
     if (m_iPlaylistId != m_pTrackCollection->getPlaylistDAO().getPlaylistIdFromName(AUTODJ_TABLE)) {
diff --git a/src/library/trackmodel.h b/src/library/trackmodel.h
index a877be7ed5..1c4a17fb49 100644
--- a/src/library/trackmodel.h
+++ b/src/library/trackmodel.h
@@ -35,13 +35,11 @@ class TrackModel {
         TRACKMODELCAPS_ADDTOCRATE        = 0x00008,
         TRACKMODELCAPS_ADDTOAUTODJ       = 0x00010,
         TRACKMODELCAPS_LOCKED            = 0x00020,
-        TRACKMODELCAPS_IMPORTMETADATA    = 0x00040,
+        TRACKMODELCAPS_EDITMETADATA      = 0x00040,
         TRACKMODELCAPS_LOADTODECK        = 0x00080,
         TRACKMODELCAPS_LOADTOSAMPLER     = 0x00100,
         TRACKMODELCAPS_LOADTOPREVIEWDECK = 0x00200,
         TRACKMODELCAPS_REMOVE            = 0x00400,
-        TRACKMODELCAPS_MANIPULATEBEATS   = 0x00800,
-        TRACKMODELCAPS_CLEAR_BEATS       = 0x01000,
         TRACKMODELCAPS_RESETPLAYED       = 0x02000,
         TRACKMODELCAPS_HIDE              = 0x04000,
         TRACKMODELCAPS_UNHIDE            = 0x08000,
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index c349463336..d1c70732a7 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -918,16 +918,14 @@ void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
     m_pMenu->addSeparator();
     m_pMetadataMenu->clear();
 
-    if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_IMPORTMETADATA)) {
+    if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_EDITMETADATA)) {
         m_pMetadataMenu->addAction(m_pImportMetadataFromFileAct);
         m_pImportMetadataFromMusicBrainzAct->setEnabled(oneSongSelected);
         m_pMetadataMenu->addAction(m_pImportMetadataFromMusicBrainzAct);
         m_pMetadataMenu->addAction(m_pExportMetadataAct);
-    }
 
-    m_pClearMetadataMenu->clear();
+        m_pClearMetadataMenu->clear();
 
-    if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_CLEAR_BEATS)) {
         if (trackModel == nullptr) {
             return;
         }
@@ -948,38 +946,38 @@ void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
         m_pClearMetadataMenu->addAction(m_pClearPlayCountAction);
     }
 
-    //FIXME: Why are clearning the main cue and loop not working?
-//     m_pClearMetadataMenu->addAction(m_pClearMainCueAction);
-    m_pClearMetadataMenu->addAction(m_pClearHotCuesAction);
-//     m_pClearMetadataMenu->addAction(m_pClearLoopAction);
-    m_pClearMetadataMenu->addAction(m_pClearReplayGainAction);
-    m_pClearMetadataMenu->addAction(m_pClearWaveformAction);
-    m_pClearMetadataMenu->addSeparator();
-    m_pClearMetadataMenu->addAction(m_pClearAllMetadataAction);
-
-    // Cover art menu only applies if at least one track is selected.
-    if (indices.size()) {
-        // We load a single track to get the necessary context for the cover (we use
-        // last to be consistent with selectionChanged above).
-        QModelIndex last = indices.last();
-        CoverInfo info;
-        info.source = static_cast<CoverInfo::Source>(
-            last.sibling(last.row(), m_iCoverSourceColumn).data().toInt());
-        info.type = static_cast<CoverInfo::Type>(
-            last.sibling(last.row(), m_iCoverTypeColumn).data().toInt());
-        info.hash = last.sibling(last.row(), m_iCoverHashColumn).data().toUInt();
-        info.trackLocation = last.sibling(
-            last.row(), m_iTrackLocationColumn).data().toString();
-        info.coverLocation = last.sibling(
-            last.row(), m_iCoverLocationColumn).data().toString();
-        m_pCoverMenu->setCoverArt(info);
-        m_pMetadataMenu->addMenu(m_pCoverMenu);
-    }
-
-    m_pMenu->addMenu(m_pMetadataMenu);
-    m_pMenu->addMenu(m_pClearMetadataMenu);
-
-    if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_MANIPULATEBEATS)) {
+    if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_EDITMETADATA)) {
+        // FIXME: Why are clearning the main cue and loop not working?
+        //m_pClearMetadataMenu->addAction(m_pClearMainCueAction);
+        m_pClearMetadataMenu->addAction(m_pClearHotCuesAction);
+        //m_pClearMetadataMenu->addAction(m_pClearLoopAction);
+        m_pClearMetadataMenu->addAction(m_pClearReplayGainAction);
+        m_pClearMetadataMenu->addAction(m_pClearWaveformAction);
+        m_pClearMetadataMenu->addSeparator();
+        m_pClearMetadataMenu->addAction(m_pClearAllMetadataAction);
+
+        // Cover art menu only applies if at least one track is selected.
+        if (indices.size()) {
+            // We load a single track to get the necessary context for the cover (we use
+            // last to be consistent with selectionChanged above).
+            QModelIndex last = indices.last();
+            CoverInfo info;
+            info.source = static_cast<CoverInfo::Source>(
+                last.sibling(last.row(), m_iCoverSourceColumn).data().toInt());
+            info.type = static_cast<CoverInfo::Type>(
+                last.sibling(last.row(), m_iCoverTypeColumn).data().toInt());
+            info.hash = last.sibling(last.row(), m_iCoverHashColumn).data().toUInt();
+            info.trackLocation = last.sibling(
+                last.row(), m_iTrackLocationColumn).data().toString();
+            info.coverLocation = last.sibling(
+                last.row(), m_iCoverLocationColumn).data().toString();
+            m_pCoverMenu->setCoverArt(info);
+            m_pMetadataMenu->addMenu(m_pCoverMenu);
+        }
+
+        m_pMenu->addMenu(m_pMetadataMenu);
+        m_pMenu->addMenu(m_pClearMetadataMenu);
+
         m_pBPMMenu->addAction(m_pBpmDoubleAction);
         m_pBPMMenu->addAction(m_pBpmHalveAction);
         m_pBPMMenu->addAction(m_pBpmTwoThirdsAction);
@@ -1045,8 +1043,8 @@ void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
                 m_pBpmThreeHalvesAction->setEnabled(true);
             }
         }
+        m_pMenu->addMenu(m_pBPMMenu);
     }
-    m_pMenu->addMenu(m_pBPMMenu);
 
     m_pMenu->addSeparator();
     if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_HIDE)) {
@@ -1062,8 +1060,12 @@ void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
         m_pMenu->addAction(m_pPurgeAct);
     }
     m_pMenu->addAction(m_pFileBrowserAct);
-    m_pPropertiesAct->setEnabled(oneSongSelected);
-    m_pMenu->addAction(m_pPropertiesAct);
+
+    if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_EDITMETADATA)) {
+        m_pMenu->addSeparator();
+        m_pPropertiesAct->setEnabled(oneSongSelected);
+        m_pMenu->addAction(m_pPropertiesAct);
+    }
 
     //Create the right-click menu
     m_pMenu->popup(event->globalPos());
@@ -1473,7 +1475,7 @@ void WTrackTableView::sendToAutoDJ(PlaylistDAO::AutoDJSendLoc loc) {
 }
 
 void WTrackTableView::slotImportTrackMetadataFromFileTags() {
-    if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_IMPORTMETADATA)) {
+    if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_EDITMETADATA)) {
         return;
     }
 
@@ -1498,7 +1500,7 @@ void WTrackTableView::slotImportTrackMetadataFromFileTags() {
 }
 
 void WTrackTableView::slotExportTrackMetadataIntoFileTags() {
-    if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_IMPORTMETADATA)) {
+    if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_EDITMETADATA)) {
         return;
     }