gstreamer 1.0.3 → 1.1.0

data/ext/gstreamer/rbgst-message.c

@@ -1,25 +1,24 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2007 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Ruby-GNOME2 Project Team
  *
- * This file is part of Ruby/GStreamer.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * Ruby/GStreamer is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * Ruby/GStreamer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Ruby/GStreamer; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
  */
 
-#include "rbgst.h"
 #include "rbgst-private.h"
 #ifdef HAVE_GST_PBUTILS
 #  include <gst/pbutils/missing-plugins.h>
@@ -621,7 +620,7 @@ type_name(VALUE self)
 
 
 void
-Init_gst_message(void)
+Init_gst_message(VALUE mGst)
 {
     VALUE rb_cGstMessageType;
 

data/ext/gstreamer/rbgst-mini-object.c

@@ -1,38 +1,38 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2007 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Ruby-GNOME2 Project Team
  *
- * This file is part of Ruby/GStreamer.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * Ruby/GStreamer is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * Ruby/GStreamer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Ruby/GStreamer; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
  */
 
-#include "rbgst.h"
 #include "rbgst-private.h"
 
 /* Class: Gst::MiniObject
  * Base class for refcounted lightweight objects.
  */
 
+#define RG_TARGET_NAMESPACE rb_cGstMiniObject
 #define SELF(object) (RVAL2GST_MINI_OBJ(object))
 #define RVAL2GST_FLAGS(flags) \
     (RVAL2GFLAGS(flags, GST_TYPE_MINI_OBJECT_FLAGS))
 #define GST_FLAGS2RVAL(flags) \
     (GFLAGS2RVAL(flags, GST_TYPE_MINI_OBJECT_FLAGS))
 
-VALUE rb_cGstMiniObject;
+VALUE RG_TARGET_NAMESPACE;
 
 static RGConvertTable table = {0};
 
@@ -94,7 +94,7 @@ rbgst_mini_object_robj2instance(VALUE object)
 {
     gpointer instance;
 
-    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGstMiniObject))) {
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, RG_TARGET_NAMESPACE))) {
         rb_raise(rb_eTypeError, "not a Gst::MiniObject");
     }
     Data_Get_Struct(object, GstMiniObject, instance);
@@ -133,47 +133,47 @@ s_allocate(VALUE klass)
 }
 
 static VALUE
-get_flags(VALUE self)
+rg_flags(VALUE self)
 {
     return GST_FLAGS2RVAL(GST_MINI_OBJECT_FLAGS(SELF(self)));
 }
 
 static VALUE
-set_flags(VALUE self, VALUE flag)
+rg_set_flags(VALUE self, VALUE flag)
 {
     GST_MINI_OBJECT_FLAGS(SELF(self)) = RVAL2GST_FLAGS(flag);
     return Qnil;
 }
 
 static VALUE
-raise_flag(VALUE self, VALUE flag)
+rg_raise_flag(VALUE self, VALUE flag)
 {
     GST_MINI_OBJECT_FLAG_SET(SELF(self), RVAL2GST_FLAGS(flag));
     return Qnil;
 }
 
 static VALUE
-lower_flag(VALUE self, VALUE flag)
+rg_lower_flag(VALUE self, VALUE flag)
 {
     GST_MINI_OBJECT_FLAG_UNSET(SELF(self), RVAL2GST_FLAGS(flag));
     return Qnil;
 }
 
 static VALUE
-flag_raised_p(VALUE self, VALUE flag)
+rg_flag_raised_p(VALUE self, VALUE flag)
 {
     return CBOOL2RVAL(GST_MINI_OBJECT_FLAG_IS_SET(SELF(self),
                                                   RVAL2GST_FLAGS(flag)));
 }
 
 static VALUE
-writable_p(VALUE self)
+rg_writable_p(VALUE self)
 {
     return CBOOL2RVAL(gst_mini_object_is_writable(SELF(self)));
 }
 
 static VALUE
-writable_bang(VALUE self)
+rg_writable_bang(VALUE self)
 {
     GstMiniObject *original, *writable;
 
@@ -186,7 +186,7 @@ writable_bang(VALUE self)
 }
 
 void
-Init_gst_mini_object(void)
+Init_gst_mini_object(VALUE mGst)
 {
     table.type = GST_TYPE_MINI_OBJECT;
     table.get_superclass = rbgst_mini_object_get_superclass;
@@ -200,21 +200,21 @@ Init_gst_mini_object(void)
 
     RG_DEF_CONVERSION(&table);
 
-    rb_cGstMiniObject = G_DEF_CLASS(GST_TYPE_MINI_OBJECT, "MiniObject", mGst);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GST_TYPE_MINI_OBJECT, "MiniObject", mGst);
 
-    G_DEF_CLASS(GST_TYPE_MINI_OBJECT_FLAGS, "Flags", rb_cGstMiniObject);
-    G_DEF_CONSTANTS(rb_cGstMiniObject, GST_TYPE_MINI_OBJECT_FLAGS,
+    G_DEF_CLASS(GST_TYPE_MINI_OBJECT_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_MINI_OBJECT_FLAGS,
                     "GST_MINI_OBJECT_");
 
-    rb_define_alloc_func(rb_cGstMiniObject, s_allocate);
+    rb_define_alloc_func(RG_TARGET_NAMESPACE, s_allocate);
 
-    rb_define_method(rb_cGstMiniObject, "flags", get_flags, 0);
-    rb_define_method(rb_cGstMiniObject, "set_flags", set_flags, 1);
-    rb_define_method(rb_cGstMiniObject, "raise_flag", raise_flag, 1);
-    rb_define_method(rb_cGstMiniObject, "lower_flag", lower_flag, 1);
-    rb_define_method(rb_cGstMiniObject, "flag_raised?", flag_raised_p, 1);
-    rb_define_method(rb_cGstMiniObject, "writable?", writable_p, 0);
-    rb_define_method(rb_cGstMiniObject, "writable!", writable_bang, 0);
+    RG_DEF_METHOD(flags, 0);
+    RG_DEF_METHOD(set_flags, 1);
+    RG_DEF_METHOD(raise_flag, 1);
+    RG_DEF_METHOD(lower_flag, 1);
+    RG_DEF_METHOD_P(flag_raised, 1);
+    RG_DEF_METHOD_P(writable, 0);
+    RG_DEF_METHOD_BANG(writable, 0);
 
-    G_DEF_SETTERS(rb_cGstMiniObject);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gstreamer/rbgst-object.c

@@ -1,30 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
- * Copyright (C) 2007 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
  *
- * This file is part of Ruby/GStreamer.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * Ruby/GStreamer is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * Ruby/GStreamer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Ruby/GStreamer; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
  */
 
-#include "rbgst.h"
+#include "rbgst-private.h"
 
+#define RG_TARGET_NAMESPACE cObject
 #define SELF(self) (RVAL2GST_OBJ(self))
 
-static RGConvertTable table = {0};
+static RGConvertTable table;
 
 /* Class: Gst::Object
  * Basis for the GST object hierarchy.
@@ -41,7 +42,7 @@ rbgst_object_instance2robj(gpointer instance)
     return rbgobj_get_ruby_object_from_gobject(instance, TRUE);
 }
 
-void
+static void
 rbgst_object_initialize(VALUE obj, gpointer cobj)
 {
     if (GST_OBJECT_IS_FLOATING(cobj)) {
@@ -53,28 +54,30 @@ rbgst_object_initialize(VALUE obj, gpointer cobj)
 }
 
 static VALUE
-object_set_name(VALUE self, VALUE name)
+rg_set_name(VALUE self, VALUE name)
 {
     return CBOOL2RVAL(gst_object_set_name(SELF(self), RVAL2CSTR(name)));
 }
 
 void
-Init_gst_object(void)
+Init_gst_object(VALUE mGst)
 {
-    VALUE cGstObject;
+    VALUE RG_TARGET_NAMESPACE;
 
+    memset(&table, 0, sizeof(table));
     table.type = GST_TYPE_OBJECT;
+    table.klass = Qnil;
     table.instance2robj = rbgst_object_instance2robj;
     table.initialize = rbgst_object_initialize;
 
     RG_DEF_CONVERSION(&table);
 
-    cGstObject = G_DEF_CLASS(GST_TYPE_OBJECT, "Object", mGst);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GST_TYPE_OBJECT, "Object", mGst);
 
-    rb_define_method(cGstObject, "set_name", object_set_name, 1);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "name", rg_set_name, 1);
 
-    G_DEF_SETTERS(cGstObject);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
-    G_DEF_CLASS(GST_TYPE_OBJECT_FLAGS, "Flags", cGstObject);
-    G_DEF_CONSTANTS(cGstObject, GST_TYPE_OBJECT_FLAGS, "GST_");
+    G_DEF_CLASS(GST_TYPE_OBJECT_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_OBJECT_FLAGS, "GST_");
 }

data/ext/gstreamer/rbgst-pad-template.c

@@ -1,27 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
- * Copyright (C) 2007 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
  *
- * This file is part of Ruby/GStreamer.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * Ruby/GStreamer is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * Ruby/GStreamer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Ruby/GStreamer; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
  */
 
-#include "rbgst.h"
+#include "rbgst-private.h"
 
+#define RG_TARGET_NAMESPACE cPadTemplate
 #define SELF(self) RVAL2GST_PAD_TEMPLATE(self)
 
 /* Class: Gst::PadTemplate
@@ -37,7 +38,7 @@
  * Returns: the name of the pad template.
  */
 static VALUE
-get_name(VALUE self)
+rg_name(VALUE self)
 {
     /*
      *  We can't call Gst::Object#name since the real name
@@ -51,7 +52,7 @@ get_name(VALUE self)
  * Returns: the pad's presence (see Gst::Pad::Presence).
  */
 static VALUE
-get_presence(VALUE self)
+rg_presence(VALUE self)
 {
     return GENUM2RVAL(GST_PAD_TEMPLATE_PRESENCE(SELF(self)),
                       GST_TYPE_PAD_PRESENCE);
@@ -61,7 +62,7 @@ get_presence(VALUE self)
  * Returns: the pad's direction (see Gst::Pad::Direction).
  */
 static VALUE
-get_direction(VALUE self)
+rg_direction(VALUE self)
 {
     return GENUM2RVAL(GST_PAD_TEMPLATE_DIRECTION(SELF(self)),
                       GST_TYPE_PAD_DIRECTION);
@@ -75,7 +76,7 @@ get_direction(VALUE self)
  * Returns: a Gst::Caps object.
  */
 static VALUE
-get_caps(VALUE self)
+rg_caps(VALUE self)
 {
     return GST_CAPS2RVAL(gst_pad_template_get_caps(RGST_PAD_TEMPLATE(self)));
 }
@@ -89,36 +90,36 @@ get_caps(VALUE self)
  * Returns: always nil.
  */
 static VALUE
-each_caps(VALUE self)
+rg_each_caps(VALUE self)
 {
-    return rb_ary_yield(get_caps(self));
+    return rb_ary_yield(rg_caps(self));
 }
 
 /* Method: has_caps?
  * Returns: true if the pad template has capabilities, false otherwise.
  */
 static VALUE
-has_caps_p(VALUE self)
+rg_has_caps_p(VALUE self)
 {
     return CBOOL2RVAL(SELF(self)->caps != NULL);
 }
 
 void
-Init_gst_pad_template (void)
+Init_gst_pad_template (VALUE mGst)
 {
-    VALUE cGstPadTemplate;
+    VALUE RG_TARGET_NAMESPACE;
 
-    cGstPadTemplate = G_DEF_CLASS(GST_TYPE_PAD_TEMPLATE, "PadTemplate", mGst);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GST_TYPE_PAD_TEMPLATE, "PadTemplate", mGst);
 
-    rb_define_method(cGstPadTemplate, "name", get_name, 0);
-    rb_define_method(cGstPadTemplate, "presence", get_presence, 0);
-    rb_define_method(cGstPadTemplate, "direction", get_direction, 0);
-    rb_define_method(cGstPadTemplate, "caps", get_caps, 0);
-    rb_define_method(cGstPadTemplate, "each_caps", each_caps, 0);
-    rb_define_method(cGstPadTemplate, "has_caps?", has_caps_p, 0);
-    rb_define_alias(cGstPadTemplate, "have_caps?", "has_caps?");
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(presence, 0);
+    RG_DEF_METHOD(direction, 0);
+    RG_DEF_METHOD(caps, 0);
+    RG_DEF_METHOD(each_caps, 0);
+    RG_DEF_METHOD_P(has_caps, 0);
+    RG_DEF_ALIAS("have_caps?", "has_caps?");
 
-    G_DEF_CLASS(GST_TYPE_PAD_TEMPLATE_FLAGS, "Flags", cGstPadTemplate);
-    G_DEF_CONSTANTS(cGstPadTemplate, GST_TYPE_PAD_TEMPLATE_FLAGS,
+    G_DEF_CLASS(GST_TYPE_PAD_TEMPLATE_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_PAD_TEMPLATE_FLAGS,
                     "GST_PAD_TEMPLATE_");
 }

data/ext/gstreamer/rbgst-pad.c

@@ -1,30 +1,32 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
- * Copyright (C) 2006, 2008 Sjoerd Simons <sjoerd@luon.net>
- * Copyright (C) 2008 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006, 2008 Sjoerd Simons <sjoerd@luon.net>
+ *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
  *
- * This file is part of Ruby/GStreamer.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * Ruby/GStreamer is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * Ruby/GStreamer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Ruby/GStreamer; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
  */
 
-#include "rbgst.h"
+#include "rbgst-private.h"
 
+#define RG_TARGET_NAMESPACE cPad
 #define SELF(self) RVAL2GST_PAD(self)
 
-static VALUE cGstPad;
+static VALUE RG_TARGET_NAMESPACE;
 
 /* Class: Gst::Pad
  * The link between Gst::Element objects.
@@ -35,10 +37,10 @@ static VALUE cGstPad;
  */
 
 static VALUE
-rb_gst_pad_get_name (VALUE self)
+rg_name (VALUE self)
 {
-	GstPad *pad = RGST_PAD (self);
-	return CSTR2RVAL (gst_pad_get_name (pad));
+    GstPad *pad = RGST_PAD (self);
+    return CSTR2RVAL (gst_pad_get_name (pad));
 }
 
 /* Method: direction
@@ -46,24 +48,24 @@ rb_gst_pad_get_name (VALUE self)
  */
 
 static VALUE
-rb_gst_pad_get_direction (VALUE self)
+rg_direction (VALUE self)
 {
-	GstPad *pad = RGST_PAD (self);
-	return GENUM2RVAL (GST_PAD_DIRECTION(pad), GST_TYPE_PAD_DIRECTION);
+    GstPad *pad = RGST_PAD (self);
+    return GENUM2RVAL (GST_PAD_DIRECTION(pad), GST_TYPE_PAD_DIRECTION);
 }
 
 /* Method: pad_template
  * Returns: the Gst::PadTemplate object of this pad.
  */
 static VALUE
-rb_gst_pad_get_pad_template(VALUE self)
+rg_pad_template(VALUE self)
 {
-	GstPadTemplate *templ = gst_pad_get_pad_template (RGST_PAD (self));
-	if (templ != NULL) {
-		gst_object_ref (GST_OBJECT (templ));
-		return RGST_PAD_TEMPLATE_NEW (templ);
-	}   
-	return Qnil;
+    GstPadTemplate *templ = gst_pad_get_pad_template (RGST_PAD (self));
+    if (templ != NULL) {
+        gst_object_ref (GST_OBJECT (templ));
+        return RGST_PAD_TEMPLATE_NEW (templ);
+    }   
+    return Qnil;
 }
 
 /*
@@ -75,10 +77,10 @@ rb_gst_pad_get_pad_template(VALUE self)
  * Returns: true if supported, false otherwise.
  */
 static VALUE
-rb_gst_pad_provides_query_types (VALUE self)
+rg_provides_query_types_p (VALUE self)
 {
-	GstPad *pad = RGST_PAD (self);
-	return CBOOL2RVAL (GST_PAD_QUERYTYPEFUNC (pad) != gst_pad_get_query_types_default);
+    GstPad *pad = RGST_PAD (self);
+    return CBOOL2RVAL (GST_PAD_QUERYTYPEFUNC (pad) != gst_pad_get_query_types_default);
 }
 
 /*
@@ -89,19 +91,19 @@ rb_gst_pad_provides_query_types (VALUE self)
  * Returns: an array of Gst::QueryType objects.
  */
 static VALUE
-rb_gst_pad_get_query_types (VALUE self)
+rg_query_types (VALUE self)
 {
-	const GstQueryType *types; 
-	VALUE arr;
-
-	arr = rb_ary_new ();
-	types = gst_pad_get_query_types (RGST_PAD (self));
-	
-	while (types && *types) {
-		rb_ary_push (arr, RGST_QUERY_TYPE_NEW ((GstQueryType *)types));
-		types++;
-	}
-	return arr;
+    const GstQueryType *types; 
+    VALUE arr;
+
+    arr = rb_ary_new ();
+    types = gst_pad_get_query_types (RGST_PAD (self));
+
+    while (types && *types) {
+        rb_ary_push (arr, RGST_QUERY_TYPE_NEW ((GstQueryType *)types));
+        types++;
+    }
+    return arr;
 }
 
 /*
@@ -113,13 +115,13 @@ rb_gst_pad_get_query_types (VALUE self)
  * Returns: always nil.
  */
 static VALUE
-rb_gst_pad_each_query_type (VALUE self)
+rg_each_query_type (VALUE self)
 {
-	return rb_ary_yield (rb_gst_pad_get_query_types (self));
+    return rb_ary_yield (rg_query_types (self));
 }
 
 static VALUE
-rb_gst_pad_is_linked(VALUE self)
+rg_linked_p(VALUE self)
 {
     return CBOOL2RVAL(gst_pad_is_linked(SELF(self)));
 }
@@ -131,7 +133,7 @@ rb_gst_pad_link_raw(VALUE self, VALUE other_pad)
     GstPad *sink_pad;
 
     src_pad = SELF(self);
-    if (!RVAL2CBOOL(rb_obj_is_kind_of(other_pad, cGstPad))) {
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(other_pad, RG_TARGET_NAMESPACE))) {
         rb_raise(rb_eTypeError, "Not a Gst::Pad");
     }
 
@@ -148,7 +150,7 @@ rb_gst_pad_link_raw(VALUE self, VALUE other_pad)
  * Returns: a Gst::Pad::LinkReturn
  */
 static VALUE
-rb_gst_pad_link(VALUE self, VALUE other_pad)
+rg_link(VALUE self, VALUE other_pad)
 {
     return GENUM2RVAL(rb_gst_pad_link_raw(self, other_pad),
                       GST_TYPE_PAD_LINK_RETURN);
@@ -171,7 +173,7 @@ rb_gst_pad_link(VALUE self, VALUE other_pad)
  *          Return values aren't used in this case.)
  */
 static VALUE
-rb_gst_pad_link_shift(VALUE self, VALUE other_pad)
+rg_operator_link_shift(VALUE self, VALUE other_pad)
 {
     if (rb_gst_pad_link_raw(self, other_pad) == GST_PAD_LINK_OK)
         return other_pad;
@@ -188,13 +190,13 @@ rb_gst_pad_link_shift(VALUE self, VALUE other_pad)
  * Returns: true if the pads were unlinked and false if the pads weren't linked.
  */
 static VALUE
-rb_gst_pad_unlink(VALUE self, VALUE other_pad)
+rg_unlink(VALUE self, VALUE other_pad)
 {
     GstPad *src_pad;
     GstPad *sink_pad;
 
     src_pad = SELF(self);
-    if (!CBOOL2RVAL(rb_obj_is_kind_of(other_pad, cGstPad))) {
+    if (!CBOOL2RVAL(rb_obj_is_kind_of(other_pad, RG_TARGET_NAMESPACE))) {
         rb_raise(rb_eTypeError, "Not a Gst::Pad");
     }
     sink_pad = RVAL2GST_PAD(other_pad);
@@ -214,7 +216,7 @@ rb_gst_pad_unlink(VALUE self, VALUE other_pad)
  * Method: query
  */
 static VALUE
-rb_gst_pad_query(VALUE self, VALUE query)
+rg_query(VALUE self, VALUE query)
 {
     return CBOOL2RVAL(gst_pad_query(SELF(self), RVAL2GST_QUERY(query)));
 }
@@ -229,10 +231,10 @@ rb_gst_pad_query(VALUE self, VALUE query)
  * otherwise.
  */
 static VALUE
-rb_gst_pad_send_event (VALUE self, VALUE event)
+rg_send_event (VALUE self, VALUE event)
 {
-	return CBOOL2RVAL (gst_pad_send_event (RGST_PAD (self),
-					       RGST_EVENT (event)));
+    return CBOOL2RVAL (gst_pad_send_event (RGST_PAD (self),
+                                           RGST_EVENT (event)));
 }
 
 /*
@@ -243,7 +245,7 @@ rb_gst_pad_send_event (VALUE self, VALUE event)
  * Returns: a Gst::Caps object.
  */
 static VALUE
-rb_gst_pad_get_caps(VALUE self)
+rg_caps(VALUE self)
 {
     return GST_CAPS2RVAL_UNREF(gst_pad_get_caps(SELF(self)));
 }
@@ -256,7 +258,7 @@ rb_gst_pad_get_caps(VALUE self)
  * Returns: a Gst::Caps object.
  */
 static VALUE
-rb_gst_pad_get_negotiated_caps(VALUE self)
+rg_negotiated_caps(VALUE self)
 {
     return GST_CAPS2RVAL_UNREF(gst_pad_get_negotiated_caps(SELF(self)));
 }
@@ -269,7 +271,7 @@ rb_gst_pad_get_negotiated_caps(VALUE self)
  * Returns: true if the setting succeeded
  */
 static VALUE
-rb_gst_pad_set_caps(VALUE self, VALUE caps)
+rg_set_caps(VALUE self, VALUE caps)
 {
     return CBOOL2RVAL(gst_pad_set_caps(SELF(self), RVAL2GST_CAPS(caps)));
 }
@@ -282,7 +284,7 @@ rb_gst_pad_set_caps(VALUE self, VALUE caps)
  * Returns: true if the setting succeeded
  */
 static VALUE
-rb_gst_pad_set_active(VALUE self, VALUE active)
+rg_set_active(VALUE self, VALUE active)
 {
     return CBOOL2RVAL(gst_pad_set_active(SELF(self), RVAL2CBOOL(active)));
 }
@@ -295,44 +297,42 @@ rb_gst_pad_set_active(VALUE self, VALUE active)
  * Returns: Returns the peer pad or Qnil if there is none
  */
 static VALUE
-rb_gst_pad_get_peer(VALUE self)
+rg_peer(VALUE self)
 {
     return GST_PAD2RVAL_UNREF(gst_pad_get_peer(SELF(self)));
 }
 
-
 void
-Init_gst_pad (void)
+Init_gst_pad (VALUE mGst)
 {
-    cGstPad = G_DEF_CLASS (GST_TYPE_PAD, "Pad", mGst);
-
-    rb_define_method(cGstPad, "direction", rb_gst_pad_get_direction, 0);
-    rb_define_method(cGstPad, "name", rb_gst_pad_get_name, 0);
-    rb_define_method(cGstPad, "pad_template", rb_gst_pad_get_pad_template, 0);
-    rb_define_method(cGstPad, "provides_query_types?", rb_gst_pad_provides_query_types, 0);
-    rb_define_method(cGstPad, "query_types", rb_gst_pad_get_query_types, 0);
-    rb_define_method(cGstPad, "each_query_type", rb_gst_pad_each_query_type, 0);
-    rb_define_method(cGstPad, "linked?", rb_gst_pad_is_linked, 0);
-    rb_define_method(cGstPad, "link", rb_gst_pad_link, 1);
-    rb_define_method(cGstPad, ">>", rb_gst_pad_link_shift, 1);
-    rb_define_method(cGstPad, "unlink", rb_gst_pad_unlink, 1);
-    rb_define_method(cGstPad, "query", rb_gst_pad_query, 1);
-    rb_define_method(cGstPad, "send_event", rb_gst_pad_send_event, 1);
-    rb_define_method(cGstPad, "caps", rb_gst_pad_get_caps, 0);
-    rb_define_method(cGstPad, "negotiated_caps", rb_gst_pad_get_negotiated_caps, 0);
-    rb_define_method(cGstPad, "set_caps", rb_gst_pad_set_caps, 1);
-    rb_define_method(cGstPad, "set_active", rb_gst_pad_set_active, 1);
-    rb_define_method(cGstPad, "peer", rb_gst_pad_get_peer, 0);
-
-    G_DEF_SETTERS(cGstPad);
-
-
-    G_DEF_CLASS(GST_TYPE_PAD_LINK_RETURN, "LinkReturn", cGstPad);
-    G_DEF_CONSTANTS(cGstPad, GST_TYPE_PAD_LINK_RETURN, "GST_PAD_");
-    G_DEF_CLASS(GST_TYPE_PAD_DIRECTION, "Direction", cGstPad);
-    G_DEF_CONSTANTS(cGstPad, GST_TYPE_PAD_DIRECTION, "GST_PAD_");
-    G_DEF_CLASS(GST_TYPE_PAD_FLAGS, "Flags", cGstPad);
-    G_DEF_CONSTANTS(cGstPad, GST_TYPE_PAD_FLAGS, "GST_PAD_");
-    G_DEF_CLASS(GST_TYPE_PAD_PRESENCE, "Presence", cGstPad);
-    G_DEF_CONSTANTS(cGstPad, GST_TYPE_PAD_PRESENCE, "GST_PAD_");
+    RG_TARGET_NAMESPACE = G_DEF_CLASS (GST_TYPE_PAD, "Pad", mGst);
+
+    RG_DEF_METHOD(direction, 0);
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(pad_template, 0);
+    RG_DEF_METHOD_P(provides_query_types, 0);
+    RG_DEF_METHOD(query_types, 0);
+    RG_DEF_METHOD(each_query_type, 0);
+    RG_DEF_METHOD_P(linked, 0);
+    RG_DEF_METHOD(link, 1);
+    RG_DEF_METHOD_OPERATOR(">>", link_shift, 1);
+    RG_DEF_METHOD(unlink, 1);
+    RG_DEF_METHOD(query, 1);
+    RG_DEF_METHOD(send_event, 1);
+    RG_DEF_METHOD(caps, 0);
+    RG_DEF_METHOD(negotiated_caps, 0);
+    RG_DEF_METHOD(set_caps, 1);
+    RG_DEF_METHOD(set_active, 1);
+    RG_DEF_METHOD(peer, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
+
+    G_DEF_CLASS(GST_TYPE_PAD_LINK_RETURN, "LinkReturn", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_PAD_LINK_RETURN, "GST_PAD_");
+    G_DEF_CLASS(GST_TYPE_PAD_DIRECTION, "Direction", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_PAD_DIRECTION, "GST_PAD_");
+    G_DEF_CLASS(GST_TYPE_PAD_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_PAD_FLAGS, "GST_PAD_");
+    G_DEF_CLASS(GST_TYPE_PAD_PRESENCE, "Presence", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_PAD_PRESENCE, "GST_PAD_");
 }