gnomemm r1612 - in gstreamermm/trunk: . gstreamer/src tests

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Thu Jul 17 03:17:03 2008
New Revision: 1612
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1612&view=rev

Log:
2008-07-16  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/src/element.ccg:
	* gstreamer/src/element.hg:
	* gstreamer/src/event.ccg:
	* gstreamer/src/event.hg:
	* gstreamer/src/format.ccg:
	* gstreamer/src/format.hg:
	* gstreamer/src/message.ccg:
	* gstreamer/src/message.hg:
	* gstreamer/src/query.ccg:
	* gstreamer/src/query.hg:
	* tests/test-event-wrap.cc:
	* tests/test-message-wrap.cc:
	* tests/test-query-wrap.cc: Put get_name() and get_quark() functions
	in a namespace to avoid conflicts.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/element.ccg
   gstreamermm/trunk/gstreamer/src/element.hg
   gstreamermm/trunk/gstreamer/src/event.ccg
   gstreamermm/trunk/gstreamer/src/event.hg
   gstreamermm/trunk/gstreamer/src/format.ccg
   gstreamermm/trunk/gstreamer/src/format.hg
   gstreamermm/trunk/gstreamer/src/message.ccg
   gstreamermm/trunk/gstreamer/src/message.hg
   gstreamermm/trunk/gstreamer/src/query.ccg
   gstreamermm/trunk/gstreamer/src/query.hg
   gstreamermm/trunk/tests/test-event-wrap.cc
   gstreamermm/trunk/tests/test-message-wrap.cc
   gstreamermm/trunk/tests/test-query-wrap.cc

Modified: gstreamermm/trunk/gstreamer/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.ccg	Thu Jul 17 03:17:03 2008
@@ -43,6 +43,9 @@
   delete (Gst::Element*) data;
 }
 
+namespace Enums
+{
+
 Glib::ustring get_name(State s)
 {
   return gst_element_state_get_name(GstState(s));
@@ -53,6 +56,8 @@
   return gst_element_state_change_return_get_name(GstStateChangeReturn(s));
 }
 
+} //namespace Enums
+
 Glib::RefPtr<Element> Element::link(const Glib::RefPtr<Element>& dest)
 {
   const bool result = gst_element_link(gobj(), dest->gobj());

Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.hg	Thu Jul 17 03:17:03 2008
@@ -62,7 +62,8 @@
 
 _WRAP_ENUM(StateChangeReturn, GstStateChangeReturn)
 
-//TODO: Use a namespace or prefix, because Gst::get_name() is too generic. murrayc.
+namespace Enums
+{
 
 /**  Gets a string representing the given state.
  *
@@ -78,6 +79,8 @@
  */
 Glib::ustring get_name(StateChangeReturn s);
 
+} //namespace Enums
+
 /** Gst::Element â Abstract base class for all pipeline elements.
  * Gst::Element is the abstract base class needed to construct an element that
  * can be used in a GStreamer pipeline. Please refer to the plugin writers
@@ -102,7 +105,7 @@
  *
  * Each element has a state (see State). You can get and set the state of an
  * element with get_state() and set_state(). To get a string representation of
- * a State, use state_get_name().
+ * a State, use Gst::Enums::get_name().
  *
  * You can get and set a Clock on an element using get_clock() and set_clock().
  * Some elements can provide a clock for the pipeline if provides_clock()

Modified: gstreamermm/trunk/gstreamer/src/event.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.ccg	Thu Jul 17 03:17:03 2008
@@ -27,6 +27,9 @@
 namespace Gst
 {
 
+namespace Enums
+{
+
 Glib::ustring get_name(EventType t)
 {
   return gst_event_type_get_name(GstEventType(t));
@@ -37,6 +40,8 @@
   return Glib::QueryQuark(gst_event_type_to_quark(GstEventType(t)));
 }
 
+} //namespace Enums
+
 Structure Event::get_structure() const
 {
   static Structure structure;

Modified: gstreamermm/trunk/gstreamer/src/event.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.hg	Thu Jul 17 03:17:03 2008
@@ -61,6 +61,9 @@
 class Structure;
 class TagList;
 
+namespace Enums
+{
+
 /** Get a printable name for the given event type.
  *
  * @param type The event type.
@@ -75,6 +78,8 @@
  */
 Glib::QueryQuark get_quark(EventType t);
 
+} //namespace Enums
+
 /** Gst::Event â A structure describing events that are passed up and down a
  * pipeline.
  * The event class provides factory methods to construct and functions query

Modified: gstreamermm/trunk/gstreamer/src/format.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/format.ccg	Thu Jul 17 03:17:03 2008
@@ -24,6 +24,9 @@
 namespace Gst
 {
 
+namespace Enums
+{
+
 Glib::ustring get_name(Format f)
 {
   return gst_format_get_name(GstFormat(f));
@@ -34,6 +37,8 @@
   return Glib::QueryQuark(gst_format_to_quark(GstFormat(f)));
 }
 
+} //namespace Enums
+
 Format get_format(const Glib::ustring& nick)
 {
   return Format(gst_format_get_by_nick(nick.c_str()));

Modified: gstreamermm/trunk/gstreamer/src/format.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/format.hg	Thu Jul 17 03:17:03 2008
@@ -46,7 +46,8 @@
   Glib::QueryQuark    quark;
 };
 
-//TODO: Use a namespace or prefix (and watch out that there are other get_name() functions elsewhere. murrayc.
+namespace Enums
+{
 
 /** Get a printable name for the given format. Do not modify or free.
  * 
@@ -62,6 +63,8 @@
  */
 Glib::QueryQuark get_quark(Format f);
 
+} //namespace Enums
+
 /** Return the format registered with the given nick.
  *
  * @param nick The nick of the format.

Modified: gstreamermm/trunk/gstreamer/src/message.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.ccg	Thu Jul 17 03:17:03 2008
@@ -27,6 +27,9 @@
 namespace Gst
 {
 
+namespace Enums
+{
+
 Glib::ustring get_name(MessageType t)
 {
   return gst_message_type_get_name(GstMessageType(t));
@@ -37,6 +40,8 @@
   return Glib::QueryQuark(gst_message_type_to_quark(GstMessageType(t)));
 }
 
+} //namespace Enums
+
 Structure Message::get_structure() const
 {
   static Structure structure;

Modified: gstreamermm/trunk/gstreamer/src/message.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.hg	Thu Jul 17 03:17:03 2008
@@ -32,9 +32,14 @@
 
 _WRAP_ENUM(MessageType, GstMessageType)
 
+namespace Enums
+{
+
 Glib::ustring get_name(MessageType t);
 Glib::QueryQuark get_quark(MessageType t);
 
+} //namespace Enums
+
 class Structure;
 class TagList;
 

Modified: gstreamermm/trunk/gstreamer/src/query.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.ccg	Thu Jul 17 03:17:03 2008
@@ -25,6 +25,9 @@
 namespace Gst
 {
 
+namespace Enums
+{
+
 Glib::ustring get_name(QueryType t)
 {
   return gst_query_type_get_name(GstQueryType(t));
@@ -35,6 +38,8 @@
   return Glib::QueryQuark(gst_query_type_to_quark(GstQueryType(t)));
 }
 
+} //namespace Enums
+
 Structure Query::get_structure() const
 {
   GstStructure* gst_structure = const_cast<GstStructure*>(gst_query_get_structure(const_cast<GstQuery*>(gobj())));

Modified: gstreamermm/trunk/gstreamer/src/query.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.hg	Thu Jul 17 03:17:03 2008
@@ -32,6 +32,9 @@
 
 _WRAP_ENUM(QueryType, GstQueryType)
 
+namespace Enums
+{
+
 /** Get a printable name for the given query type.
  *
  * @param query The query type.
@@ -48,6 +51,8 @@
 Glib::QueryQuark get_quark(QueryType t);
 _IGNORE(gst_query_type_to_quark)
 
+} //namespace Enums
+
 struct QueryTypeDefinition
 {
   QueryType             value;

Modified: gstreamermm/trunk/tests/test-event-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-event-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-event-wrap.cc	Thu Jul 17 03:17:03 2008
@@ -34,7 +34,7 @@
 
   Glib::RefPtr<Gst::EventLatency> event_latency = Glib::RefPtr<Gst::EventLatency>::cast_dynamic(event);
   std::cout << "event is a Gst::EventLatency: " << (bool)event_latency  << std::endl;
-  std::cout << "event type name: '" << Gst::get_name(event->get_event_type()) << "'" << std::endl;
+  std::cout << "event type name: '" << Gst::Enums::get_name(event->get_event_type()) << "'" << std::endl;
 
   const Gst::Structure structure = event->get_structure();
   if(structure)

Modified: gstreamermm/trunk/tests/test-message-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-message-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-message-wrap.cc	Thu Jul 17 03:17:03 2008
@@ -38,7 +38,7 @@
 
   Glib::RefPtr<Gst::MessageWarning> message_warning = Glib::RefPtr<Gst::MessageWarning>::cast_dynamic(message);
   std::cout << "message is a Gst::MessageWarning: " << (bool)message_warning  << std::endl;
-  std::cout << "message type name: '" << Gst::get_name(message->get_message_type()) << "'"  << std::endl;
+  std::cout << "message type name: '" << Gst::Enums::get_name(message->get_message_type()) << "'"  << std::endl;
 
   const Gst::Structure structure = message->get_structure();
   if(structure)

Modified: gstreamermm/trunk/tests/test-query-wrap.cc
==============================================================================
--- gstreamermm/trunk/tests/test-query-wrap.cc	(original)
+++ gstreamermm/trunk/tests/test-query-wrap.cc	Thu Jul 17 03:17:03 2008
@@ -34,7 +34,7 @@
 
   Glib::RefPtr<Gst::QueryPosition> query_position = Glib::RefPtr<Gst::QueryPosition>::cast_dynamic(query);
   std::cout << "query is a Gst::QueryPosition: " << (bool)query_position  << std::endl;
-  std::cout << "query type name: '" << Gst::get_name(query->get_query_type()) << "'" << std::endl;
+  std::cout << "query type name: '" << Gst::Enums::get_name(query->get_query_type()) << "'" << std::endl;
 
   const Gst::Structure structure = query->get_structure();
   if(structure)