mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp: use generic marshaller

Browse source
This commit is contained in:
Tim-Philipp Müller 2014-10-24 10:17:47 +01:00
parent 0eea730523
commit db89f0dca4
5 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/rtsp.mk
View file

@ -28,7 +28,6 @@ rtsp_LOCAL_SRC_FILES_BASE:= \
gst-libs/gst/rtsp/gstrtsprange.c \ gst-libs/gst/rtsp/gstrtsprange.c \
gst-libs/gst/rtsp/gstrtsptransport.c \ gst-libs/gst/rtsp/gstrtsptransport.c \
gst-libs/gst/rtsp/gstrtspurl.c \ gst-libs/gst/rtsp/gstrtspurl.c \
gst-libs/gst/rtsp/gstrtsp-marshal.c \
gst-libs/gst/rtsp/gstrtsp-enumtypes.c gst-libs/gst/rtsp/gstrtsp-enumtypes.c
LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE)) LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE))

2
gst-libs/gst/rtsp/.gitignore vendored
View file

@ -1,4 +1,2 @@
gstrtsp-enumtypes.c gstrtsp-enumtypes.c
gstrtsp-enumtypes.h gstrtsp-enumtypes.h
gstrtsp-marshal.c
gstrtsp-marshal.h

5
gst-libs/gst/rtsp/Makefile.am
View file

@ -16,8 +16,8 @@ libgstrtspinclude_HEADERS = \
lib_LTLIBRARIES = libgstrtsp-@GST_API_VERSION@.la lib_LTLIBRARIES = libgstrtsp-@GST_API_VERSION@.la
built_sources = gstrtsp-marshal.c gstrtsp-enumtypes.c built_sources = gstrtsp-enumtypes.c
built_headers = gstrtsp-marshal.h gstrtsp-enumtypes.h built_headers = gstrtsp-enumtypes.h
libgstrtsp_@GST_API_VERSION@_la_SOURCES = gstrtsptransport.c \ libgstrtsp_@GST_API_VERSION@_la_SOURCES = gstrtsptransport.c \
gstrtspurl.c \ gstrtspurl.c \
@ -38,7 +38,6 @@ libgstrtsp_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(GIO_LIBS) $(LIBM)
libgstrtsp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) $(WIN32_LIBS) libgstrtsp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) $(WIN32_LIBS)
BUILT_SOURCES = $(built_headers) $(built_sources) BUILT_SOURCES = $(built_headers) $(built_sources)
EXTRA_DIST = gstrtsp-marshal.list
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
glib_gen_prefix = __gst_rtsp glib_gen_prefix = __gst_rtsp

2
gst-libs/gst/rtsp/gstrtsp-marshal.list
View file

@ -1,2 +0,0 @@
# rtsp marshallers
ENUM:POINTER,POINTER

3
gst-libs/gst/rtsp/gstrtspextension.c
View file

@ -35,7 +35,6 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstrtsp-marshal.h"
#include "gstrtsp-enumtypes.h" #include "gstrtsp-enumtypes.h"
#include "gstrtspextension.h" #include "gstrtspextension.h"
@ -82,7 +81,7 @@ gst_rtsp_extension_iface_init (GstRTSPExtension * iface)
gst_rtsp_extension_signals[SIGNAL_SEND] = gst_rtsp_extension_signals[SIGNAL_SEND] =
g_signal_new ("send", G_TYPE_FROM_CLASS (iface), g_signal_new ("send", G_TYPE_FROM_CLASS (iface),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPExtensionInterface, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPExtensionInterface,
send), NULL, NULL, __gst_rtsp_marshal_ENUM__POINTER_POINTER, send), NULL, NULL, g_cclosure_marshal_generic,
GST_TYPE_RTSP_RESULT, 2, G_TYPE_POINTER, G_TYPE_POINTER); GST_TYPE_RTSP_RESULT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
initialized = TRUE; initialized = TRUE;
} }