gstreamer 1.2.6 → 2.0.0

data/Rakefile

@@ -6,108 +6,152 @@ require 'gnome2-raketask'
 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"]
+  _package.dependency.gem.runtime = ["glib2", "gobject-introspection"]
   _package.win32.packages = ["libsoup"]
   _package.win32.dependencies = ["jpeg", "libxml2"]
+  _package.win32.build_dependencies = [
+    "glib2", "atk", "pango", "gdk_pixbuf2", "gtk2", "gobject-introspection",
+  ]
   xiph_download_url_base = "http://downloads.xiph.org/releases"
   freedesktop_download_url_base = "http://gstreamer.freedesktop.org/src"
   sf_net_download_url_base = "http://downloads.sourceforge.net/project"
   libmad_version = "0.15.1b"
-  _package.win32.build_packages = [
+  _package.external_packages = [
     {
       :name => "libogg",
       :download_base_url => "#{xiph_download_url_base}/ogg",
       :label => "Ogg",
       :version => "1.3.0",
-      :configure_args => [],
+      :windows => {
+        :configure_args => [],
+      },
     },
     {
       :name => "libvorbis",
       :download_base_url => "#{xiph_download_url_base}/vorbis",
       :label => "Vorbis",
       :version => "1.3.2",
-      :configure_args => [],
+      :windows => {
+        :configure_args => [],
+      },
     },
     {
       :name => "libtheora",
       :download_base_url => "#{xiph_download_url_base}/theora",
       :label => "Theora",
       :version => "1.1.1",
-      :configure_args => [],
+      :windows => {
+        :configure_args => [],
+        :build_concurrently => false,
+      },
     },
     # {
     #   :name => "libmad",
     #   :download_base_url => "#{sf_net_download_url_base}/mad/libmad/#{libmad_version}",
     #   :label => "MAD",
     #   :version => libmad_version,
-    #   :configure_args => ["CFLAGS=-O3 -march=i686"],
-    #   :need_autoreconf => true,
-    #   :patches => ["libmad-0.15.1b-fix-mingw-build.diff"],
+    #   :windows => {
+    #     :configure_args => ["CFLAGS=-O3 -march=i686"],
+    #     :need_autoreconf => true,
+    #     :patches => ["libmad-0.15.1b-fix-mingw-build.diff"],
+    #   },
     # },
     {
       :name => "flac",
       :download_base_url => "#{xiph_download_url_base}/flac",
       :label => "FLAC",
       :version => "1.2.1",
-      :configure_args => ["--disable-cpplibs"],
-      :need_autogen => true,
-      :patches => [
-        "flac-1.2.1-fix-mingw-build.diff",
-        # "flac-1.2.1-fix-doc-install.diff",
-      ],
+      :windows => {
+        :configure_args => ["--disable-cpplibs"],
+        :need_autogen => true,
+        :patches => [
+          "flac-1.2.1-fix-mingw-build.diff",
+          # "flac-1.2.1-fix-doc-install.diff",
+        ],
+      },
     },
     {
       :name => "speex",
       :download_base_url => "#{xiph_download_url_base}/speex",
       :label => "Speex",
       :version => "1.2rc1",
-      :configure_args => [],
+      :windows => {
+        :configure_args => [],
+      },
     },
     {
       :name => "gstreamer",
       :download_base_url => "#{freedesktop_download_url_base}/gstreamer",
       :label => "GStreamer",
-      :version => "0.10.35",
-      :configure_args => ["--enable-check"],
+      :version => "1.0.6",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--enable-check",
+          "--enable-introspection",
+        ],
+        :build_concurrently => false,
+      },
     },
     {
       :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"],
+      :version => "1.0.6",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--enable-introspection",
+        ],
+        :build_concurrently => false,
+      },
     },
     {
       :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", "--disable-shout2"],
+      :version => "1.0.6",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--disable-shout2",
+        ],
+      },
     },
     {
       :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"],
+      :version => "1.0.6",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => ["--disable-librfb"],
+      },
     },
     # {
     #   :name => "gst-plugins-ugly",
     #   :download_base_url => "#{freedesktop_download_url_base}/gst-plugins-ugly",
     #   :label => "GStreamer plugins (ugly)",
-    #   :version => "0.10.18",
-    #   :configure_args => [],
+    #   :version => "1.0.6",
+    #   :compression_method => "xz",
+    #   :windows => {
+    #     :configure_args => [],
+    #   },
     # },
     {
-      :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=#{_package.win32.build_host}- " +
-                            "--target-os=mingw32 " +
-                            "--arch=i686 " +
-                            "--pkg-config=pkg-config"],
+      :name => "gst-libav",
+      :download_base_url => "#{freedesktop_download_url_base}/gst-libav",
+      :label => "GStreamer libav",
+      :version => "1.0.6",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => ["--with-libav-extra-configure=" +
+                              "--cross-prefix=#{_package.win32.build_host}- " +
+                              "--target-os=mingw32 " +
+                              "--arch=i686 " +
+                              "--pkg-config=pkg-config " +
+                              "--disable-gpl"],
+      },
       :bundled_packages => [
         {
           :name => "libav",
@@ -119,11 +163,6 @@ package = GNOME2Package.new do |_package|
       ],
     },
   ]
-  _package.win32.build_dependencies = [
-    "glib2", "atk", "pango", "gdk_pixbuf2", "gtk2",
-  ]
-  _package.win32.support_concurrent_build = false
-  _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")

data/ext/gstreamer/extconf.rb

@@ -20,7 +20,7 @@ end
 $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 
 module_name = "gstreamer"
-package_id = "gstreamer-0.10"
+package_id = "gstreamer-1.0"
 
 begin
   require 'mkmf-gnome2'
@@ -30,9 +30,11 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
-["glib2"].each do |package|
+["glib2", "gobject-introspection"].each do |package|
   directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  build_base_path = "#{directory}/tmp/#{RUBY_PLATFORM}"
+  package_library_name = package.gsub(/-/, "_")
+  build_dir = "#{build_base_path}/#{package_library_name}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",
                      top_dir.to_s,
                      :top_build_dir => top_build_dir.to_s,
@@ -42,30 +44,15 @@ end
 setup_win32(module_name, base_dir)
 
 unless required_pkg_config_package(package_id,
-                                   :debian => "libgstreamer0.10-dev",
+                                   :debian => "libgstreamer1.0-dev",
                                    :redhat => "gstreamer-devel",
                                    :homebrew => "gstreamer",
                                    :macports => "gstreamer")
   exit(false)
 end
-unless required_pkg_config_package("gstreamer-plugins-base-0.10",
-                                   :debian => "libgstreamer-plugins-base0.10-dev",
-                                   :redhat => "gstreamer-plugins-base-devel",
-                                   :homebrew => "gst-plugins-base",
-                                   :macports => "gst-plugins-base")
-  exit(false)
-end
 
-have_header("unistd.h")
-have_header("io.h")
-
-if have_library("gstinterfaces-0.10") and
-    have_header("gst/interfaces/xoverlay.h")
-  $CFLAGS += " -DHAVE_GST_OVERLAY"
-end
-
-if PKGConfig.have_package("gstreamer-pbutils-0.10")
-  $CFLAGS += " -DHAVE_GST_PBUTILS"
+unless PKGConfig.have_package("gobject-introspection-1.0")
+  exit(false)
 end
 
 create_pkg_config_file("Ruby/GStreamer", package_id)
@@ -78,4 +65,3 @@ if pkg_config_dir.is_a?(String)
     makefile.puts("pkgconfigdir=#{pkg_config_dir}")
   end
 end
-

data/ext/gstreamer/rbgst.c

@@ -1,8 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2007  Ruby-GNOME2 Project Team
- *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
+ *  Copyright (C) 2013  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -20,218 +18,108 @@
  *  MA  02110-1301  USA
  */
 
-#include "rbgst-private.h"
+#include <gst/gst.h>
 
-#define RG_TARGET_NAMESPACE mGst
+#include <rb-gobject-introspection.h>
 
-void Init_gstreamer (void);
+extern void Init_gstreamer (void);
 
-/* Module: Gst
- * The GStreamer module.
- */
-VALUE RG_TARGET_NAMESPACE;
-
-static void
-Init_gst_classes (void)
+static gboolean
+rg_gst_bus_func_p(GIArgInfo *info)
 {
-    Init_gst_bin (RG_TARGET_NAMESPACE);
-    Init_gst_bus(RG_TARGET_NAMESPACE);
-    Init_gst_caps (RG_TARGET_NAMESPACE);
-    Init_gst_child_proxy(RG_TARGET_NAMESPACE);
-    Init_gst_clock (RG_TARGET_NAMESPACE);
-    Init_gst_clock_entry (RG_TARGET_NAMESPACE);
-    Init_gst_element (RG_TARGET_NAMESPACE);
-    Init_gst_elementfactory (RG_TARGET_NAMESPACE);
-    Init_gst_seek(RG_TARGET_NAMESPACE);
-    Init_gst_format (RG_TARGET_NAMESPACE);
-    Init_gst_structure(RG_TARGET_NAMESPACE);
-    Init_gst_index (RG_TARGET_NAMESPACE);
-    Init_gst_indexentry (RG_TARGET_NAMESPACE);
-    Init_gst_indexfactory (RG_TARGET_NAMESPACE);
-    Init_gst_object (RG_TARGET_NAMESPACE);
-    Init_gst_pad (RG_TARGET_NAMESPACE);
-    Init_gst_pad_template(RG_TARGET_NAMESPACE);
-    Init_gst_ghost_pad(RG_TARGET_NAMESPACE);
-    Init_gst_parse (RG_TARGET_NAMESPACE);
-    Init_gst_pipeline (RG_TARGET_NAMESPACE);
-    Init_gst_plugin (RG_TARGET_NAMESPACE);
-    Init_gst_plugin_feature(RG_TARGET_NAMESPACE);
-    Init_gst_querytype (RG_TARGET_NAMESPACE);
-    Init_gst_registry (RG_TARGET_NAMESPACE);
-    Init_gst_static_caps(RG_TARGET_NAMESPACE);
-    Init_gst_static_pad_template(RG_TARGET_NAMESPACE);
-    Init_gst_systemclock (RG_TARGET_NAMESPACE);
-    Init_gst_tag (RG_TARGET_NAMESPACE);
-    Init_gst_tag_setter (RG_TARGET_NAMESPACE);
-    Init_gst_typefindfactory (RG_TARGET_NAMESPACE);
-    Init_gst_value(RG_TARGET_NAMESPACE);
-    Init_gst_xml (RG_TARGET_NAMESPACE);
-
-    Init_gst_mini_object(RG_TARGET_NAMESPACE);
-    Init_gst_buffer(RG_TARGET_NAMESPACE);
-    Init_gst_message(RG_TARGET_NAMESPACE);
-    Init_gst_query(RG_TARGET_NAMESPACE);
-    Init_gst_event(RG_TARGET_NAMESPACE);
-
-#if defined(HAVE_GST_OVERLAY)
-    Init_gst_x_overlay (RG_TARGET_NAMESPACE);
-#endif
-
-#ifdef HAVE_MEDIA_INFO
-    Init_gst_mediatype (RG_TARGET_NAMESPACE);
-#endif
-
-#ifdef HAVE_GST_PBUTILS
-    Init_gst_install_plugins_context (RG_TARGET_NAMESPACE);
-    Init_gst_install_plugins (RG_TARGET_NAMESPACE);
-    Init_gst_install_plugins_return (RG_TARGET_NAMESPACE);
-#endif
-}
+    GITypeInfo type_info;
+    GIBaseInfo *interface_info;
+    const gchar *namespace;
+    const gchar *name;
+    gboolean gst_bus_func_p = FALSE;
+
+    g_arg_info_load_type(info, &type_info);
+    interface_info = g_type_info_get_interface(&type_info);
+    namespace = g_base_info_get_namespace(interface_info);
+    name = g_base_info_get_name(interface_info);
+    if (strcmp(namespace, "Gst") == 0 && strcmp(name, "BusFunc") == 0) {
+        gst_bus_func_p = TRUE;
+    }
+    g_base_info_unref(interface_info);
 
-/*
- * Class method: init(*args)
- *
- * Initializes the GStreamer library (using *args), setting up internal path 
- * lists, registering built-in elements, and loading standard plugins.
- *  
- * If *args are ommited, GStreamer will be initialized using arguments from the 
- * Ruby command line.
- *
- * A RuntimeError exception will be raised if GStreamer could not be initialized.
- *
- * Returns: always true, or an exception on failure.
- */
+    return gst_bus_func_p;
+}
 
-static VALUE
-rg_s_init (int argc, VALUE * argv, G_GNUC_UNUSED VALUE self)
+static gboolean
+rg_gst_bus_func_callback(GstBus *bus, GstMessage *message, gpointer user_data)
 {
-    gint i, gargc;
-    VALUE argary;
-    gchar **gargv;
-    GError *error = NULL;
-    static gboolean initialized = FALSE;
-
-    if (initialized)
-        return Qtrue;
-    initialized = TRUE;
-
-    /*
-     * Convert arguments in a Ruby array.
-     * If no arguments are provided, we use the command line ones.
-     */
-    rb_scan_args (argc, argv, "01", &argary);
-
-    if (NIL_P (argary)) {
-        argary = rb_const_get(rb_cObject, rb_intern("ARGV"));
-        gargc = RARRAY_LEN(argary);
-    } else {
-        Check_Type(argary, T_ARRAY);
-        gargc = RARRAY_LEN(argary);
+    RBGICallbackData *callback_data = user_data;
+    VALUE rb_keep;
+    ID id_call;
+
+    CONST_ID(id_call, "call");
+    rb_keep = rb_funcall(callback_data->rb_callback, id_call, 2,
+                         GOBJ2RVAL(bus),
+                         BOXED2RVAL(message, GST_MINI_OBJECT_TYPE(message)));
+    if (callback_data->metadata->scope_type == GI_SCOPE_TYPE_ASYNC) {
+        rb_gi_callback_data_free(callback_data);
     }
+    return RVAL2CBOOL(rb_keep);
+}
 
-    /*
-     * Fill the gargv array with the provided arguments.
-     */
-    gargv = ALLOCA_N (char *, gargc + 1);
-
-    gargv[0] = RVAL2CSTR(rb_argv0);
-
-    for (i = 0; i < gargc; i++) {
-        if (TYPE (RARRAY_PTR(argary)[i]) == T_STRING) {
-            gargv[i + 1] = RVAL2CSTR(RARRAY_PTR(argary)[i]);
-        } else {
-            gargv[i + 1] = "";
-        }
+static gpointer
+rg_gst_bus_func_callback_finder(GIArgInfo *info)
+{
+    if (!rg_gst_bus_func_p(info)) {
+        return NULL;
     }
-    gargc++;
-
-    /*
-     * Now, we can initialize GStreamer.
-     */
-    if (!gst_init_check(&gargc, &gargv, &error))
-        RAISE_GERROR(error);
-
-    /*
-     * Initialize all included classes 
-     */
-    Init_gst_classes ();
+    return rg_gst_bus_func_callback;
+}
 
-    rbgutil_start_callback_dispatch_thread();
+static gboolean
+rg_gst_tag_foreach_func_p(GIArgInfo *info)
+{
+    GITypeInfo type_info;
+    GIBaseInfo *interface_info;
+    const gchar *namespace;
+    const gchar *name;
+    gboolean gst_tag_foreach_func_p = FALSE;
+
+    g_arg_info_load_type(info, &type_info);
+    interface_info = g_type_info_get_interface(&type_info);
+    namespace = g_base_info_get_namespace(interface_info);
+    name = g_base_info_get_name(interface_info);
+    if (strcmp(namespace, "Gst") == 0 && strcmp(name, "TagForeachFunc") == 0) {
+        gst_tag_foreach_func_p = TRUE;
+    }
+    g_base_info_unref(interface_info);
 
-    return Qtrue;
+    return gst_tag_foreach_func_p;
 }
 
-/*
- * Class method: version
- *
- * Gets the version number of the GStreamer library, in an array
- * of 3 fixnums, which represent major, minor and macro numbers. 
- *
- *  # Prints GStreamer version in a String 'major.minor.macro.nano'
- *  p Gst.version.join('.')
- *
- * Returns: an Array of 4 fixnums (major, minor, macro and nano numbers).
- */
-static VALUE
-rg_s_version (G_GNUC_UNUSED VALUE self)
+static void
+rg_gst_tag_foreach_func_callback(const GstTagList *list, const gchar *tag,
+                                 gpointer user_data)
 {
-    guint major, minor, micro, nano;
-
-    gst_version(&major, &minor, &micro, &nano);
-    return rb_ary_new3(4,
-                       INT2NUM(major), INT2NUM(minor),
-                       INT2NUM(micro), INT2NUM(nano));
+    RBGICallbackData *callback_data = user_data;
+    ID id_call;
+
+    CONST_ID(id_call, "call");
+    rb_funcall(callback_data->rb_callback, id_call, 2,
+               BOXED2RVAL(list, GST_MINI_OBJECT_TYPE(list)),
+               CSTR2RVAL(tag));
+    if (callback_data->metadata->scope_type == GI_SCOPE_TYPE_ASYNC) {
+        rb_gi_callback_data_free(callback_data);
+    }
 }
 
-static VALUE
-rg_s_check_version_p(G_GNUC_UNUSED VALUE self, VALUE rb_major, VALUE rb_minor, VALUE rb_micro)
+static gpointer
+rg_gst_tag_foreach_func_callback_finder(GIArgInfo *info)
 {
-    guint major, minor, micro, nano;
-
-    gst_version(&major, &minor, &micro, &nano);
-    return CBOOL2RVAL(major > NUM2UINT(rb_major) ||
-                      (major == NUM2UINT(rb_major) &&
-                       minor > NUM2UINT(rb_minor)) ||
-                      (major == NUM2UINT(rb_major) &&
-                       minor == NUM2UINT(rb_minor) &&
-                       micro >= NUM2UINT(rb_micro)));
+    if (!rg_gst_tag_foreach_func_p(info)) {
+        return NULL;
+    }
+    return rg_gst_tag_foreach_func_callback;
 }
 
 void
 Init_gstreamer (void)
 {
-    RG_TARGET_NAMESPACE = rb_define_module ("Gst");
-
-    RG_DEF_SMETHOD(init, -1);
-    RG_DEF_SMETHOD(version, 0);
-
-    /*
-     * Constant: VERSION_MAJOR
-     * GStreamer's major version.
-     */
-    rb_define_const(RG_TARGET_NAMESPACE, "VERSION_MAJOR", INT2FIX(GST_VERSION_MAJOR));
-
-    /*
-     * Constant: VERSION_MINOR
-     * GStreamer's minor version.
-     */
-    rb_define_const(RG_TARGET_NAMESPACE, "VERSION_MINOR", INT2FIX(GST_VERSION_MINOR));
-
-    /*
-     * Constant: VERSION_MICRO
-     * GStreamer's micro version.
-     */
-    rb_define_const(RG_TARGET_NAMESPACE, "VERSION_MICRO", INT2FIX(GST_VERSION_MICRO));
-
-    /*
-     * Constant: BUILD_VERSION
-     * GStreamer's build version.
-     */
-    rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION",
-                    rb_ary_new3(3,
-                                INT2FIX(GST_VERSION_MAJOR),
-                                INT2FIX(GST_VERSION_MINOR),
-                                INT2FIX(GST_VERSION_MICRO)));
-
-    RG_DEF_SMETHOD_P(check_version, 3);
+    rb_gi_callback_register_finder(rg_gst_bus_func_callback_finder);
+    rb_gi_callback_register_finder(rg_gst_tag_foreach_func_callback_finder);
 }

data/lib/gst/base_loader.rb

@@ -0,0 +1,20 @@
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+module Gst
+  class BaseLoader < GObjectIntrospection::Loader
+  end
+end

data/lib/gst/bin.rb

@@ -0,0 +1,32 @@
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+module Gst
+  class Bin
+    alias_method :add_element, :add
+    def add_elements(*elements)
+      elements.each do |element|
+        add_element(element)
+      end
+    end
+    alias_method :add, :add_elements
+
+    def <<(element)
+      add_element(element)
+      self
+    end
+  end
+end

data/lib/gst/bus.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+module Gst
+  class Bus
+    alias_method :add_watch_full, :add_watch
+    def add_watch(priority=GLib::PRIORITY_DEFAULT, &block)
+      add_watch_full(priority, &block)
+    end
+  end
+end