[Libreoffice-commits] core.git: avmedia/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 29 17:03:39 UTC 2020


 avmedia/source/gstreamer/gstplayer.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 3a01e9aee46d1f53f6bee1bfa1ee257af85ea85c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 29 13:40:47 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 29 18:03:09 2020 +0100

    gtk: make sidebar media panel "play video" work
    
    blank impress, insert video, use sidebar media panel to play video,
    without this chage the video playes in a toplevel window because the
    size is 0x0 so the widget doesn't get created in the first place
    
    Change-Id: I7200423a693fb475dede357071ef10030c5bb790
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87694
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index bba734b34c79..c581f6e19710 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -819,12 +819,11 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
     ::osl::MutexGuard aGuard(m_aMutex);
 
     uno::Reference< ::media::XPlayerWindow >    xRet;
-    awt::Size                                   aSize;
 
-    if (rArguments.getLength() > 1 && (rArguments[1] >>= maArea))
-        aSize = awt::Size(maArea.Width, maArea.Height);
-    else
-        aSize = getPreferredPlayerWindowSize();
+    if (rArguments.getLength() > 1)
+       rArguments[1] >>= maArea;
+
+    awt::Size aSize = getPreferredPlayerWindowSize();
 
     if( mbFakeVideo )
         preparePlaybin( maURL, nullptr );


More information about the Libreoffice-commits mailing list