rtsp: Use glib-mkenums to generate GstRTSPProfile and GstRTSPLowerTrans GTypes

diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 3a874803a8fc8d726b2670490f05530faded37f5..ce990fea7feac6b5f55b9310cf973a2d2e9c7655 100644 (file)
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -42,7 +42,7 @@ CLEANFILES = $(BUILT_SOURCES)
 
 glib_gen_prefix = __gst_rtsp
 glib_enum_define = gst_rtsp
-glib_enum_headers = gstrtspdefs.h
+glib_enum_headers = $(libgstrtspinclude_HEADERS)
 glib_gen_basename = gstrtsp
 
 include $(top_srcdir)/common/gst-glib-gen.mak

diff --git a/gst-libs/gst/rtsp/gstrtsptransport.c b/gst-libs/gst/rtsp/gstrtsptransport.c
index 2dd9acbe4110c284e3fa1bfa75fdcff6ae1ad1da..6d99f1c0f03ce52ab7d4bfa02cd0f3c620acf730 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtsptransport.c
+++ b/gst-libs/gst/rtsp/gstrtsptransport.c
@@ -52,6 +52,7 @@
 #include <stdlib.h>
 
 #include "gstrtsptransport.h"
+#include "gstrtsp-enumtypes.h"
 
 #define MAX_MANAGERS   2
 
@@ -118,26 +119,6 @@ static const RTSPProfileMap profiles[] = {
   {NULL, GST_RTSP_PROFILE_UNKNOWN}
 };
 
-GType
-gst_rtsp_profile_get_type (void)
-{
-  static volatile gsize rtsp_profile_type = 0;
-  static const GFlagsValue rtsp_profile[] = {
-    {GST_RTSP_PROFILE_AVP, "GST_RTSP_PROFILE_AVP", "avp"},
-    {GST_RTSP_PROFILE_SAVP, "GST_RTSP_PROFILE_SAVP", "savp"},
-    {GST_RTSP_PROFILE_AVPF, "GST_RTSP_PROFILE_AVPF", "avpf"},
-    {GST_RTSP_PROFILE_SAVPF, "GST_RTSP_PROFILE_SAVPF", "savpf"},
-    {0, NULL, NULL},
-  };
-
-  if (g_once_init_enter (&rtsp_profile_type)) {
-    GType tmp = g_flags_register_static ("GstRTSPProfile", rtsp_profile);
-    g_once_init_leave (&rtsp_profile_type, tmp);
-  }
-
-  return (GType) rtsp_profile_type;
-}
-
 typedef struct
 {
   const gchar *name;
@@ -151,28 +132,6 @@ static const RTSPLTransMap ltrans[] = {
   {NULL, GST_RTSP_LOWER_TRANS_UNKNOWN}
 };
 
-GType
-gst_rtsp_lower_trans_get_type (void)
-{
-  static volatile gsize rtsp_lower_trans_type = 0;
-  static const GFlagsValue rtsp_lower_trans[] = {
-    {GST_RTSP_LOWER_TRANS_UDP, "GST_RTSP_LOWER_TRANS_UDP", "udp-unicast"},
-    {GST_RTSP_LOWER_TRANS_UDP_MCAST, "GST_RTSP_LOWER_TRANS_UDP_MCAST",
-        "udp-multicast"},
-    {GST_RTSP_LOWER_TRANS_TCP, "GST_RTSP_LOWER_TRANS_TCP", "tcp"},
-    {GST_RTSP_LOWER_TRANS_HTTP, "GST_RTSP_LOWER_TRANS_HTTP", "http"},
-    {GST_RTSP_LOWER_TRANS_TLS, "GST_RTSP_LOWER_TRANS_TLS", "tls"},
-    {0, NULL, NULL},
-  };
-
-  if (g_once_init_enter (&rtsp_lower_trans_type)) {
-    GType tmp = g_flags_register_static ("GstRTSPLowerTrans", rtsp_lower_trans);
-    g_once_init_leave (&rtsp_lower_trans_type, tmp);
-  }
-
-  return (GType) rtsp_lower_trans_type;
-}
-
 #define RTSP_TRANSPORT_PARAMETER_IS_UNIQUE(param) \
 G_STMT_START {                                    \
   if ((transport_params & (param)) != 0)          \

diff --git a/gst-libs/gst/rtsp/gstrtsptransport.h b/gst-libs/gst/rtsp/gstrtsptransport.h
index c90652a6c91112d0f84a3492716ef79ddaf7fbd0..1412f9bec601cce6da4a7048da91a390c07f60ed 100644 (file)
--- a/gst-libs/gst/rtsp/gstrtsptransport.h
+++ b/gst-libs/gst/rtsp/gstrtsptransport.h
@@ -80,9 +80,6 @@ typedef enum {
   GST_RTSP_PROFILE_SAVPF   = (1 << 3),
 } GstRTSPProfile;
 
-#define GST_TYPE_RTSP_PROFILE (gst_rtsp_profile_get_type())
-GType gst_rtsp_profile_get_type (void);
-
 /**
  * GstRTSPLowerTrans:
  * @GST_RTSP_LOWER_TRANS_UNKNOWN: invalid transport flag
@@ -103,9 +100,6 @@ typedef enum {
   GST_RTSP_LOWER_TRANS_TLS       = (1 << 5)
 } GstRTSPLowerTrans;
 
-#define GST_TYPE_RTSP_LOWER_TRANS (gst_rtsp_lower_trans_get_type())
-GType gst_rtsp_lower_trans_get_type (void);
-
 typedef struct _GstRTSPRange GstRTSPRange;
 typedef struct _GstRTSPTransport GstRTSPTransport;