mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-07 11:12:17 +00:00
gst-libs/gst/: Move the rtspextension.h interface into gstrtspextension.h as part of libgstrtsp instead of libgstinte...
Original commit message from CVS: * gst-libs/gst/interfaces/Makefile.am: * gst-libs/gst/interfaces/interfaces-marshal.list: * gst-libs/gst/interfaces/rtspextension.c: * gst-libs/gst/interfaces/rtspextension.h: * gst-libs/gst/rtsp/Makefile.am: * gst-libs/gst/rtsp/gstrtsp.h: * gst-libs/gst/rtsp/gstrtspextension.c: (gst_rtsp_extension_get_type), (gst_rtsp_extension_iface_init), (gst_rtsp_extension_detect_server), (gst_rtsp_extension_before_send), (gst_rtsp_extension_after_send), (gst_rtsp_extension_parse_sdp), (gst_rtsp_extension_setup_media), (gst_rtsp_extension_configure_stream), (gst_rtsp_extension_get_transports), (gst_rtsp_extension_stream_select), (gst_rtsp_extension_send): * gst-libs/gst/rtsp/gstrtspextension.h: * gst-libs/gst/rtsp/rtsp-marshal.list: Move the rtspextension.h interface into gstrtspextension.h as part of libgstrtsp instead of libgstinterfaces, because it's only for use within plugins, not applications. Add stuff to do the enum & marshal generation needed in libgstrtsp now. Use the GST_TYPE_RTSP_RESULT enum type for the return value of the signal that the GstRTSPExtension interface emits, since G_TYPE_ENUM is abstract.
This commit is contained in:
parent
6d1a34eff2
commit
aa14635c47
8 changed files with 81 additions and 9 deletions
26
ChangeLog
26
ChangeLog
|
@ -1,3 +1,29 @@
|
||||||
|
2007-07-26 Jan Schmidt <thaytan@mad.scientist.com>
|
||||||
|
|
||||||
|
* gst-libs/gst/interfaces/Makefile.am:
|
||||||
|
* gst-libs/gst/interfaces/interfaces-marshal.list:
|
||||||
|
* gst-libs/gst/interfaces/rtspextension.c:
|
||||||
|
* gst-libs/gst/interfaces/rtspextension.h:
|
||||||
|
* gst-libs/gst/rtsp/Makefile.am:
|
||||||
|
* gst-libs/gst/rtsp/gstrtsp.h:
|
||||||
|
* gst-libs/gst/rtsp/gstrtspextension.c:
|
||||||
|
(gst_rtsp_extension_get_type), (gst_rtsp_extension_iface_init),
|
||||||
|
(gst_rtsp_extension_detect_server),
|
||||||
|
(gst_rtsp_extension_before_send), (gst_rtsp_extension_after_send),
|
||||||
|
(gst_rtsp_extension_parse_sdp), (gst_rtsp_extension_setup_media),
|
||||||
|
(gst_rtsp_extension_configure_stream),
|
||||||
|
(gst_rtsp_extension_get_transports),
|
||||||
|
(gst_rtsp_extension_stream_select), (gst_rtsp_extension_send):
|
||||||
|
* gst-libs/gst/rtsp/gstrtspextension.h:
|
||||||
|
* gst-libs/gst/rtsp/rtsp-marshal.list:
|
||||||
|
Move the rtspextension.h interface into gstrtspextension.h
|
||||||
|
as part of libgstrtsp instead of libgstinterfaces, because it's
|
||||||
|
only for use within plugins, not applications.
|
||||||
|
Add stuff to do the enum & marshal generation needed in libgstrtsp now.
|
||||||
|
Use the GST_TYPE_RTSP_RESULT enum type for the return value of the
|
||||||
|
signal that the GstRTSPExtension interface emits, since G_TYPE_ENUM
|
||||||
|
is abstract.
|
||||||
|
|
||||||
2007-07-26 Wim Taymans <wim.taymans@gmail.com>
|
2007-07-26 Wim Taymans <wim.taymans@gmail.com>
|
||||||
|
|
||||||
* gst-libs/gst/interfaces/Makefile.am:
|
* gst-libs/gst/interfaces/Makefile.am:
|
||||||
|
|
|
@ -10,7 +10,6 @@ headers_interfaces = \
|
||||||
mixertrack.h \
|
mixertrack.h \
|
||||||
navigation.h \
|
navigation.h \
|
||||||
propertyprobe.h \
|
propertyprobe.h \
|
||||||
rtspextension.h \
|
|
||||||
tuner.h \
|
tuner.h \
|
||||||
tunernorm.h \
|
tunernorm.h \
|
||||||
tunerchannel.h \
|
tunerchannel.h \
|
||||||
|
@ -46,7 +45,6 @@ libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
mixertrack.c \
|
mixertrack.c \
|
||||||
navigation.c \
|
navigation.c \
|
||||||
propertyprobe.c \
|
propertyprobe.c \
|
||||||
rtspextension.c \
|
|
||||||
tuner.c \
|
tuner.c \
|
||||||
tunernorm.c \
|
tunernorm.c \
|
||||||
tunerchannel.c \
|
tunerchannel.c \
|
||||||
|
|
|
@ -3,4 +3,3 @@ VOID:OBJECT,POINTER
|
||||||
VOID:OBJECT,STRING
|
VOID:OBJECT,STRING
|
||||||
VOID:OBJECT,ULONG
|
VOID:OBJECT,ULONG
|
||||||
VOID:OBJECT,INT
|
VOID:OBJECT,INT
|
||||||
ENUM:POINTER,POINTER
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ libgstrtspincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/rtsp
|
||||||
libgstrtspinclude_HEADERS = gstrtspbase64.h \
|
libgstrtspinclude_HEADERS = gstrtspbase64.h \
|
||||||
gstrtspconnection.h \
|
gstrtspconnection.h \
|
||||||
gstrtspdefs.h \
|
gstrtspdefs.h \
|
||||||
|
gstrtspextension.h \
|
||||||
gstrtspmessage.h \
|
gstrtspmessage.h \
|
||||||
gstrtsprange.h \
|
gstrtsprange.h \
|
||||||
gstrtsptransport.h \
|
gstrtsptransport.h \
|
||||||
|
@ -13,17 +14,36 @@ libgstrtspinclude_HEADERS = gstrtspbase64.h \
|
||||||
|
|
||||||
lib_LTLIBRARIES = libgstrtsp-@GST_MAJORMINOR@.la
|
lib_LTLIBRARIES = libgstrtsp-@GST_MAJORMINOR@.la
|
||||||
|
|
||||||
|
built_sources = rtsp-marshal.c gstrtsp-enumtypes.c
|
||||||
|
built_headers = rtsp-marshal.h gstrtsp-enumtypes.h
|
||||||
|
|
||||||
libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtspbase64.c \
|
libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtspbase64.c \
|
||||||
gstrtspconnection.c \
|
gstrtspconnection.c \
|
||||||
gstrtspdefs.c \
|
gstrtspdefs.c \
|
||||||
|
gstrtspextension.c \
|
||||||
gstrtspmessage.c \
|
gstrtspmessage.c \
|
||||||
gstrtsprange.c \
|
gstrtsprange.c \
|
||||||
gstrtsptransport.c \
|
gstrtsptransport.c \
|
||||||
gstrtspurl.c
|
gstrtspurl.c
|
||||||
|
|
||||||
|
nodist_libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = $(built_sources)
|
||||||
|
nodist_libgstrtspinclude_HEADERS = gstrtsp-enumtypes.h
|
||||||
|
|
||||||
|
noinst_HEADERS = gstrtsp.h
|
||||||
|
|
||||||
#gstrtspextwms.c
|
#gstrtspextwms.c
|
||||||
#rtspextreal.c
|
#rtspextreal.c
|
||||||
|
|
||||||
libgstrtsp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
libgstrtsp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
libgstrtsp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
|
libgstrtsp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
|
||||||
libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
|
libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
|
||||||
|
|
||||||
|
BUILT_SOURCES = $(built_headers) $(built_sources)
|
||||||
|
EXTRA_DIST = rtsp-marshal.list
|
||||||
|
CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
|
||||||
|
glib_enum_prefix=gst_rtsp
|
||||||
|
glib_enum_define=gst_rtsp
|
||||||
|
glib_enum_headers=gstrtspdefs.h
|
||||||
|
|
||||||
|
include $(top_srcdir)/common/glib-gen.mak
|
||||||
|
|
27
gst-libs/gst/rtsp/gstrtsp.h
Normal file
27
gst-libs/gst/rtsp/gstrtsp.h
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
/* GStreamer RTSP extension
|
||||||
|
* Copyright (C) 2007 Wim Taymans <wim.taymans@gmail.com>
|
||||||
|
*
|
||||||
|
* rtsp.h: Generic include to pull in defs
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Library General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Library General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Library General Public
|
||||||
|
* License along with this library; if not, write to the
|
||||||
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
#ifndef __RTSP_H__
|
||||||
|
#define __RTSP_H__
|
||||||
|
|
||||||
|
#include <gst/rtsp/gstrtspdefs.h>
|
||||||
|
#include <gst/rtsp/gstrtsp-enumtypes.h>
|
||||||
|
|
||||||
|
#endif
|
|
@ -1,7 +1,7 @@
|
||||||
/* GStreamer RTSP extension
|
/* GStreamer RTSP extension
|
||||||
* Copyright (C) 2007 Wim Taymans <wim.taymans@gmail.com>
|
* Copyright (C) 2007 Wim Taymans <wim.taymans@gmail.com>
|
||||||
*
|
*
|
||||||
* rtspextension.c: RTSP extension mechanism
|
* gstrtspextension.c: RTSP extension mechanism
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Library General Public
|
* modify it under the terms of the GNU Library General Public
|
||||||
|
@ -35,8 +35,9 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "interfaces-marshal.h"
|
#include "rtsp-marshal.h"
|
||||||
#include "rtspextension.h"
|
#include "gstrtsp-enumtypes.h"
|
||||||
|
#include "gstrtspextension.h"
|
||||||
|
|
||||||
static void gst_rtsp_extension_iface_init (GstRTSPExtension * iface);
|
static void gst_rtsp_extension_iface_init (GstRTSPExtension * iface);
|
||||||
|
|
||||||
|
@ -81,8 +82,8 @@ 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_interfaces_marshal_ENUM__POINTER_POINTER,
|
send), NULL, NULL, gst_rtsp_marshal_ENUM__POINTER_POINTER,
|
||||||
G_TYPE_ENUM, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
GST_TYPE_RTSP_RESULT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||||
initialized = TRUE;
|
initialized = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
/* GStreamer RTSP Extension
|
/* GStreamer RTSP Extension
|
||||||
* Copyright (C) 2007 Wim Taymans <wim@fluendo.com>
|
* Copyright (C) 2007 Wim Taymans <wim@fluendo.com>
|
||||||
*
|
*
|
||||||
* rtspextension.h: RTSP Extension interface.
|
* gstrtspextension.h: RTSP Extension interface.
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Library General Public
|
* modify it under the terms of the GNU Library General Public
|
1
gst-libs/gst/rtsp/rtsp-marshal.list
Normal file
1
gst-libs/gst/rtsp/rtsp-marshal.list
Normal file
|
@ -0,0 +1 @@
|
||||||
|
ENUM:POINTER,POINTER
|
Loading…
Reference in a new issue