From cfd6f763a77f95756b862128c5aeb9d2dcb94745 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 10 Aug 2006 19:46:14 +0000 Subject: [PATCH] gdp: add gst_object_{s,g}et_control_rate(), add private data section, fix docs Original commit message from CVS: * docs/libs/gstreamer-libs-sections.txt: * libs/gst/controller/gstcontroller.c: (_gst_controller_get_property), (_gst_controller_set_property), (_gst_controller_init), (_gst_controller_class_init): * libs/gst/controller/gstcontroller.h: * libs/gst/controller/gsthelper.c: (gst_object_get_control_rate), (gst_object_set_control_rate): API: add gst_object_{s,g}et_control_rate(), add private data section, fix docs * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packetizer_new): * libs/gst/dataprotocol/dataprotocol.h: add deprecation guards to make gtk-doc happy and allow disabling cruft --- gst/gdp/dataprotocol.c | 10 +++++++++- gst/gdp/dataprotocol.h | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gst/gdp/dataprotocol.c b/gst/gdp/dataprotocol.c index 9e71bd1..fa80636 100644 --- a/gst/gdp/dataprotocol.c +++ b/gst/gdp/dataprotocol.c @@ -380,6 +380,7 @@ gst_dp_header_payload_type (const guint8 * header) * * Returns: %TRUE if the header was successfully created. */ +#ifndef GST_DISABLE_DEPRECATED gboolean gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags, guint * length, guint8 ** header) @@ -387,6 +388,7 @@ gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags, return gst_dp_header_from_buffer_any (buffer, flags, length, header, GST_DP_VERSION_0_2); } +#endif static gboolean gst_dp_header_from_buffer_1_0 (const GstBuffer * buffer, GstDPHeaderFlag flags, @@ -396,7 +398,7 @@ gst_dp_header_from_buffer_1_0 (const GstBuffer * buffer, GstDPHeaderFlag flags, GST_DP_VERSION_1_0); } - /** +/** * gst_dp_packet_from_caps: * @caps: a #GstCaps to create a packet for * @flags: the #GDPHeaderFlags to create the header with @@ -410,6 +412,7 @@ gst_dp_header_from_buffer_1_0 (const GstBuffer * buffer, GstDPHeaderFlag flags, * * Returns: %TRUE if the packet was successfully created. */ +#ifndef GST_DISABLE_DEPRECATED gboolean gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, guint * length, guint8 ** header, guint8 ** payload) @@ -417,6 +420,7 @@ gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, return gst_dp_packet_from_caps_any (caps, flags, length, header, payload, GST_DP_VERSION_0_2); } +#endif static gboolean gst_dp_packet_from_caps_1_0 (const GstCaps * caps, GstDPHeaderFlag flags, @@ -440,6 +444,7 @@ gst_dp_packet_from_caps_1_0 (const GstCaps * caps, GstDPHeaderFlag flags, * * Returns: %TRUE if the packet was successfully created. */ +#ifndef GST_DISABLE_DEPRECATED gboolean gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags, guint * length, guint8 ** header, guint8 ** payload) @@ -517,6 +522,7 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags, *header = h; return TRUE; } +#endif static gboolean gst_dp_packet_from_event_1_0 (const GstEvent * event, GstDPHeaderFlag flags, @@ -869,11 +875,13 @@ gst_dp_packetizer_new (GstDPVersion version) ret->version = version; switch (version) { +#ifndef GST_DISABLE_DEPRECATED case GST_DP_VERSION_0_2: ret->header_from_buffer = gst_dp_header_from_buffer; ret->packet_from_caps = gst_dp_packet_from_caps; ret->packet_from_event = gst_dp_packet_from_event; break; +#endif case GST_DP_VERSION_1_0: ret->header_from_buffer = gst_dp_header_from_buffer_1_0; ret->packet_from_caps = gst_dp_packet_from_caps_1_0; diff --git a/gst/gdp/dataprotocol.h b/gst/gdp/dataprotocol.h index 5783dfd..4e90e2e 100644 --- a/gst/gdp/dataprotocol.h +++ b/gst/gdp/dataprotocol.h @@ -140,21 +140,26 @@ GstDPPayloadType gst_dp_header_payload_type (const guint8 * header); /* converting from GstBuffer/GstEvent/GstCaps */ +#ifndef GST_DISABLE_DEPRECATED gboolean gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags, guint * length, guint8 ** header); +#endif +#ifndef GST_DISABLE_DEPRECATED gboolean gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, guint * length, guint8 ** header, guint8 ** payload); +#endif +#ifndef GST_DISABLE_DEPRECATED gboolean gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags, guint * length, guint8 ** header, guint8 ** payload); - +#endif /* converting to GstBuffer/GstEvent/GstCaps */ GstBuffer * gst_dp_buffer_from_header (guint header_length, const guint8 * header); -- 2.7.4