gnomemm r2090 - in gstreamermm/trunk: . gstreamer/src

From: jaalburqu svn gnome org
To: svn-commits-list gnome org
Subject: gnomemm r2090 - in gstreamermm/trunk: . gstreamer/src
Date: Thu, 12 Mar 2009 03:54:21 +0000 (UTC)
Author: jaalburqu
Date: Thu Mar 12 03:54:21 2009
New Revision: 2090
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2090&view=rev

Log:
2009-03-11  JosÃ Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/src/basesink.ccg:
	* gstreamer/src/bin.ccg:
	* gstreamer/src/bin.hg:
	* gstreamer/src/buffer.hg:
	* gstreamer/src/bus.ccg:
	* gstreamer/src/caps.ccg:
	* gstreamer/src/clock.ccg:
	* gstreamer/src/element.ccg:
	* gstreamer/src/element.hg:
	* gstreamer/src/elementfactory.ccg:
	* gstreamer/src/elementfactory.hg:
	* gstreamer/src/format.ccg:
	* gstreamer/src/format.hg:
	* gstreamer/src/iterator.hg:
	* gstreamer/src/message.ccg:
	* gstreamer/src/pad.ccg:
	* gstreamer/src/pad.hg:
	* gstreamer/src/parse.hg:
	* gstreamer/src/pipeline.ccg:
	* gstreamer/src/query.ccg:
	* gstreamer/src/structure.ccg: Corrected use of NULL in source files
	where missing sentinel warning is not generated.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/basesink.ccg
   gstreamermm/trunk/gstreamer/src/bin.ccg
   gstreamermm/trunk/gstreamer/src/bin.hg
   gstreamermm/trunk/gstreamer/src/buffer.hg
   gstreamermm/trunk/gstreamer/src/bus.ccg
   gstreamermm/trunk/gstreamer/src/caps.ccg
   gstreamermm/trunk/gstreamer/src/clock.ccg
   gstreamermm/trunk/gstreamer/src/element.ccg
   gstreamermm/trunk/gstreamer/src/element.hg
   gstreamermm/trunk/gstreamer/src/elementfactory.ccg
   gstreamermm/trunk/gstreamer/src/elementfactory.hg
   gstreamermm/trunk/gstreamer/src/format.ccg
   gstreamermm/trunk/gstreamer/src/format.hg
   gstreamermm/trunk/gstreamer/src/iterator.hg
   gstreamermm/trunk/gstreamer/src/message.ccg
   gstreamermm/trunk/gstreamer/src/pad.ccg
   gstreamermm/trunk/gstreamer/src/pad.hg
   gstreamermm/trunk/gstreamer/src/parse.hg
   gstreamermm/trunk/gstreamer/src/pipeline.ccg
   gstreamermm/trunk/gstreamer/src/query.ccg
   gstreamermm/trunk/gstreamer/src/structure.ccg

Modified: gstreamermm/trunk/gstreamer/src/basesink.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/basesink.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/basesink.ccg	Thu Mar 12 03:54:21 2009
@@ -26,12 +26,12 @@
 
 ClockReturn BaseSink::wait_clock(ClockTime time)
 {
-  return (ClockReturn)(gst_base_sink_wait_clock(const_cast<GstBaseSink*>(gobj()), (GstClockTime)(time), NULL));
+  return (ClockReturn)(gst_base_sink_wait_clock(const_cast<GstBaseSink*>(gobj()), (GstClockTime)(time), 0));
 }
 
 FlowReturn BaseSink::wait_eos(ClockTime time)
 {
-  return (FlowReturn)(gst_base_sink_wait_eos(const_cast<GstBaseSink*>(gobj()), (GstClockTime)(time), NULL));
+  return (FlowReturn)(gst_base_sink_wait_eos(const_cast<GstBaseSink*>(gobj()), (GstClockTime)(time), 0));
 }
 
 } // namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/bin.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.ccg	Thu Mar 12 03:54:21 2009
@@ -54,7 +54,7 @@
   const bool result = gst_bin_add(gobj(), celement);
 
   // If addition successful, return RefPtr<..> to this bin, otherwise return
-  // NULL RefPtr<...>
+  // null RefPtr<...>
   if(result)
     return Glib::wrap(gobj(), true);
   else
@@ -68,7 +68,7 @@
   const bool result = gst_bin_remove(gobj(), Glib::unwrap(element));
 
   // If removal successful, return RefPtr<..> to this bin, otherwise return
-  // NULL RefPtr<...>
+  // null RefPtr<...>
   if(result)
     return Glib::wrap(gobj(), true);
   else

Modified: gstreamermm/trunk/gstreamer/src/bin.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bin.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/bin.hg	Thu Mar 12 03:54:21 2009
@@ -176,7 +176,7 @@
    * MT safe.
    *
    * element the Gst::Element to remove
-   * Returns this Gst::Bin if successful (for further removing if wanted), NULL
+   * Returns this Gst::Bin if successful (for further removing if wanted), null
    * otherwise
    */
   Glib::RefPtr<Gst::Bin> remove(const Glib::RefPtr<Gst::Element>& element);

Modified: gstreamermm/trunk/gstreamer/src/buffer.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/buffer.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/buffer.hg	Thu Mar 12 03:54:21 2009
@@ -122,7 +122,7 @@
 
   /** Get the malloc data of this buffer.
    * @return A pointer to any data allocated for this buffer using g_malloc().
-   * If this is non-NULL, this memory will be freed at the end of the buffer's
+   * If this is non-null, this memory will be freed at the end of the buffer's
    * lifecycle (i.e. when its refcount becomes zero).
    */
   _MEMBER_GET(malloc_data, malloc_data, guint8*, guint8*)

Modified: gstreamermm/trunk/gstreamer/src/bus.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/bus.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/bus.ccg	Thu Mar 12 03:54:21 2009
@@ -88,9 +88,9 @@
 {
   static SlotMessageSync slot_copy;
 
-  // Clear a possibly existing sync handler by calling with NULL before setting
+  // Clear a possibly existing sync handler by calling with 0 before setting
   // a new one (see gst_bus_set_sync_handler docs)
-  gst_bus_set_sync_handler(gobj(), NULL, NULL);
+  gst_bus_set_sync_handler(gobj(), 0, 0);
 
   slot_copy = slot;
   gst_bus_set_sync_handler(gobj(), &Bus_Message_Sync_gstreamermm_callback, &slot_copy);

Modified: gstreamermm/trunk/gstreamer/src/caps.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/caps.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/caps.ccg	Thu Mar 12 03:54:21 2009
@@ -51,7 +51,7 @@
 {
   //We take a copy because gst_caps_append_structure() wants to take ownership:
   GstStructure* copy = gst_structure_copy(structure.gobj());
-  return Glib::wrap(gst_caps_new_full(copy, NULL));
+  return Glib::wrap(gst_caps_new_full(copy, 0));
 }
 
 void Caps::append_structure(const Structure& structure)

Modified: gstreamermm/trunk/gstreamer/src/clock.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/clock.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/clock.ccg	Thu Mar 12 03:54:21 2009
@@ -99,7 +99,7 @@
 
 ClockReturn ClockID::wait()
 {
-  return (ClockReturn) gst_clock_id_wait(gobj(), NULL);
+  return (ClockReturn) gst_clock_id_wait(gobj(), 0);
 }
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/element.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.ccg	Thu Mar 12 03:54:21 2009
@@ -69,12 +69,12 @@
 
 bool Element::query_position(Format& format) const
 {
-  return gst_element_query_position(const_cast<GstElement*>(gobj()), reinterpret_cast<GstFormat*>(&format), NULL);
+  return gst_element_query_position(const_cast<GstElement*>(gobj()), reinterpret_cast<GstFormat*>(&format), 0);
 }
 
 bool Element::query_duration(Format& format) const
 {
-  return gst_element_query_duration(const_cast<GstElement*>(gobj()), reinterpret_cast<GstFormat*>(&format), NULL);
+  return gst_element_query_duration(const_cast<GstElement*>(gobj()), reinterpret_cast<GstFormat*>(&format), 0);
 }
 
 // This method is written manually because an extra ref is necessary. See

Modified: gstreamermm/trunk/gstreamer/src/element.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/element.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/element.hg	Thu Mar 12 03:54:21 2009
@@ -464,7 +464,7 @@
 template <class T_Interface>
 ElementInterfaced<T_Interface>::~ElementInterfaced()
 {
-  // Set the gobject_ to NULL so that when this is deleted, the gobject doesn't
+  // Set the gobject_ to null so that when this is deleted, the gobject doesn't
   // go with it and other elements "wrapping" the gobject are not affected
   gobject_ = 0;
 }

Modified: gstreamermm/trunk/gstreamer/src/elementfactory.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/elementfactory.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/elementfactory.ccg	Thu Mar 12 03:54:21 2009
@@ -30,7 +30,7 @@
 
 Glib::RefPtr<Gst::Element> ElementFactory::create_element(const Glib::ustring& factory_name)
 {
-  return Glib::wrap(gst_element_factory_make(factory_name.c_str(), NULL));
+  return Glib::wrap(gst_element_factory_make(factory_name.c_str(), 0));
 }
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/elementfactory.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/elementfactory.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/elementfactory.hg	Thu Mar 12 03:54:21 2009
@@ -77,7 +77,7 @@
 public:
   _WRAP_METHOD(static Glib::RefPtr<Gst::ElementFactory> find(const Glib::ustring& name), gst_element_factory_find)
 
-  //Note that name can't be NULL here, though it seems like gstreamer should allow that as for gst_element_factory_make().
+  //Note that name can't be null here, though it seems like gstreamer should allow that as for gst_element_factory_make().
   _WRAP_METHOD(Glib::RefPtr<Gst::Element> create_named_element(const Glib::ustring& name), gst_element_factory_create)
 
   _WRAP_METHOD(static Glib::RefPtr<Gst::Element> create_element(const Glib::ustring& factory_name, const Glib::ustring& name), gst_element_factory_make)

Modified: gstreamermm/trunk/gstreamer/src/format.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/format.ccg	Thu Mar 12 03:54:21 2009
@@ -75,7 +75,7 @@
 {
   const GstFormatDefinition* gstdef = gst_format_get_details(GstFormat(format));
 
-  g_return_val_if_fail(gstdef != NULL, false);
+  g_return_val_if_fail(gstdef != 0, false);
 
   def.value = Format(gstdef->value);
   def.nick = gstdef->nick;

Modified: gstreamermm/trunk/gstreamer/src/format.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/format.hg	Thu Mar 12 03:54:21 2009
@@ -66,7 +66,7 @@
 /** Get a printable name for the given format. Do not modify or free.
  * 
  * @param format A Gst::Format.
- * @return The name of the format or NULL if the format is unknown.
+ * @return The name of the format or an empty string if the format is unknown.
  */
 Glib::ustring get_name(Format format);
 

Modified: gstreamermm/trunk/gstreamer/src/iterator.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/iterator.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/iterator.hg	Thu Mar 12 03:54:21 2009
@@ -245,7 +245,7 @@
 {
   current_result = (Gst::IteratorResult) gst_iterator_next(cobj(), &current);
 
-  // Set current to NULL if iterator is done:
+  // Set current to null if iterator is done:
   if (current_result == Gst::ITERATOR_DONE)
     current = 0;
 

Modified: gstreamermm/trunk/gstreamer/src/message.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.ccg	Thu Mar 12 03:54:21 2009
@@ -88,7 +88,7 @@
 Glib::Error MessageError::parse() const
 {
   GError* c_error = 0;
-  gst_message_parse_error(const_cast<GstMessage*>(gobj()), &c_error, NULL);
+  gst_message_parse_error(const_cast<GstMessage*>(gobj()), &c_error, 0);
 
   return Glib::Error(c_error);
 }
@@ -96,7 +96,7 @@
 std::string MessageError::parse_debug() const
 {
   gchar* c_debug = 0;
-  gst_message_parse_error(const_cast<GstMessage*>(gobj()), NULL, &c_debug);
+  gst_message_parse_error(const_cast<GstMessage*>(gobj()), 0, &c_debug);
 
   std::string result = c_debug;
   if (c_debug)
@@ -132,7 +132,7 @@
 Glib::Error MessageWarning::parse() const
 {
   GError* c_error = 0;
-  gst_message_parse_warning(const_cast<GstMessage*>(gobj()), &c_error, NULL);
+  gst_message_parse_warning(const_cast<GstMessage*>(gobj()), &c_error, 0);
 
   return Glib::Error(c_error);
 }
@@ -140,7 +140,7 @@
 std::string MessageWarning::parse_debug() const
 {
   gchar* c_debug = 0;
-  gst_message_parse_warning(const_cast<GstMessage*>(gobj()), NULL, &c_debug);
+  gst_message_parse_warning(const_cast<GstMessage*>(gobj()), 0, &c_debug);
 
   std::string result = c_debug;
   if (c_debug)
@@ -177,7 +177,7 @@
 Glib::Error MessageInfo::parse() const
 {
   GError* c_error = 0;
-  gst_message_parse_info(const_cast<GstMessage*>(gobj()), &c_error, NULL);
+  gst_message_parse_info(const_cast<GstMessage*>(gobj()), &c_error, 0);
 
   return Glib::Error(c_error);
 }
@@ -185,7 +185,7 @@
 std::string MessageInfo::parse_debug() const
 {
   gchar* c_debug = 0;
-  gst_message_parse_info(const_cast<GstMessage*>(gobj()), NULL, &c_debug);
+  gst_message_parse_info(const_cast<GstMessage*>(gobj()), 0, &c_debug);
 
   std::string result = c_debug;
   if (c_debug)
@@ -251,7 +251,7 @@
   GstBufferingMode mode;
 
   gst_message_parse_buffering_stats(const_cast<GstMessage*>(gobj()),
-    (GstBufferingMode*)(&mode), NULL, NULL, NULL);
+    (GstBufferingMode*)(&mode), 0, 0, 0);
   return (BufferingMode)(mode);
 }
 
@@ -259,8 +259,8 @@
 {
   int avg_in;
 
-  gst_message_parse_buffering_stats(const_cast<GstMessage*>(gobj()), NULL,
-    &avg_in, NULL, NULL);
+  gst_message_parse_buffering_stats(const_cast<GstMessage*>(gobj()), 0,
+    &avg_in, 0, 0);
   return avg_in;
 }
 
@@ -268,8 +268,8 @@
 {
   int avg_out;
 
-  gst_message_parse_buffering_stats(const_cast<GstMessage*>(gobj()), NULL,
-    NULL, &avg_out, NULL);
+  gst_message_parse_buffering_stats(const_cast<GstMessage*>(gobj()), 0,
+    0, &avg_out, 0);
   return avg_out;
 }
 
@@ -277,8 +277,8 @@
 {
   gint64 buffering_left;
 
-  gst_message_parse_buffering_stats(const_cast<GstMessage*>(gobj()), NULL,
-    NULL, NULL, &buffering_left);
+  gst_message_parse_buffering_stats(const_cast<GstMessage*>(gobj()), 0,
+    0, 0, &buffering_left);
   return buffering_left;
 }
 
@@ -361,7 +361,7 @@
 Glib::RefPtr<Gst::Clock> MessageClockProvide::parse()
 {
   GstClock* cclock = 0;
-  gst_message_parse_clock_provide(gobj(), &cclock, NULL);
+  gst_message_parse_clock_provide(gobj(), &cclock, 0);
   return Glib::wrap(cclock);
 }
 
@@ -373,7 +373,7 @@
 bool MessageClockProvide::parse_ready() const
 {
   gboolean ready = false;
-  gst_message_parse_clock_provide(const_cast<GstMessage*>(gobj()), NULL,
+  gst_message_parse_clock_provide(const_cast<GstMessage*>(gobj()), 0,
     &ready);
   return ready;
 }
@@ -438,7 +438,7 @@
 
 Glib::RefPtr<Gst::Message> MessageApplication::create(const Glib::RefPtr<Gst::Object>& src)
 {
-  GstMessage* message = gst_message_new_application(src->gobj(), NULL);
+  GstMessage* message = gst_message_new_application(src->gobj(), 0);
   return Gst::Message::wrap(message, false);
 }
 
@@ -456,7 +456,7 @@
 
 Glib::RefPtr<Gst::Message> MessageElement::create(const Glib::RefPtr<Gst::Object>& src)
 {
-  GstMessage* message = gst_message_new_element(src->gobj(), NULL);
+  GstMessage* message = gst_message_new_element(src->gobj(), 0);
   return Gst::Message::wrap(message, false);
 }
 
@@ -476,7 +476,7 @@
 Glib::RefPtr<Gst::Message> MessageCustom::create(MessageType type, const Glib::RefPtr<Gst::Object>& src)
 {
   GstMessage* message = gst_message_new_custom(GstMessageType(type),
-    src->gobj(), NULL);
+    src->gobj(), 0);
   return Gst::Message::wrap(message, false);
 }
 
@@ -500,7 +500,7 @@
 gint64 MessageSegmentStart::parse() const
 {
   gint64 position;
-  gst_message_parse_segment_start(const_cast<GstMessage*>(gobj()), NULL,
+  gst_message_parse_segment_start(const_cast<GstMessage*>(gobj()), 0,
     &position);
   return position;
 }
@@ -509,7 +509,7 @@
 {
   Format format;
   gst_message_parse_segment_start(const_cast<GstMessage*>(gobj()),
-    (GstFormat*)(&format), NULL);
+    (GstFormat*)(&format), 0);
   return format;
 }
 
@@ -533,7 +533,7 @@
 gint64 MessageSegmentDone::parse() const
 {
   gint64 position;
-  gst_message_parse_segment_done(const_cast<GstMessage*>(gobj()), NULL,
+  gst_message_parse_segment_done(const_cast<GstMessage*>(gobj()), 0,
     &position);
   return position;
 }
@@ -542,7 +542,7 @@
 {
   Format format;
   gst_message_parse_segment_done(const_cast<GstMessage*>(gobj()),
-    (GstFormat*)(&format), NULL);
+    (GstFormat*)(&format), 0);
   return format;
 }
 
@@ -566,7 +566,7 @@
 gint64 MessageDuration::parse() const
 {
   gint64 position;
-  gst_message_parse_duration(const_cast<GstMessage*>(gobj()), NULL, &position);
+  gst_message_parse_duration(const_cast<GstMessage*>(gobj()), 0, &position);
   return position;
 }
 
@@ -574,7 +574,7 @@
 {
   Format format;
   gst_message_parse_duration(const_cast<GstMessage*>(gobj()),
-    (GstFormat*)(&format), NULL);
+    (GstFormat*)(&format), 0);
   return format;
 }
 

Modified: gstreamermm/trunk/gstreamer/src/pad.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.ccg	Thu Mar 12 03:54:21 2009
@@ -80,7 +80,7 @@
 {
 
 Pad::Pad(PadDirection dir)
-  : _CONSTRUCT("name", NULL, "direction", dir)
+  : _CONSTRUCT("name", 0, "direction", dir)
 {}
 
 Pad::Pad(const Glib::RefPtr<const Gst::PadTemplate>& templ,
@@ -89,7 +89,7 @@
 {}
 
 Pad::Pad(const Glib::RefPtr<const Gst::PadTemplate>& templ)
-  : _CONSTRUCT("name", NULL, "direction", templ->get_direction(), "template",
+  : _CONSTRUCT("name", 0, "direction", templ->get_direction(), "template",
       templ->gobj())
 {}
 
@@ -154,22 +154,22 @@
 
 bool Pad::query_position(Format& format) const
 {
-  return gst_pad_query_position(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), NULL);
+  return gst_pad_query_position(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), 0);
 }
 
 bool Pad::query_duration(Format& format) const
 {
-  return gst_pad_query_duration(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), NULL);
+  return gst_pad_query_duration(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), 0);
 }
 
 bool Pad::query_peer_position(Format& format) const
 {
-  return gst_pad_query_peer_position(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), NULL);
+  return gst_pad_query_peer_position(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), 0);
 }
 
 bool Pad::query_peer_duration(Format& format) const
 {
-  return gst_pad_query_peer_duration(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), NULL);
+  return gst_pad_query_peer_duration(const_cast<GstPad*>(gobj()), reinterpret_cast<GstFormat*>(&format), 0);
 }
 
 FlowReturn Pad::chain(const Glib::RefPtr<Gst::Buffer>& buffer)

Modified: gstreamermm/trunk/gstreamer/src/pad.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pad.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pad.hg	Thu Mar 12 03:54:21 2009
@@ -103,7 +103,7 @@
    *
    * @param name The name of the new pad.
    * @param direction The GstPadDirection of the pad.
-   * @return A new Gst::Pad, or NULL in case of an error. MT safe.
+   * @return A new Gst::Pad, or a null RefPtr<> in case of an error. MT safe.
    */
   _WRAP_CREATE(const Glib::ustring& name, PadDirection dir)
 
@@ -111,7 +111,7 @@
    * given direction.
    *
    * @param direction The GstPadDirection of the pad.
-   * @return A new Gst::Pad, or NULL in case of an error. MT safe.
+   * @return A new Gst::Pad, or a null RefPtr<> in case of an error. MT safe.
    */
   _WRAP_CREATE(PadDirection dir)
 
@@ -119,7 +119,7 @@
    *
    * @param templ The pad template to use.
    * @param name The name of the element.
-   * @return A new Gst::Pad, or NULL in case of an error.
+   * @return A new Gst::Pad, or a null RefPtr<> in case of an error.
    */
   _WRAP_CREATE(const Glib::RefPtr<const Gst::PadTemplate>& pad_template)
 
@@ -127,7 +127,7 @@
    * the given template.
    *
    * @param templ The pad template to use.
-   * @return A new Gst::Pad, or NULL in case of an error.
+   * @return A new Gst::Pad, or a null RefPtr<> in case of an error.
    */
   _WRAP_CREATE(const Glib::RefPtr<const Gst::PadTemplate>& pad_template, const Glib::ustring& name)
 

Modified: gstreamermm/trunk/gstreamer/src/parse.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/parse.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/parse.hg	Thu Mar 12 03:54:21 2009
@@ -51,14 +51,14 @@
   static Glib::QueryQuark error_quark();
 
   /** Create a new pipeline based on command line syntax. Please note that you
-   * might get a return value that is not NULL even though the error is set. In
-   * this case there was a recoverable parsing error and you can try to play
-   * the pipeline.
+   * might get a return value that is not a null RefPtr<> even though the error
+   * is set. In this case there was a recoverable parsing error and you can try
+   * to play the pipeline.
    * @param pipeline_description The command line describing the pipeline.
    * @param error The error message in case of an erroneous pipeline.
-   * @return A new element on success, NULL on failure. If more than one
-   * toplevel element is specified by the pipeline_description, all elements
-   * are put into a Gst::Pipeline, which than is returned.
+   * @return A new element on success, a null RefPtr<> on failure. If more than
+   * one toplevel element is specified by the pipeline_description, all
+   * elements are put into a Gst::Pipeline, which than is returned.
    * @throw Gst::CoreError
    * @throw Gst::ParseError
    */
@@ -70,10 +70,10 @@
 
   /** Create a new element based on command line syntax. An error does not
    * mean that the pipeline could not be constructed.
-   * @param argv NULL-terminated array of arguments.
+   * @param argv null-terminated array of arguments.
    * @param error Will contain an error message if an erroneuos pipeline is
    * specified. 
-   * @return A new element on success and NULL on failure.
+   * @return A new element on success and null on failure.
    * @throw Gst::CoreError
    * @throw Gst::ParseError
    */
@@ -96,7 +96,7 @@
    * @param ghost_unconnected_pads Whether to automatically create ghost pads
    * for unconnected source or sink pads within the bin.
    * @param err Where to store the error message in case of an error.
-   * @return A newly-created bin, or NULL if an error occurred.
+   * @return A newly-created bin, or a null RefPtr<> if an error occurred.
    * @throw Gst::CoreError
    * @throw Gst::ParseError
    */

Modified: gstreamermm/trunk/gstreamer/src/pipeline.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pipeline.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/pipeline.ccg	Thu Mar 12 03:54:21 2009
@@ -27,7 +27,7 @@
 {
 
 Pipeline::Pipeline()
-: _CONSTRUCT("name", NULL)
+: _CONSTRUCT("name", 0)
 {}
 
 } // namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/query.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.ccg	Thu Mar 12 03:54:21 2009
@@ -71,7 +71,7 @@
 {
   const GstQueryTypeDefinition* gstdef = gst_query_type_get_details(GstQueryType(type));
 
-  g_return_val_if_fail(gstdef != NULL, false);
+  g_return_val_if_fail(gstdef != 0, false);
 
   def.value = QueryType(gstdef->value);
   def.nick = gstdef->nick;
@@ -119,7 +119,7 @@
 
 void QueryConvert::parse(Format& dest_format, gint64& dest_value) const
 {
-  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, NULL,
+  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), 0, 0,
     (GstFormat*)(&dest_format), &dest_value);
 }
 
@@ -127,30 +127,30 @@
 {
   Format src_format;
   gst_query_parse_convert(const_cast<GstQuery*>(gobj()),
-    (GstFormat*)(&src_format), NULL, NULL, NULL);
+    (GstFormat*)(&src_format), 0, 0, 0);
   return src_format;
 }
 
 gint64 QueryConvert::parse_src_value() const
 {
   gint64 src_value;
-  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, &src_value,
-    NULL, NULL);
+  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), 0, &src_value,
+    0, 0);
   return src_value;
 }
 
 Format QueryConvert::parse_dest_format() const
 {
   Format dest_format;
-  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, NULL,
-    (GstFormat*)(&dest_format), NULL);
+  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), 0, 0,
+    (GstFormat*)(&dest_format), 0);
   return dest_format;
 }
 
 gint64 QueryConvert::parse_dest_value() const
 {
   gint64 dest_value;
-  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), NULL, NULL, NULL,
+  gst_query_parse_convert(const_cast<GstQuery*>(gobj()), 0, 0, 0,
     &dest_value);
   return dest_value;
 }
@@ -180,7 +180,7 @@
 gint64 QueryPosition::parse() const
 {
   gint64 position;
-  gst_query_parse_position(const_cast<GstQuery*>(gobj()), NULL, &position);
+  gst_query_parse_position(const_cast<GstQuery*>(gobj()), 0, &position);
   return position;
 }
 
@@ -188,7 +188,7 @@
 {
   Format format;
   gst_query_parse_position(const_cast<GstQuery*>(gobj()),
-    (GstFormat*)(&format), NULL);
+    (GstFormat*)(&format), 0);
   return format;
 }
 
@@ -217,7 +217,7 @@
 gint64 QueryDuration::parse() const
 {
   gint64 duration;
-  gst_query_parse_duration(const_cast<GstQuery*>(gobj()), NULL, &duration);
+  gst_query_parse_duration(const_cast<GstQuery*>(gobj()), 0, &duration);
   return duration;
 }
 
@@ -225,7 +225,7 @@
 {
   Format format;
   gst_query_parse_duration(const_cast<GstQuery*>(gobj()),
-    (GstFormat*)(&format), NULL);
+    (GstFormat*)(&format), 0);
   return format;
 }
 
@@ -256,22 +256,22 @@
 bool QueryLatency::parse_live() const
 {
   gboolean glive;
-  gst_query_parse_latency(const_cast<GstQuery*>(gobj()), &glive, NULL, NULL);
+  gst_query_parse_latency(const_cast<GstQuery*>(gobj()), &glive, 0, 0);
   return glive;
 }
 
 ClockTime QueryLatency::parse_min() const
 {
   ClockTime min;
-  gst_query_parse_latency(const_cast<GstQuery*>(gobj()), NULL,
-    (ClockTime*)(&min), NULL);
+  gst_query_parse_latency(const_cast<GstQuery*>(gobj()), 0,
+    (ClockTime*)(&min), 0);
   return min;
 }
 
 ClockTime QueryLatency::parse_max() const
 {
   ClockTime max;
-  gst_query_parse_latency(const_cast<GstQuery*>(gobj()), NULL, NULL,
+  gst_query_parse_latency(const_cast<GstQuery*>(gobj()), 0, 0,
     (ClockTime*)(&max));
   return max;
 }
@@ -304,30 +304,30 @@
 {
   Format format;
   gst_query_parse_seeking(const_cast<GstQuery*>(gobj()),
-    (GstFormat*)(&format), NULL, NULL, NULL);
+    (GstFormat*)(&format), 0, 0, 0);
   return format;
 }
 
 bool QuerySeeking::parse_seekable() const
 {
   gboolean gseekable;
-  gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), NULL,
-    &gseekable, NULL, NULL);
+  gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), 0,
+    &gseekable, 0, 0);
   return gseekable;
 }
 
 gint64 QuerySeeking::parse_start() const
 {
   gint64 start;
-  gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), NULL, NULL,
-    &start, NULL);
+  gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), 0, 0,
+    &start, 0);
   return start;
 }
 
 gint64 QuerySeeking::parse_end() const
 {
   gint64 end;
-  gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), NULL, NULL,NULL,
+  gst_query_parse_seeking(const_cast<GstQuery*>(gobj()), 0, 0, 0,
     &end);
   return end;
 }
@@ -393,32 +393,32 @@
 double QuerySegment::parse_rate() const
 {
   double rate;
-  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), &rate, NULL,
-    NULL, NULL);
+  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), &rate, 0,
+    0, 0);
   return rate;
 }
 
 Format QuerySegment::parse_format() const
 {
   Format format;
-  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), NULL,
-    (GstFormat*)(&format), NULL, NULL);
+  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), 0,
+    (GstFormat*)(&format), 0, 0);
   return format;
 }
 
 gint64 QuerySegment::parse_start() const
 {
   gint64 start;
-  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), NULL, NULL,
-    &start, NULL);
+  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), 0, 0,
+    &start, 0);
   return start;
 }
 
 gint64 QuerySegment::parse_stop() const
 {
   gint64 stop;
-  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), NULL, NULL,
-    NULL, &stop);
+  gst_query_parse_segment(const_cast<GstQuery*>(gobj()), 0, 0,
+    0, &stop);
   return stop;
 }
 
@@ -450,14 +450,14 @@
 {
   gboolean gbusy;
   gst_query_parse_buffering_percent(const_cast<GstQuery*>(gobj()), &gbusy,
-    NULL);
+    0);
   return gbusy;
 }
 
 int QueryBuffering::parse_percent() const
 {
   int percent;
-  gst_query_parse_buffering_percent(const_cast<GstQuery*>(gobj()), NULL,
+  gst_query_parse_buffering_percent(const_cast<GstQuery*>(gobj()), 0,
     &percent);
   return percent;
 }
@@ -478,31 +478,31 @@
 {
   BufferingMode mode;
   gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()),
-    (GstBufferingMode*)(&mode), NULL, NULL, NULL);
+    (GstBufferingMode*)(&mode), 0, 0, 0);
   return mode;
 }
 
 int QueryBuffering::parse_input_rate() const
 {
   int avg_in;
-  gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), NULL,
-    &avg_in, NULL, NULL);
+  gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), 0,
+    &avg_in, 0, 0);
   return avg_in;
 }
 
 int QueryBuffering::parse_output_rate() const
 {
   int avg_out;
-  gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), NULL, NULL,
-    &avg_out, NULL);
+  gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), 0, 0,
+    &avg_out, 0);
   return avg_out;
 }
 
 gint64 QueryBuffering::parse_time_left() const
 {
   gint64 buffering_left;
-  gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), NULL,
-    NULL, NULL, &buffering_left);
+  gst_query_parse_buffering_stats(const_cast<GstQuery*>(gobj()), 0,
+    0, 0, &buffering_left);
   return buffering_left;
 }
 
@@ -522,31 +522,31 @@
 {
   Format format;
   gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()),
-    (GstFormat*)(&format), NULL, NULL, NULL);
+    (GstFormat*)(&format), 0, 0, 0);
   return format;
 }
 
 gint64 QueryBuffering::parse_start() const
 {
   gint64 start;
-  gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), NULL,
-    &start, NULL, NULL);
+  gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), 0,
+    &start, 0, 0);
   return start;
 }
 
 gint64 QueryBuffering::parse_stop() const
 {
   gint64 stop;
-  gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), NULL,
-    NULL, &stop, NULL);
+  gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), 0,
+    0, &stop, 0);
   return stop;
 }
 
 gint64 QueryBuffering::parse_total_time() const
 {
   gint64 estimated_total;
-  gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), NULL,
-    NULL, NULL, &estimated_total);
+  gst_query_parse_buffering_range(const_cast<GstQuery*>(gobj()), 0,
+    0, 0, &estimated_total);
   return estimated_total;
 }
 

Modified: gstreamermm/trunk/gstreamer/src/structure.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/structure.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/structure.ccg	Thu Mar 12 03:54:21 2009
@@ -99,7 +99,7 @@
 
 void Structure::set_field(const Glib::ustring& fieldname, bool value)
 {
-  gst_structure_set(gobj(), fieldname.c_str(), G_TYPE_BOOLEAN, value, NULL);
+  gst_structure_set(gobj(), fieldname.c_str(), G_TYPE_BOOLEAN, value, 0);
 }
 
 void Structure::set_field(const Glib::ustring& fieldname, int value)
@@ -423,7 +423,7 @@
 
 Structure Structure::create_from_string(const Glib::ustring& the_string)
 {
-  return Structure(gst_structure_from_string(the_string.c_str(), NULL)); 
+  return Structure(gst_structure_from_string(the_string.c_str(), 0)); 
 }
 
 bool Structure::fixate_nearest_fraction(const Glib::ustring& name, const Gst::Fraction& target)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]