diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2019-05-31 13:26:32 +0200 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2019-06-25 20:53:36 +0200 |
commit | 817e7f7f2e468070802b3176f3deb7f4a88c6c31 (patch) | |
tree | 5d8e07481fa7386d813e07a115f99fd7479626d3 | |
parent | tdf#120873 Qt5 invert checked state on trigger (diff) | |
download | core-817e7f7f2e468070802b3176f3deb7f4a88c6c31.tar.gz core-817e7f7f2e468070802b3176f3deb7f4a88c6c31.zip |
Drop extra define ENABLE_GTKSINK
Directly use 'ENABLE_GTK3' instead, s.a. discussion at
https://gerrit.libreoffice.org/#/c/72968/ .
Reviewed-on: https://gerrit.libreoffice.org/73270
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 34bbf192a7753205bb64d14e4eec4ce303317396)
Change-Id: I9713cd942e3f7308974eebc432dce0d2bc5adadc
Reviewed-on: https://gerrit.libreoffice.org/74650
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r-- | avmedia/Library_avmediagst.mk | 1 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 8 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.hxx | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 9b9622b7edc5..cd651c82e60b 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_libs,avmediagst,\ ifneq ($(ENABLE_GTK3),) $(eval $(call gb_Library_add_cxxflags,avmediagst,\ $$(GTK3_CFLAGS) \ - -DENABLE_GTKSINK \ )) $(eval $(call gb_Library_add_libs,avmediagst,\ diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 250f924f5096..1fd480504236 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -292,7 +292,7 @@ Player::Player() : GstPlayer_BASE( m_aMutex ), mpPlaybin( nullptr ), mpVolumeControl( nullptr ), -#if defined(ENABLE_GTKSINK) +#if ENABLE_GTK3 && ! defined (AVMEDIA_GST_0_10) mpGtkWidget( nullptr ), #endif mbUseGtkSink( false ), @@ -352,7 +352,7 @@ void SAL_CALL Player::disposing() // Release the elements and pipeline if( mbInitialized ) { -#if defined(ENABLE_GTKSINK) +#if ENABLE_GTK3 && ! defined (AVMEDIA_GST_0_10) if (mpGtkWidget) { gtk_widget_destroy(mpGtkWidget); @@ -642,7 +642,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) { -#if defined(ENABLE_GTKSINK) +#if ENABLE_GTK3 && ! defined (AVMEDIA_GST_0_10) if (mpGtkWidget) { gtk_widget_destroy(mpGtkWidget); @@ -989,7 +989,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co } GstElement *pVideosink = nullptr; -#if defined(ENABLE_GTKSINK) +#if ENABLE_GTK3 && ! defined (AVMEDIA_GST_0_10) pVideosink = (aToolkit == "gtk3") ? gst_element_factory_make("gtksink", "gtksink") : nullptr; if (pVideosink) diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index c57f60a7802f..b7a18205ff17 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX #define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX +#include <config_vclplug.h> + #include <osl/conditn.hxx> #include "gstcommon.hxx" @@ -27,7 +29,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#if defined(ENABLE_GTKSINK) +#if ENABLE_GTK3 && ! defined (AVMEDIA_GST_0_10) # include <gtk/gtk.h> #endif @@ -83,7 +85,7 @@ private: // Add elements and pipeline here GstElement* mpPlaybin; // the playbin is also a pipeline GstElement* mpVolumeControl; // the playbin is also a pipeline -#if defined(ENABLE_GTKSINK) +#if ENABLE_GTK3 && ! defined (AVMEDIA_GST_0_10) GtkWidget* mpGtkWidget; #endif bool mbUseGtkSink; |