From f509043c1d18bf7b25ddec60543670346b4282f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 4 Jan 2016 10:11:20 +0200 Subject: [PATCH] playback/player: player: Build against GstPlayer version from gst-plugins-bad everywhere The old version with everything included and buildable against GStreamer 1.6 can still be found in the gst-player-0.1 branch and will be continued to be updated for a while. --- playback/player/android/jni/Android.mk | 13 ++------ playback/player/android/jni/player.c | 2 +- playback/player/gst-play/Makefile.am | 5 ++- playback/player/gtk/Makefile.am | 5 ++- playback/player/gtk/gtk-play.c | 1 - .../ios/GstPlay.xcodeproj/project.pbxproj | 33 ------------------- .../player/ios/GstPlay/VideoViewController.m | 2 +- playback/player/qt/play.pro | 11 ++----- 8 files changed, 10 insertions(+), 62 deletions(-) diff --git a/playback/player/android/jni/Android.mk b/playback/player/android/jni/Android.mk index 77af905fb9..65e2044d99 100644 --- a/playback/player/android/jni/Android.mk +++ b/playback/player/android/jni/Android.mk @@ -3,17 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := gstplayer -LOCAL_SRC_FILES := \ - player.c \ - ../../lib/gst/player/gstplayer.c \ - ../../lib/gst/player/gstplayer-signal-dispatcher.c \ - ../../lib/gst/player/gstplayer-video-renderer.c \ - ../../lib/gst/player/gstplayer-media-info.c \ - ../../lib/gst/player/gstplayer-g-main-context-signal-dispatcher.c \ - ../../lib/gst/player/gstplayer-video-overlay-video-renderer.c \ - ../../lib/gst/player/gstplayer-visualization.c +LOCAL_SRC_FILES := player.c -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../lib LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) @@ -43,6 +34,6 @@ GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) $(GSTREAMER_PLUGINS_CODECS_RESTRICTED) $(GSTREAMER_CODECS_GPL) $(GSTREAMER_PLUGINS_ENCODING) $(GSTREAMER_PLUGINS_VIS) $(GSTREAMER_PLUGINS_EFFECTS) $(GSTREAMER_PLUGINS_NET_RESTRICTED) -GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0 glib-2.0 +GSTREAMER_EXTRA_DEPS := gstreamer-player-1.0 gstreamer-video-1.0 glib-2.0 include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk diff --git a/playback/player/android/jni/player.c b/playback/player/android/jni/player.c index ee537086aa..ed72e86f75 100644 --- a/playback/player/android/jni/player.c +++ b/playback/player/android/jni/player.c @@ -25,7 +25,7 @@ #include #include -#include "gst/player/player.h" +#include GST_DEBUG_CATEGORY_STATIC (debug_category); #define GST_CAT_DEFAULT debug_category diff --git a/playback/player/gst-play/Makefile.am b/playback/player/gst-play/Makefile.am index 534e0df83f..184e8c1aa1 100644 --- a/playback/player/gst-play/Makefile.am +++ b/playback/player/gst-play/Makefile.am @@ -2,9 +2,8 @@ bin_PROGRAMS = gst-play gst_play_SOURCES = gst-play.c gst-play-kb.c gst-play-kb.h -LDADD = $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la \ - $(GSTREAMER_LIBS) $(GLIB_LIBS) $(LIBM) +LDADD = $(GSTREAMER_LIBS) $(GLIB_LIBS) $(LIBM) -AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GLIB_CFLAGS) $(WARNING_CFLAGS) +AM_CFLAGS = $(GSTREAMER_CFLAGS) $(GLIB_CFLAGS) $(WARNING_CFLAGS) noinst_HEADERS = gst-play-kb.h diff --git a/playback/player/gtk/Makefile.am b/playback/player/gtk/Makefile.am index 97ce95dce3..45623e5507 100644 --- a/playback/player/gtk/Makefile.am +++ b/playback/player/gtk/Makefile.am @@ -28,9 +28,8 @@ BUILT_SOURCES: gtk-play-resources.c gtk-play-resources.h gtk_play_SOURCES = gtk-play.c gtk-play-resources.c gtk-video-renderer.c -LDADD = $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la \ - $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS) +LDADD = $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS) -AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS) +AM_CFLAGS = $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS) noinst_HEADERS = gtk-play-resources.h gtk-video-renderer.h diff --git a/playback/player/gtk/gtk-play.c b/playback/player/gtk/gtk-play.c index 51d0bf0235..c91693b78f 100644 --- a/playback/player/gtk/gtk-play.c +++ b/playback/player/gtk/gtk-play.c @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/playback/player/ios/GstPlay.xcodeproj/project.pbxproj b/playback/player/ios/GstPlay.xcodeproj/project.pbxproj index 9a3e45cf45..6d9ff1f322 100644 --- a/playback/player/ios/GstPlay.xcodeproj/project.pbxproj +++ b/playback/player/ios/GstPlay.xcodeproj/project.pbxproj @@ -23,8 +23,6 @@ AD2B885C198D65470070367B /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AD2B885A198D65470070367B /* MainStoryboard_iPad.storyboard */; }; AD2B8861198D65780070367B /* LibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B885E198D65780070367B /* LibraryViewController.m */; }; AD2B8862198D65780070367B /* VideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B8860198D65780070367B /* VideoViewController.m */; }; - AD2B886C198D69ED0070367B /* gstplayer.c in Sources */ = {isa = PBXBuildFile; fileRef = AD2B886A198D69ED0070367B /* gstplayer.c */; }; - E95DEC9B1B8332F100CC3512 /* gstplayer-media-info.c in Sources */ = {isa = PBXBuildFile; fileRef = E95DEC981B8332F100CC3512 /* gstplayer-media-info.c */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -53,12 +51,6 @@ AD2B885E198D65780070367B /* LibraryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibraryViewController.m; sourceTree = ""; }; AD2B885F198D65780070367B /* VideoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoViewController.h; sourceTree = ""; }; AD2B8860198D65780070367B /* VideoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoViewController.m; sourceTree = ""; }; - AD2B886A198D69ED0070367B /* gstplayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gstplayer.c; sourceTree = ""; }; - AD2B886B198D69ED0070367B /* gstplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gstplayer.h; sourceTree = ""; }; - E95DEC971B8332F100CC3512 /* gstplayer-media-info-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gstplayer-media-info-private.h"; sourceTree = ""; }; - E95DEC981B8332F100CC3512 /* gstplayer-media-info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "gstplayer-media-info.c"; sourceTree = ""; }; - E95DEC991B8332F100CC3512 /* gstplayer-media-info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gstplayer-media-info.h"; sourceTree = ""; }; - E95DEC9A1B8332F100CC3512 /* player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,7 +71,6 @@ AD2B8812198D631B0070367B = { isa = PBXGroup; children = ( - AD2B8868198D69ED0070367B /* gst */, AD2B8826198D631B0070367B /* GstPlay */, AD2B881D198D631B0070367B /* Frameworks */, AD2B881C198D631B0070367B /* Products */, @@ -140,28 +131,6 @@ name = "Supporting Files"; sourceTree = ""; }; - AD2B8868198D69ED0070367B /* gst */ = { - isa = PBXGroup; - children = ( - AD2B8869198D69ED0070367B /* player */, - ); - name = gst; - path = ../lib/gst; - sourceTree = ""; - }; - AD2B8869198D69ED0070367B /* player */ = { - isa = PBXGroup; - children = ( - E95DEC971B8332F100CC3512 /* gstplayer-media-info-private.h */, - E95DEC981B8332F100CC3512 /* gstplayer-media-info.c */, - E95DEC991B8332F100CC3512 /* gstplayer-media-info.h */, - E95DEC9A1B8332F100CC3512 /* player.h */, - AD2B886A198D69ED0070367B /* gstplayer.c */, - AD2B886B198D69ED0070367B /* gstplayer.h */, - ); - path = player; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -229,14 +198,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E95DEC9B1B8332F100CC3512 /* gstplayer-media-info.c in Sources */, AD2B8861198D65780070367B /* LibraryViewController.m in Sources */, AD2B8831198D631B0070367B /* AppDelegate.m in Sources */, AD2B8862198D65780070367B /* VideoViewController.m in Sources */, AD2B8858198D637A0070367B /* EaglUIVIew.m in Sources */, AD2B882D198D631B0070367B /* main.m in Sources */, AD2B8837198D631B0070367B /* gst_ios_init.m in Sources */, - AD2B886C198D69ED0070367B /* gstplayer.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/playback/player/ios/GstPlay/VideoViewController.m b/playback/player/ios/GstPlay/VideoViewController.m index 19c379926c..079fcde229 100644 --- a/playback/player/ios/GstPlay/VideoViewController.m +++ b/playback/player/ios/GstPlay/VideoViewController.m @@ -1,5 +1,5 @@ #import "VideoViewController.h" -#import +#import #import @interface VideoViewController () { diff --git a/playback/player/qt/play.pro b/playback/player/qt/play.pro index d16440c284..87a14902d4 100644 --- a/playback/player/qt/play.pro +++ b/playback/player/qt/play.pro @@ -6,8 +6,6 @@ CONFIG += c++11 DEFINES += GST_USE_UNSTABLE_API -INCLUDEPATH += ../lib - RESOURCES += qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model @@ -22,11 +20,8 @@ QT_CONFIG -= no-pkg-config CONFIG += link_pkgconfig PKGCONFIG = \ gstreamer-1.0 \ - gstreamer-audio-1.0 \ - gstreamer-tag-1.0 \ - gstreamer-pbutils-1.0 \ - gstreamer-video-1.0 \ - gstreamer-gl-1.0 + gstreamer-player-1.0 \ + gstreamer-tag-1.0 } macx { @@ -46,8 +41,6 @@ HEADERS += \ SOURCES += main.cpp \ qgstplayer.cpp \ - ../lib/gst/player/gstplayer.c \ - ../lib/gst/player/gstplayer-media-info.c \ player.cpp \ quickrenderer.cpp \ imagesample.cpp