[vlc-commits] [Git][videolan/vlc][master] qt: fix regressions due to new intf wrapping

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
b9dfd603 by Alaric Senat at 2021-06-26T12:56:31+00:00
qt: fix regressions due to new intf wrapping

Since the actual interface object is now contained in the main Qt
Interface. This fixes regressions introduced by
537d41a468f6f8d155b54214e0214e5576d52e68 which were breaking the vlc var
fetching.

- - - - -


3 changed files:

- modules/gui/qt/dialogs/extended/extended_panels.cpp
- modules/gui/qt/maininterface/main_interface.cpp
- modules/gui/qt/menus/menus.cpp


Changes:

=====================================
modules/gui/qt/dialogs/extended/extended_panels.cpp
=====================================
@@ -1371,7 +1371,7 @@ void SyncWidget::setValue( double d )
 SyncControls::SyncControls( qt_intf_t *_p_intf, QWidget *_parent )
     : QWidget( _parent )
     , p_intf( _p_intf )
-    , m_SubsDelayCfgFactor(p_intf, SUBSDELAY_CFG_FACTOR)
+    , m_SubsDelayCfgFactor(VLC_OBJECT(p_intf->intf), SUBSDELAY_CFG_FACTOR)
 {
     QGroupBox *AVBox, *subsBox;
     QToolButton *updateButton;


=====================================
modules/gui/qt/maininterface/main_interface.cpp
=====================================
@@ -134,7 +134,7 @@ MainInterface::MainInterface(qt_intf_t *_p_intf , QWidget* parent, Qt::WindowFla
     updateIntfScaleFactor();
 
     /* Get the available interfaces */
-    m_extraInterfaces = new VLCVarChoiceModel(p_intf, "intf-add", this);
+    m_extraInterfaces = new VLCVarChoiceModel(VLC_OBJECT(p_intf->intf), "intf-add", this);
 
     vlc_medialibrary_t* ml = vlc_ml_instance_get( p_intf );
     b_hasMedialibrary = (ml != NULL);


=====================================
modules/gui/qt/menus/menus.cpp
=====================================
@@ -390,7 +390,7 @@ QMenu *VLCMenuBar::ViewMenu( qt_intf_t *p_intf, QMenu *current, MainInterface *_
 QMenu *VLCMenuBar::InterfacesMenu( qt_intf_t *p_intf, QMenu *current )
 {
     assert(current);
-    VLCVarChoiceModel* model = new VLCVarChoiceModel(VLC_OBJECT(p_intf), "intf-add", current);
+    VLCVarChoiceModel* model = new VLCVarChoiceModel(VLC_OBJECT(p_intf->intf), "intf-add", current);
     CheckableListMenu* submenu = new CheckableListMenu(qtr("Interfaces"), model, CheckableListMenu::UNGROUPED, current);
     current->addMenu(submenu);
     return current;
@@ -853,7 +853,7 @@ QMenu* VLCMenuBar::PopupMenu( qt_intf_t *p_intf, bool show )
         /* In skins interface, append some items */
         if( p_intf->b_isDialogProvider )
         {
-            vlc_object_t* p_object = vlc_object_parent(p_intf);
+            vlc_object_t* p_object = vlc_object_parent(p_intf->intf);
             submenu->setTitle( qtr( "Interface" ) );
 
             /* Open skin dialog box */



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b9dfd6038a2ef33b1eca5ef8497dd9291463ac89

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b9dfd6038a2ef33b1eca5ef8497dd9291463ac89
You're receiving this email because of your account on code.videolan.org.