GNOME.org
 

[gstreamermm] Correct constant declarations in header files.

commit a7b4ab6449c52e0a365fe37a1fb8fa82497571de
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Tue Feb 2 16:09:15 2010 -0500

    	Correct constant declarations in header files.
    
    	* gstreamer/src/basetransform.ccg:
    	* gstreamer/src/basetransform.hg (BASE_TRANSFORM_SINK_NAME): Move
    	constant into the BaseTransform class renaming it to SINK_NAME.
    	(BASE_TRANSFORM_SRC_NAME): Ditto.
    	* gstreamer/src/clock.hg: Declare the ClockTime constants as static
    	and use GLIBMM_API for if the library is compiled in Windows.
    
    	* gstreamer/src/event.hg:
    	* gstreamer/src/interface.hg:
    	* gstreamer/src/iterator.hg:
    	* gstreamer/src/message.hg:
    	* gstreamer/src/query.hg:
    	* gstreamer/src/taglist.hg:
    	* gstreamer/src/tagsetter.hg: Code formatting.
    
    	* gstreamer/gstreamermm/gst_wrap_init.h: Typo.

 ChangeLog                             |   22 ++++++++++++++++++++++
 gstreamer/gstreamermm/gst_wrap_init.h |    4 ++--
 gstreamer/src/basetransform.ccg       |    3 +++
 gstreamer/src/basetransform.hg        |   15 ++++++++-------
 gstreamer/src/clock.hg                |   10 +++++-----
 gstreamer/src/event.hg                |    4 ++--
 gstreamer/src/interface.hg            |    4 ++--
 gstreamer/src/iterator.hg             |    6 +++---
 gstreamer/src/message.hg              |    2 +-
 gstreamer/src/query.hg                |    2 +-
 gstreamer/src/taglist.hg              |   16 ++++++++--------
 gstreamer/src/tagsetter.hg            |   14 +++++++-------
 12 files changed, 64 insertions(+), 38 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index de8f63b..1ae9e70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-02-02  José Alburquerque  <jaalburqu svn gnome org>
+
+	Correct constant declarations in header files.
+
+	* gstreamer/src/basetransform.ccg:
+	* gstreamer/src/basetransform.hg (BASE_TRANSFORM_SINK_NAME): Move
+	constant into the BaseTransform class renaming it to SINK_NAME.
+	(BASE_TRANSFORM_SRC_NAME): Ditto.
+	* gstreamer/src/clock.hg: Declare the ClockTime constants as static
+	and use GLIBMM_API for if the library is compiled in Windows.
+
+	* gstreamer/src/event.hg:
+	* gstreamer/src/interface.hg:
+	* gstreamer/src/iterator.hg:
+	* gstreamer/src/message.hg:
+	* gstreamer/src/query.hg:
+	* gstreamer/src/taglist.hg:
+	* gstreamer/src/tagsetter.hg: Code formatting.
+
+	* gstreamer/gstreamermm/gst_wrap_init.h: Typo.
+
+
 2010-02-01  José Alburquerque  <jaalburqu svn gnome org>
 
 	Remove initial class identification in Doxygen class docs.
diff --git a/gstreamer/gstreamermm/gst_wrap_init.h b/gstreamer/gstreamermm/gst_wrap_init.h
index 1f75581..e41aed0 100644
--- a/gstreamer/gstreamermm/gst_wrap_init.h
+++ b/gstreamer/gstreamermm/gst_wrap_init.h
@@ -26,8 +26,8 @@
 
 namespace Gst
 {
-  /** Initializes the wrapping system of Gst::MiniObject-derived classes.  There
-   * is no need to use this function directly. Instead use Gst::init() or
+  /** Initializes the wrapping system of Gst::MiniObject-derived classes.
+   * There is no need to use this function directly. Instead use Gst::init() or
    * Gst::init_check().
    */
   void gst_wrap_init();
diff --git a/gstreamer/src/basetransform.ccg b/gstreamer/src/basetransform.ccg
index b1c56ca..1a509b6 100644
--- a/gstreamer/src/basetransform.ccg
+++ b/gstreamer/src/basetransform.ccg
@@ -26,6 +26,9 @@ _PINCLUDE(gstreamermm/private/element_p.h)
 namespace Gst
 {
 
+const Glib::ustring BaseTransform::SINK_NAME = GST_BASE_TRANSFORM_SINK_NAME;
+const Glib::ustring BaseTransform::SRC_NAME = GST_BASE_TRANSFORM_SRC_NAME;
+
 void BaseTransform::lock()
 {
   GST_BASE_TRANSFORM_LOCK(gobj());
diff --git a/gstreamer/src/basetransform.hg b/gstreamer/src/basetransform.hg
index fa93b33..a7f6990 100644
--- a/gstreamer/src/basetransform.hg
+++ b/gstreamer/src/basetransform.hg
@@ -25,13 +25,6 @@ _DEFS(gstreamermm,gst)
 
 namespace Gst
 {
-/** The name of the templates for the sink pad ("sink").
- */
-const Glib::ustring BASE_TRANSFORM_SINK_NAME = GST_BASE_TRANSFORM_SINK_NAME;
-
-/** The name of the templates for the source pad ("src").
- */
-const Glib::ustring BASE_TRANSFORM_SRC_NAME = GST_BASE_TRANSFORM_SRC_NAME;
 
 /** A base class for simple transform filters.
  * This base class is for filter elements that process data.
@@ -139,6 +132,14 @@ class BaseTransform
   _CLASS_GOBJECT(BaseTransform, GstBaseTransform, GST_BASE_TRANSFORM, Element, GstElement)
 
 public:
+  /** The name of the templates for the sink pad ("sink").
+   */
+  static const Glib::ustring SINK_NAME;
+
+  /** The name of the templates for the source pad ("src").
+   */
+  static const Glib::ustring SRC_NAME;
+
   _WRAP_METHOD(bool is_passthrough() const, gst_base_transform_is_passthrough)
   _WRAP_METHOD(void set_passthrough(bool passthrough), gst_base_transform_set_passthrough)
   _WRAP_METHOD(bool is_in_place() const, gst_base_transform_is_in_place)
diff --git a/gstreamer/src/clock.hg b/gstreamer/src/clock.hg
index ffb53a0..8250182 100644
--- a/gstreamer/src/clock.hg
+++ b/gstreamer/src/clock.hg
@@ -37,23 +37,23 @@ typedef GstClockTimeDiff ClockTimeDiff;
 
 /** A constant to define an undefined clock time.
  */
-const ClockTime CLOCK_TIME_NONE = GST_CLOCK_TIME_NONE;
+static GLIBMM_API const ClockTime CLOCK_TIME_NONE = GST_CLOCK_TIME_NONE;
 
 /** A constant that defines one GStreamer second.
  */
-const ClockTime SECOND = GST_SECOND;
+static GLIBMM_API const ClockTime SECOND = GST_SECOND;
 
 /** A constant that defines one GStreamer millisecond.
  */
-const ClockTime MILLI_SECOND = GST_MSECOND;
+static GLIBMM_API const ClockTime MILLI_SECOND = GST_MSECOND;
 
 /** A constant that defines one GStreamer microsecond.
  */
-const ClockTime MICRO_SECOND = GST_USECOND;
+static GLIBMM_API const ClockTime MICRO_SECOND = GST_USECOND;
 
 /** A constant that defines one GStreamer nanosecond.
  */
-const ClockTime NANO_SECOND = GST_NSECOND;
+static GLIBMM_API const ClockTime NANO_SECOND = GST_NSECOND;
 
 _WRAP_ENUM(ClockEntryType, GstClockEntryType)
 _WRAP_ENUM(ClockReturn, GstClockReturn)
diff --git a/gstreamer/src/event.hg b/gstreamer/src/event.hg
index 6be9729..c7eb458 100644
--- a/gstreamer/src/event.hg
+++ b/gstreamer/src/event.hg
@@ -125,7 +125,7 @@ public:
    * derived one) because the derived Gst::Event classes do not correspond
    * to GType types in the GStreamer API.
    */
-  static Glib::RefPtr<Gst::Event> wrap(GstEvent* event, bool take_copy=false);
+  static Glib::RefPtr<Gst::Event> wrap(GstEvent* event, bool take_copy = false);
 
 // A copy is taken so that the original is not freed by the wrapper.
 #m4 _CONVERSION(`const GstStructure*',`const Gst::Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
@@ -297,7 +297,7 @@ public:
    */
   static Glib::RefPtr<Gst::Event> create(bool update, double rate,
     Format format, gint64 strat, gint64 stop, gint64 position,
-    double applied_rate=1.0);
+    double applied_rate = 1.0);
 
   /** Get the update flag, rate, format, start, stop and position in the
    * newsegment event.
diff --git a/gstreamer/src/interface.hg b/gstreamer/src/interface.hg
index f3a4d24..e3371d1 100644
--- a/gstreamer/src/interface.hg
+++ b/gstreamer/src/interface.hg
@@ -115,8 +115,8 @@ Glib::RefPtr< Gst::ElementInterfaced<T_CastTo> > Interface::cast(const Glib::Ref
 {
   if(element && gst_element_implements_interface(Glib::unwrap(element), T_CastTo::get_type()))
   {
-    void* result =
-      gst_implements_interface_cast(Glib::unwrap(element), T_CastTo::get_type());
+    void* result = gst_implements_interface_cast(Glib::unwrap(element),
+      T_CastTo::get_type());
 
     Gst::ElementInterfaced<T_CastTo>* element_interfaced =
       new ElementInterfaced<T_CastTo>((GstElement*) result);
diff --git a/gstreamer/src/iterator.hg b/gstreamer/src/iterator.hg
index 60c57e6..8d913bb 100644
--- a/gstreamer/src/iterator.hg
+++ b/gstreamer/src/iterator.hg
@@ -104,7 +104,7 @@ protected:
    * @param take_ownership Whether to take over the underlying C object.  If
    * true, C object is freed when wrapper is destroyed.
    */
-  explicit IteratorBase(GstIterator* castitem, bool take_ownership=true);
+  explicit IteratorBase(GstIterator* castitem, bool take_ownership = true);
 
   /** Assignment operator.  It replaces the contents of the iterator with the
    * contents of the new one freeing the underlying C object if a
@@ -150,7 +150,7 @@ public:
    * @param take_ownership Whether to take over the underlying C object.  If
    * true, C object is freed when wrapper is destroyed.
    */
-  explicit IteratorBasic(GstIterator* castitem, bool take_ownership=true);
+  explicit IteratorBasic(GstIterator* castitem, bool take_ownership = true);
 
   /** Resynchronizes the iterator and moves the iterator to the first item.
    *
@@ -204,7 +204,7 @@ public:
    * @param take_ownership Whether to take over the underlying C object.  If
    * true, C object is freed when wrapper is destroyed.
    */
-  explicit Iterator(GstIterator* castitem, bool take_ownership=true);
+  explicit Iterator(GstIterator* castitem, bool take_ownership = true);
 
   /** Moves to the next iterator item.
    *
diff --git a/gstreamer/src/message.hg b/gstreamer/src/message.hg
index 52b81da..4e1155b 100644
--- a/gstreamer/src/message.hg
+++ b/gstreamer/src/message.hg
@@ -82,7 +82,7 @@ public:
    *  (rather than a derived one) because the derived Gst::Message classes
    *  do not correspond to GType types in the GStreamer API.
    */
-  static Glib::RefPtr<Gst::Message> wrap(GstMessage* message, bool take_copy=false);
+  static Glib::RefPtr<Gst::Message> wrap(GstMessage* message, bool take_copy = false);
 
 // A copy is taken so that the original is not freed by the wrapper.
 #m4 _CONVERSION(`const GstStructure*',`const Gst::Structure',`Glib::wrap(const_cast<GstStructure*>($3), true)')
diff --git a/gstreamer/src/query.hg b/gstreamer/src/query.hg
index d2efd9c..6508d2b 100644
--- a/gstreamer/src/query.hg
+++ b/gstreamer/src/query.hg
@@ -118,7 +118,7 @@ public:
    * derived one) because the derived Gst::Query classes do not correspond
    * to GType types in the GStreamer API.
    */
-  static Glib::RefPtr<Gst::Query> wrap(GstQuery* query, bool take_copy=false);
+  static Glib::RefPtr<Gst::Query> wrap(GstQuery* query, bool take_copy = false);
 
    /** Makes a writable query from the given query.  Does exactly what
     * Gst::MiniObject::create_writable() does for the Gst::Query.
diff --git a/gstreamer/src/taglist.hg b/gstreamer/src/taglist.hg
index 7fe54d4..ee7ebae 100644
--- a/gstreamer/src/taglist.hg
+++ b/gstreamer/src/taglist.hg
@@ -344,8 +344,8 @@ public:
   _WRAP_METHOD(static TagFlag get_flag(const Glib::ustring& tag), gst_tag_get_flag)
   _WRAP_METHOD(static bool is_fixed(const Glib::ustring& tag), gst_tag_is_fixed)
   _WRAP_METHOD(bool is_empty() const, gst_tag_list_is_empty)
-  _WRAP_METHOD(void insert(const Gst::TagList& other, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_list_insert)
-  _WRAP_METHOD(Gst::TagList merge(const Gst::TagList& other, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_list_merge)
+  _WRAP_METHOD(void insert(const Gst::TagList& other, TagMergeMode mode = TAG_MERGE_PREPEND), gst_tag_list_insert)
+  _WRAP_METHOD(Gst::TagList merge(const Gst::TagList& other, TagMergeMode mode = TAG_MERGE_PREPEND), gst_tag_list_merge)
   _WRAP_METHOD(guint size(const Glib::ustring& tag) const, gst_tag_list_get_tag_size)
 
   /** Sets a GValue for the given @a tag using the specified mode.
@@ -354,7 +354,7 @@ public:
    * @param mode The mode to use.
    * @param value The Glib::Value<> to use.
    */
-  void add_value(Tag tag, const Glib::ValueBase& value, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add_value(Tag tag, const Glib::ValueBase& value, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Sets a GValue for the given @a tag using the specified mode.
    *
@@ -362,7 +362,7 @@ public:
    * @param mode The mode to use.
    * @param value The Glib::Value<> to use.
    */
-  void add_value(const Glib::ustring& tag, const Glib::ValueBase& value, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add_value(const Glib::ustring& tag, const Glib::ValueBase& value, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   _IGNORE(gst_tag_list_add_value)
 
@@ -379,7 +379,7 @@ public:
    * @param data A string to which the tag should be set to.
    * @param mode The merge mode to use.
    */
-  void add(Tag tag, const char* data, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add(Tag tag, const char* data, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Sets the value for the given tag to string @a data using the specified
    * mode.
@@ -388,7 +388,7 @@ public:
    * @param data A string to which the tag should be set to.
    * @param mode The merge mode to use.
    */
-  void add(const Glib::ustring& tag, const char* data, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add(const Glib::ustring& tag, const char* data, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Sets the value for the given tag using the specified mode.
    *
@@ -398,7 +398,7 @@ public:
    * @param mode The merge mode to use.
    */
   template <class DataType>
-  void add(Tag tag, const DataType& data, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add(Tag tag, const DataType& data, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Sets the value for the given tag using the specified mode.
    *
@@ -408,7 +408,7 @@ public:
    * @param mode The merge mode to use.
    */
   template <class DataType>
-  void add(const Glib::ustring& tag, const DataType& data, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add(const Glib::ustring& tag, const DataType& data, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   _IGNORE(gst_tag_list_add_valist, gst_tag_list_add_valist_values)
 
diff --git a/gstreamer/src/tagsetter.hg b/gstreamer/src/tagsetter.hg
index 090c39d..2133fb7 100644
--- a/gstreamer/src/tagsetter.hg
+++ b/gstreamer/src/tagsetter.hg
@@ -46,7 +46,7 @@ class TagSetter : public Glib::Interface
 
 public:
   _WRAP_METHOD(void reset_tags(), gst_tag_setter_reset_tags)
-  _WRAP_METHOD(void merge_tags(const Gst::TagList& list, TagMergeMode mode=TAG_MERGE_PREPEND), gst_tag_setter_merge_tags)
+  _WRAP_METHOD(void merge_tags(const Gst::TagList& list, TagMergeMode mode = TAG_MERGE_PREPEND), gst_tag_setter_merge_tags)
 
   /** Adds the given Glib::ValueBase on the setter using the given merge mode. 
    *
@@ -54,7 +54,7 @@ public:
    * @param value The value to set the tag to.
    * @param mode The mode to use.
    */
-  void add_tag(Tag tag, const Glib::ValueBase& value, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add_tag(Tag tag, const Glib::ValueBase& value, TagMergeMode mode = TAG_MERGE_PREPEND);
   _IGNORE(gst_tag_setter_add_tag_valist,
           gst_tag_setter_add_tag_value,
           gst_tag_setter_add_tag_valist_values)
@@ -66,7 +66,7 @@ public:
    * @param mode The mode to use.
    */
   void add_tag(const Glib::ustring& tag, const Glib::ValueBase& value,
-    TagMergeMode mode=TAG_MERGE_PREPEND);
+    TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Adds the given value on the setter using the given merge mode.
    *
@@ -76,7 +76,7 @@ public:
    * @param mode The mode to use.
    */
   template <class DataType>
-  void add_tag(Tag tag, const DataType& data, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add_tag(Tag tag, const DataType& data, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Adds the given value on the setter using the given merge mode.
    *
@@ -87,7 +87,7 @@ public:
    */
   template <class DataType>
     void add_tag(const Glib::ustring& tag, const DataType& data,
-    TagMergeMode mode=TAG_MERGE_PREPEND);
+    TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Adds the given value on the setter using the given merge mode. 
    *
@@ -95,7 +95,7 @@ public:
    * @param data The value to set the tag to.
    * @param mode The mode to use.
    */
-  void add_tag(Tag tag, const char* data, TagMergeMode mode=TAG_MERGE_PREPEND);
+  void add_tag(Tag tag, const char* data, TagMergeMode mode = TAG_MERGE_PREPEND);
 
   /** Adds the given value on the setter using the given merge mode. 
    *
@@ -104,7 +104,7 @@ public:
    * @param mode The mode to use.
    */
   void add_tag(const Glib::ustring& tag, const char* data,
-    TagMergeMode mode=TAG_MERGE_PREPEND);
+    TagMergeMode mode = TAG_MERGE_PREPEND);
 
 // A copy is taken so that the original is not freed by the wrapper.
 #m4 _CONVERSION(`const GstTagList*',`const Gst::TagList',`Glib::wrap_taglist(const_cast<GstTagList*>($3), true)')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]