modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp

@@ -88,31 +88,25 @@ void appendMediaIntoPlaylist(vlc_medialibrary_t* ml, int64_t playlistId, const s
 {
     assert(m_mediaLib);
 
+    struct Ctx {
+        MLItemId createdPlaylistId;
+    };
 
-    std::vector<MLItemId> itemList;
-    for (const QVariant & id : initialItems)
-    {
-        if (id.canConvert<MLItemId>() == false)
-            continue;
-
-        const MLItemId & itemId = id.value<MLItemId>();
-
-        if (itemId.id == 0)
-            continue;
-        itemList.push_back(itemId);
-    }
-
-    m_mediaLib->runOnMLThread(this,
+    m_mediaLib->runOnMLThread<Ctx>(this,
     //ML thread
-    [name, itemList](vlc_medialibrary_t* ml)
+    [name](vlc_medialibrary_t* ml, Ctx& ctx)
     {
         vlc_ml_playlist_t * playlist = vlc_ml_playlist_create(ml, qtu(name));
         if (playlist)
         {
-            auto playlistId = playlist->i_id;
+            ctx.createdPlaylistId = MLItemId(playlist->i_id, VLC_ML_PARENT_UNKNOWN);
             vlc_ml_playlist_release(playlist);
-
-            appendMediaIntoPlaylist(ml, playlistId, itemList);
+        }
+    },
+    [this, initialItems](quint64, const Ctx& ctx) {
+        if (ctx.createdPlaylistId.id)
+        {
+            append(ctx.createdPlaylistId, initialItems);
         }
     });
 }

modules/gui/qt/network/networkdevicemodel.cpp

@@ -559,10 +559,10 @@ bool NetworkDeviceModel::addAndPlay(const QModelIndexList& itemIdList)
 }
 
 /* Q_INVOKABLE */
-QVector<SharedInputItem> NetworkDeviceModel::getItemsForIndexes(const QModelIndexList & indexes) const
+QVariantList NetworkDeviceModel::getItemsForIndexes(const QModelIndexList & indexes) const
 {
     Q_D(const NetworkDeviceModel);
-    QVector<SharedInputItem> items;
+    QVariantList items;
 
     for (const QModelIndex & modelIndex : indexes)
     {
@@ -570,7 +570,7 @@ QVector<SharedInputItem> NetworkDeviceModel::getItemsForIndexes(const QModelInde
         if (!item)
             continue;
 
-        items.append(SharedInputItem(item->inputItem.get(), true));
+        items.append(QVariant::fromValue(SharedInputItem(item->inputItem.get(), true)));
     }
 
     return items;

modules/gui/qt/network/networkdevicemodel.hpp

@@ -115,7 +115,7 @@ public:
     Q_INVOKABLE bool addAndPlay(const QVariantList& itemIdList);
     Q_INVOKABLE bool addAndPlay(const QModelIndexList& itemIdList);
 
-    Q_INVOKABLE QVector<SharedInputItem> getItemsForIndexes(const QModelIndexList & indexes) const;
+    Q_INVOKABLE QVariantList getItemsForIndexes(const QModelIndexList & indexes) const;
 
 signals:
     void ctxChanged();

modules/gui/qt/network/networkmediamodel.cpp

@@ -721,10 +721,10 @@ bool NetworkMediaModel::addAndPlay(const QModelIndexList& itemIdList)
 }
 
 /* Q_INVOKABLE */
-QVector<SharedInputItem> NetworkMediaModel::getItemsForIndexes(const QModelIndexList & indexes) const
+QVariantList NetworkMediaModel::getItemsForIndexes(const QModelIndexList & indexes) const
 {
     Q_D(const NetworkMediaModel);
-    QVector<SharedInputItem> items;
+    QVariantList items;
 
     for (const QModelIndex & modelIndex : indexes)
     {
@@ -736,7 +736,7 @@ QVector<SharedInputItem> NetworkMediaModel::getItemsForIndexes(const QModelIndex
 
         const NetworkTreeItem & tree = item->tree;
 
-        items.append(SharedInputItem(tree.media.get(), true));
+        items.append(QVariant::fromValue(SharedInputItem(tree.media.get(), true)));
     }
 
     return items;

modules/gui/qt/network/networkmediamodel.hpp

@@ -173,7 +173,7 @@ public:
     Q_INVOKABLE bool addAndPlay(const QVariantList& itemIdList);
     Q_INVOKABLE bool addAndPlay(const QModelIndexList& itemIdList);
 
-    Q_INVOKABLE QVector<SharedInputItem> getItemsForIndexes(const QModelIndexList & indexes) const;
+    Q_INVOKABLE QVariantList getItemsForIndexes(const QModelIndexList & indexes) const;
 
 signals:
     void nameChanged();

modules/gui/qt/playlist/playlist_model.cpp

@@ -24,6 +24,7 @@
 #include "playlist_model_p.hpp"
 #include <algorithm>
 #include <cassert>
+#include "util/shared_input_item.hpp"
 #include "playlist_controller.hpp"
 
 namespace vlc {
@@ -401,11 +402,11 @@ int PlaylistListModel::getCurrentIndex() const
 }
 
 /* Q_INVOKABLE */
-QVector<SharedInputItem> PlaylistListModel::getItemsForIndexes(const QVector<int> & indexes) const
+QVariantList PlaylistListModel::getItemsForIndexes(const QVector<int> & indexes) const
 {
     Q_D(const PlaylistListModel);
 
-    QVector<SharedInputItem> items;
+    QVariantList items;
 
     for (int index : indexes)
     {
@@ -422,7 +423,7 @@ QVector<SharedInputItem> PlaylistListModel::getItemsForIndexes(const QVector<int
         if (media == nullptr)
             continue;
 
-        items.append(SharedInputItem(media, true));
+        items.append(QVariant::fromValue(SharedInputItem(media, true)));
     }
 
     return items;

modules/gui/qt/playlist/playlist_model.hpp

@@ -26,7 +26,6 @@
 #include "playlist_common.hpp"
 #include "playlist_item.hpp"
 #include "util/vlctick.hpp"
-#include "util/shared_input_item.hpp"
 
 #include <QAbstractListModel>
 
@@ -72,7 +71,7 @@ public:
 
     int getCurrentIndex() const;
 
-    Q_INVOKABLE QVector<SharedInputItem> getItemsForIndexes(const QVector<int> & indexes) const;
+    Q_INVOKABLE QVariantList getItemsForIndexes(const QVector<int> & indexes) const;
 
 public slots:
     Playlist getPlaylist() const;