really remove MusicAudioTrack

fixes Windows build

autotests/CMakeLists.txt

@@ -22,7 +22,6 @@ target_include_directories(viewManagerTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 set(databaseInterfaceTest_SOURCES
     databaseinterfacetest.cpp
     databasetestdata.h
-    ../src/musicaudiotrack.cpp
 )
 
 ecm_add_test(${databaseInterfaceTest_SOURCES}
@@ -34,7 +33,6 @@ target_include_directories(databaseInterfaceTest PRIVATE ${CMAKE_SOURCE_DIR}/src
 
 set(managemediaplayercontrolTest_SOURCES
     managemediaplayercontroltest.cpp
-    ../src/musicaudiotrack.cpp
     ../src/elisautils.cpp
 )
 
@@ -46,7 +44,6 @@ ecm_add_test(${managemediaplayercontrolTest_SOURCES}
 
 set(manageheaderbarTest_SOURCES
     manageheaderbartest.cpp
-    ../src/musicaudiotrack.cpp
     ../src/elisautils.cpp
 )
 
@@ -72,7 +69,6 @@ target_include_directories(manageaudioplayerTest PRIVATE ${CMAKE_SOURCE_DIR}/src
 set(mediaplaylistTest_SOURCES
     mediaplaylisttest.cpp
     ../src/elisautils.cpp
-    ../src/musicaudiotrack.cpp
 )
 
 ecm_qt_declare_logging_category(mediaplaylistTest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
@@ -88,7 +84,6 @@ target_include_directories(mediaplaylistTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 set(trackslistenertest_SOURCES
     trackslistenertest.cpp
     ../src/elisautils.cpp
-    ../src/musicaudiotrack.cpp
 )
 
 ecm_add_test(${trackslistenertest_SOURCES}
@@ -101,7 +96,6 @@ target_include_directories(trackslistenertest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(datamodeltest_SOURCES
     datamodeltest.cpp
-    ../src/musicaudiotrack.cpp
 )
 
 ecm_qt_declare_logging_category(datamodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
@@ -116,7 +110,6 @@ target_include_directories(datamodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(trackmetadatamodeltest_SOURCES
     trackmetadatamodeltest.cpp
-    ../src/musicaudiotrack.cpp
 )
 
 ecm_qt_declare_logging_category(trackmetadatamodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
@@ -131,7 +124,6 @@ target_include_directories(trackmetadatamodeltest PRIVATE ${CMAKE_SOURCE_DIR}/sr
 
 set(alltracksproxymodeltest_SOURCES
     alltracksproxymodeltest.cpp
-    ../src/musicaudiotrack.cpp
 )
 
 ecm_qt_declare_logging_category(alltracksproxymodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
@@ -147,7 +139,6 @@ target_include_directories(alltracksproxymodeltest PRIVATE ${CMAKE_SOURCE_DIR}/s
 if (KF5FileMetaData_FOUND)
     set(localfilelistingtest_SOURCES
         localfilelistingtest.cpp
-        ../src/musicaudiotrack.cpp
     )
 
     ecm_add_test(${localfilelistingtest_SOURCES}

autotests/alltracksproxymodeltest.cpp

@@ -17,7 +17,6 @@
 
 #include "databasetestdata.h"
 
-#include "musicaudiotrack.h"
 #include "databaseinterface.h"
 #include "models/datamodel.h"
 #include "models/alltracksproxymodel.h"
@@ -48,7 +47,6 @@ private Q_SLOTS:
     {
         qRegisterMetaType<QHash<qulonglong,int>>("QHash<qulonglong,int>");
         qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
-        qRegisterMetaType<QHash<QString,QVector<MusicAudioTrack>>>("QHash<QString,QVector<MusicAudioTrack>>");
         qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
         qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
     }
@@ -91,7 +89,7 @@ private Q_SLOTS:
         QCOMPARE(endRemoveRowsSpy.count(), 0);
         QCOMPARE(dataChangedSpy.count(), 0);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        musicDb.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 1);
         QCOMPARE(endInsertRowsSpy.count(), 1);
@@ -155,7 +153,7 @@ private Q_SLOTS:
         QCOMPARE(endRemoveRowsSpy.count(), 0);
         QCOMPARE(dataChangedSpy.count(), 0);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        musicDb.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 1);
         QCOMPARE(endInsertRowsSpy.count(), 1);
@@ -227,7 +225,7 @@ private Q_SLOTS:
         QCOMPARE(endRemoveRowsSpy.count(), 0);
         QCOMPARE(dataChangedSpy.count(), 0);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        musicDb.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 1);
         QCOMPARE(endInsertRowsSpy.count(), 1);
@@ -237,16 +235,16 @@ private Q_SLOTS:
 
         QCOMPARE(proxyTracksModel.rowCount(), 23);
 
-        auto newTrack = MusicAudioTrack{true, QStringLiteral("$23"), QStringLiteral("0"), QStringLiteral("track23"),
+        auto newTrack = DataTypes::TrackDataType{true, QStringLiteral("$23"), QStringLiteral("0"), QStringLiteral("track23"),
                 QStringLiteral("artist2"), QStringLiteral("album4"), QStringLiteral("artist2"), 23, 1, QTime::fromMSecsSinceStartOfDay(23),
         {QUrl::fromLocalFile(QStringLiteral("/$23"))},
                 QDateTime::fromMSecsSinceEpoch(23),
         {QUrl::fromLocalFile(QStringLiteral("file://image$23"))}, 5, true,
         {}, QStringLiteral("composer1"), QStringLiteral("lyricist1"), false};
-        auto newTracks = QList<MusicAudioTrack>();
+        auto newTracks = DataTypes::ListTrackDataType();
         newTracks.push_back(newTrack);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(newTracks), mNewCovers);
+        musicDb.insertTracksList(newTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 2);
         QCOMPARE(endInsertRowsSpy.count(), 2);
@@ -301,7 +299,7 @@ private Q_SLOTS:
             newFiles.push_back(oneTrack.resourceURI());
         }
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        musicDb.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 1);
         QCOMPARE(endInsertRowsSpy.count(), 1);
@@ -311,13 +309,13 @@ private Q_SLOTS:
 
         QCOMPARE(proxyTracksModel.rowCount(), 23);
 
-        auto newTrack = MusicAudioTrack{true, QStringLiteral("$23"), QStringLiteral("0"), QStringLiteral("track23"),
+        auto newTrack = DataTypes::TrackDataType{true, QStringLiteral("$23"), QStringLiteral("0"), QStringLiteral("track23"),
                 QStringLiteral("artist2"), QStringLiteral("album4"), QStringLiteral("artist2"), 23, 1, QTime::fromMSecsSinceStartOfDay(23),
         {QUrl::fromLocalFile(QStringLiteral("/$23"))},
                 QDateTime::fromMSecsSinceEpoch(23),
         {QUrl::fromLocalFile(QStringLiteral("file://image$23"))}, 5, true,
         {}, QStringLiteral("composer1"), QStringLiteral("lyricist1"), false};
-        auto newTracks = QList<MusicAudioTrack>();
+        auto newTracks = DataTypes::ListTrackDataType();
         newTracks.push_back(newTrack);
 
         auto newCover = QUrl::fromLocalFile(QStringLiteral("album5"));
@@ -329,7 +327,7 @@ private Q_SLOTS:
             newFiles2.push_back(oneTrack.resourceURI());
         }
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(newTracks), newCovers);
+        musicDb.insertTracksList(newTracks, newCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 2);
         QCOMPARE(endInsertRowsSpy.count(), 2);
@@ -378,7 +376,7 @@ private Q_SLOTS:
         QCOMPARE(endRemoveRowsSpy.count(), 0);
         QCOMPARE(dataChangedSpy.count(), 0);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        musicDb.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 1);
         QCOMPARE(endInsertRowsSpy.count(), 1);
@@ -388,15 +386,15 @@ private Q_SLOTS:
 
         QCOMPARE(proxyTracksModel.rowCount(), 23);
 
-        auto newTrack = MusicAudioTrack{true, QStringLiteral("$1"), QStringLiteral("0"), QStringLiteral("track1"),
+        auto newTrack = DataTypes::TrackDataType{true, QStringLiteral("$1"), QStringLiteral("0"), QStringLiteral("track1"),
                 QStringLiteral("artist1"), QStringLiteral("album1"), QStringLiteral("Various Artists"),
                 1, 1, QTime::fromMSecsSinceStartOfDay(1), {QUrl::fromLocalFile(QStringLiteral("/$1"))},
                 QDateTime::fromMSecsSinceEpoch(1),
         {QUrl::fromLocalFile(QStringLiteral("file://image$1"))}, 5, true, {}, QStringLiteral("composer1"), QStringLiteral("lyricist1"), false};
-        auto newTracks = QList<MusicAudioTrack>();
+        auto newTracks = DataTypes::ListTrackDataType();
         newTracks.push_back(newTrack);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(newTracks), mNewCovers);
+        musicDb.insertTracksList(newTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 1);
         QCOMPARE(endInsertRowsSpy.count(), 1);
@@ -487,7 +485,7 @@ private Q_SLOTS:
         QCOMPARE(endRemoveRowsSpy.count(), 0);
         QCOMPARE(dataChangedSpy.count(), 0);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        musicDb.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 1);
         QCOMPARE(endInsertRowsSpy.count(), 1);
@@ -497,16 +495,16 @@ private Q_SLOTS:
 
         QCOMPARE(proxyTracksModel.rowCount(), 23);
 
-        auto newTrack = MusicAudioTrack{true, QStringLiteral("$23"), QStringLiteral("0"), QStringLiteral("track23"),
+        auto newTrack = DataTypes::TrackDataType{true, QStringLiteral("$23"), QStringLiteral("0"), QStringLiteral("track23"),
                 QStringLiteral("artist2"), QStringLiteral("album4"), QStringLiteral("artist2"), 23, 1, QTime::fromMSecsSinceStartOfDay(23),
         {QUrl::fromLocalFile(QStringLiteral("/$23"))},
                 QDateTime::fromMSecsSinceEpoch(23),
         {QUrl::fromLocalFile(QStringLiteral("file://image$23"))}, 5, true, {}, QStringLiteral("composer1"), QStringLiteral("lyricist1"), false};
 
-        auto newTracks = QList<MusicAudioTrack>();
+        auto newTracks = DataTypes::ListTrackDataType();
         newTracks.push_back(newTrack);
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(newTracks), mNewCovers);
+        musicDb.insertTracksList(newTracks, mNewCovers);
 
         QCOMPARE(beginInsertRowsSpy.count(), 2);
         QCOMPARE(endInsertRowsSpy.count(), 2);

autotests/databasetestdata.h

@@ -18,7 +18,7 @@
 #ifndef DATABASETESTDATA_H
 #define DATABASETESTDATA_H
 
-#include "musicaudiotrack.h"
+#include "datatypes.h"
 
 #include <QList>
 #include <QUrl>
@@ -35,7 +35,7 @@ public:
 
 protected:
 
-    QList<MusicAudioTrack> mNewTracks = {
+    DataTypes::ListTrackDataType mNewTracks = {
         {true, QStringLiteral("$1"), QStringLiteral("0"), QStringLiteral("track1"),
          QStringLiteral("artist1"), QStringLiteral("album1"), QStringLiteral("Various Artists"),
          1, 1, QTime::fromMSecsSinceStartOfDay(1), {QUrl::fromLocalFile(QStringLiteral("/$1"))}, QDateTime::fromMSecsSinceEpoch(1),

autotests/filescannertest.cpp

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "musicaudiotrack.h"
 #include "filescanner.h"
 #include "config-upnp-qt.h"
 

autotests/localfilelistingtest.cpp

@@ -18,7 +18,6 @@
 #include "databasetestdata.h"
 
 #include "file/localfilelisting.h"
-#include "musicaudiotrack.h"
 
 #include "config-upnp-qt.h"
 
@@ -57,7 +56,6 @@ private Q_SLOTS:
     {
         qRegisterMetaType<QHash<qulonglong,int>>("QHash<qulonglong,int>");
         qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
-        qRegisterMetaType<QList<MusicAudioTrack>>("QList<MusicAudioTrack>");
         qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
         qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
         qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
@@ -415,7 +413,7 @@ private Q_SLOTS:
         QCOMPARE(modifiedTracksListSpy.count(), 0);
 
         auto newTracksSignalLast = tracksListSpy.at(1);
-        auto newTracksLast = newTracksSignalLast.at(0).value<QList<MusicAudioTrack>>();
+        auto newTracksLast = newTracksSignalLast.at(0).value<DataTypes::ListTrackDataType>();
         auto newCoversLast = newTracksSignalLast.at(1).value<QHash<QString, QUrl>>();
 
         QCOMPARE(newTracksLast.count(), 1);

autotests/manageheaderbartest.h

@@ -22,8 +22,6 @@
 
 #include "databasetestdata.h"
 
-#include "musicaudiotrack.h"
-
 #include <QList>
 #include <QHash>
 #include <QString>

autotests/managemediaplayercontroltest.cpp

@@ -20,7 +20,6 @@
 #include "managemediaplayercontrol.h"
 #include "mediaplaylist.h"
 #include "databaseinterface.h"
-#include "musicaudiotrack.h"
 #include "trackslistener.h"
 
 #include <QHash>

autotests/managemediaplayercontroltest.h

@@ -22,8 +22,6 @@
 
 #include "databasetestdata.h"
 
-#include "musicaudiotrack.h"
-
 #include <QList>
 #include <QHash>
 #include <QString>

autotests/mediaplaylisttest.h

@@ -20,8 +20,6 @@
 
 #include "databasetestdata.h"
 
-#include "musicaudiotrack.h"
-
 #include <QObject>
 #include <QHash>
 #include <QVector>

autotests/trackmetadatamodeltest.cpp

@@ -82,7 +82,7 @@ private Q_SLOTS:
 
         musicDb.init(QStringLiteral("testDb"), databaseFile.fileName());
 
-        musicDb.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        musicDb.insertTracksList(mNewTracks, mNewCovers);
 
         TrackMetadataModel myModel;
         QAbstractItemModelTester testModel(&myModel);

autotests/trackslistenertest.cpp

@@ -55,7 +55,6 @@ private Q_SLOTS:
     {
         qRegisterMetaType<QHash<qulonglong,int>>("QHash<qulonglong,int>");
         qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
-        qRegisterMetaType<QList<MusicAudioTrack>>("QList<MusicAudioTrack>");
         qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
         qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
         qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
@@ -95,7 +94,7 @@ private Q_SLOTS:
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
         QCOMPARE(tracksListAddedSpy.count(), 0);
 
-        myDatabaseContent.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        myDatabaseContent.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
@@ -217,7 +216,7 @@ private Q_SLOTS:
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
         QCOMPARE(tracksListAddedSpy.count(), 0);
 
-        myDatabaseContent.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        myDatabaseContent.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
@@ -284,7 +283,7 @@ private Q_SLOTS:
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
         QCOMPARE(tracksListAddedSpy.count(), 0);
 
-        myDatabaseContent.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        myDatabaseContent.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
@@ -363,7 +362,7 @@ private Q_SLOTS:
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
 
-        myDatabaseContent.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        myDatabaseContent.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
@@ -417,7 +416,7 @@ private Q_SLOTS:
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
         QCOMPARE(tracksListAddedSpy.count(), 0);
 
-        myDatabaseContent.insertTracksList(MusicAudioTrack::tracksToListData(mNewTracks), mNewCovers);
+        myDatabaseContent.insertTracksList(mNewTracks, mNewCovers);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
@@ -440,14 +439,14 @@ private Q_SLOTS:
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
-        myDatabaseContent.insertTracksList(MusicAudioTrack::tracksToListData({
+        myDatabaseContent.insertTracksList({
                                                {true, QStringLiteral("$1"), QStringLiteral("0"), QStringLiteral("track1"),
                                                 QStringLiteral("artist1"), QStringLiteral("album1"), QStringLiteral("Various Artists"),
                                                 2, 3, QTime::fromMSecsSinceStartOfDay(1000), {QUrl::fromLocalFile(QStringLiteral("/$1"))},
                                                 QDateTime::fromMSecsSinceEpoch(1),
                                                 {QUrl::fromLocalFile(QStringLiteral("file://image$1"))}, 1, false,
                                                 {}, {}, QStringLiteral("lyricist1"), false}
-                                           }), mNewCovers);
+                                           }, mNewCovers);
 
         QCOMPARE(trackHasChangedSpy.count(), 2);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);

src/datatypes.h

@@ -62,6 +62,7 @@ public:
         SampleRateRole,
         ResourceRole,
         IdRole,
+        ParentIdRole,
         DatabaseIdRole,
         IsSingleDiscAlbumRole,
         ContainerDataRole,
@@ -91,6 +92,23 @@ public:
 
         using DataType::DataType;
 
+        TrackDataType(bool aValid, QString aId, QString aParentId, QString aTitle, QString aArtist, QString aAlbumName,
+                      QString aAlbumArtist, int aTrackNumber, int aDiscNumber, QTime aDuration, QUrl aResourceURI,
+                      const QDateTime &fileModificationTime, QUrl aAlbumCover, int rating, bool aIsSingleDiscAlbum,
+                      QString aGenre, QString aComposer, QString aLyricist, bool aHasEmbeddedCover)
+            : DataType({{key_type::TitleRole, aTitle}, {key_type::AlbumRole, aAlbumName},
+                        {key_type::ArtistRole, aArtist}, {key_type::AlbumArtistRole, aAlbumArtist},
+                        {key_type::IdRole, aId}, {key_type::ParentIdRole, aParentId},
+                        {key_type::TrackNumberRole, aTrackNumber}, {key_type::DiscNumberRole, aDiscNumber},
+                        {key_type::DurationRole, aDuration}, {key_type::ResourceRole, aResourceURI},
+                        {key_type::FileModificationTime, fileModificationTime}, {key_type::ImageUrlRole, aAlbumCover},
+                        {key_type::RatingRole, rating}, {key_type::IsSingleDiscAlbumRole, aIsSingleDiscAlbum},
+                        {key_type::GenreRole, aGenre}, {key_type::ComposerRole, aComposer},
+                        {key_type::LyricistRole, aLyricist}, {key_type::HasEmbeddedCover, aHasEmbeddedCover},})
+        {
+            Q_UNUSED(aValid)
+        }
+
         bool isValid() const
         {
             return !isEmpty() && duration().isValid();

src/file/localfilelisting.cpp

@@ -17,8 +17,6 @@
 
 #include "localfilelisting.h"
 
-#include "musicaudiotrack.h"
-
 #include "abstractfile/indexercommon.h"
 
 #include <QThread>

src/mediaplaylist.cpp

@@ -19,7 +19,6 @@
 
 #include "playListLogging.h"
 #include "datatypes.h"
-#include "musicaudiotrack.h"
 #include "musiclistenersmanager.h"
 
 #include <QUrl>

src/mediaplaylist.h

@@ -20,7 +20,6 @@
 
 #include "elisaLib_export.h"
 
-#include "musicaudiotrack.h"
 #include "elisautils.h"
 #include "datatypes.h"
 
@@ -30,6 +29,7 @@
 
 #include <utility>
 #include <tuple>
+#include <memory>
 
 class MediaPlayListPrivate;
 class MusicListenersManager;
@@ -113,6 +113,7 @@ public:
         SampleRateRole,
         ResourceRole,
         IdRole,
+        ParentIdRole,
         DatabaseIdRole,
         IsSingleDiscAlbumRole,
         ContainerDataRole,
@@ -363,11 +364,6 @@ public:
           mTrackNumber(trackNumber), mDiscNumber(discNumber), mId(id), mEntryType(entryType) {
     }
 
-    explicit MediaPlayListEntry(const MusicAudioTrack &track)
-        : mTitle(track.title()), mAlbum(track.albumName()), mTrackNumber(track.trackNumber()),
-          mDiscNumber(track.discNumber()), mId(track.databaseId()), mIsValid(true) {
-    }
-
     explicit MediaPlayListEntry(const MediaPlayList::TrackDataType &track)
         : mTitle(track[DataTypes::TitleRole]),
           mAlbum(track[DataTypes::AlbumRole]),

src/models/alltracksproxymodel.h

@@ -22,7 +22,6 @@
 #include "elisaLib_export.h"
 
 #include "abstractmediaproxymodel.h"
-#include "musicaudiotrack.h"
 #include "elisautils.h"
 
 class ELISALIB_EXPORT AllTracksProxyModel : public AbstractMediaProxyModel

src/models/filebrowserproxymodel.h

@@ -21,7 +21,6 @@
 
 #include "elisaLib_export.h"
 
-#include "musicaudiotrack.h"
 #include "filescanner.h"
 #include "elisautils.h"