Kaydet (Commit) 34bbf192 authored tarafından Michael Weghorn's avatar Michael Weghorn Kaydeden (comit) Katarina Behrens

Drop extra define ENABLE_GTKSINK

Directly use 'ENABLE_GTK3' instead, s.a. discussion at
https://gerrit.libreoffice.org/#/c/72968/ .

Change-Id: I9713cd942e3f7308974eebc432dce0d2bc5adadc
Reviewed-on: https://gerrit.libreoffice.org/73270
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 593e8c67
...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_libs,avmediagst,\ ...@@ -24,7 +24,6 @@ $(eval $(call gb_Library_add_libs,avmediagst,\
ifneq ($(ENABLE_GTK3),) ifneq ($(ENABLE_GTK3),)
$(eval $(call gb_Library_add_cxxflags,avmediagst,\ $(eval $(call gb_Library_add_cxxflags,avmediagst,\
$$(GTK3_CFLAGS) \ $$(GTK3_CFLAGS) \
-DENABLE_GTKSINK \
)) ))
$(eval $(call gb_Library_add_libs,avmediagst,\ $(eval $(call gb_Library_add_libs,avmediagst,\
......
...@@ -292,7 +292,7 @@ Player::Player() : ...@@ -292,7 +292,7 @@ Player::Player() :
GstPlayer_BASE( m_aMutex ), GstPlayer_BASE( m_aMutex ),
mpPlaybin( nullptr ), mpPlaybin( nullptr ),
mpVolumeControl( nullptr ), mpVolumeControl( nullptr ),
#if defined(ENABLE_GTKSINK) #if ENABLE_GTK3
mpGtkWidget( nullptr ), mpGtkWidget( nullptr ),
#endif #endif
mbUseGtkSink( false ), mbUseGtkSink( false ),
...@@ -352,7 +352,7 @@ void SAL_CALL Player::disposing() ...@@ -352,7 +352,7 @@ void SAL_CALL Player::disposing()
// Release the elements and pipeline // Release the elements and pipeline
if( mbInitialized ) if( mbInitialized )
{ {
#if defined(ENABLE_GTKSINK) #if ENABLE_GTK3
if (mpGtkWidget) if (mpGtkWidget)
{ {
gtk_widget_destroy(mpGtkWidget); gtk_widget_destroy(mpGtkWidget);
...@@ -642,7 +642,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) ...@@ -642,7 +642,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
{ {
#if defined(ENABLE_GTKSINK) #if ENABLE_GTK3
if (mpGtkWidget) if (mpGtkWidget)
{ {
gtk_widget_destroy(mpGtkWidget); gtk_widget_destroy(mpGtkWidget);
...@@ -981,7 +981,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co ...@@ -981,7 +981,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
} }
GstElement *pVideosink = nullptr; GstElement *pVideosink = nullptr;
#if defined(ENABLE_GTKSINK) #if ENABLE_GTK3
pVideosink = (aToolkit == "gtk3") ? pVideosink = (aToolkit == "gtk3") ?
gst_element_factory_make("gtksink", "gtksink") : nullptr; gst_element_factory_make("gtksink", "gtksink") : nullptr;
if (pVideosink) if (pVideosink)
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX #ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX #define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX
#include <config_vclplug.h>
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include "gstcommon.hxx" #include "gstcommon.hxx"
...@@ -27,7 +29,7 @@ ...@@ -27,7 +29,7 @@
#include <cppuhelper/compbase.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#if defined(ENABLE_GTKSINK) #if ENABLE_GTK3
# include <gtk/gtk.h> # include <gtk/gtk.h>
#endif #endif
...@@ -83,7 +85,7 @@ private: ...@@ -83,7 +85,7 @@ private:
// Add elements and pipeline here // Add elements and pipeline here
GstElement* mpPlaybin; // the playbin is also a pipeline GstElement* mpPlaybin; // the playbin is also a pipeline
GstElement* mpVolumeControl; // the playbin is also a pipeline GstElement* mpVolumeControl; // the playbin is also a pipeline
#if defined(ENABLE_GTKSINK) #if ENABLE_GTK3
GtkWidget* mpGtkWidget; GtkWidget* mpGtkWidget;
#endif #endif
bool mbUseGtkSink; bool mbUseGtkSink;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment