qt: store the parser internally

mayhemheroes · Oct 9, 2024 · d3c65e6 · d3c65e6
1 parent cb5ee63
commit d3c65e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/modules/gui/qt/maininterface/mainctx.cpp b/modules/gui/qt/maininterface/mainctx.cpp
@@ -76,6 +76,7 @@
 #endif
 
 #include <vlc_interface.h>
+#include <vlc_preparser.h>
 
 #define VLC_REFERENCE_SCALE_FACTOR 96.
 
@@ -221,6 +222,7 @@ MainCtx::MainCtx(qt_intf_t *_p_intf)
         QMetaObject::invokeMethod(m_medialib, &MediaLib::reload, Qt::QueuedConnection);
     }
 
+    m_preparser = libvlc_GetMainPreparser(libvlc);
 
 #ifdef UPDATE_CHECK
     /* Checking for VLC updates */

diff --git a/modules/gui/qt/maininterface/mainctx.hpp b/modules/gui/qt/maininterface/mainctx.hpp
@@ -70,6 +70,7 @@ class VLCVarChoiceModel;
 #ifdef UPDATE_CHECK
 class UpdateModel;
 #endif
+struct vlc_preparser_t;
 
 namespace vlc {
 namespace playlist {
@@ -166,6 +167,7 @@ class MainCtx : public QObject
 public:
     /* Getters */
     inline qt_intf_t* getIntf() const { return p_intf; }
+    inline vlc_preparser_t *getPreparser() const { return m_preparser; };
     bool smoothScroll() const { return m_smoothScroll; }
 
     VLCSystray* getSysTray() { return m_systray.get(); }
@@ -319,6 +321,7 @@ class MainCtx : public QObject
     void initSystray();
 
     qt_intf_t* p_intf = nullptr;
+    vlc_preparser_t *m_preparser = nullptr;
 
     bool m_hasEmbededVideo = false;
     VideoSurfaceProvider* m_videoSurfaceProvider = nullptr;

diff --git a/modules/gui/qt/network/networkmediamodel.cpp b/modules/gui/qt/network/networkmediamodel.cpp
@@ -355,8 +355,7 @@ class NetworkMediaModelPrivate
         if (!q->m_ctx || !m_hasTree || m_qmlInitializing)
             return false;
 
-        auto libvlc = vlc_object_instance(q->m_ctx->getIntf());
-        auto parser = libvlc_GetMainPreparser(libvlc);
+        auto parser = q->m_ctx->getPreparser();
         if (unlikely(parser == NULL))
             return false;
 
@@ -495,8 +494,7 @@ NetworkMediaModel::~NetworkMediaModel()
     //this can only be acquired from UI thread
     if (!d->m_preparseSem.tryAcquire())
     {
-        auto libvlc = vlc_object_instance(m_ctx->getIntf());
-        auto parser = libvlc_GetMainPreparser(libvlc);
+        auto parser = m_ctx->getPreparser();
         if (likely(parser != NULL))
         {
             vlc_preparser_Cancel( parser, this );