[gstreamermm: 35/167] childproxy renewed

[Murray Cumming <murrayc src gnome org>]

commit 008806291702a02942ac6c6bded5b688892674db
Author: Tomek Lakota <tomasz lakota flytronic pl>
Date:   Thu Jul 25 03:28:57 2013 +0200

    childproxy renewed

 gstreamer/src/childproxy.ccg  |   16 ++++++++--------
 gstreamer/src/childproxy.hg   |    8 ++++----
 gstreamer/src/gst_vfuncs.defs |    2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/gstreamer/src/childproxy.ccg b/gstreamer/src/childproxy.ccg
index 8032389..7aec3de 100644
--- a/gstreamer/src/childproxy.ccg
+++ b/gstreamer/src/childproxy.ccg
@@ -20,32 +20,32 @@
 namespace Gst
 {
 
-bool ChildProxy::lookup(const Glib::RefPtr<Gst::Object>& object,
-  const Glib::ustring& name, Glib::RefPtr<Gst::Object>& target,
+bool ChildProxy::lookup(const Glib::RefPtr<Gst::ChildProxy>& object,
+  const Glib::ustring& name, Glib::RefPtr<Glib::Object>& target,
   GParamSpec*& pspec)
 {
-  GstObject* gst_object = 0;
+  GObject* g_object = 0;
   bool const result = gst_child_proxy_lookup(Glib::unwrap(object),
-    name.c_str(), &gst_object, &pspec);
-  target = Glib::wrap(gst_object);
+    name.c_str(), &g_object, &pspec);
+  target = Glib::wrap(g_object);
   return result;
 }
 
 Glib::RefPtr<Gst::ChildProxy> ChildProxy::get_proxy_property(const Glib::ustring& name, Glib::ValueBase& 
value)
 {
-  gst_child_proxy_get_property(GST_OBJECT(gobj()), name.c_str(), value.gobj());
+  gst_child_proxy_get_property(const_cast<GstChildProxy*>(gobj()), name.c_str(), value.gobj());
   return Glib::wrap(gobj(), true);
 }
 
 Glib::RefPtr<const Gst::ChildProxy> ChildProxy::get_proxy_property(const Glib::ustring& name, 
Glib::ValueBase& value) const
 {
-  gst_child_proxy_get_property(GST_OBJECT(gobj()), name.c_str(), value.gobj());
+  gst_child_proxy_get_property(const_cast<GstChildProxy*>(gobj()), name.c_str(), value.gobj());
   return Glib::wrap(const_cast<GstChildProxy*>(gobj()), true);
 }
 
 Glib::RefPtr<Gst::ChildProxy> ChildProxy::set_proxy_property(const Glib::ustring& name, const 
Glib::ValueBase& value)
 {
-  gst_child_proxy_set_property(GST_OBJECT(gobj()), name.c_str(), value.gobj());
+  gst_child_proxy_set_property(const_cast<GstChildProxy*>(gobj()), name.c_str(), value.gobj());
   return Glib::wrap(gobj(), true);
 }
 
diff --git a/gstreamer/src/childproxy.hg b/gstreamer/src/childproxy.hg
index 2602c67..19182f7 100644
--- a/gstreamer/src/childproxy.hg
+++ b/gstreamer/src/childproxy.hg
@@ -52,12 +52,12 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Gst::Object> get_child(const Glib::ustring& name), 
gst_child_proxy_get_child_by_name)
   _WRAP_METHOD(Glib::RefPtr<const Gst::Object> get_child(const Glib::ustring& name) const, 
gst_child_proxy_get_child_by_name, constversion)
 
-  _WRAP_METHOD(Glib::RefPtr<Gst::Object> get_child(guint index), gst_child_proxy_get_child_by_index)
-  _WRAP_METHOD(Glib::RefPtr<const Gst::Object> get_child(guint index) const, 
gst_child_proxy_get_child_by_index, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Glib::Object> get_child(guint index), gst_child_proxy_get_child_by_index)
+  _WRAP_METHOD(Glib::RefPtr<const Glib::Object> get_child(guint index) const, 
gst_child_proxy_get_child_by_index, constversion)
 
   _WRAP_METHOD_DOCS_ONLY(gst_child_proxy_lookup)
   //TODO: Maybe GParamSpec should be wrapped in glibmm?
-  static bool lookup(const Glib::RefPtr<Gst::Object>& object, const Glib::ustring& name, 
Glib::RefPtr<Gst::Object>& target, GParamSpec*& pspec);
+  static bool lookup(const Glib::RefPtr<Gst::ChildProxy>& object, const Glib::ustring& name, 
Glib::RefPtr<Glib::Object>& target, GParamSpec*& pspec);
 
   /** Gets a single property using the Gst::ChildProxy mechanism.
    * @param name The property to get.
@@ -97,7 +97,7 @@ public:
 
   /** Virtual method to fetch the child.
    */
-  _WRAP_VFUNC(Glib::RefPtr<Gst::Object> get_child_by_index(guint index) const, "get_child_by_index")
+  _WRAP_VFUNC(Glib::RefPtr<Glib::Object> get_child_by_index(guint index) const, "get_child_by_index")
 
   /** Virtual method to get the children count.
    */
diff --git a/gstreamer/src/gst_vfuncs.defs b/gstreamer/src/gst_vfuncs.defs
index 22e5ec7..b719f03 100644
--- a/gstreamer/src/gst_vfuncs.defs
+++ b/gstreamer/src/gst_vfuncs.defs
@@ -539,7 +539,7 @@
 
 (define-vfunc get_child_by_index
   (of-object "GstChildProxy")
-  (return-type "GstObject*")
+  (return-type "GObject*")
   (parameters
    '("guint" "index")
   )