From: Tim-Philipp Müller <tim@centricular.net>
Date: Wed, 29 Aug 2012 18:23:57 +0000 (+0100)
Subject: encodebin: rename flags type name
X-Git-Tag: 1.19.3~511^2~5982
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b89dddede4e64acb1cce0b7950c0d260f6ef2e7;p=platform%2Fupstream%2Fgstreamer.git

encodebin: rename flags type name
---

diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c
index 2659806..8d2efe1 100644
--- a/gst/encoding/gstencodebin.c
+++ b/gst/encoding/gstencodebin.c
@@ -120,12 +120,12 @@
 
 typedef enum
 {
-  GST_ENC_FLAG_NO_AUDIO_CONVERSION = (1 << 0),
-  GST_ENC_FLAG_NO_VIDEO_CONVERSION = (1 << 1)
-} GstEncFlags;
+  GST_ENCODEBIN_FLAG_NO_AUDIO_CONVERSION = (1 << 0),
+  GST_ENCODEBIN_FLAG_NO_VIDEO_CONVERSION = (1 << 1)
+} GstEncodeBinFlags;
 
-#define GST_TYPE_ENC_FLAGS (gst_enc_flags_get_type())
-GType gst_enc_flags_get_type (void);
+#define GST_TYPE_ENCODEBIN_FLAGS (gst_encodebin_flags_get_type())
+GType gst_encodebin_flags_get_type (void);
 
 /* generic templates */
 static GstStaticPadTemplate muxer_src_template =
@@ -190,7 +190,7 @@ struct _GstEncodeBin
   guint64 tolerance;
   gboolean avoid_reencoding;
 
-  GstEncFlags flags;
+  GstEncodeBinFlags flags;
 };
 
 struct _GstEncodeBinClass
@@ -261,13 +261,13 @@ enum
 #define C_FLAGS(v) ((guint) v)
 
 GType
-gst_enc_flags_get_type (void)
+gst_encodebin_flags_get_type (void)
 {
   static const GFlagsValue values[] = {
-    {C_FLAGS (GST_ENC_FLAG_NO_AUDIO_CONVERSION), "Do not use audio conversion "
-          "elements", "no-audio-conversion"},
-    {C_FLAGS (GST_ENC_FLAG_NO_VIDEO_CONVERSION), "Do not use video conversion "
-          "elements", "no-video-conversion"},
+    {C_FLAGS (GST_ENCODEBIN_FLAG_NO_AUDIO_CONVERSION), "Do not use audio "
+          "conversion elements", "no-audio-conversion"},
+    {C_FLAGS (GST_ENCODEBIN_FLAG_NO_VIDEO_CONVERSION), "Do not use video "
+          "conversion elements", "no-video-conversion"},
     {0, NULL, NULL}
   };
   static volatile GType id = 0;
@@ -275,7 +275,7 @@ gst_enc_flags_get_type (void)
   if (g_once_init_enter ((gsize *) & id)) {
     GType _id;
 
-    _id = g_flags_register_static ("GstEncFlags", values);
+    _id = g_flags_register_static ("GstEncodeBinFlags", values);
 
     g_once_init_leave ((gsize *) & id, _id);
   }
@@ -381,7 +381,7 @@ gst_encode_bin_class_init (GstEncodeBinClass * klass)
    */
   g_object_class_install_property (gobject_klass, PROP_FLAGS,
       g_param_spec_flags ("flags", "Flags", "Flags to control behaviour",
-          GST_TYPE_ENC_FLAGS, DEFAULT_FLAGS,
+          GST_TYPE_ENCODEBIN_FLAGS, DEFAULT_FLAGS,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /* Signals */
@@ -1229,7 +1229,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof,
   /* FIXME : Once we have properties for specific converters, use those */
   if (GST_IS_ENCODING_VIDEO_PROFILE (sprof)) {
     const gboolean native_video =
-        ! !(ebin->flags & GST_ENC_FLAG_NO_VIDEO_CONVERSION);
+        ! !(ebin->flags & GST_ENCODEBIN_FLAG_NO_VIDEO_CONVERSION);
     GstElement *cspace = NULL, *scale, *vrate, *cspace2 = NULL;
 
     GST_LOG ("Adding conversion elements for video stream");
@@ -1291,7 +1291,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof,
     }
 
   } else if (GST_IS_ENCODING_AUDIO_PROFILE (sprof)
-      && !(ebin->flags & GST_ENC_FLAG_NO_AUDIO_CONVERSION)) {
+      && !(ebin->flags & GST_ENCODEBIN_FLAG_NO_AUDIO_CONVERSION)) {
     GstElement *aconv, *ares, *arate, *aconv2;
 
     GST_LOG ("Adding conversion elements for audio stream");