gnomemm r1828 - in gstreamermm/trunk: . build_shared gstreamer/gstreamermm gstreamer/src

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Tue Dec  9 00:00:25 2008
New Revision: 1828
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1828&view=rev

Log:
2008-12-08  Josà Alburquerque  <jaalburqu svn gnome org>

	* build_shared/Makefile_build.am_fragment: Added generated plug-in
	header files to list of files to be installed but not distributed.

	* gstreamer/src/parse.ccg:
	* gstreamer/src/parse.hg: Renamed get_bin() to create_bin() (A bin is
	created).

	* gstreamer/gstreamermm/miniobject.cc:
	* gstreamer/gstreamermm/miniobject.h: Reverted changes to "unshadow"
	Glib::ObjectBase::gobject_ for now because there's much more to this
	than just changing the field name (usages of the member variable must
	also be changed).

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/build_shared/Makefile_build.am_fragment
   gstreamermm/trunk/gstreamer/gstreamermm/miniobject.cc
   gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h
   gstreamermm/trunk/gstreamer/src/parse.ccg
   gstreamermm/trunk/gstreamer/src/parse.hg

Modified: gstreamermm/trunk/build_shared/Makefile_build.am_fragment
==============================================================================
--- gstreamermm/trunk/build_shared/Makefile_build.am_fragment	(original)
+++ gstreamermm/trunk/build_shared/Makefile_build.am_fragment	Tue Dec  9 00:00:25 2008
@@ -43,6 +43,7 @@
 
 sublib_includedir	= $(includedir)/$(sublib_libname)/$(sublib_name)
 sublib_include_HEADERS	= $(files_all_built_h) $(files_all_extra_h)
+nodist_sublib_include_HEADERS = $(files_plugin_built_h)
 
 maintainer-clean-local:
 	(cd $(srcdir) && rm -f $(files_all_built_cc) $(files_all_built_h))

Modified: gstreamermm/trunk/gstreamer/gstreamermm/miniobject.cc
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/miniobject.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/miniobject.cc	Tue Dec  9 00:00:25 2008
@@ -29,17 +29,17 @@
 {}
 
 MiniObject::MiniObject()
-: _gobject(0)
+: gobject_(0)
 {
 }
 
 MiniObject::MiniObject(GstMiniObject* castitem, bool take_copy)
-: _gobject(take_copy ? gst_mini_object_copy(castitem) : castitem)
+: gobject_(take_copy ? gst_mini_object_copy(castitem) : castitem)
 {
 }
 
 MiniObject::MiniObject(const MiniObject& other)
-: _gobject(gst_mini_object_copy(other._gobject))
+: gobject_(gst_mini_object_copy(other.gobject_))
 {
 }
 
@@ -53,27 +53,27 @@
 
 MiniObject::~MiniObject()
 {
-  if(_gobject)
-    gst_mini_object_unref(_gobject);
+  if(gobject_)
+    gst_mini_object_unref(gobject_);
 }
 
 void MiniObject::swap(MiniObject& other)
 {
-  GstMiniObject *const temp = _gobject;
-  _gobject = other._gobject;
-  other._gobject = temp;
+  GstMiniObject *const temp = gobject_;
+  gobject_ = other.gobject_;
+  other.gobject_ = temp;
 }
 
 void 
 MiniObject::reference() const
 {
-  gst_mini_object_ref(_gobject);
+  gst_mini_object_ref(gobject_);
 }
 
 void
 MiniObject::unreference() const
 {
-  gst_mini_object_unref(_gobject);
+  gst_mini_object_unref(gobject_);
 }
 
 guint MiniObject::get_flags() const
@@ -99,19 +99,19 @@
 Glib::RefPtr<Gst::MiniObject>
 MiniObject::copy() const
 {
-  GstMiniObject * copy = gst_mini_object_copy(_gobject);
+  GstMiniObject * copy = gst_mini_object_copy(gobject_);
   return Gst::wrap(copy, false);
 }
 
 bool
 MiniObject::is_writable() const
 {
-  return gst_mini_object_is_writable(_gobject);
+  return gst_mini_object_is_writable(gobject_);
 }
 
 Glib::RefPtr<Gst::MiniObject> MiniObject::create_writable()
 {
-  return Gst::wrap(gst_mini_object_make_writable(_gobject));
+  return Gst::wrap(gst_mini_object_make_writable(gobject_));
 }
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/miniobject.h	Tue Dec  9 00:00:25 2008
@@ -144,7 +144,7 @@
   void swap(MiniObject& other);
 
 protected:
-  GstMiniObject* _gobject;
+  GstMiniObject* gobject_; //TODO: Doesn't this shadow a member variable in Glib::ObjectBase?
 };
 
 } // namespace Gst
@@ -161,3 +161,4 @@
 */
 
 #endif //#ifndef _GSTREAMERMM_MINIOBJECT_H
+

Modified: gstreamermm/trunk/gstreamer/src/parse.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/parse.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/parse.ccg	Tue Dec  9 00:00:25 2008
@@ -67,9 +67,9 @@
 }
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-Glib::RefPtr<Element> Parse::get_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads)
+Glib::RefPtr<Element> Parse::create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads)
 #else
-Glib::RefPtr<Element> Parse::get_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error)
+Glib::RefPtr<Element> Parse::create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;

Modified: gstreamermm/trunk/gstreamer/src/parse.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/parse.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/parse.hg	Tue Dec  9 00:00:25 2008
@@ -103,9 +103,9 @@
    * @throw Gst::ParseError
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
-  static Glib::RefPtr<Element> get_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads);
+  static Glib::RefPtr<Element> create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads);
 #else
-  static Glib::RefPtr<Element> get_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error);
+  static Glib::RefPtr<Element> create_bin(const Glib::ustring& bin_description, bool ghost_unconnected_pads, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 };