mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
gst-libs/gst/interfaces/: Fix marshaller for the send signal.
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_rtsp_extension_iface_init), (gst_rtsp_extension_stream_select), (gst_rtsp_extension_send): * gst-libs/gst/interfaces/rtspextension.h: Fix marshaller for the send signal. Add URL to stream selection interface method.
This commit is contained in:
parent
50a3a239a0
commit
6d1a34eff2
5 changed files with 21 additions and 7 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
2007-07-26 Wim Taymans <wim.taymans@gmail.com>
|
||||
|
||||
* gst-libs/gst/interfaces/Makefile.am:
|
||||
* gst-libs/gst/interfaces/interfaces-marshal.list:
|
||||
* gst-libs/gst/interfaces/rtspextension.c:
|
||||
(gst_rtsp_extension_iface_init),
|
||||
(gst_rtsp_extension_stream_select), (gst_rtsp_extension_send):
|
||||
* gst-libs/gst/interfaces/rtspextension.h:
|
||||
Fix marshaller for the send signal.
|
||||
Add URL to stream selection interface method.
|
||||
|
||||
2007-07-26 Jan Schmidt <thaytan@mad.scientist.com>
|
||||
|
||||
* gst-libs/gst/riff/Makefile.am:
|
||||
|
|
|
@ -3,3 +3,4 @@ VOID:OBJECT,POINTER
|
|||
VOID:OBJECT,STRING
|
||||
VOID:OBJECT,ULONG
|
||||
VOID:OBJECT,INT
|
||||
ENUM:POINTER,POINTER
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "interfaces-marshal.h"
|
||||
#include "rtspextension.h"
|
||||
|
||||
static void gst_rtsp_extension_iface_init (GstRTSPExtension * iface);
|
||||
|
@ -80,8 +81,8 @@ gst_rtsp_extension_iface_init (GstRTSPExtension * iface)
|
|||
gst_rtsp_extension_signals[SIGNAL_SEND] =
|
||||
g_signal_new ("send", G_TYPE_FROM_CLASS (iface),
|
||||
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPExtensionInterface,
|
||||
send), NULL, NULL, g_cclosure_marshal_VOID__POINTER,
|
||||
G_TYPE_NONE, 1, G_TYPE_POINTER);
|
||||
send), NULL, NULL, gst_interfaces_marshal_ENUM__POINTER_POINTER,
|
||||
G_TYPE_ENUM, 2, G_TYPE_POINTER, G_TYPE_POINTER);
|
||||
initialized = TRUE;
|
||||
}
|
||||
}
|
||||
|
@ -181,14 +182,14 @@ gst_rtsp_extension_get_transports (GstRTSPExtension * ext,
|
|||
}
|
||||
|
||||
GstRTSPResult
|
||||
gst_rtsp_extension_stream_select (GstRTSPExtension * ext)
|
||||
gst_rtsp_extension_stream_select (GstRTSPExtension * ext, GstRTSPUrl * url)
|
||||
{
|
||||
GstRTSPExtensionInterface *iface;
|
||||
GstRTSPResult res = GST_RTSP_OK;
|
||||
|
||||
iface = GST_RTSP_EXTENSION_GET_IFACE (ext);
|
||||
if (iface->stream_select)
|
||||
res = iface->stream_select (ext);
|
||||
res = iface->stream_select (ext, url);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <gst/sdp/gstsdpmessage.h>
|
||||
#include <gst/rtsp/gstrtsptransport.h>
|
||||
#include <gst/rtsp/gstrtspmessage.h>
|
||||
#include <gst/rtsp/gstrtspurl.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
@ -58,7 +59,7 @@ struct _GstRTSPExtensionInterface {
|
|||
|
||||
GstRTSPResult (*get_transports) (GstRTSPExtension *ext, GstRTSPLowerTrans protocols, gchar **transport);
|
||||
|
||||
GstRTSPResult (*stream_select) (GstRTSPExtension *ext);
|
||||
GstRTSPResult (*stream_select) (GstRTSPExtension *ext, GstRTSPUrl *url);
|
||||
|
||||
/* signals */
|
||||
GstRTSPResult (*send) (GstRTSPExtension *ext, GstRTSPMessage *req, GstRTSPMessage *resp);
|
||||
|
@ -81,7 +82,7 @@ GstRTSPResult gst_rtsp_extension_setup_media (GstRTSPExtension *ext, Gst
|
|||
gboolean gst_rtsp_extension_configure_stream (GstRTSPExtension *ext, GstCaps *caps);
|
||||
GstRTSPResult gst_rtsp_extension_get_transports (GstRTSPExtension *ext, GstRTSPLowerTrans protocols,
|
||||
gchar **transport);
|
||||
GstRTSPResult gst_rtsp_extension_stream_select (GstRTSPExtension *ext);
|
||||
GstRTSPResult gst_rtsp_extension_stream_select (GstRTSPExtension *ext, GstRTSPUrl *url);
|
||||
|
||||
/* signal emision */
|
||||
GstRTSPResult gst_rtsp_extension_send (GstRTSPExtension *ext, GstRTSPMessage *req,
|
||||
|
|
Loading…
Reference in a new issue