rtsp: GST_EXPORT -> GST_RTSP_API

We need different export decorators for the different libs.
For now no actual change though, just rename before the release,
and add prelude headers to define the new decorator to GST_EXPORT.

diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index e7087e7384d3e1ce7f5f150ce71fc7cd951b12af..ceb07f462396f9eabc02cf9529f2166f9a9ac73d 100644 (file)
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -2,6 +2,7 @@ libgstrtspincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtsp
 
 libgstrtspinclude_HEADERS = \
                            rtsp.h \
+                           rtsp-prelude.h \
                            gstrtsp.h \
                            gstrtsptransport.h \
                            gstrtspurl.h \
@@ -44,7 +45,8 @@ glib_gen_prefix = __gst_rtsp
 glib_enum_define = gst_rtsp
 glib_enum_headers = $(libgstrtspinclude_HEADERS)
 glib_gen_basename = gstrtsp
-glib_gen_decl_banner=GST_EXPORT
+glib_gen_decl_banner=GST_RTSP_API
+glib_gen_decl_include=\#include <gst/rtsp/rtsp-prelude.h>
 
 include $(top_srcdir)/common/gst-glib-gen.mak
 

diff --git a/gst-libs/gst/rtsp/gstrtspconnection.h b/gst-libs/gst/rtsp/gstrtspconnection.h
index 3d9797d6543df1fd0a35b223d6e31027ad16a74f..adea8af0b748d244fdea7760b6184536318555f4 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtspconnection.h
+++ b/gst-libs/gst/rtsp/gstrtspconnection.h
@@ -62,59 +62,59 @@ typedef struct _GstRTSPConnection GstRTSPConnection;
 
 /* opening/closing a connection */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_create         (const GstRTSPUrl *url, GstRTSPConnection **conn);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_create_from_socket (GSocket * socket,
                                                        const gchar * ip,
                                                        guint16 port,
                                                        const gchar * initial_buffer,
                                                        GstRTSPConnection ** conn);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_accept                 (GSocket * socket, GstRTSPConnection ** conn, GCancellable * cancellable);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_connect                (GstRTSPConnection * conn, GTimeVal * timeout);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_connect_with_response  (GstRTSPConnection * conn, GTimeVal * timeout, GstRTSPMessage * response);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_close                  (GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_free                   (GstRTSPConnection *conn);
 
 /* TLS connections */
 
-GST_EXPORT
+GST_RTSP_API
 GTlsConnection *     gst_rtsp_connection_get_tls                  (GstRTSPConnection * conn, GError ** error);
 
-GST_EXPORT
+GST_RTSP_API
 gboolean             gst_rtsp_connection_set_tls_validation_flags (GstRTSPConnection * conn, GTlsCertificateFlags flags);
 
-GST_EXPORT
+GST_RTSP_API
 GTlsCertificateFlags gst_rtsp_connection_get_tls_validation_flags (GstRTSPConnection * conn);
 
-GST_EXPORT
+GST_RTSP_API
 void                 gst_rtsp_connection_set_tls_database (GstRTSPConnection * conn, GTlsDatabase * database);
 
-GST_EXPORT
+GST_RTSP_API
 GTlsDatabase *       gst_rtsp_connection_get_tls_database (GstRTSPConnection * conn);
 
-GST_EXPORT
+GST_RTSP_API
 void                 gst_rtsp_connection_set_tls_interaction (GstRTSPConnection * conn, GTlsInteraction * interaction);
 
-GST_EXPORT
+GST_RTSP_API
 GTlsInteraction *    gst_rtsp_connection_get_tls_interaction (GstRTSPConnection * conn);
 
 typedef gboolean (*GstRTSPConnectionAcceptCertificateFunc) (GTlsConnection *conn,
                                                             GTlsCertificate *peer_cert,
                                                             GTlsCertificateFlags errors,
                                                             gpointer user_data);
-GST_EXPORT
+GST_RTSP_API
 void                 gst_rtsp_connection_set_accept_certificate_func (GstRTSPConnection * conn,
                                                                       GstRTSPConnectionAcceptCertificateFunc func,
                                                                       gpointer user_data,
@@ -122,108 +122,108 @@ void                 gst_rtsp_connection_set_accept_certificate_func (GstRTSPCon
 
 /* sending/receiving raw bytes */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_read           (GstRTSPConnection * conn, guint8 * data,
                                                        guint size, GTimeVal * timeout);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_write          (GstRTSPConnection * conn, const guint8 * data,
                                                        guint size, GTimeVal * timeout);
 
 /* sending/receiving messages */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_send           (GstRTSPConnection *conn, GstRTSPMessage *message,
                                                        GTimeVal *timeout);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_receive        (GstRTSPConnection *conn, GstRTSPMessage *message,
                                                        GTimeVal *timeout);
 
 /* status management */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_poll           (GstRTSPConnection *conn, GstRTSPEvent events,
                                                        GstRTSPEvent *revents, GTimeVal *timeout);
 
 /* reset the timeout */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_next_timeout   (GstRTSPConnection *conn, GTimeVal *timeout);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_reset_timeout  (GstRTSPConnection *conn);
 
 /* flushing state */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_flush          (GstRTSPConnection *conn, gboolean flush);
 
 /* HTTP proxy support */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_set_proxy      (GstRTSPConnection *conn,
                                                        const gchar *host, guint port);
 
 /* configure authentication data */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_set_auth       (GstRTSPConnection *conn, GstRTSPAuthMethod method,
                                                        const gchar *user, const gchar *pass);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_connection_set_auth_param    (GstRTSPConnection *conn,
                                                           const gchar * param,
                                                           const gchar *value);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_connection_clear_auth_params (GstRTSPConnection *conn);
 
 /* configure DSCP */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_set_qos_dscp   (GstRTSPConnection *conn,
                                                        guint qos_dscp);
 
 /* accessors */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPUrl *       gst_rtsp_connection_get_url        (const GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_API
 const gchar *      gst_rtsp_connection_get_ip         (const GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_connection_set_ip         (GstRTSPConnection *conn, const gchar *ip);
 
-GST_EXPORT
+GST_RTSP_API
 GSocket *          gst_rtsp_connection_get_read_socket  (const GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_API
 GSocket *          gst_rtsp_connection_get_write_socket (const GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_connection_set_http_mode  (GstRTSPConnection *conn,
                                                        gboolean enable);
 
 /* tunneling */
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_connection_set_tunneled   (GstRTSPConnection *conn, gboolean tunneled);
 
-GST_EXPORT
+GST_RTSP_API
 gboolean           gst_rtsp_connection_is_tunneled    (const GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_API
 const gchar *      gst_rtsp_connection_get_tunnelid   (const GstRTSPConnection *conn);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_connection_do_tunnel      (GstRTSPConnection *conn, GstRTSPConnection *conn2);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_connection_set_remember_session_id (GstRTSPConnection *conn, gboolean remember);
 
-GST_EXPORT
+GST_RTSP_API
 gboolean           gst_rtsp_connection_get_remember_session_id (GstRTSPConnection *conn);
 
 /* async IO */
@@ -279,45 +279,45 @@ typedef struct {
   gpointer _gst_reserved[GST_PADDING-1];
 } GstRTSPWatchFuncs;
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPWatch *     gst_rtsp_watch_new                (GstRTSPConnection *conn,
                                                       GstRTSPWatchFuncs *funcs,
                                                       gpointer user_data,
                                                       GDestroyNotify notify);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_watch_reset              (GstRTSPWatch *watch);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_watch_unref              (GstRTSPWatch *watch);
 
-GST_EXPORT
+GST_RTSP_API
 guint              gst_rtsp_watch_attach             (GstRTSPWatch *watch,
                                                       GMainContext *context);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_watch_set_send_backlog  (GstRTSPWatch *watch,
                                                      gsize bytes, guint messages);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_watch_get_send_backlog  (GstRTSPWatch *watch,
                                                      gsize *bytes, guint *messages);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_watch_write_data         (GstRTSPWatch *watch,
                                                       const guint8 *data,
                                                       guint size, guint *id);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_watch_send_message       (GstRTSPWatch *watch,
                                                       GstRTSPMessage *message,
                                                       guint *id);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_watch_wait_backlog       (GstRTSPWatch * watch,
                                                       GTimeVal *timeout);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_watch_set_flushing       (GstRTSPWatch * watch,
                                                       gboolean flushing);
 G_END_DECLS

diff --git a/gst-libs/gst/rtsp/gstrtspdefs.h b/gst-libs/gst/rtsp/gstrtspdefs.h
index 525c7d195cc71edb3e023243451cd211ae44f444..0f9fe812ef003a64fc150e13e60caeb8f92f9560 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtspdefs.h
+++ b/gst-libs/gst/rtsp/gstrtspdefs.h
@@ -44,6 +44,7 @@
 #define __GST_RTSP_DEFS_H__
 
 #include <gst/gst.h>
+#include <gst/rtsp/rtsp-prelude.h>
 
 G_BEGIN_DECLS
 
@@ -397,37 +398,37 @@ typedef enum {
   GST_RTSP_STS_OPTION_NOT_SUPPORTED                 = 551
 } GstRTSPStatusCode;
 
-GST_EXPORT
+GST_RTSP_API
 gchar*             gst_rtsp_strresult          (GstRTSPResult result);
 
-GST_EXPORT
+GST_RTSP_API
 const gchar*       gst_rtsp_method_as_text     (GstRTSPMethod method);
 
-GST_EXPORT
+GST_RTSP_API
 const gchar*       gst_rtsp_version_as_text    (GstRTSPVersion version);
 
-GST_EXPORT
+GST_RTSP_API
 const gchar*       gst_rtsp_header_as_text     (GstRTSPHeaderField field);
 
-GST_EXPORT
+GST_RTSP_API
 const gchar*       gst_rtsp_status_as_text     (GstRTSPStatusCode code);
 
-GST_EXPORT
+GST_RTSP_API
 gchar*             gst_rtsp_options_as_text    (GstRTSPMethod options);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPMethod      gst_rtsp_options_from_text  (const gchar *options);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPHeaderField gst_rtsp_find_header_field  (const gchar *header);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPMethod      gst_rtsp_find_method        (const gchar *method);
 
-GST_EXPORT
+GST_RTSP_API
 gboolean           gst_rtsp_header_allow_multiple (GstRTSPHeaderField field);
 
-GST_EXPORT
+GST_RTSP_API
 gchar *            gst_rtsp_generate_digest_auth_response (const gchar *algorithm,
                                                            const gchar *method,
                                                            const gchar *realm,

diff --git a/gst-libs/gst/rtsp/gstrtspextension.h b/gst-libs/gst/rtsp/gstrtspextension.h
index 9f7f024ab789bc6164974d10c5fdf4b131e46605..dce78bfece6b739759d047ee292ca9221013eb7a 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtspextension.h
+++ b/gst-libs/gst/rtsp/gstrtspextension.h
@@ -76,44 +76,44 @@ struct _GstRTSPExtensionInterface {
   gpointer                 _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_API
 GType           gst_rtsp_extension_get_type          (void);
 
 /* invoke vfunction on interface */
 
-GST_EXPORT
+GST_RTSP_API
 gboolean        gst_rtsp_extension_detect_server     (GstRTSPExtension *ext, GstRTSPMessage *resp);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_before_send       (GstRTSPExtension *ext, GstRTSPMessage *req);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_after_send        (GstRTSPExtension *ext, GstRTSPMessage *req,
                                                       GstRTSPMessage *resp);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_parse_sdp         (GstRTSPExtension *ext, GstSDPMessage *sdp,
                                                       GstStructure *s);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_setup_media       (GstRTSPExtension *ext, GstSDPMedia *media);
 
-GST_EXPORT
+GST_RTSP_API
 gboolean        gst_rtsp_extension_configure_stream  (GstRTSPExtension *ext, GstCaps *caps);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_get_transports    (GstRTSPExtension *ext, GstRTSPLowerTrans protocols,
                                                       gchar **transport);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_stream_select     (GstRTSPExtension *ext, GstRTSPUrl *url);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_receive_request   (GstRTSPExtension *ext, GstRTSPMessage *req);
 
 /* signal emision */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_extension_send              (GstRTSPExtension *ext, GstRTSPMessage *req,
                                                       GstRTSPMessage *resp);
 

diff --git a/gst-libs/gst/rtsp/gstrtspmessage.h b/gst-libs/gst/rtsp/gstrtspmessage.h
index 30ad0bea0fde490c3079ded6b92314c585c3530c..236b3ab31755da6049b9f78b3aaa02747cebe240 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtspmessage.h
+++ b/gst-libs/gst/rtsp/gstrtspmessage.h
@@ -107,7 +107,7 @@ struct _GstRTSPMessage
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_API
 GType                   gst_rtsp_msg_get_type            (void);
 
 #define GST_TYPE_RTSP_MESSAGE           (gst_rtsp_msg_get_type())
@@ -116,37 +116,37 @@ GType                   gst_rtsp_msg_get_type            (void);
 
 /* memory management */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_new             (GstRTSPMessage **msg);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_init            (GstRTSPMessage *msg);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_unset           (GstRTSPMessage *msg);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_free            (GstRTSPMessage *msg);
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_copy            (const GstRTSPMessage *msg,
                                                      GstRTSPMessage **copy);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPMsgType     gst_rtsp_message_get_type        (GstRTSPMessage *msg);
 
 /* request */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_new_request     (GstRTSPMessage **msg,
                                                      GstRTSPMethod method,
                                                      const gchar *uri);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_init_request    (GstRTSPMessage *msg,
                                                      GstRTSPMethod method,
                                                      const gchar *uri);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_parse_request   (GstRTSPMessage *msg,
                                                      GstRTSPMethod *method,
                                                      const gchar **uri,
@@ -154,19 +154,19 @@ GstRTSPResult      gst_rtsp_message_parse_request   (GstRTSPMessage *msg,
 
 /* response */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_new_response    (GstRTSPMessage **msg,
                                                      GstRTSPStatusCode code,
                                                      const gchar *reason,
                                                      const GstRTSPMessage *request);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_init_response   (GstRTSPMessage *msg,
                                                      GstRTSPStatusCode code,
                                                      const gchar *reason,
                                                      const GstRTSPMessage *request);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_parse_response  (GstRTSPMessage *msg,
                                                      GstRTSPStatusCode *code,
                                                      const gchar **reason,
@@ -174,57 +174,57 @@ GstRTSPResult      gst_rtsp_message_parse_response  (GstRTSPMessage *msg,
 
 /* data */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_new_data        (GstRTSPMessage **msg,
                                                      guint8 channel);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_init_data       (GstRTSPMessage *msg,
                                                      guint8 channel);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_parse_data      (GstRTSPMessage *msg,
                                                      guint8 *channel);
 
 /* headers */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_add_header      (GstRTSPMessage *msg,
                                                      GstRTSPHeaderField field,
                                                      const gchar *value);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_take_header     (GstRTSPMessage *msg,
                                                      GstRTSPHeaderField field,
                                                      gchar *value);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_remove_header   (GstRTSPMessage *msg,
                                                      GstRTSPHeaderField field,
                                                      gint indx);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_get_header      (const GstRTSPMessage *msg,
                                                      GstRTSPHeaderField field,
                                                      gchar **value,
                                                      gint indx);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_add_header_by_name    (GstRTSPMessage * msg,
                                                            const gchar    * header,
                                                            const gchar    * value);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_take_header_by_name   (GstRTSPMessage * msg,
                                                            const gchar    * header,
                                                            gchar          * value);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_remove_header_by_name (GstRTSPMessage * msg,
                                                            const gchar    * header,
                                                            gint             index);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_get_header_by_name    (GstRTSPMessage * msg,
                                                            const gchar    * header,
                                                            gchar         ** value,
@@ -232,28 +232,28 @@ GstRTSPResult      gst_rtsp_message_get_header_by_name    (GstRTSPMessage * msg,
 
 /* header serialization */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_append_headers  (const GstRTSPMessage *msg,
                                                      GString *str);
 
 /* handling the body */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_set_body        (GstRTSPMessage *msg,
                                                      const guint8 *data,
                                                      guint size);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_take_body       (GstRTSPMessage *msg,
                                                      guint8 *data,
                                                      guint size);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_get_body        (const GstRTSPMessage *msg,
                                                      guint8 **data,
                                                      guint *size);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_steal_body      (GstRTSPMessage *msg,
                                                      guint8 **data,
                                                      guint *size);
@@ -277,30 +277,30 @@ struct _GstRTSPAuthParam {
   gchar *value;
 };
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPAuthParam *       gst_rtsp_auth_param_copy (GstRTSPAuthParam * param);
-GST_EXPORT
+GST_RTSP_API
 void                     gst_rtsp_auth_param_free (GstRTSPAuthParam * param);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPAuthCredential ** gst_rtsp_message_parse_auth_credentials (GstRTSPMessage * msg, GstRTSPHeaderField field);
 
-GST_EXPORT
+GST_RTSP_API
 void                     gst_rtsp_auth_credentials_free (GstRTSPAuthCredential ** credentials);
 
 #define GST_TYPE_RTSP_AUTH_CREDENTIAL gst_rtsp_auth_credential_get_type()
 
-GST_EXPORT
+GST_RTSP_API
 GType                    gst_rtsp_auth_credential_get_type (void);
 
 #define GST_TYPE_RTSP_AUTH_PARAM gst_rtsp_auth_param_get_type()
 
-GST_EXPORT
+GST_RTSP_API
 GType                    gst_rtsp_auth_param_get_type (void);
 
 /* debug */
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_message_dump            (GstRTSPMessage *msg);
 
 G_END_DECLS

diff --git a/gst-libs/gst/rtsp/gstrtsprange.h b/gst-libs/gst/rtsp/gstrtsprange.h
index 884f5cae1d5edcbad8637d15f1ffdeb50fe3cabc..c14bf0f103454ae3854c448670db6fafe878b884 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtsprange.h
+++ b/gst-libs/gst/rtsp/gstrtsprange.h
@@ -142,20 +142,20 @@ struct _GstRTSPTimeRange {
   GstRTSPTime2 max2;
 };
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult   gst_rtsp_range_parse        (const gchar *rangestr, GstRTSPTimeRange **range);
 
-GST_EXPORT
+GST_RTSP_API
 gchar *         gst_rtsp_range_to_string    (const GstRTSPTimeRange *range);
 
-GST_EXPORT
+GST_RTSP_API
 void            gst_rtsp_range_free         (GstRTSPTimeRange *range);
 
-GST_EXPORT
+GST_RTSP_API
 gboolean        gst_rtsp_range_get_times     (const GstRTSPTimeRange *range,
                                               GstClockTime *min, GstClockTime *max);
 
-GST_EXPORT
+GST_RTSP_API
 gboolean        gst_rtsp_range_convert_units (GstRTSPTimeRange * range,
                                               GstRTSPRangeUnit unit);
 

diff --git a/gst-libs/gst/rtsp/gstrtsptransport.h b/gst-libs/gst/rtsp/gstrtsptransport.h
index bdcbe088e732f5b9c53c5005d0423ecbe4dc5e20..2f3797f82f6aab2a774a3e41b57e4c4f21994025 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtsptransport.h
+++ b/gst-libs/gst/rtsp/gstrtsptransport.h
@@ -171,29 +171,29 @@ struct _GstRTSPTransport {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_transport_new          (GstRTSPTransport **transport);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_transport_init         (GstRTSPTransport *transport);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_transport_parse        (const gchar *str, GstRTSPTransport *transport);
 
-GST_EXPORT
+GST_RTSP_API
 gchar*             gst_rtsp_transport_as_text      (GstRTSPTransport *transport);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_transport_get_mime     (GstRTSPTransMode trans, const gchar **mime);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_transport_get_manager  (GstRTSPTransMode trans, const gchar **manager, guint option);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_transport_get_media_type (GstRTSPTransport *transport,
                                                       const gchar **media_type);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_transport_free         (GstRTSPTransport *transport);
 
 G_END_DECLS

diff --git a/gst-libs/gst/rtsp/gstrtspurl.h b/gst-libs/gst/rtsp/gstrtspurl.h
index 7f686c68993395c697fb91fe4b948174ccee9bb2..2a78b404830ca04835cc734037efd4fcf3632143 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtspurl.h
+++ b/gst-libs/gst/rtsp/gstrtspurl.h
@@ -86,28 +86,28 @@ struct _GstRTSPUrl {
   gchar             *query;
 };
 
-GST_EXPORT
+GST_RTSP_API
 GType gst_rtsp_url_get_type (void);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_url_parse           (const gchar *urlstr, GstRTSPUrl **url);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPUrl*        gst_rtsp_url_copy            (const GstRTSPUrl *url);
 
-GST_EXPORT
+GST_RTSP_API
 void               gst_rtsp_url_free            (GstRTSPUrl *url);
 
-GST_EXPORT
+GST_RTSP_API
 gchar*             gst_rtsp_url_get_request_uri (const GstRTSPUrl *url);
 
-GST_EXPORT
+GST_RTSP_API
 gchar**            gst_rtsp_url_decode_path_components
                                                 (const GstRTSPUrl *url);
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_url_set_port        (GstRTSPUrl *url, guint16 port);
 
-GST_EXPORT
+GST_RTSP_API
 GstRTSPResult      gst_rtsp_url_get_port        (const GstRTSPUrl *url, guint16 *port);
 
 #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC

diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build
index 1b2b376c504822e9472d0d3f1ac0039720f74f05..69ba21e58372c0be0dc24af3b31af8cee245a923 100644 (file)
--- a/gst-libs/gst/rtsp/meson.build
+++ b/gst-libs/gst/rtsp/meson.build
@@ -17,6 +17,7 @@ rtsp_headers = [
   'gstrtsprange.h',
   'gstrtsptransport.h',
   'gstrtspurl.h',
+  'rtsp-prelude.h',
   'rtsp.h',
 ]
 install_headers(rtsp_headers, subdir : 'gstreamer-1.0/gst/rtsp/')

diff --git a/gst-libs/gst/rtsp/rtsp-prelude.h b/gst-libs/gst/rtsp/rtsp-prelude.h
new file mode 100644 (file)
index 0000000..03c028d
--- /dev/null
+++ b/gst-libs/gst/rtsp/rtsp-prelude.h
@@ -0,0 +1,31 @@
+/* GStreamer Rtsp Library
+ * Copyright (C) 2018 GStreamer developers
+ *
+ * rtsp-prelude.h: prelude include header for gst-rtsp library
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_RTSP_PRELUDE_H__
+#define __GST_RTSP_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_RTSP_API
+#define GST_RTSP_API GST_EXPORT
+#endif
+
+#endif /* __GST_RTSP_PRELUDE_H__ */

diff --git a/gst-libs/gst/rtsp/rtsp.h b/gst-libs/gst/rtsp/rtsp.h
index 3044b1f0e6415b75ea0ede825c45e5d4a715fb09..a44b650b0942e939b5f30dd47f309e9471262114 100644 (file)
--- a/gst-libs/gst/rtsp/rtsp.h
+++ b/gst-libs/gst/rtsp/rtsp.h
@@ -22,6 +22,8 @@
 #ifndef __GST_RTSP__H__
 #define __GST_RTSP__H__
 
+#include <gst/rtsp/rtsp-prelude.h>
+
 #include <gst/rtsp/gstrtsp.h>
 #include <gst/rtsp/gstrtspconnection.h>
 #include <gst/rtsp/gstrtspdefs.h>

diff --git a/gst-libs/gst/rtsp/rtsp_mkenum.py b/gst-libs/gst/rtsp/rtsp_mkenum.py
index 0c5797e64d42e1e48650b9f1b97f4b3d814abdf1..71ffecca669d2b797098fd78bf563ee78259f035 100755 (executable)
--- a/gst-libs/gst/rtsp/rtsp_mkenum.py
+++ b/gst-libs/gst/rtsp/rtsp_mkenum.py
@@ -9,11 +9,11 @@ import sys, os, shutil, subprocess
 
 h_array = [
     '--fhead',
-    "#ifndef __gst_rtsp_ENUM_TYPES_H__\n#define __gst_rtsp_ENUM_TYPES_H__\n\n#include <gst/gst.h>\n\nG_BEGIN_DECLS\n",
+    "#ifndef __gst_rtsp_ENUM_TYPES_H__\n#define __gst_rtsp_ENUM_TYPES_H__\n\n#include <gst/gst.h>\n#include <gst/rtsp/rtsp-prelude.h>\nG_BEGIN_DECLS\n",
     '--fprod',
     "\n/* enumerations from \"@filename@\" */\n",
     '--vhead',
-    "GST_EXPORT GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n",
+    "GST_RTSP_API GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n",
     '--ftail',
     "G_END_DECLS\n\n#endif /* __gst_rtsp_ENUM_TYPES_H__ */"
 ]