diff options
author | Yousuf Philips <philipz85@hotmail.com> | 2016-08-14 23:53:31 +0400 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-08-15 12:39:55 +0000 |
commit | c2f95e69684948aa2db75b95afbf7a5eb77be953 (patch) | |
tree | 1ddd809b9907c45ed11891755db922a535c8525c /avmedia/inc | |
parent | use SvNumberNatNum::IsComplete() instead of IsSet(), tdf#79398 follow-up (diff) | |
download | core-c2f95e69684948aa2db75b95afbf7a5eb77be953.tar.gz core-c2f95e69684948aa2db75b95afbf7a5eb77be953.zip |
tdf#87794: Media Playback Panel
Change-Id: I2ad02ea031c2a1f558f76bd4c5dd816e400c5269
Reviewed-on: https://gerrit.libreoffice.org/27363
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'avmedia/inc')
-rw-r--r-- | avmedia/inc/mediacontrol.hxx | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 1139f985209f..85f0fea14b88 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -28,6 +28,7 @@ #include <vcl/toolbox.hxx> #include <vcl/edit.hxx> #include <vcl/image.hxx> +#include <avmedia/MediaControlBase.hxx> #define AVMEDIA_CONTROLOFFSET 6 @@ -36,17 +37,9 @@ class ListBox; namespace avmedia { - -enum MediaControlStyle -{ - MEDIACONTROLSTYLE_SINGLELINE = 0, - MEDIACONTROLSTYLE_MULTILINE = 1 -}; - - class MediaItem; -class MediaControl : public Control +class MediaControl : public Control, public MediaControlBase { public: @@ -64,15 +57,10 @@ protected: virtual void execute( const MediaItem& rItem ) = 0; virtual void Resize() override; + virtual void InitializeWidgets() override; private: - void implUpdateToolboxes(); - void implUpdateTimeSlider(); - void implUpdateVolumeSlider(); - void implUpdateTimeField( double fCurTime ); - Image implGetImage( sal_Int32 nImageId ) const; - DECL_LINK_TYPED( implTimeHdl, Slider*, void ); DECL_LINK_TYPED( implTimeEndHdl, Slider*, void ); DECL_LINK_TYPED( implVolumeHdl, Slider*, void ); @@ -80,19 +68,12 @@ private: DECL_LINK_TYPED( implZoomSelectHdl, ListBox&, void ); DECL_LINK_TYPED(implTimeoutHdl, Idle *, void); - ImageList maImageList; Idle maIdle; MediaItem maItem; - VclPtr<ToolBox> maPlayToolBox; - VclPtr<Slider> maTimeSlider; - VclPtr<ToolBox> maMuteToolBox; - VclPtr<Slider> maVolumeSlider; - VclPtr<ToolBox> maZoomToolBox; - VclPtr<ListBox> mpZoomListBox; - VclPtr<Edit> maTimeEdit; + VclPtr<ToolBox> mpZoomToolBox; Size maMinSize; - MediaControlStyle meControlStyle; bool mbLocked; + MediaControlStyle meControlStyle; }; } |