[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - avmedia/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 4 06:29:42 UTC 2020
avmedia/source/gstreamer/gstplayer.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 79c1a3c9d7b5857c63e692681f8a4865f99f798d
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 29 13:40:47 2020 +0000
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Feb 4 07:29:08 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/+/87696
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 764a27639eb5..51bac5246cc5 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -820,12 +820,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