modules/gui/qt/medialibrary/mlgenremodel.cpp

@@ -126,13 +126,13 @@ vlc_ml_sorting_criteria_t MLGenreModel::nameToCriteria(QByteArray name) const
 
 QString MLGenreModel::getCover(MLGenre * genre) const
 {
-    return ml()->customCover()->get(genre->getId()
-                                    , QSize(MLGENREMODEL_COVER_WIDTH, MLGENREMODEL_COVER_HEIGHT)
-                                    , m_coverDefault
-                                    , MLGENREMODEL_COVER_COUNTX
-                                    , MLGENREMODEL_COVER_COUNTY
-                                    , MLGENREMODEL_COVER_BLUR
-                                    , true);
+    return MLCustomCover::url(genre->getId()
+                            , QSize(MLGENREMODEL_COVER_WIDTH, MLGENREMODEL_COVER_HEIGHT)
+                            , m_coverDefault
+                            , MLGENREMODEL_COVER_COUNTX
+                            , MLGENREMODEL_COVER_COUNTY
+                            , MLGENREMODEL_COVER_BLUR
+                            , true);
 }
 
 //-------------------------------------------------------------------------------------------------

modules/gui/qt/medialibrary/mlplaylistlistmodel.cpp

@@ -358,10 +358,10 @@ void MLPlaylistListModel::setTransactionPending(const bool value)
 
 QString MLPlaylistListModel::getCover(MLPlaylist * playlist) const
 {
-    return ml()->customCover()->get(playlist->getId()
-                                    , m_coverSize
-                                    , m_coverDefault
-                                    , PLAYLIST_COVERX, PLAYLIST_COVERY);
+    return MLCustomCover::url(playlist->getId()
+                            , m_coverSize
+                            , m_coverDefault
+                            , PLAYLIST_COVERX, PLAYLIST_COVERY);
 }
 
 //-------------------------------------------------------------------------------------------------

modules/gui/qt/medialibrary/mlvideofoldersmodel.cpp

@@ -83,9 +83,9 @@ QVariant MLVideoFoldersModel::itemRoleData(MLItem * item, const int role) const
             return QVariant::fromValue( getFirstSymbol(folder->getTitle()) );
         case FOLDER_THUMBNAIL:
         {
-            return ml()->customCover()->get(folder->getId()
-                                            , QSize(MLVIDEOFOLDERSMODEL_COVER_WIDTH, MLVIDEOFOLDERSMODEL_COVER_HEIGHT)
-                                            , QStringLiteral(":/placeholder/noart_videoCover.svg"));
+            return MLCustomCover::url(folder->getId()
+                                    , QSize(MLVIDEOFOLDERSMODEL_COVER_WIDTH, MLVIDEOFOLDERSMODEL_COVER_HEIGHT)
+                                    , QStringLiteral(":/placeholder/noart_videoCover.svg"));
         }
         case FOLDER_DURATION:
             return QVariant::fromValue(folder->getDuration());

modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp

@@ -94,9 +94,11 @@ QVariant MLVideoGroupsModel::itemRoleData(MLItem * item, const int role) const /
                 return QVariant::fromValue(group->getTitle());
             case VIDEO_THUMBNAIL:
             {
-                return ml()->customCover()->get(group->getId()
-                                                , QSize(MLVIDEOGROUPSMODEL_COVER_WIDTH, MLVIDEOGROUPSMODEL_COVER_HEIGHT)
-                                                , QStringLiteral(":/placeholder/noart_videoCover.svg"));
+                return MLCustomCover::url(
+                    group->getId(),
+                    QSize(MLVIDEOGROUPSMODEL_COVER_WIDTH, MLVIDEOGROUPSMODEL_COVER_HEIGHT),
+                    QStringLiteral(":/placeholder/noart_videoCover.svg")
+                );
             }
             case VIDEO_DURATION:
                 return QVariant::fromValue(group->getDuration());

modules/gui/qt/menus/menus.cpp

@@ -45,6 +45,7 @@
 #include "dialogs/extended/extended_panels.hpp"
 #include "dialogs/systray/systray.hpp"
 #include "util/varchoicemodel.hpp"
+#include "util/color_scheme_model.hpp"
 #include "medialibrary/medialib.hpp"
 #include "medialibrary/mlrecentsmodel.hpp"
 #include "medialibrary/mlbookmarkmodel.hpp"

modules/gui/qt/menus/qml_menu_wrapper.cpp

@@ -23,6 +23,7 @@
 #include "medialibrary/mlbookmarkmodel.hpp"
 #include "network/networkdevicemodel.hpp"
 #include "network/networkmediamodel.hpp"
+#include "player/player_controller.hpp"
 #include "playlist/playlist_controller.hpp"
 #include "playlist/playlist_model.hpp"
 #include "dialogs/dialogs_provider.hpp"

modules/gui/qt/menus/qml_menu_wrapper.hpp

@@ -29,6 +29,7 @@
 
 Q_MOC_INCLUDE("playlist/playlist_controller.hpp")
 Q_MOC_INCLUDE("playlist/playlist_model.hpp")
+Q_MOC_INCLUDE("player/player_controller.hpp")
 Q_MOC_INCLUDE("network/networkdevicemodel.hpp")
 Q_MOC_INCLUDE("network/networkmediamodel.hpp")
 Q_MOC_INCLUDE("medialibrary/mlplaylistlistmodel.hpp")

modules/gui/qt/network/networkmediamodel.cpp

@@ -20,6 +20,7 @@
 #include "mediatreelistener.hpp"
 
 #include "maininterface/mainctx.hpp"
+#include "medialibrary/medialib.hpp"
 #include "medialibrary/mlmedia.hpp"
 #include "medialibrary/mlmediastore.hpp"
 

modules/gui/qt/player/player_controller.cpp

@@ -63,16 +63,13 @@ PlayerControllerPrivate::~PlayerControllerPrivate()
     vlc_player_RemoveTimer( m_player, m_player_timer );
 }
 
-bool PlayerController::isCurrentItemSynced()
+bool PlayerControllerPrivate::isCurrentItemSynced()
 {
-    Q_D(PlayerController);
-
     /* The media can change before the UI gets updated and thus a player
      * request can be submitted on the wrong media or worse, no media at
      * all. Here d->m_currentItem is read and modified under the player
      * lock. */
-
-    return d->m_currentItem.get() == vlc_player_GetCurrentMedia( d->m_player );
+    return m_currentItem.get() == vlc_player_GetCurrentMedia( m_player );
 }
 
 
@@ -1017,6 +1014,15 @@ static void on_player_timer_smpte_update(const struct vlc_player_timer_smpte_tim
     });
 }
 
+
+static void on_art_fetch_ended_callback(input_item_t *p_item, bool fetched,
+                                     void *userdata)
+{
+    PlayerControllerPrivate *me = reinterpret_cast<PlayerControllerPrivate *>(userdata);
+    me->onArtFetchEnded(p_item, fetched);
+}
+
+
 } //extern "C"
 
 static const struct vlc_player_cbs player_cbs = {
@@ -1083,6 +1089,15 @@ static const struct vlc_player_timer_smpte_cbs player_timer_smpte_cbs = {
     on_player_timer_smpte_update
 };
 
+// art fetcher callbacks
+
+static const struct vlc_metadata_cbs art_fetcher_cbs  = []{
+    struct vlc_metadata_cbs cbs{};
+    cbs.on_art_fetch_ended = on_art_fetch_ended_callback;
+    return cbs;
+}();
+
+
 PlayerControllerPrivate::PlayerControllerPrivate(PlayerController *playercontroller, qt_intf_t *p_intf)
     : q_ptr(playercontroller)
     , p_intf(p_intf)
@@ -1153,8 +1168,6 @@ PlayerController::PlayerController( qt_intf_t *_p_intf )
              this, &PlayerController::menusUpdateAudio );
     connect( &d_ptr->m_position_timer, &QTimer::timeout, this, &PlayerController::updatePositionFromTimer );
     connect( &d_ptr->m_time_timer, &QTimer::timeout, this, &PlayerController::updateTimeFromTimer );
-
-    input_preparser_cbs.on_art_fetch_ended = onArtFetchEnded_callback;
 }
 
 PlayerController::~PlayerController()
@@ -1256,7 +1269,7 @@ void PlayerController::setTime(VLCTick new_time)
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_SetTime( d->m_player, new_time );
 }
@@ -1268,7 +1281,7 @@ void PlayerController::setPosition(double position)
         return;
 
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_SetPosition( d->m_player, position );
 }
@@ -1279,7 +1292,7 @@ void PlayerController::jumpFwd()
     msg_Dbg( d->p_intf, "jumpFwd");
     int i_interval = var_InheritInteger( d->p_intf, "short-jump-size" );
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_JumpTime( d->m_player, vlc_tick_from_sec( i_interval ) );
 }
@@ -1290,7 +1303,7 @@ void PlayerController::jumpBwd()
     msg_Dbg( d->p_intf, "jumpBwd");
     int i_interval = var_InheritInteger( d->p_intf, "short-jump-size" );
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_JumpTime( d->m_player, vlc_tick_from_sec( -i_interval ) );
 }
@@ -1300,7 +1313,7 @@ void PlayerController::jumpToTime(VLCTick i_time)
     Q_D(PlayerController);
     msg_Dbg( d->p_intf, "jumpToTime");
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_JumpTime( d->m_player, i_time );
 }
@@ -1310,7 +1323,7 @@ void PlayerController::jumpToPos( double new_pos )
     Q_D(PlayerController);
     {
         vlc_player_locker lock{ d->m_player };
-        if( !isCurrentItemSynced() )
+        if( !d->isCurrentItemSynced() )
             return;
         if( vlc_player_IsStarted( d->m_player ) )
             vlc_player_SetPosition( d->m_player, new_pos );
@@ -1322,7 +1335,7 @@ void PlayerController::frameNext()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_NextVideoFrame( d->m_player );
 }
@@ -1333,7 +1346,7 @@ void PlayerController::setAudioDelay(VLCTick delay)
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_SetAudioDelay( d->m_player, delay, VLC_PLAYER_WHENCE_ABSOLUTE );
 }
@@ -1350,7 +1363,7 @@ void PlayerController::setSubtitleDelay(VLCTick delay)
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if(!isCurrentItemSynced() )
+    if(!d->isCurrentItemSynced() )
         return;
     vlc_player_SetSubtitleDelay( d->m_player, delay, VLC_PLAYER_WHENCE_ABSOLUTE );
 }
@@ -1367,7 +1380,7 @@ void PlayerController::setSecondarySubtitleDelay(VLCTick delay)
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (d->m_secondarySpuEsId.get() != NULL)
         vlc_player_SetEsIdDelay(d->m_player, d->m_secondarySpuEsId.get(),
@@ -1419,7 +1432,7 @@ void PlayerController::setSubtitleFPS(float fps)
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     vlc_player_SetAssociatedSubsFPS( d->m_player, fps );
 }
@@ -1430,7 +1443,7 @@ void PlayerController::sectionPrev()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
     {
@@ -1445,7 +1458,7 @@ void PlayerController::sectionNext()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
     {
@@ -1460,7 +1473,7 @@ void PlayerController::sectionMenu()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
         vlc_player_Navigate( d->m_player, VLC_PLAYER_NAV_MENU );
@@ -1470,7 +1483,7 @@ void PlayerController::navigateUp()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
         vlc_player_Navigate( d->m_player, VLC_PLAYER_NAV_UP);
@@ -1480,7 +1493,7 @@ void PlayerController::navigateDown()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
         vlc_player_Navigate( d->m_player, VLC_PLAYER_NAV_DOWN);
@@ -1490,7 +1503,7 @@ void PlayerController::navigateLeft()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
         vlc_player_Navigate( d->m_player, VLC_PLAYER_NAV_LEFT);
@@ -1500,7 +1513,7 @@ void PlayerController::navigateRight()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
         vlc_player_Navigate( d->m_player, VLC_PLAYER_NAV_RIGHT);
@@ -1510,7 +1523,7 @@ void PlayerController::navigateActivate()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
         vlc_player_Navigate( d->m_player, VLC_PLAYER_NAV_ACTIVATE);
@@ -1520,7 +1533,7 @@ void PlayerController::chapterNext()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (vlc_player_IsStarted(d->m_player ))
         vlc_player_SelectNextChapter( d->m_player );
@@ -1530,7 +1543,7 @@ void PlayerController::chapterPrev()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (vlc_player_IsStarted(d->m_player ))
         vlc_player_SelectPrevChapter( d->m_player );
@@ -1540,7 +1553,7 @@ void PlayerController::titleNext()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (vlc_player_IsStarted(d->m_player ))
         vlc_player_SelectNextTitle( d->m_player );
@@ -1550,7 +1563,7 @@ void PlayerController::titlePrev()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (vlc_player_IsStarted(d->m_player ))
         vlc_player_SelectPrevTitle( d->m_player );
@@ -1562,7 +1575,7 @@ void PlayerController::changeProgram( int program )
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if( vlc_player_IsStarted( d->m_player ) )
         vlc_player_SelectProgram( d->m_player, program );
@@ -1575,7 +1588,7 @@ void PlayerController::enableTeletext( bool enable )
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (vlc_player_IsStarted(d->m_player ))
         vlc_player_SetTeletextEnabled( d->m_player, enable );
@@ -1585,7 +1598,7 @@ void PlayerController::setTeletextPage(int page)
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (vlc_player_IsTeletextEnabled( d->m_player ))
         vlc_player_SelectTeletextPage( d->m_player, page );
@@ -1595,7 +1608,7 @@ void PlayerController::setTeletextTransparency( bool transparent )
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if( !isCurrentItemSynced() )
+    if( !d->isCurrentItemSynced() )
         return;
     if (vlc_player_IsTeletextEnabled( d->m_player ))
         vlc_player_SetTeletextTransparency( d->m_player, transparent );
@@ -1812,7 +1825,7 @@ void PlayerController::restorePlaybackPos()
 {
     Q_D(PlayerController);
     vlc_player_locker lock{ d->m_player };
-    if (!isCurrentItemSynced())
+    if (!d->isCurrentItemSynced())
         return;
     vlc_player_RestorePlaybackPos( d->m_player );
 }
@@ -1960,29 +1973,22 @@ void PlayerController::requestArtUpdate( input_item_t *p_item, bool b_forced )
         libvlc_MetadataRequest( vlc_object_instance(d->p_intf), p_item,
                                 (b_forced) ? META_REQUEST_OPTION_FETCH_ANY
                                            : META_REQUEST_OPTION_FETCH_LOCAL,
-                                &input_preparser_cbs, this, 0, NULL );
+                               &art_fetcher_cbs, d, 0, NULL );
     }
 }
 
-void PlayerController::onArtFetchEnded_callback(input_item_t *p_item, bool fetched,
-                                                void *userdata)
-{
-    PlayerController *me = reinterpret_cast<PlayerController *>(userdata);
-    me->onArtFetchEnded(p_item, fetched);
-}
-
-void PlayerController::onArtFetchEnded(input_item_t *p_item, bool)
+void PlayerControllerPrivate::onArtFetchEnded(input_item_t *p_item, bool)
 {
-    Q_D(PlayerController);
+    Q_Q(PlayerController);
 
-    vlc_player_locker lock{ d->m_player };
-    bool b_current_item = (p_item == vlc_player_GetCurrentMedia( d->m_player ));
+    vlc_player_locker lock{ m_player };
+    bool b_current_item = (p_item == vlc_player_GetCurrentMedia( m_player ));
     /* No input will signal the cover art to update,
          * let's do it ourself */
     if ( b_current_item )
-        d->UpdateArt( p_item );
+        UpdateArt( p_item );
     else
-        emit artChanged( p_item );
+        emit q->artChanged( p_item );
 }
 
 const QString PlayerController::decodeArtURL( input_item_t *p_item )

modules/gui/qt/player/player_controller.hpp

@@ -479,16 +479,9 @@ private slots:
     void menusUpdateAudio( const QString& );
 
 private:
-    bool isCurrentItemSynced();
-
     Q_DECLARE_PRIVATE(PlayerController)
     QScopedPointer<PlayerControllerPrivate> d_ptr;
     QSignalMapper *menusAudioMapper; //used by VLCMenuBar
-
-    /* updateArt gui request */
-    struct vlc_metadata_cbs input_preparser_cbs {};
-    static void onArtFetchEnded_callback(input_item_t *, bool fetched, void *userdata);
-    void onArtFetchEnded(input_item_t *, bool fetched);
 };
 
 #endif

modules/gui/qt/player/player_controller_p.hpp

@@ -49,6 +49,8 @@ public:
     void UpdateTrackSelection(vlc_es_id_t *trackid, bool selected);
     void UpdateSpuOrder(vlc_es_id_t *es_id, enum vlc_vout_order spu_order);
     int interpolateTime(vlc_tick_t system_now);
+    bool isCurrentItemSynced();
+    void onArtFetchEnded(input_item_t *, bool fetched);
 
     // SMPTE Timer
     void addSMPTETimer();

modules/gui/qt/playlist/playlist_controller.cpp

@@ -346,8 +346,9 @@ static const struct vlc_playlist_callbacks playlist_callbacks = []{
 
 //private API
 
-PlaylistControllerPrivate::PlaylistControllerPrivate(PlaylistController* playlistController)
+PlaylistControllerPrivate::PlaylistControllerPrivate(PlaylistController* playlistController, vlc_playlist_t *playlist)
     : q_ptr(playlistController)
+    , m_playlist(playlist)
 {
     fillSortKeyTitleList();
 }
@@ -363,20 +364,31 @@ PlaylistControllerPrivate::~PlaylistControllerPrivate()
 
 //public API
 
-PlaylistController::PlaylistController(QObject *parent)
+PlaylistController::PlaylistController(vlc_playlist_t *playlist, QObject *parent)
     : QObject(parent)
-    , d_ptr( new PlaylistControllerPrivate(this) )
+    , d_ptr( new PlaylistControllerPrivate(this, playlist) )
 {
+    Q_D(PlaylistController);
+    assert(playlist);
+
     connect(this, &PlaylistController::itemsMoved, this, &PlaylistController::resetSortKey);
     connect(this, &PlaylistController::itemsAdded, this, &PlaylistController::resetSortKey);
     connect(this, &PlaylistController::isEmptyChanged, [this](bool isEmpty) {if (isEmpty) emit resetSortKey();});
-}
 
-PlaylistController::PlaylistController(vlc_playlist_t *playlist, QObject *parent)
-    : QObject(parent)
-    , d_ptr( new PlaylistControllerPrivate(this) )
-{
-    setPlaylist(playlist);
+    {
+        vlc_playlist_locker locker(d->m_playlist);
+        d->m_listener = vlc_playlist_AddListener(d->m_playlist, &playlist_callbacks, d, true);
+    }
+    /*
+     * Queue a playlistInitialized to be sent after the initial state callbacks
+     * vlc_playlist_AddListener will synchronously call each callback in
+     * playlist_callbacks, which will in turn queue an async call on the Qt
+     * main thread
+     */
+    d->callAsync([this, d](){
+        d->m_initialized = true;
+        emit initializedChanged();
+    });
 }
 
 PlaylistController::~PlaylistController()
@@ -705,34 +717,6 @@ Playlist PlaylistController::getPlaylist() const
     return Playlist(d->m_playlist);
 }
 
-void PlaylistController::setPlaylist(vlc_playlist_t* newPlaylist)
-{
-    Q_D(PlaylistController);
-    if (d->m_playlist && d->m_listener)
-    {
-        vlc_playlist_locker locker(d->m_playlist);
-        vlc_playlist_RemoveListener(d->m_playlist, d->m_listener);
-        d->m_playlist = nullptr;
-        d->m_listener = nullptr;
-    }
-    if (newPlaylist)
-    {
-        vlc_playlist_locker locker(newPlaylist);
-        d->m_playlist = newPlaylist;
-        d->m_listener = vlc_playlist_AddListener(d->m_playlist, &playlist_callbacks, d, true);
-        /*
-         * Queue a playlistInitialized to be sent after the initial state callbacks
-         * vlc_playlist_AddListener will synchronously call each callback in
-         * playlist_callbacks, which will in turn queue an async call on the Qt
-         * main thread
-         */
-        d->callAsync([=](){
-            emit playlistInitialized();
-        });
-    }
-    emit playlistChanged( Playlist(newPlaylist) );
-}
-
 void PlaylistController::resetSortKey()
 {
     Q_D(PlaylistController);
@@ -740,11 +724,6 @@ void PlaylistController::resetSortKey()
     emit sortKeyChanged();
 }
 
-void PlaylistController::setPlaylist(const Playlist& playlist)
-{
-    setPlaylist(playlist.m_playlist);
-}
-
 PlaylistController::PlaybackRepeat PlaylistController::getRepeatMode() const
 {
     Q_D(const PlaylistController);
@@ -854,6 +833,11 @@ QVariantList PlaylistController::getSortKeyTitleList() const
     return d->sortKeyTitleList;
 }
 
+bool PlaylistController::isInitialized() const
+{
+    Q_D(const PlaylistController);
+    return d->m_initialized;
+}
 
   } // namespace playlist
 } // namespace vlc

modules/gui/qt/playlist/playlist_controller.hpp

@@ -90,9 +90,10 @@ public:
     };
     Q_ENUM(MediaStopAction)
 
+    Q_PROPERTY(bool initialized READ isInitialized NOTIFY initializedChanged FINAL)
     Q_PROPERTY(QVariantList sortKeyTitleList READ getSortKeyTitleList CONSTANT FINAL)
 
-    Q_PROPERTY(Playlist playlist READ getPlaylist WRITE setPlaylist NOTIFY playlistChanged FINAL)
+    Q_PROPERTY(Playlist playlist READ getPlaylist CONSTANT FINAL)
 
     Q_PROPERTY(PlaylistItem currentItem READ getCurrentItem NOTIFY currentItemChanged FINAL)
 
@@ -141,46 +142,39 @@ public:
     Q_INVOKABLE void explore(const PlaylistItem& pItem);
 
 public:
-    PlaylistController(QObject *parent = nullptr);
     PlaylistController(vlc_playlist_t *playlist, QObject *parent = nullptr);
     virtual ~PlaylistController();
 
 
-public slots:
-    PlaylistItem getCurrentItem() const;
-
+public:
+    SortKey getSortKey() const;
     bool hasNext() const;
     bool hasPrev() const;
 
     bool isRandom() const;
-    void setRandom( bool );
-
     MediaStopAction getMediaStopAction() const;
-    void setMediaStopAction(MediaStopAction );
-
     PlaybackRepeat getRepeatMode() const;
-    void setRepeatMode( PlaybackRepeat mode );
-
     bool isEmpty() const;
     int count() const;
     int currentIndex() const;
+    SortOrder getSortOrder() const;
+    bool isInitialized() const;
 
-    SortKey getSortKey() const;
+public slots:
+    PlaylistItem getCurrentItem() const;
+
+    void setRandom( bool );
+    void setMediaStopAction(MediaStopAction );
+    void setRepeatMode( PlaybackRepeat mode );
     void setSortKey(SortKey sortKey);
-    SortOrder getSortOrder() const;
     void setSortOrder(SortOrder sortOrder);
     void switchSortOrder();
 
     QVariantList getSortKeyTitleList() const;
     Playlist getPlaylist() const;
-    void setPlaylist(const Playlist& playlist);
-    void setPlaylist(vlc_playlist_t* newPlaylist);
-
     void resetSortKey();
 
 signals:
-    void playlistChanged( Playlist );
-
     void currentItemChanged( );
 
     void hasNextChanged( bool );
@@ -201,7 +195,7 @@ signals:
     void itemsRemoved(size_t index, size_t count);
     void itemsUpdated(size_t index, QVector<PlaylistItem>);
 
-    void playlistInitialized();
+    void initializedChanged();
 
 private:
     Q_DECLARE_PRIVATE(PlaylistController)

modules/gui/qt/playlist/playlist_controller_p.hpp

@@ -33,7 +33,7 @@ public:
     PlaylistController * const q_ptr;
 
 public:
-    PlaylistControllerPrivate(PlaylistController* playlistController);
+    PlaylistControllerPrivate(PlaylistController* playlistController, vlc_playlist_t *playlist);
     PlaylistControllerPrivate() = delete;
     ~PlaylistControllerPrivate();
 
@@ -56,6 +56,7 @@ public:
     vlc_playlist_t* m_playlist = nullptr;
     vlc_playlist_listener_id* m_listener = nullptr;
 
+    bool m_initialized = false;
     ssize_t m_currentIndex = -1;
     PlaylistItem m_currentItem;
     bool m_hasNext= false;

modules/gui/qt/style/systempalette.cpp

@@ -22,6 +22,7 @@
 #include <QFile>
 #include <maininterface/mainctx.hpp>
 #include <vlc_modules.h>
+#include <vlc_picture.h>
 
 namespace {