gstreamer 1.1.9 → 1.2.0

data/Rakefile

@@ -53,7 +53,7 @@ package = GNOME2Package.new do |_package|
       :need_autogen => true,
       :patches => [
         "flac-1.2.1-fix-mingw-build.diff",
-        "flac-1.2.1-fix-doc-install.diff",
+        # "flac-1.2.1-fix-doc-install.diff",
       ],
     },
     {

data/ext/gstreamer/rbgst-element.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2007, 2008 Ruby-GNOME2 Project Team
  *  Copyright (C) 2006, 2008 Sjoerd Simons <sjoerd@luon.net>
  *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
@@ -81,7 +81,6 @@ typedef struct _ThreadData {
     } data;
 } ThreadData;
 
-static RGConvertTable table;
 static VALUE RG_TARGET_NAMESPACE;
 static ID id_gtype;
 static GThreadPool *set_state_thread_pool;
@@ -96,7 +95,7 @@ define_class_if_need(VALUE klass, GType type)
 }
 
 static VALUE
-instance2robj(gpointer instance)
+instance2robj(gpointer instance, gpointer user_data)
 {
     VALUE klass;
     GType type;
@@ -104,7 +103,7 @@ instance2robj(gpointer instance)
     type = G_TYPE_FROM_INSTANCE(instance);
     klass = GTYPE2CLASS(type);
     define_class_if_need(klass, type);
-    return rbgst_object_instance2robj(instance);
+    return rbgst_object_instance2robj(instance, user_data);
 }
 
 /* Class: Gst::Element
@@ -1027,6 +1026,7 @@ initialize_thread_pool(GThreadPool **pool, GFunc function)
 void
 Init_gst_element(VALUE mGst)
 {
+    RGConvertTable table;
     memset(&table, 0, sizeof(table));
     table.type = GST_TYPE_ELEMENT;
     table.klass = Qnil;

data/ext/gstreamer/rbgst-event.c

@@ -27,8 +27,6 @@
  * Events.
  */
 
-static RGConvertTable table = {0};
-
 static VALUE rb_cGstEvent;
 static VALUE rb_cGstEventFlushStart;
 static VALUE rb_cGstEventFlushStop;
@@ -42,13 +40,13 @@ static VALUE rb_cGstEventNavigation;
 static VALUE rb_cGstEventLatency;
 
 static VALUE
-get_superclass(void)
+get_superclass(G_GNUC_UNUSED gpointer user_data)
 {
     return rb_cGstMiniObject;
 }
 
 static VALUE
-instance2robj(gpointer instance)
+instance2robj(gpointer instance, G_GNUC_UNUSED gpointer user_data)
 {
     VALUE klass;
     GstEvent *event;
@@ -314,6 +312,9 @@ rbgst_event_get_type(VALUE self)
 void
 Init_gst_event (VALUE mGst)
 {
+    RGConvertTable table;
+
+    memset(&table, 0, sizeof(RGConvertTable));
     table.type = GST_TYPE_EVENT;
     table.get_superclass = get_superclass;
     table.instance2robj = instance2robj;

data/ext/gstreamer/rbgst-install-plugins-context.c

@@ -25,11 +25,10 @@
 
 #define RG_TARGET_NAMESPACE cInstallPluginsContext
 
-static RGConvertTable context_table = {0};
 static VALUE RG_TARGET_NAMESPACE;
 
 static VALUE
-context2robj(gpointer context)
+context2robj(gpointer context, G_GNUC_UNUSED gpointer user_data)
 {
     return Data_Wrap_Struct(RG_TARGET_NAMESPACE, NULL,
                             gst_install_plugins_context_free,
@@ -37,7 +36,7 @@ context2robj(gpointer context)
 }
 
 static gpointer
-robj2context(VALUE object)
+robj2context(VALUE object, G_GNUC_UNUSED gpointer user_data)
 {
     gpointer instance;
 
@@ -71,6 +70,9 @@ rg_set_xid(VALUE self, VALUE xid)
 void
 Init_gst_install_plugins_context(VALUE mGst)
 {
+    RGConvertTable context_table;
+
+    memset(&context_table, 0, sizeof(RGConvertTable));
     context_table.type = GST_TYPE_INSTALL_PLUGINS_CONTEXT;
     context_table.instance2robj = context2robj;
     context_table.robj2instance = robj2context;

data/ext/gstreamer/rbgst-message.c

@@ -32,7 +32,6 @@
 #define RVAL2GST_MSG_TYPE(type) RVAL2GFLAGS(type, GST_TYPE_MESSAGE_TYPE)
 #define GST_MSG_TYPE2RVAL(type) GFLAGS2RVAL(type, GST_TYPE_MESSAGE_TYPE)
 
-static RGConvertTable table = {0};
 static VALUE rb_cGstMessage;
 static VALUE rb_cGstMessageUnknown;
 static VALUE rb_cGstMessageEos;
@@ -64,13 +63,13 @@ static VALUE rb_cGstMissingURISourceMessage;
 #endif
 
 static VALUE
-get_superclass(void)
+get_superclass(G_GNUC_UNUSED gpointer user_data)
 {
     return rb_cGstMiniObject;
 }
 
 static VALUE
-instance2robj(gpointer instance)
+instance2robj(gpointer instance, G_GNUC_UNUSED gpointer user_data)
 {
     VALUE klass;
     GstMessage *message;
@@ -623,7 +622,9 @@ void
 Init_gst_message(VALUE mGst)
 {
     VALUE rb_cGstMessageType;
+    RGConvertTable table;
 
+    memset(&table, 0, sizeof(RGConvertTable));
     table.type = GST_TYPE_MESSAGE;
     table.get_superclass = get_superclass;
     table.instance2robj = instance2robj;

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2007  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
@@ -34,8 +34,6 @@
 
 VALUE RG_TARGET_NAMESPACE;
 
-static RGConvertTable table = {0};
-
 void
 _rbgst_mini_object_free(void *ptr)
 {
@@ -45,7 +43,7 @@ _rbgst_mini_object_free(void *ptr)
 }
 
 static VALUE
-rbgst_mini_object_get_superclass(void)
+rbgst_mini_object_get_superclass(G_GNUC_UNUSED gpointer user_data)
 {
     return rb_cObject;
 }
@@ -62,7 +60,7 @@ initialize_with_abstract_check(int argc, VALUE *argv, VALUE self)
 }
 
 static void
-rbgst_mini_object_type_init_hook(VALUE klass)
+rbgst_mini_object_type_init_hook(VALUE klass, G_GNUC_UNUSED gpointer user_data)
 {
     if (G_TYPE_IS_ABSTRACT(CLASS2GTYPE(klass)))
         rbg_define_method(klass, "initialize",
@@ -70,7 +68,7 @@ rbgst_mini_object_type_init_hook(VALUE klass)
 }
 
 static VALUE
-gvalue2rvalue(const GValue *value)
+gvalue2rvalue(const GValue *value, G_GNUC_UNUSED gpointer user_data)
 {
     GstMiniObject* obj;
     obj = gst_value_get_mini_object(value);
@@ -78,19 +76,20 @@ gvalue2rvalue(const GValue *value)
 }
 
 static void
-rvalue2gvalue(VALUE value, GValue *result)
+rvalue2gvalue(VALUE value, GValue *result, G_GNUC_UNUSED gpointer user_data)
 {
     gst_value_set_mini_object(result, NIL_P(value) ? NULL : RVAL2GOBJ(value));
 }
 
 static void
-rbgst_mini_object_initialize(VALUE object, gpointer instance)
+rbgst_mini_object_initialize(VALUE object, gpointer instance,
+                             G_GNUC_UNUSED gpointer user_data)
 {
     DATA_PTR(object) = instance;
 }
 
 static gpointer
-rbgst_mini_object_robj2instance(VALUE object)
+rbgst_mini_object_robj2instance(VALUE object, G_GNUC_UNUSED gpointer user_data)
 {
     gpointer instance;
 
@@ -108,7 +107,8 @@ rbgst_mini_object_define_class_if_need(VALUE klass, GType type)
 }
 
 static VALUE
-rbgst_mini_object_instance2robj(gpointer instance)
+rbgst_mini_object_instance2robj(gpointer instance,
+                                G_GNUC_UNUSED gpointer user_data)
 {
     VALUE klass;
     GType type;
@@ -121,7 +121,7 @@ rbgst_mini_object_instance2robj(gpointer instance)
 }
 
 static void
-rbgst_mini_object_unref(gpointer instance)
+rbgst_mini_object_unref(gpointer instance, G_GNUC_UNUSED gpointer user_data)
 {
     gst_mini_object_unref(instance);
 }
@@ -188,6 +188,9 @@ rg_writable_bang(VALUE self)
 void
 Init_gst_mini_object(VALUE mGst)
 {
+    RGConvertTable table;
+
+    memset(&table, 0, sizeof(RGConvertTable));
     table.type = GST_TYPE_MINI_OBJECT;
     table.get_superclass = rbgst_mini_object_get_superclass;
     table.type_init_hook = rbgst_mini_object_type_init_hook;

data/ext/gstreamer/rbgst-object.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2007  Ruby-GNOME2 Project Team
  *  Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
  *
@@ -25,14 +25,12 @@
 #define RG_TARGET_NAMESPACE cObject
 #define SELF(self) (RVAL2GST_OBJ(self))
 
-static RGConvertTable table;
-
 /* Class: Gst::Object
  * Basis for the GST object hierarchy.
  */
 
 VALUE
-rbgst_object_instance2robj(gpointer instance)
+rbgst_object_instance2robj(gpointer instance, G_GNUC_UNUSED gpointer user_data)
 {
     if (GST_OBJECT_IS_FLOATING(instance)) {
         gst_object_ref(instance);
@@ -43,7 +41,8 @@ rbgst_object_instance2robj(gpointer instance)
 }
 
 static void
-rbgst_object_initialize(VALUE obj, gpointer cobj)
+rbgst_object_initialize(VALUE obj, gpointer cobj,
+                        G_GNUC_UNUSED gpointer user_data)
 {
     if (GST_OBJECT_IS_FLOATING(cobj)) {
         gst_object_ref(cobj);
@@ -63,6 +62,7 @@ void
 Init_gst_object(VALUE mGst)
 {
     VALUE RG_TARGET_NAMESPACE;
+    RGConvertTable table;
 
     memset(&table, 0, sizeof(table));
     table.type = GST_TYPE_OBJECT;

data/ext/gstreamer/rbgst-private.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2008  Ruby-GNOME2 Project
  *
  *  This library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ VALUE _rbgst_collect_elements(GstIterator *iter);
 void _rbgst_mini_object_free(void *ptr);
 
 /* implemented in rbgst-object.c */
-VALUE rbgst_object_instance2robj(gpointer instance);
+VALUE rbgst_object_instance2robj(gpointer instance, gpointer user_data);
 
 
 G_GNUC_INTERNAL void Init_gst_bin (VALUE mGst);

data/ext/gstreamer/rbgst-query.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2007  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Sjoerd Simons <sjoerd@luon.net>
  *  Copyright (C) 2006  Zaheer Abbas Merali <zaheerabbas at merali dot org>
@@ -28,8 +28,6 @@
  * Queries.
  */
 
-static RGConvertTable table;
-
 static VALUE rb_cGstQueryPosition;
 static VALUE rb_cGstQueryDuration;
 static VALUE rb_cGstQueryLatency;
@@ -40,13 +38,13 @@ static VALUE rb_cGstQueryFormats;
 static VALUE rb_cGstQuery;
 
 static VALUE
-get_superclass(void)
+get_superclass(G_GNUC_UNUSED gpointer user_data)
 {
     return rb_cGstMiniObject;
 }
 
 static VALUE
-instance2robj(gpointer instance)
+instance2robj(gpointer instance, G_GNUC_UNUSED gpointer user_data)
 {
     VALUE klass;
     GstQuery *query;
@@ -263,6 +261,8 @@ formats_parse(VALUE self)
 void
 Init_gst_query (VALUE mGst)
 {
+    RGConvertTable table;
+
     memset(&table, 0, sizeof(table));
     table.type = GST_TYPE_QUERY;
     table.klass = Qnil;

data/ext/gstreamer/rbgst-value.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2008  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
@@ -23,16 +23,9 @@
 
 static VALUE cIntRange, cFourcc, cFractionRange;
 
-static RGConvertTable value_list_table;
-static RGConvertTable value_array_table;
-static RGConvertTable int_range_table;
-static RGConvertTable fourcc_table;
-static RGConvertTable fraction_table;
-static RGConvertTable fraction_range_table;
-
-
 static void
-value_list_rvalue2gvalue(VALUE value, GValue *result)
+value_list_rvalue2gvalue(VALUE value, GValue *result,
+                         G_GNUC_UNUSED gpointer user_data)
 {
     guint i, len;
 
@@ -46,7 +39,7 @@ value_list_rvalue2gvalue(VALUE value, GValue *result)
 }
 
 static VALUE
-value_list_gvalue2rvalue(const GValue *value)
+value_list_gvalue2rvalue(const GValue *value, G_GNUC_UNUSED gpointer user_data)
 {
     guint i, len;
     VALUE result;
@@ -62,7 +55,8 @@ value_list_gvalue2rvalue(const GValue *value)
 
 
 static void
-value_array_rvalue2gvalue(VALUE value, GValue *result)
+value_array_rvalue2gvalue(VALUE value, GValue *result,
+                          G_GNUC_UNUSED gpointer user_data)
 {
     guint i, len;
 
@@ -76,7 +70,7 @@ value_array_rvalue2gvalue(VALUE value, GValue *result)
 }
 
 static VALUE
-value_array_gvalue2rvalue(const GValue *value)
+value_array_gvalue2rvalue(const GValue *value, G_GNUC_UNUSED gpointer user_data)
 {
     guint i, len;
     VALUE result;
@@ -113,7 +107,7 @@ g_value_free(gpointer instance)
 }
 
 static VALUE
-g_value_to_ruby_value(const GValue *value)
+g_value_to_ruby_value(const GValue *value, G_GNUC_UNUSED gpointer user_data)
 {
     VALUE klass;
     GType type;
@@ -127,20 +121,21 @@ g_value_to_ruby_value(const GValue *value)
 }
 
 static VALUE
-g_value_type_instance_to_ruby_object(gpointer instance)
+g_value_type_instance_to_ruby_object(gpointer instance, gpointer user_data)
 {
-    return g_value_to_ruby_value(instance);
+    return g_value_to_ruby_value(instance, user_data);
 }
 
 static void
-g_value_type_unref(gpointer instance)
+g_value_type_unref(gpointer instance, G_GNUC_UNUSED gpointer user_data)
 {
     g_value_unset(instance);
 }
 
 #define DEF_G_VALUE_CONVERTERS(prefix, g_type, type)            \
 static gpointer                                                 \
-prefix ## _robj2instance(VALUE object)                          \
+prefix ## _robj2instance(VALUE object,                          \
+                         G_GNUC_UNUSED gpointer user_data)      \
 {                                                               \
     gpointer instance;                                          \
                                                                 \
@@ -228,13 +223,14 @@ int_range_to_a(VALUE self)
 }
 
 static VALUE
-int_range_get_superclass(void)
+int_range_get_superclass(G_GNUC_UNUSED gpointer user_data)
 {
     return rb_cObject;
 }
 
 static void
-int_range_rvalue2gvalue(VALUE value, GValue *result)
+int_range_rvalue2gvalue(VALUE value, GValue *result,
+                        G_GNUC_UNUSED gpointer user_data)
 {
     GValue *val;
 
@@ -248,13 +244,14 @@ DEF_G_VALUE_CONVERTERS(int_range, GST_TYPE_INT_RANGE, IntRange)
 
 
 static VALUE
-fourcc_get_superclass(void)
+fourcc_get_superclass(G_GNUC_UNUSED gpointer user_data)
 {
     return rb_cObject;
 }
 
 static void
-fourcc_rvalue2gvalue(VALUE value, GValue *result)
+fourcc_rvalue2gvalue(VALUE value, GValue *result,
+                     G_GNUC_UNUSED gpointer user_data)
 {
     gst_value_set_fourcc(result,
                          gst_value_get_fourcc(RVAL2GOBJ(value)));
@@ -294,7 +291,8 @@ fourcc_to_i(VALUE self)
 
 
 static void
-fraction_rvalue2gvalue(VALUE value, GValue *result)
+fraction_rvalue2gvalue(VALUE value, GValue *result,
+                       G_GNUC_UNUSED gpointer user_data)
 {
     gst_value_set_fraction(result,
                            NUM2INT(rb_funcall(value, rb_intern("numerator"), 0)),
@@ -303,7 +301,7 @@ fraction_rvalue2gvalue(VALUE value, GValue *result)
 }
 
 static VALUE
-fraction_gvalue2rvalue(const GValue *value)
+fraction_gvalue2rvalue(const GValue *value, G_GNUC_UNUSED gpointer user_data)
 {
     return rb_funcall(Qnil, rb_intern("Rational"), 2,
                       INT2NUM(gst_value_get_fraction_numerator(value)),
@@ -385,13 +383,14 @@ fraction_range_to_a(VALUE self)
 }
 
 static VALUE
-fraction_range_get_superclass(void)
+fraction_range_get_superclass(G_GNUC_UNUSED gpointer user_data)
 {
     return rb_cObject;
 }
 
 static void
-fraction_range_rvalue2gvalue(VALUE value, GValue *result)
+fraction_range_rvalue2gvalue(VALUE value, GValue *result,
+                             G_GNUC_UNUSED gpointer user_data)
 {
     GValue *val;
 
@@ -407,6 +406,13 @@ DEF_G_VALUE_CONVERTERS(fraction_range, GST_TYPE_FRACTION_RANGE, FractionRange)
 void
 Init_gst_value(VALUE mGst)
 {
+    RGConvertTable value_list_table;
+    RGConvertTable value_array_table;
+    RGConvertTable int_range_table;
+    RGConvertTable fourcc_table;
+    RGConvertTable fraction_table;
+    RGConvertTable fraction_range_table;
+
     memset(&value_list_table, 0, sizeof(value_list_table));
     value_list_table.type = GST_TYPE_LIST;
     value_list_table.klass = Qnil;

data/sample/gst-gi.rb

@@ -0,0 +1,55 @@
+# 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
+
+require "gobject-introspection"
+
+base_dir = Pathname.new(__FILE__).dirname.dirname.dirname.expand_path
+vendor_dir = base_dir + "vendor" + "local"
+vendor_bin_dir = vendor_dir + "bin"
+GLib.prepend_environment_path(vendor_bin_dir)
+
+module Gst
+  LOG_DOMAIN = "GStreamer"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
+
+  class << self
+    @initialized = false
+    def init(argv=ARGV)
+      return if @initialized
+      @initialized = true
+      loader = Loader.new(self, argv)
+      loader.load("Gst")
+    end
+  end
+
+  class Loader < GObjectIntrospection::Loader
+    def initialize(base_module, init_arguments)
+      super(base_module)
+      @init_arguments = init_arguments
+    end
+
+    private
+    def pre_load(repository, namespace)
+      init = repository.find(namespace, "init")
+      argc, argv = init.invoke(1 + @init_arguments.size,
+                               [$0] + @init_arguments)
+      @init_arguments.replace(argv)
+    end
+
+    def post_load(repository, namespace)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gstreamer
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 9
-  version: 1.1.9
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-30 00:00:00 Z
+date: 2013-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: glib2
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
         - 1
-        - 1
-        - 9
-        version: 1.1.9
+        - 2
+        - 0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id001
 description: Ruby/GStreamer is a Ruby binding for GStreamer.
@@ -95,6 +95,7 @@ files:
 - ext/gstreamer/rbgst-element.c
 - ext/gstreamer/rbgst-value.c
 - sample/media-type.rb
+- sample/gst-gi.rb
 - sample/audio-player.rb
 - sample/install-plugins.rb
 - sample/xml-player.rb