gstreamer 1.0.3 → 1.1.0

data/Rakefile

@@ -1,15 +1,213 @@
 # -*- ruby -*-
 
 require './../glib2/lib/gnome2-raketask'
+require 'open-uri'
 
 package = GNOME2Package.new do |_package|
   _package.summary = "Ruby/GStreamer is a Ruby binding for GStreamer."
   _package.description = "Ruby/GStreamer is a Ruby binding for GStreamer."
   _package.dependency.gem.runtime = ["glib2"]
-  # TODO: use http://code.google.com/p/ossbuild/downloads/list ???
-  _package.win32.packages = []
-  _package.win32.dependencies = []
+  _package.win32.packages = ["libsoup"]
+  _package.win32.dependencies = ["jpeg", "libxml2"]
   _package.post_install_message = "This library is experimental."
+  _package.cross_compiling do |spec|
+    if /mingw|mswin/ =~ spec.platform.to_s
+      spec.add_runtime_dependency("cairo", ">= 1.10.1")
+      spec.add_runtime_dependency("pango", ">= #{_package.version}")
+      spec.add_runtime_dependency("gdk_pixbuf2", ">= #{_package.version}")
+    end
+  end
 end
 package.define_tasks
 
+namespace :win32 do
+  host = "i686-w64-mingw32"
+
+  dist_dir = Pathname.new("vendor/local").expand_path
+  license_dir = dist_dir + "share" + "license"
+  tmp_dir = Pathname.new("tmp").expand_path
+  download_dir = tmp_dir + "download"
+
+  rcairo_win32_path = ENV["RCAIRO_WIN32_PATH"] || "../../rcairo.win32"
+  rcairo_win32_path = File.expand_path(rcairo_win32_path)
+  rcairo_win32_include_path = "#{rcairo_win32_path}/vendor/local/include"
+  rcairo_win32_lib_path = "#{rcairo_win32_path}/vendor/local/lib"
+
+  xiph_download_url_base = "http://downloads.xiph.org/releases"
+  freedesktop_download_url_base = "http://gstreamer.freedesktop.org/src"
+  packages = [
+    {
+      :name => "libogg",
+      :download_base_url => "#{xiph_download_url_base}/ogg",
+      :label => "Ogg",
+      :version => "1.3.0",
+      :configure_args => [],
+    },
+    {
+      :name => "libvorbis",
+      :download_base_url => "#{xiph_download_url_base}/vorbis",
+      :label => "Vorbis",
+      :version => "1.3.2",
+      :configure_args => [],
+    },
+    {
+      :name => "libtheora",
+      :download_base_url => "#{xiph_download_url_base}/theora",
+      :label => "Theora",
+      :version => "1.1.1",
+      :configure_args => [],
+    },
+    # {
+    #   :name => "flac",
+    #   :download_base_url => "#{xiph_download_url_base}/flac",
+    #   :label => "FLAC",
+    #   :version => "1.2.1",
+    #   :configure_args => ["--disable-cpplibs"],
+    # },
+    {
+      :name => "speex",
+      :download_base_url => "#{xiph_download_url_base}/speex",
+      :label => "Speex",
+      :version => "1.2rc1",
+      :configure_args => [],
+    },
+    {
+      :name => "gstreamer",
+      :download_base_url => "#{freedesktop_download_url_base}/gstreamer",
+      :label => "GStreamer",
+      :version => "0.10.35",
+      :configure_args => ["--enable-check"],
+    },
+    {
+      :name => "gst-plugins-base",
+      :download_base_url => "#{freedesktop_download_url_base}/gst-plugins-base",
+      :label => "GStreamer plugins (base)",
+      :version => "0.10.35",
+      :configure_args => ["--disable-gnome_vfs"],
+    },
+    {
+      :name => "gst-plugins-good",
+      :download_base_url => "#{freedesktop_download_url_base}/gst-plugins-good",
+      :label => "GStreamer plugins (good)",
+      :version => "0.10.30",
+      :configure_args => ["--disable-gconf"],
+    },
+    {
+      :name => "gst-plugins-bad",
+      :download_base_url => "#{freedesktop_download_url_base}/gst-plugins-bad",
+      :label => "GStreamer plugins (bad)",
+      :version => "0.10.22",
+      :configure_args => ["--disable-librfb"],
+    },
+    {
+      :name => "gst-ffmpeg",
+      :download_base_url => "#{freedesktop_download_url_base}/gst-ffmpeg",
+      :label => "GStreamer ffmpeg",
+      :version => "0.10.12",
+      :configure_args => ["--with-ffmpeg-extra-configure=" +
+                            "--cross-prefix=#{host}- " +
+                            "--target-os=mingw32 " +
+                            "--arch=i686 " +
+                            "--pkg-config=pkg-config"],
+      :bundled_packages => [
+        {
+          :name => "libav",
+          :path => "gst-libs/ext/libav",
+          :license_files => ["LICENSE", "CREDITS",
+                             "COPYING.GPLv2", "COPYING.GPLv3",
+                             "COPYING.LGPLv2.1", "COPYING.LGPLv3"],
+        }
+      ],
+    },
+  ]
+
+  namespace :download do
+    packages.each do |_package|
+      base = "#{_package[:name]}-#{_package[:version]}"
+      tar_gz = "#{base}.tar.gz"
+      tar_gz_url = "#{_package[:download_base_url]}/#{tar_gz}"
+      tar_gz_full_path = download_dir + tar_gz
+
+      desc "Download #{_package[:label]} into #{download_dir}."
+      task _package[:name] => tar_gz_full_path.to_s
+
+      directory_path = tar_gz_full_path.dirname
+      directory directory_path.to_s
+      file tar_gz_full_path.to_s => directory_path.to_s do
+        rake_output_message "downloading... #{tar_gz_url}"
+        open(tar_gz_url) do |downloaded_tar_gz|
+          tar_gz_full_path.open("wb") do |tar_gz_file|
+            tar_gz_file.print(downloaded_tar_gz.read)
+          end
+        end
+      end
+    end
+  end
+
+  namespace :build do
+    task :prepare do
+      depended_packages = ["glib2", "atk", "pango", "gdk_pixbuf2", "gtk2"]
+      pkg_config_path = (["gstreamer"] + depended_packages).collect do |_package|
+        "../#{_package}/vendor/local/lib/pkgconfig"
+      end
+      ENV["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
+        File.expand_path(path)
+      end.join(":")
+      ENV["PKG_CONFIG_LIBDIR"] = "#{rcairo_win32_path}/vendor/local/lib/pkgconfig"
+    end
+
+    packages.each do |_package|
+      desc "Build #{_package[:label]} and install it into #{dist_dir}."
+      task _package[:name] => [:prepare, "win32:download:#{_package[:name]}"] do
+        package_tmp_dir = tmp_dir + _package[:name]
+        rm_rf(package_tmp_dir)
+        mkdir_p(package_tmp_dir)
+
+        base = "#{_package[:name]}-#{_package[:version]}"
+        tar_gz = "#{base}.tar.gz"
+        tar_gz_full_path = download_dir + tar_gz
+        Dir.chdir(package_tmp_dir.to_s) do
+          sh("tar", "xzf", tar_gz_full_path.to_s) or exit(false)
+        end
+
+        Dir.chdir((package_tmp_dir + base).to_s) do
+          sh("./configure",
+             "CPPFLAGS=-I#{rcairo_win32_include_path} -I#{dist_dir + 'include'}",
+             "LDFLAGS=-L#{rcairo_win32_lib_path} -L#{dist_dir + 'lib'}",
+             "--prefix=#{dist_dir}",
+             "--host=#{host}",
+             *_package[:configure_args]) or exit(false)
+          common_make_args = []
+          common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
+          build_make_args = common_make_args.dup
+          install_make_args = common_make_args.dup
+          make_n_jobs = ENV["MAKE_N_JOBS"]
+          build_make_args << "-j#{make_n_jobs}" if make_n_jobs
+          ENV["GREP_OPTIONS"] = "--text"
+          sh("nice", "make", *build_make_args) or exit(false)
+          sh("make", "install", *install_make_args) or exit(false)
+
+          package_license_dir = license_dir + _package[:name]
+          mkdir_p(package_license_dir)
+          package_license_files = ["AUTHORS", "COPYING", "COPYING.LIB"]
+          package_license_files = package_license_files.reject do |file|
+            not File.exist?(file)
+          end
+          cp(package_license_files, package_license_dir)
+          bundled_packages = _package[:bundled_packages] || []
+          bundled_packages.each do |bundled_package|
+            bundled_package_license_dir = license_dir + bundled_package[:name]
+            mkdir_p(bundled_package_license_dir)
+            license_files = bundled_package[:license_files].collect do |file|
+              File.join(bundled_package[:path], file)
+            end
+            cp(license_files, bundled_package_license_dir)
+          end
+        end
+      end
+    end
+  end
+
+  desc "Build GStreamer binaries"
+  task :build => packages.collect {|_package| "win32:build:#{_package[:name]}"}
+end

data/ext/gstreamer/extconf.rb

@@ -19,7 +19,7 @@ end
 
 $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 
-module_name = "gst"
+module_name = "gstreamer"
 package_id = "gstreamer-0.10"
 
 begin
@@ -30,6 +30,15 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
+["glib2"].each do |package|
+  directory = "#{package}#{version_suffix}"
+  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  add_depend_package(package, "#{directory}/ext/#{package}",
+                     top_dir.to_s,
+                     :top_build_dir => top_build_dir.to_s,
+                     :target_build_dir => build_dir)
+end
+
 setup_win32(module_name, base_dir)
 
 PKGConfig.have_package(package_id) or exit 1
@@ -47,15 +56,6 @@ if PKGConfig.have_package("gstreamer-pbutils-0.10")
   $CFLAGS += " -DHAVE_GST_PBUTILS"
 end
 
-["glib2"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{package}",
-                     top_dir.to_s,
-                     :top_build_dir => top_build_dir.to_s,
-                     :target_build_dir => build_dir)
-end
-
 create_pkg_config_file("Ruby/GStreamer", package_id)
 $defs << "-DRUBY_GST_COMPILATION"
 create_makefile(module_name)

data/ext/gstreamer/misc.c

@@ -1,24 +1,25 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
+ *  Copyright (C) 2011  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"
 
 VALUE
 rb_str_new_with_format (char *fmt, ...)

data/ext/gstreamer/rbgst-bin.c

@@ -1,27 +1,28 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
- *                     2004 Erwan Loisant <erwan@loisant.org>
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
+ *                      2004 Erwan Loisant <erwan@loisant.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 cBin
 #define SELF(self) RVAL2GST_BIN(self)
 
 /* Class: Gst::Bin
@@ -41,7 +42,7 @@
  * Returns: a newly allocated Gst::Bin object.
  */
 static VALUE
-rb_gst_bin_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     GstElement *bin;
     VALUE name;
@@ -60,7 +61,7 @@ rb_gst_bin_initialize(int argc, VALUE *argv, VALUE self)
  * Returns: the number of elements in the container.
  */
 static VALUE
-rb_gst_bin_size(VALUE self)
+rg_size(VALUE self)
 {
     return INT2NUM(GST_BIN_NUMCHILDREN(SELF(self)));
 }
@@ -75,7 +76,7 @@ rb_gst_bin_size(VALUE self)
  * implements the interface.
  */
 static VALUE
-rb_gst_bin_get_children(int argc, VALUE *argv, VALUE self)
+rg_children(int argc, VALUE *argv, VALUE self)
 {
     VALUE children, iface;
 
@@ -106,7 +107,7 @@ rb_gst_bin_get_children(int argc, VALUE *argv, VALUE self)
  * bins.
  */
 static VALUE
-rb_gst_bin_get_children_recurse(VALUE self)
+rg_children_recurse(VALUE self)
 {
    GstIterator *iter;
    VALUE children;
@@ -118,19 +119,19 @@ rb_gst_bin_get_children_recurse(VALUE self)
 }
 
 static VALUE
-rb_gst_bin_get_children_cookie(VALUE self)
+rg_children_cookie(VALUE self)
 {
     return UINT2NUM(GST_BIN_CHILDREN_COOKIE(SELF(self)));
 }
 
 static VALUE
-rb_gst_bin_get_child_bus(VALUE self)
+rg_child_bus(VALUE self)
 {
     return GST_BUS2RVAL(SELF(self)->child_bus);
 }
 
 static VALUE
-rb_gst_bin_get_messages(VALUE self)
+rg_messages(VALUE self)
 {
     GList *node;
     VALUE messages;
@@ -144,13 +145,13 @@ rb_gst_bin_get_messages(VALUE self)
 }
 
 static VALUE
-rb_gst_bin_polling_p(VALUE self)
+rg_polling_p(VALUE self)
 {
     return CBOOL2RVAL(SELF(self)->polling);
 }
 
 static VALUE
-rb_gst_bin_clock_dirty_p(VALUE self)
+rg_clock_dirty_p(VALUE self)
 {
     return CBOOL2RVAL(SELF(self)->clock_dirty);
 }
@@ -164,7 +165,7 @@ rb_gst_bin_clock_dirty_p(VALUE self)
  * Returns: a Gst::Clock object, or nil.
  */
 static VALUE
-rb_gst_bin_get_provided_clock(VALUE self)
+rg_provided_clock(VALUE self)
 {
     return GST_CLOCK2RVAL(SELF(self)->provided_clock);
 }
@@ -179,7 +180,7 @@ rb_gst_bin_get_provided_clock(VALUE self)
  * Returns: self.
  */
 static VALUE
-rb_gst_bin_set_provided_clock(VALUE self, VALUE clock)
+rg_set_provided_clock(VALUE self, VALUE clock)
 {
     GstBin *bin;
 
@@ -195,7 +196,7 @@ rb_gst_bin_set_provided_clock(VALUE self, VALUE clock)
 }
 
 static VALUE
-rb_gst_bin_get_clock_provider(VALUE self)
+rg_clock_provider(VALUE self)
 {
     return GST_ELEMENT2RVAL(SELF(self)->clock_provider);
 }
@@ -209,7 +210,7 @@ rb_gst_bin_get_clock_provider(VALUE self)
  * Returns: self.
  */
 static VALUE
-rb_gst_bin_add(VALUE self, VALUE element)
+rg_operator_add(VALUE self, VALUE element)
 {
     VALUE klass = GTYPE2CLASS(GST_TYPE_ELEMENT);
 
@@ -230,17 +231,16 @@ rb_gst_bin_add(VALUE self, VALUE element)
  * Returns: nil.
  */
 static VALUE
-rb_gst_bin_add_multi(int argc, VALUE *argv, VALUE self)
+rg_add(int argc, VALUE *argv, VALUE self)
 {
     int i;
 
     for (i = 0; i < argc; i++) {
-        rb_gst_bin_add(self, argv[i]);
+        rg_operator_add(self, argv[i]);
     }
     return Qnil;
 }
 
-
 /*
  * Method: remove(*elements)
  * elements: a list of Gst::Element objects.
@@ -251,7 +251,7 @@ rb_gst_bin_add_multi(int argc, VALUE *argv, VALUE self)
  * Returns: nil.
  */
 static VALUE
-rb_gst_bin_remove(int argc, VALUE *argv, VALUE self)
+rg_remove(int argc, VALUE *argv, VALUE self)
 {
     int i;
     GstBin *bin;
@@ -272,7 +272,7 @@ rb_gst_bin_remove(int argc, VALUE *argv, VALUE self)
  * Returns: nil.
  */
 static VALUE
-rb_gst_bin_clear(VALUE self)
+rg_clear(VALUE self)
 {
     GstBin *bin;
     GList *node, *children;
@@ -296,9 +296,9 @@ rb_gst_bin_clear(VALUE self)
  * Returns: always nil.
  */
 static VALUE
-rb_gst_bin_each_element(int argc, VALUE *argv, VALUE self)
+rg_each(int argc, VALUE *argv, VALUE self)
 {
-    return rb_ary_yield(rb_gst_bin_get_children(argc, argv, self));
+    return rb_ary_yield(rg_children(argc, argv, self));
 }
 
 /*
@@ -310,9 +310,9 @@ rb_gst_bin_each_element(int argc, VALUE *argv, VALUE self)
  * Returns: always nil.
  */
 static VALUE
-rb_gst_bin_each_recurse_element(VALUE self)
+rg_each_recurse(VALUE self)
 {
-    return rb_ary_yield(rb_gst_bin_get_children_recurse(self));
+    return rb_ary_yield(rg_children_recurse(self));
 }
 
 /*
@@ -340,7 +340,7 @@ rb_gst_bin_each_recurse_element(VALUE self)
  * an element with the given name nor implementing the interface.
  */
 static VALUE
-rb_gst_bin_get(int argc, VALUE *argv, VALUE self)
+rg_get_child(int argc, VALUE *argv, VALUE self)
 {
     VALUE index_or_name_or_interface, recurse;
     GstElement *element = NULL;
@@ -374,27 +374,27 @@ rb_gst_bin_get(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-rb_gst_bin_get_sinks(VALUE self)
+rg_sinks(VALUE self)
 {
     return _rbgst_collect_elements(gst_bin_iterate_sinks(SELF(self)));
 }
 
 static VALUE
-rb_gst_bin_get_sources(VALUE self)
+rg_sources(VALUE self)
 {
     return _rbgst_collect_elements(gst_bin_iterate_sources(SELF(self)));
 }
 
 #ifdef GST_DEBUG_BIN_TO_DOT_FILE
 static VALUE
-rb_gst_bin_to_dot_file(VALUE self, VALUE details, VALUE filename)
+rg_to_dot_file(VALUE self, VALUE details, VALUE filename)
 {
     GST_DEBUG_BIN_TO_DOT_FILE(SELF(self), NUM2INT(details), RVAL2CSTR(filename));
     return Qnil;
 }
 
 static VALUE
-rb_gst_bin_to_dot_file_with_ts(VALUE self, VALUE details, VALUE filename)
+rg_to_dot_file_with_ts(VALUE self, VALUE details, VALUE filename)
 {
     GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(SELF(self),
                                       NUM2INT(details),
@@ -404,63 +404,55 @@ rb_gst_bin_to_dot_file_with_ts(VALUE self, VALUE details, VALUE filename)
 #endif
 
 void
-Init_gst_bin (void)
+Init_gst_bin (VALUE mGst)
 {
-    VALUE rb_cGstBin;
-
-    rb_cGstBin = G_DEF_CLASS(GST_TYPE_BIN, "Bin", mGst);
+    VALUE RG_TARGET_NAMESPACE;
 
-    rb_include_module(rb_cGstBin, rb_mEnumerable);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GST_TYPE_BIN, "Bin", mGst);
 
-    rb_define_method(rb_cGstBin, "initialize", rb_gst_bin_initialize, -1);
+    rb_include_module(RG_TARGET_NAMESPACE, rb_mEnumerable);
 
-    rb_define_method(rb_cGstBin, "size", rb_gst_bin_size, 0);
-    rb_define_alias(rb_cGstBin, "length", "size");
+    RG_DEF_METHOD(initialize, -1);
 
-    rb_define_method(rb_cGstBin, "children", rb_gst_bin_get_children, -1);
-    rb_define_method(rb_cGstBin, "each", rb_gst_bin_each_element, -1);
+    RG_DEF_METHOD(size, 0);
+    RG_DEF_ALIAS("length", "size");
 
-    rb_define_method(rb_cGstBin, "children_recurse", 
-                     rb_gst_bin_get_children_recurse, 0);
-    rb_define_method(rb_cGstBin, "each_recurse", 
-                     rb_gst_bin_each_recurse_element, 0);
+    RG_DEF_METHOD(children, -1);
+    RG_DEF_METHOD(each, -1);
 
-    rb_define_method(rb_cGstBin, "children_cookie",
-                     rb_gst_bin_get_children_cookie, 0);
-    rb_define_method(rb_cGstBin, "child_bus", rb_gst_bin_get_child_bus, 0);
-    rb_define_method(rb_cGstBin, "messages", rb_gst_bin_get_messages, 0);
-    rb_define_method(rb_cGstBin, "polling?", rb_gst_bin_polling_p, 0);
-    rb_define_method(rb_cGstBin, "clock_dirty?", rb_gst_bin_clock_dirty_p, 0);
-    rb_define_method(rb_cGstBin, "provided_clock",
-                     rb_gst_bin_get_provided_clock, 0);
-    rb_define_method(rb_cGstBin, "set_provided_clock",
-                     rb_gst_bin_set_provided_clock, 1);
-    rb_define_method(rb_cGstBin, "clock_provider",
-                     rb_gst_bin_get_clock_provider, 0);
+    RG_DEF_METHOD(children_recurse, 0);
+    RG_DEF_METHOD(each_recurse, 0);
 
+    RG_DEF_METHOD(children_cookie, 0);
+    RG_DEF_METHOD(child_bus, 0);
+    RG_DEF_METHOD(messages, 0);
+    RG_DEF_METHOD_P(polling, 0);
+    RG_DEF_METHOD_P(clock_dirty, 0);
+    RG_DEF_METHOD(provided_clock, 0);
+    RG_DEF_METHOD(set_provided_clock, 1);
+    RG_DEF_METHOD(clock_provider, 0);
 
-    rb_define_method(rb_cGstBin, "<<", rb_gst_bin_add, 1);
-    rb_define_method(rb_cGstBin, "add", rb_gst_bin_add_multi, -1);
-    rb_define_method(rb_cGstBin, "remove", rb_gst_bin_remove, -1);
-    rb_define_method(rb_cGstBin, "clear", rb_gst_bin_clear, 0);
+    RG_DEF_METHOD_OPERATOR("<<", add, 1);
+    RG_DEF_METHOD(add, -1);
+    RG_DEF_METHOD(remove, -1);
+    RG_DEF_METHOD(clear, 0);
 
-    rb_define_method(rb_cGstBin, "get_child", rb_gst_bin_get, -1);
+    RG_DEF_METHOD(get_child, -1);
 
-    rb_define_method(rb_cGstBin, "sinks", rb_gst_bin_get_sinks, 0);
-    rb_define_method(rb_cGstBin, "sources", rb_gst_bin_get_sources, 0);
+    RG_DEF_METHOD(sinks, 0);
+    RG_DEF_METHOD(sources, 0);
 
 #ifdef GST_DEBUG_BIN_TO_DOT_FILE
-    rb_define_method(rb_cGstBin, "to_dot_file", rb_gst_bin_to_dot_file, 2);
-    rb_define_method(rb_cGstBin, "to_dot_file_with_ts",
-                     rb_gst_bin_to_dot_file_with_ts, 2);
+    RG_DEF_METHOD(to_dot_file, 2);
+    RG_DEF_METHOD(to_dot_file_with_ts, 2);
 #endif
 
-    G_DEF_SETTERS(rb_cGstBin);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
-    G_DEF_CLASS(GST_TYPE_BIN_FLAGS, "Flags", rb_cGstBin);
-    G_DEF_CONSTANTS(rb_cGstBin, GST_TYPE_BIN_FLAGS, "GST_BIN_");
+    G_DEF_CLASS(GST_TYPE_BIN_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_BIN_FLAGS, "GST_BIN_");
 #ifdef GST_DEBUG_BIN_TO_DOT_FILE
-    G_DEF_CONSTANTS(rb_cGstBin, GST_TYPE_DEBUG_GRAPH_DETAILS,
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GST_TYPE_DEBUG_GRAPH_DETAILS,
         "GST_DEBUG_GRAPH_");
 #endif
 }