From ad30e7df148253c6bd8466b3b45e1ed151585c2e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 29 Jan 2020 19:59:14 +0000
Subject: weld MediaPlaybackPanel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I84c9e6f37de3b22b896f8109e49a5a0391630ac2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87754
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 include/avmedia/MediaControlBase.hxx | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'include/avmedia')

diff --git a/include/avmedia/MediaControlBase.hxx b/include/avmedia/MediaControlBase.hxx
index 73febe30fd76..2db0cf637160 100644
--- a/include/avmedia/MediaControlBase.hxx
+++ b/include/avmedia/MediaControlBase.hxx
@@ -19,10 +19,7 @@
 #ifndef INCLUDED_AVMEDIA_MEDIACONTROLBASE_HXX
 #define INCLUDED_AVMEDIA_MEDIACONTROLBASE_HXX
 
-#include <vcl/edit.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/slider.hxx>
+#include <vcl/weld.hxx>
 
 #include <avmedia/avmediadllapi.h>
 
@@ -64,19 +61,21 @@ public:
     virtual ~MediaControlBase(){};
 
 protected:
-    VclPtr<ToolBox>     mpPlayToolBox;
-    VclPtr<Slider>      mpTimeSlider;
-    VclPtr<ToolBox>     mpMuteToolBox;
-    VclPtr<Slider>      mpVolumeSlider;
-    VclPtr<ListBox>     mpZoomListBox;
-    VclPtr<Edit>        mpTimeEdit;
-    static Image GetImage(sal_Int32 nImageId);
+    std::unique_ptr<weld::Toolbar> mxPlayToolBox;
+    std::unique_ptr<weld::Scale> mxTimeSlider;
+    std::unique_ptr<weld::Toolbar> mxMuteToolBox;
+    std::unique_ptr<weld::Scale> mxVolumeSlider;
+    std::unique_ptr<weld::ComboBox> mxZoomListBox;
+    std::unique_ptr<weld::Entry> mxTimeEdit;
+    bool mbCurrentlySettingZoom;
+
     virtual void InitializeWidgets();
-    virtual void UpdateToolBoxes( MediaItem aMediaItem );
+    virtual void UpdateToolBoxes(const MediaItem& rMediaItem);
     void UpdateVolumeSlider( MediaItem const & aMediaItem );
     void UpdateTimeSlider( MediaItem const & aMediaItem );
     void UpdateTimeField( MediaItem const & aMediaItem, double fTime );
-    void SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem const & aItem, sal_uInt16 nId);
+    void SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem const & aItem, const OString& rId);
+    void disposeWidgets();
 };
 
 }
-- 
cgit