[gstreamermm: 51/167] fixed object class

[Murray Cumming <murrayc src gnome org>]

commit c76c33462483eef8c1585f48da459ff5e84c8832
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Fri Jul 26 13:22:21 2013 +0200

    fixed object class

 gstreamer/src/object.ccg |    8 +++-----
 gstreamer/src/object.hg  |    1 -
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/gstreamer/src/object.ccg b/gstreamer/src/object.ccg
index 1f0a94f..52a174b 100644
--- a/gstreamer/src/object.ccg
+++ b/gstreamer/src/object.ccg
@@ -29,20 +29,18 @@ Object::Object(const Glib::ConstructParams& construct_params)
   Glib::Object(construct_params)
 {
   // Get rid of the floating reference for newly constructed Gst::Objects.
-  gst_object_ref(gobj());
-  gst_object_sink(gobj());
+  gst_object_ref_sink(gobj());
 }
 
 Object::Object(GstObject* castitem)
 :
   Glib::Object(reinterpret_cast<GObject*>(castitem))
 {
-  if(G_LIKELY(GST_OBJECT_IS_FLOATING(castitem)))
+  if(G_LIKELY(g_object_is_floating(castitem)))
   {
     //The floating reference is convenience for C,
     //but is useless and difficult for us:
-    gst_object_ref(gobj());
-    gst_object_sink(gobj());
+    gst_object_ref_sink(gobj());
   }
 }
 
diff --git a/gstreamer/src/object.hg b/gstreamer/src/object.hg
index 2a00822..a40376e 100644
--- a/gstreamer/src/object.hg
+++ b/gstreamer/src/object.hg
@@ -67,7 +67,6 @@ public:
 //TODO: These conversions should probably be in the glibmm conversion files.
 #m4 _CONVERSION(`GMutex*',`Glib::Threads::Mutex*',`Glib::Threads::wrap($3)')
 #m4 _CONVERSION(`GMutex*',`const Glib::Threads::Mutex*',`Glib::Threads::wrap($3)')
-  _MEMBER_GET_PTR(lock, lock, Glib::Threads::Mutex*, GMutex*)
 
   _WRAP_METHOD(bool set_name(const Glib::ustring& name), gst_object_set_name)
   _WRAP_METHOD(Glib::ustring get_name() const, gst_object_get_name)