mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-03 23:16:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback/player: Move library around into a proper directory

Browse source
This commit is contained in:
Sebastian Dröge 2014-08-02 20:33:38 +02:00
parent 3352d5aee0
commit b34e62884c
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
playback/player/android/jni/Android.mk
View file

@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := gstplayer LOCAL_MODULE := gstplayer
LOCAL_SRC_FILES := player.c ../../lib/gstplayer.c LOCAL_SRC_FILES := player.c ../../lib/gst/player/gstplayer.c
LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog -landroid LOCAL_LDLIBS := -llog -landroid
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
playback/player/android/jni/player.c
View file

@ -25,7 +25,7 @@
#include <android/native_window.h> #include <android/native_window.h>
#include <android/native_window_jni.h> #include <android/native_window_jni.h>
#include "../../lib/gstplayer.h" #include "../../lib/gst/player/gstplayer.h"
GST_DEBUG_CATEGORY_STATIC (debug_category); GST_DEBUG_CATEGORY_STATIC (debug_category);
#define GST_CAT_DEFAULT debug_category #define GST_CAT_DEFAULT debug_category

4
playback/player/gst-play/Makefile
View file

@ -10,11 +10,11 @@ clean:
SOURCES = \ SOURCES = \
gst-play.c \ gst-play.c \
gst-play-kb.c \ gst-play-kb.c \
../lib/gstplayer.c ../lib/gst/player/gstplayer.c
HEADERS = \ HEADERS = \
gst-play-kb.h \ gst-play-kb.h \
../lib/gstplayer.h ../lib/gst/player/gstplayer.h
gst-play: $(SOURCES) $(HEADERS) gst-play: $(SOURCES) $(HEADERS)
$(CC) -o $@ $(SOURCES) $(CFLAGS) $(LIBS) -I../lib $(CC) -o $@ $(SOURCES) $(CFLAGS) $(LIBS) -I../lib

2
playback/player/gst-play/gst-play.c
View file

@ -29,7 +29,7 @@
#include <math.h> #include <math.h>
#include "gst-play-kb.h" #include "gst-play-kb.h"
#include "gstplayer.h" #include <gst/player/gstplayer.h>
#define VOLUME_STEPS 20 #define VOLUME_STEPS 20

4
playback/player/gtk/Makefile
View file

@ -9,10 +9,10 @@ clean:
SOURCES = \ SOURCES = \
gtk-play.c \ gtk-play.c \
../lib/gstplayer.c ../lib/gst/player/gstplayer.c
HEADERS = \ HEADERS = \
../lib/gstplayer.h ../lib/gst/player/gstplayer.h
gtk-play: $(SOURCES) $(HEADERS) gtk-play: $(SOURCES) $(HEADERS)
$(CC) -o $@ $(SOURCES) $(CFLAGS) $(LIBS) -I../lib $(CC) -o $@ $(SOURCES) $(CFLAGS) $(LIBS) -I../lib

2
playback/player/gtk/gtk-play.c
View file

@ -14,7 +14,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "../lib/gstplayer.h" #include <gst/player/gstplayer.h>
typedef struct typedef struct
{ {