gstreamer 1.0.3 → 1.1.0

data/ext/gstreamer/rbgst-caps.c

@@ -1,26 +1,28 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
- * Copyright (C) 2008 Ruby-GNOME2 Project Team
- *
- * This file is part of Ruby/GStreamer.
- *
- * 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.
- *
- * 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
+ *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
+ *
+ *  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.
+ *
+ *  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.
+ *
+ *  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 cCaps
 #define SELF(self) (RVAL2GST_CAPS(self))
 
 /* Class: Gst::Caps
@@ -50,32 +52,40 @@ rbgst_ruby_object_from_gst_caps_with_unref(GstCaps *caps)
  * Returns: a newly allocated Gst::Caps object.
  */
 static VALUE
-rb_gst_caps_new (int argc, VALUE * argv, VALUE self)
+rg_initialize (int argc, VALUE * argv, VALUE self)
 {
     GstCaps *caps;
     int i;
 
     caps = gst_caps_new_any ();
     if (caps != NULL) {
-        for (i = 0; i < argc; i++)
-            gst_caps_append_structure (caps, RVAL2GST_STRUCT(argv[i]));
+        for (i = 0; i < argc; i++) {
+            GstStructure *structure;
+            structure = RVAL2GST_STRUCT(argv[i]);
+            gst_caps_append_structure (caps, gst_structure_copy (structure));
+        }
         G_INITIALIZE (self, caps);
+        gst_caps_unref (caps);
     }
     return Qnil;
 }
 
 /*
- * Method: set_any(state)
- * state: true or false.
+ * Method: set_any(set)
+ * set: true or false.
  *
  * Sets whether the caps should be compatible with any media format.
  *
  * Returns: self.
  */
 static VALUE
-rb_gst_caps_set_any (VALUE self, VALUE state)
+rg_set_any (VALUE self, VALUE set)
 {
-    RGST_CAPS (self)->flags = GST_CAPS_FLAGS_ANY;
+    if (RVAL2CBOOL(set)) {
+        RGST_CAPS(self)->flags |= GST_CAPS_FLAGS_ANY;
+    } else {
+        RGST_CAPS(self)->flags &= ~GST_CAPS_FLAGS_ANY;
+    }
     return self;
 }
 
@@ -88,7 +98,7 @@ rb_gst_caps_set_any (VALUE self, VALUE state)
  * Returns: self.
  */
 static VALUE
-rb_gst_caps_append (VALUE self, VALUE caps)
+rg_append (VALUE self, VALUE caps)
 {
     gst_caps_append (RGST_CAPS (self), RGST_CAPS (caps));
     return self;
@@ -103,7 +113,7 @@ rb_gst_caps_append (VALUE self, VALUE caps)
  * Returns: self.
  */
 static VALUE
-rb_gst_caps_append_structure (VALUE self, VALUE structure)
+rg_append_structure (VALUE self, VALUE structure)
 {
     gst_caps_append_structure (RGST_CAPS (self), RVAL2GST_STRUCT(structure));
     return self;
@@ -113,7 +123,7 @@ rb_gst_caps_append_structure (VALUE self, VALUE structure)
  * Returns: the number of structures contained in the caps.
  */
 static VALUE
-rb_gst_caps_get_size (VALUE self)
+rg_size (VALUE self)
 {
     return INT2FIX (gst_caps_get_size (RGST_CAPS (self)));
 }
@@ -128,7 +138,7 @@ returns it.
  * Returns: a Hash object corresponding to index, or nil if not found.
  */
 static VALUE
-rb_gst_caps_get_structure (VALUE self, VALUE index)
+rg_get_structure (VALUE self, VALUE index)
 {
     GstStructure *structure = gst_caps_get_structure (RGST_CAPS (self),
                                                       FIX2INT (index));
@@ -137,7 +147,7 @@ rb_gst_caps_get_structure (VALUE self, VALUE index)
 }
 
 static VALUE
-rb_gst_caps_set_simple (VALUE self, VALUE field, VALUE value)
+rg_set_simple (VALUE self, VALUE field, VALUE value)
 {
     /*
      * TODO 
@@ -149,7 +159,7 @@ rb_gst_caps_set_simple (VALUE self, VALUE field, VALUE value)
  * Returns: whether the caps represents any media format.
  */
 static VALUE
-rb_gst_caps_is_any (VALUE self)
+rg_any_p (VALUE self)
 {
     return CBOOL2RVAL (gst_caps_is_any (RGST_CAPS (self)));
 }
@@ -158,7 +168,7 @@ rb_gst_caps_is_any (VALUE self)
  * Returns: whether the caps represents no media formats.
  */
 static VALUE
-rb_gst_caps_is_empty (VALUE self)
+rg_empty_p (VALUE self)
 {
     return CBOOL2RVAL (gst_caps_is_empty (RGST_CAPS (self)));
 }
@@ -167,7 +177,7 @@ rb_gst_caps_is_empty (VALUE self)
  * Returns: whether the caps contains multiple structure.
  */
 static VALUE
-rb_gst_caps_is_simple (VALUE self)
+rg_simple_p (VALUE self)
 {
     return CBOOL2RVAL(GST_CAPS_IS_SIMPLE(RGST_CAPS (self)));
 }
@@ -182,7 +192,7 @@ rb_gst_caps_is_simple (VALUE self)
  * Returns: whether the caps is fixed.
  */
 static VALUE
-rb_gst_caps_is_fixed (VALUE self)
+rg_fixed_p (VALUE self)
 {
     return CBOOL2RVAL (gst_caps_is_fixed (RGST_CAPS (self)));
 }
@@ -195,7 +205,7 @@ rb_gst_caps_is_fixed (VALUE self)
 self.
   */
 static VALUE
-rb_gst_caps_is_equal (VALUE self, VALUE caps)
+rg_equal_p (VALUE self, VALUE caps)
 {
     return CBOOL2RVAL (gst_caps_is_equal (RGST_CAPS (self), RGST_CAPS (caps)));
 }
@@ -209,7 +219,7 @@ than self
  * (self must be fixed as well).
  */
 static VALUE
-rb_gst_caps_is_equal_fixed (VALUE self, VALUE caps)
+rg_equal_fixed_p (VALUE self, VALUE caps)
 {
     return CBOOL2RVAL (gst_caps_is_equal_fixed (RGST_CAPS (self), RGST_CAPS
                                                 (caps)));
@@ -226,7 +236,7 @@ media format that is
  * Returns: whether self is compatible with the given caps.
  */
 static VALUE
-rb_gst_caps_is_always_compatible (VALUE self, VALUE caps)
+rg_always_compatible_p (VALUE self, VALUE caps)
 {
     return CBOOL2RVAL (gst_caps_is_always_compatible (RGST_CAPS (self),
                                                       RGST_CAPS (caps)));
@@ -245,7 +255,7 @@ are included
  * Returns: whether self is a subset of the given caps.
  */
 static VALUE
-rb_gst_caps_is_subset (VALUE self, VALUE caps)
+rg_subset_p (VALUE self, VALUE caps)
 {
     return CBOOL2RVAL (gst_caps_is_subset (RGST_CAPS (self), RGST_CAPS (caps)));
 }
@@ -261,7 +271,7 @@ common to both
  * Returns: a new Gst::Caps object.
  */
 static VALUE
-rb_gst_caps_intersect (VALUE self, VALUE caps)
+rg_intersect (VALUE self, VALUE caps)
 {
     return RGST_CAPS_NEW (gst_caps_intersect (RGST_CAPS (self), RGST_CAPS
                                               (caps)));
@@ -278,7 +288,7 @@ either
  * Returns: a new Gst::Caps object.
  */
 static VALUE
-rb_gst_caps_union (VALUE self, VALUE caps)
+rg_union (VALUE self, VALUE caps)
 {
     return RGST_CAPS_NEW (gst_caps_union (RGST_CAPS (self), RGST_CAPS (caps)));
 }
@@ -293,7 +303,7 @@ rb_gst_caps_union (VALUE self, VALUE caps)
  * Returns: a new Gst::Caps object.
  */
 static VALUE
-rb_gst_caps_normalize (VALUE self)
+rg_normalize (VALUE self)
 {
     return RGST_CAPS_NEW (gst_caps_normalize (RGST_CAPS (self)));
 }
@@ -310,9 +320,9 @@ structures
  * Returns: whether the caps could be simplified.
  */
 static VALUE
-rb_gst_caps_do_simplify (VALUE self)
+rg_simplify_bang (VALUE self)
 {
-    return CBOOL2RVAL (gst_caps_do_simplify (RGST_CAPS (self)));
+    return CBOOL2RVAL (gst_caps_do_simplify (SELF (self)));
 }
 
 /*
@@ -324,7 +334,7 @@ rb_gst_caps_do_simplify (VALUE self)
  * Returns: self.
  */
 static VALUE
-rb_gst_caps_replace (VALUE self, VALUE caps)
+rg_replace_bang (VALUE self, VALUE caps)
 {
     GstCaps *current = RGST_CAPS (self);
 
@@ -336,7 +346,7 @@ rb_gst_caps_replace (VALUE self, VALUE caps)
  * Returns: a string representation of the current caps.
  */
 static VALUE
-rb_gst_caps_to_string (VALUE self)
+rg_to_s (VALUE self)
 {
     return CSTR2RVAL (gst_caps_to_string (RGST_CAPS (self)));
 }
@@ -350,7 +360,7 @@ rb_gst_caps_to_string (VALUE self)
  * Returns: a newly allocated Gst::Caps.
  */
 static VALUE
-rb_gst_caps_from_string (VALUE self, VALUE string)
+rg_s_parse (G_GNUC_UNUSED VALUE self, VALUE string)
 {
     return RGST_CAPS_NEW (gst_caps_from_string (RVAL2CSTR (string)));
 }
@@ -367,14 +377,14 @@ are included
  * Returns: the resulting caps, as a new Gst::Caps object.
  */
 static VALUE
-rb_gst_caps_subtract (VALUE self, VALUE caps)
+rg_subtract (VALUE self, VALUE caps)
 {
     return RGST_CAPS_NEW (gst_caps_subtract (RGST_CAPS (self), RGST_CAPS
                                              (caps)));
 }
 
 static VALUE
-each(VALUE self)
+rg_each(VALUE self)
 {
     int i, size;
     GstCaps *caps;
@@ -390,49 +400,46 @@ each(VALUE self)
 }
 
 void
-Init_gst_caps (void)
+Init_gst_caps (VALUE mGst)
 {
-    VALUE cGstCaps;
-
-    cGstCaps = G_DEF_CLASS (GST_TYPE_CAPS, "Caps", mGst);
-
-    rb_include_module(cGstCaps, rb_mEnumerable);
-
-    rb_define_singleton_method(cGstCaps, "parse",
-                               rb_gst_caps_from_string, 1);
-
-    rb_define_method(cGstCaps, "initialize", rb_gst_caps_new, -1);
-    rb_define_method(cGstCaps, "set_any", rb_gst_caps_set_any, 1);
-    rb_define_method(cGstCaps, "append", rb_gst_caps_append, 1);
-    rb_define_method(cGstCaps, "append_structure",
-                     rb_gst_caps_append_structure, 1);
-    rb_define_method(cGstCaps, "size", rb_gst_caps_get_size, 0);
-    rb_define_alias(cGstCaps, "length", "size");
-    rb_define_method(cGstCaps, "get_structure", rb_gst_caps_get_structure, 1);
-    rb_define_alias(cGstCaps, "[]", "get_structure");
-    rb_define_method(cGstCaps, "set_simple", rb_gst_caps_set_simple, 2);
-    rb_define_method(cGstCaps, "any?", rb_gst_caps_is_any, 0);
-    rb_define_method(cGstCaps, "empty?", rb_gst_caps_is_empty, 0);
-    rb_define_method(cGstCaps, "simple?", rb_gst_caps_is_simple, 0);
-    rb_define_alias(cGstCaps, "chained?", "simple?");
-    rb_define_method(cGstCaps, "fixed?", rb_gst_caps_is_fixed, 0);
-    rb_define_method(cGstCaps, "equal?", rb_gst_caps_is_equal, 1);
-    rb_define_alias(cGstCaps, "==", "equal?");
-    rb_define_method(cGstCaps, "equal_fixed?", rb_gst_caps_is_equal_fixed, 1);
-    rb_define_method(cGstCaps, "always_compatible?",
-                     rb_gst_caps_is_always_compatible, 1);
-    rb_define_method(cGstCaps, "subset?", rb_gst_caps_is_subset, 1);
-    rb_define_method(cGstCaps, "intersect", rb_gst_caps_intersect, 1);
-    rb_define_method(cGstCaps, "union", rb_gst_caps_union, 1);
-    rb_define_method(cGstCaps, "normalize", rb_gst_caps_normalize, 0);
-    rb_define_method(cGstCaps, "simplify!", rb_gst_caps_do_simplify, 0);
-    rb_define_method(cGstCaps, "replace!", rb_gst_caps_replace, 1);
-    rb_define_method(cGstCaps, "to_s", rb_gst_caps_to_string, 0);
-    rb_define_method(cGstCaps, "subtract", rb_gst_caps_subtract, 1);
-
-    rb_define_method(cGstCaps, "each", each, 0);
-
-    G_DEF_SETTERS(cGstCaps);
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS (GST_TYPE_CAPS, "Caps", mGst);
+
+    rb_include_module(RG_TARGET_NAMESPACE, rb_mEnumerable);
+
+    RG_DEF_SMETHOD(parse, 1);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(set_any, 1);
+    RG_DEF_METHOD(append, 1);
+    RG_DEF_METHOD(append_structure, 1);
+    RG_DEF_METHOD(size, 0);
+    RG_DEF_ALIAS("length", "size");
+    RG_DEF_METHOD(get_structure, 1);
+    RG_DEF_ALIAS("[]", "get_structure");
+    RG_DEF_METHOD(set_simple, 2);
+    RG_DEF_METHOD_P(any, 0);
+    RG_DEF_METHOD_P(empty, 0);
+    RG_DEF_METHOD_P(simple, 0);
+    RG_DEF_ALIAS("chained?", "simple?");
+    RG_DEF_METHOD_P(fixed, 0);
+    RG_DEF_METHOD_P(equal, 1);
+    RG_DEF_ALIAS("==", "equal?");
+    RG_DEF_METHOD_P(equal_fixed, 1);
+    RG_DEF_METHOD_P(always_compatible, 1);
+    RG_DEF_METHOD_P(subset, 1);
+    RG_DEF_METHOD(intersect, 1);
+    RG_DEF_METHOD(union, 1);
+    RG_DEF_METHOD(normalize, 0);
+    RG_DEF_METHOD_BANG(simplify, 0);
+    RG_DEF_METHOD_BANG(replace, 1);
+    RG_DEF_METHOD(to_s, 0);
+    RG_DEF_METHOD(subtract, 1);
+
+    RG_DEF_METHOD(each, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
 /* TODO:
     gst_caps_structure_fixate_field_nearest_int ()

data/ext/gstreamer/rbgst-child-proxy.c

@@ -1,33 +1,34 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2008 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  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"
 
 /* need to implement */
+#define RG_TARGET_NAMESPACE cChildProxy
 #define SELF(self) RVAL2GST_CHILD_PROXY(self)
 
 void
-Init_gst_child_proxy(void)
+Init_gst_child_proxy(VALUE mGst)
 {
-    VALUE rb_mGstChildProxy;
+    VALUE RG_TARGET_NAMESPACE;
 
-    rb_mGstChildProxy = G_DEF_CLASS(GST_TYPE_CHILD_PROXY, "ChildProxy", mGst);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GST_TYPE_CHILD_PROXY, "ChildProxy", mGst);
 }

data/ext/gstreamer/rbgst-clock.c

@@ -1,26 +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 cClock
 #define SELF(obj) (RVAL2GST_CLOCK(obj))
 
 /*  Class: Gst::Clock
@@ -31,7 +33,7 @@
  * Returns: the accuracy of the clock.
  */
 static VALUE
-get_resolution(VALUE self)
+rg_resolution(VALUE self)
 {
     return ULL2NUM(gst_clock_get_resolution(SELF(self)));
 }
@@ -45,7 +47,7 @@ get_resolution(VALUE self)
  * Returns: self.
  */
 static VALUE
-set_resolution(VALUE self, VALUE resolution)
+rg_set_resolution(VALUE self, VALUE resolution)
 {
     return ULL2NUM(gst_clock_set_resolution(SELF(self), NUM2ULL(resolution)));
 }
@@ -54,7 +56,7 @@ set_resolution(VALUE self, VALUE resolution)
  * Returns: the time of the clock (in nanoseconds).
  */
 static VALUE
-get_time(VALUE self)
+rg_time(VALUE self)
 {
     return ULL2NUM(gst_clock_get_time(SELF(self)));
 }
@@ -67,7 +69,7 @@ get_time(VALUE self)
  * false otherwise.
  */
 static VALUE
-equal_p(VALUE self, VALUE other_clock)
+rg_operator_equal_p(VALUE self, VALUE other_clock)
 {
     if (NIL_P(other_clock))
         return Qfalse;
@@ -80,11 +82,11 @@ equal_p(VALUE self, VALUE other_clock)
 }
 
 void
-Init_gst_clock (void)
+Init_gst_clock (VALUE mGst)
 {
-    VALUE rb_cGstClock, rb_mGstClockTime;
+    VALUE RG_TARGET_NAMESPACE, rb_mGstClockTime;
 
-    rb_cGstClock = G_DEF_CLASS(GST_TYPE_CLOCK, "Clock", mGst);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GST_TYPE_CLOCK, "Clock", mGst);
 
     rb_define_const(mGst, "SECOND", LL2NUM(GST_SECOND));
     rb_define_const(mGst, "MSECOND", LL2NUM(GST_MSECOND));
@@ -94,15 +96,15 @@ Init_gst_clock (void)
     rb_mGstClockTime = rb_define_module_under(mGst, "ClockTime");
     rb_define_const(rb_mGstClockTime, "NONE", ULL2NUM(GST_CLOCK_TIME_NONE));
 
-    G_DEF_CLASS(GST_TYPE_CLOCK_FLAGS, "Flags", rb_cGstClock);
-    G_DEF_CONSTANTS(rb_cGstClock, GST_TYPE_CLOCK_FLAGS, "GST_CLOCK_");
-    G_DEF_CLASS(GST_TYPE_CLOCK_RETURN, "Return", rb_cGstClock);
-    G_DEF_CONSTANTS(rb_cGstClock, GST_TYPE_CLOCK_RETURN, "GST_CLOCK_");
+    G_DEF_CLASS(GST_TYPE_CLOCK_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_CLOCK_FLAGS, "GST_CLOCK_");
+    G_DEF_CLASS(GST_TYPE_CLOCK_RETURN, "Return", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_CLOCK_RETURN, "GST_CLOCK_");
 
-    rb_define_method(rb_cGstClock, "resolution", get_resolution, 0);
-    rb_define_method(rb_cGstClock, "set_resolution", set_resolution, 1);
-    rb_define_method(rb_cGstClock, "time", get_time, 0);
-    rb_define_method(rb_cGstClock, "==", equal_p, 1);
+    RG_DEF_METHOD(resolution, 0);
+    RG_DEF_METHOD(set_resolution, 1);
+    RG_DEF_METHOD(time, 0);
+    RG_DEF_METHOD_OPERATOR("==", equal_p, 1);
 
-    G_DEF_SETTERS(rb_cGstClock);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }