[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - avmedia/source

[Xisco Fauli]

 avmedia/source/framework/mediaplayer.cxx   |    2 +-
 avmedia/source/viewer/mediawindow_impl.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2206e05974d8bda94d0bfee5c611d5e6f767e03c
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Wed Oct 25 13:21:32 2017 +0200

    tdf#113380: if the player doesn't exist,...
    
    ... use the same size as VLC does.
    
    See:
    https://opengrok.libreoffice.org/xref/core/avmedia/source/vlc/vlcplayer.cxx#167
    
    Change-Id: Ib878ded6c8aacf3a04227ab9efaa59b388f8ff51
    Reviewed-on: https://gerrit.libreoffice.org/43827
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit a2ec30240f7a9889e8e97b798bd862be160b47bc)
    Reviewed-on: https://gerrit.libreoffice.org/45781
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 5ea28efc864b0b064512f2049a9acd82aeaae808)
    Reviewed-on: https://gerrit.libreoffice.org/45789
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 0a0c86f88c8c..c965d24463f4 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -53,7 +53,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W
     SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
     mpMediaWindow( new MediaWindow( this, true ) )
 {
-    const Size aSize( 378, 256 );
+    const Size aSize( mpMediaWindow->getPreferredSize() );
 
     SetPosSizePixel( Point( 0, 0 ), aSize );
     SetMinOutputSizePixel( aSize );
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 172e4a3610ab..0844845a1bac 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -308,7 +308,7 @@ bool MediaWindowImpl::isValid() const
 
 Size MediaWindowImpl::getPreferredSize() const
 {
-    Size aRet;
+    Size aRet(480, 360);
 
     if( mxPlayer.is() )
     {