gstreamer 1.0.3 → 1.1.0

data/ext/gstreamer/rbgst-system-clock.c

@@ -1,24 +1,27 @@
+/* -*- 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"
+
+#define RG_TARGET_NAMESPACE cSystemClock
 
 /* Class: Gst::SystemClock
  * The Gst::SystemClock class is an implementation of Gst::Clock 
@@ -32,14 +35,14 @@
  * to a Gst::SystemClock object.
  */
 static VALUE
-rb_gst_systemclock_obtain (self)
+rg_s_obtain (self)
 {
-	return RGST_SYSTEM_CLOCK_NEW (gst_system_clock_obtain ());
+    return RGST_SYSTEM_CLOCK_NEW (gst_system_clock_obtain ());
 }
 
 void
-Init_gst_systemclock (void)
+Init_gst_systemclock (VALUE mGst)
 {
-	VALUE c = G_DEF_CLASS (GST_TYPE_SYSTEM_CLOCK, "SystemClock", mGst);
-	rb_define_singleton_method (c, "obtain", rb_gst_systemclock_obtain, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS (GST_TYPE_SYSTEM_CLOCK, "SystemClock", mGst);
+    RG_DEF_SMETHOD(obtain, 0);
 }

data/ext/gstreamer/rbgst-type-find-factory.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 cTypeFindFactory
 #define SELF(self) RVAL2GST_TYPE_FIND_FACTORY(self)
 
 /* Class: Gst::TypeFindFactory
@@ -36,22 +37,22 @@
  * Returns: an Array of Gst::TypeFindFactory objects.
  */
 static VALUE
-rb_gst_type_find_factory_get_list (void)
+rg_s_list (void)
 {
-	GList *list;
-	GList *orig;
-	VALUE arr;
+    GList *list;
+    GList *orig;
+    VALUE arr;
 
-	arr = rb_ary_new ();
-	orig = gst_type_find_factory_get_list();
-	for (list = orig; list != NULL; list = g_list_next (list)) {
-		GstTypeFindFactory *tff = GST_TYPE_FIND_FACTORY (list->data);
-		rb_ary_push (arr, RGST_TYPE_FIND_FACTORY_NEW (tff));
-	}
-	if (orig != NULL) {
-		g_list_free (orig);
-	}
-	return arr;
+    arr = rb_ary_new ();
+    orig = gst_type_find_factory_get_list();
+    for (list = orig; list != NULL; list = g_list_next (list)) {
+        GstTypeFindFactory *tff = GST_TYPE_FIND_FACTORY (list->data);
+        rb_ary_push (arr, RGST_TYPE_FIND_FACTORY_NEW (tff));
+    }
+    if (orig != NULL) {
+        g_list_free (orig);
+    }
+    return arr;
 }
 
 /*
@@ -63,7 +64,7 @@ rb_gst_type_find_factory_get_list (void)
  * associated with the type find factory.
  */
 static VALUE
-rb_gst_type_find_factory_get_extensions(VALUE self)
+rg_extensions(VALUE self)
 {
     VALUE ary;
     gchar **extensions;
@@ -90,9 +91,9 @@ rb_gst_type_find_factory_get_extensions(VALUE self)
  * Returns: the Gst::Caps object associated with this factory.
  */
 static VALUE
-rb_gst_type_find_factory_get_caps (VALUE self)
+rg_caps (VALUE self)
 {
-	return RGST_CAPS_NEW (gst_type_find_factory_get_caps (RGST_TYPE_FIND_FACTORY (self)));
+    return RGST_CAPS_NEW (gst_type_find_factory_get_caps (RGST_TYPE_FIND_FACTORY (self)));
 }
 
 #if 0   /* requires Gst::TypeFind */
@@ -105,20 +106,20 @@ rb_gst_type_find_factory_call_function (VALUE self, VALUE find)
 #endif
 
 static VALUE
-rb_gst_type_find_factory_to_s (VALUE self)
+rg_to_s (VALUE self)
 {
-	GstTypeFindFactory *factory = RGST_TYPE_FIND_FACTORY (self);
-	return rb_str_new_with_format ("TypeFind: %s", GST_PLUGIN_FEATURE_NAME (factory));
+    GstTypeFindFactory *factory = RGST_TYPE_FIND_FACTORY (self);
+    return rb_str_new_with_format ("TypeFind: %s", GST_PLUGIN_FEATURE_NAME (factory));
 }
 
 void
-Init_gst_typefindfactory (void)
+Init_gst_typefindfactory (VALUE mGst)
 {
-	VALUE c = G_DEF_CLASS (GST_TYPE_TYPE_FIND_FACTORY, "TypeFindFactory", mGst);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS (GST_TYPE_TYPE_FIND_FACTORY, "TypeFindFactory", mGst);
 
-	rb_define_singleton_method(c, "list", rb_gst_type_find_factory_get_list, 0);
-	rb_define_method(c, "extensions", rb_gst_type_find_factory_get_extensions, 0);
-	rb_define_method(c, "caps", rb_gst_type_find_factory_get_caps, 0);
-	/*rb_define_method(c, "call_function", rb_gst_type_find_factory_call_function, 1);*/
-	rb_define_method(c, "to_s", rb_gst_type_find_factory_to_s, 0);
+    RG_DEF_SMETHOD(list, 0);
+    RG_DEF_METHOD(extensions, 0);
+    RG_DEF_METHOD(caps, 0);
+    /*rb_define_method(RG_TARGET_NAMESPACE, "call_function", rb_gst_type_find_factory_call_function, 1);*/
+    RG_DEF_METHOD(to_s, 0);
 }

data/ext/gstreamer/rbgst-value.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"
 
 static VALUE cIntRange, cFourcc, cFractionRange;
 
-static RGConvertTable value_list_table = {0};
-static RGConvertTable value_array_table = {0};
-static RGConvertTable int_range_table = {0};
-static RGConvertTable fourcc_table = {0};
-static RGConvertTable fraction_table = {0};
-static RGConvertTable fraction_range_table = {0};
+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
@@ -37,7 +38,7 @@ value_list_rvalue2gvalue(VALUE value, GValue *result)
 
     len = RARRAY_LEN(value);
     for (i = 0; i < len; i++) {
-        GValue val = {0};
+        GValue val = G_VALUE_INIT;
         rbgobj_initialize_gvalue(&val, RARRAY_PTR(value)[i]);
         gst_value_list_append_value(result, &val);
         g_value_unset(&val);
@@ -67,7 +68,7 @@ value_array_rvalue2gvalue(VALUE value, GValue *result)
 
     len = RARRAY_LEN(value);
     for (i = 0; i < len; i++) {
-        GValue val = {0};
+        GValue val = G_VALUE_INIT;
         rbgobj_initialize_gvalue(&val, RARRAY_PTR(value)[i]);
         gst_value_array_append_value(result, &val);
         g_value_unset(&val);
@@ -313,7 +314,7 @@ fraction_gvalue2rvalue(const GValue *value)
 static VALUE
 fraction_range_initialize(VALUE self, VALUE min, VALUE max)
 {
-    GValue min_value = {0}, max_value = {0};
+    GValue min_value = G_VALUE_INIT, max_value = G_VALUE_INIT;
 
     rbgobj_initialize_gvalue(&min_value, min);
     rbgobj_initialize_gvalue(&max_value, max);
@@ -331,7 +332,7 @@ static VALUE
 fraction_range_set_min(VALUE self, VALUE min)
 {
     GValue *value;
-    GValue min_value = {0};
+    GValue min_value = G_VALUE_INIT;
 
     value = RVAL2GOBJ(self);
     rbgobj_initialize_gvalue(&min_value, min);
@@ -351,7 +352,7 @@ static VALUE
 fraction_range_set_max(VALUE self, VALUE max)
 {
     GValue *value;
-    GValue max_value = {0};
+    GValue max_value = G_VALUE_INIT;
 
     value = RVAL2GOBJ(self);
     rbgobj_initialize_gvalue(&max_value, max);
@@ -364,7 +365,7 @@ fraction_range_set_max(VALUE self, VALUE max)
 static VALUE
 fraction_range_set(VALUE self, VALUE min, VALUE max)
 {
-    GValue min_value = {0}, max_value = {0};
+    GValue min_value = G_VALUE_INIT, max_value = G_VALUE_INIT;
 
     rbgobj_initialize_gvalue(&min_value, min);
     rbgobj_initialize_gvalue(&max_value, max);
@@ -404,23 +405,29 @@ DEF_G_VALUE_CONVERTERS(fraction_range, GST_TYPE_FRACTION_RANGE, FractionRange)
 
 
 void
-Init_gst_value(void)
+Init_gst_value(VALUE mGst)
 {
+    memset(&value_list_table, 0, sizeof(value_list_table));
     value_list_table.type = GST_TYPE_LIST;
+    value_list_table.klass = Qnil;
     value_list_table.rvalue2gvalue = value_list_rvalue2gvalue;
     value_list_table.gvalue2rvalue = value_list_gvalue2rvalue;
 
     RG_DEF_CONVERSION(&value_list_table);
 
 
+    memset(&value_array_table, 0, sizeof(value_array_table));
     value_array_table.type = GST_TYPE_ARRAY;
+    value_array_table.klass = Qnil;
     value_array_table.rvalue2gvalue = value_array_rvalue2gvalue;
     value_array_table.gvalue2rvalue = value_array_gvalue2rvalue;
 
     RG_DEF_CONVERSION(&value_array_table);
 
 
+    memset(&int_range_table, 0, sizeof(int_range_table));
     int_range_table.type = GST_TYPE_INT_RANGE;
+    int_range_table.klass = Qnil;
     int_range_table.get_superclass = int_range_get_superclass;
     int_range_table.type_init_hook = NULL;
     int_range_table.rvalue2gvalue = int_range_rvalue2gvalue;
@@ -451,7 +458,9 @@ Init_gst_value(void)
     G_DEF_SETTERS(cIntRange);
 
 
+    memset(&fourcc_table, 0, sizeof(fourcc_table));
     fourcc_table.type = GST_TYPE_FOURCC;
+    fourcc_table.klass = Qnil;
     fourcc_table.get_superclass = fourcc_get_superclass;
     fourcc_table.type_init_hook = NULL;
     fourcc_table.rvalue2gvalue = fourcc_rvalue2gvalue;
@@ -477,6 +486,7 @@ Init_gst_value(void)
     G_DEF_SETTERS(cFourcc);
 
 
+    memset(&fraction_table, 0, sizeof(fraction_table));
     fraction_table.type = GST_TYPE_FRACTION;
     fraction_table.klass = rb_const_get(rb_cObject, rb_intern("Rational"));
     fraction_table.rvalue2gvalue = fraction_rvalue2gvalue;
@@ -485,7 +495,9 @@ Init_gst_value(void)
     RG_DEF_CONVERSION(&fraction_table);
 
 
+    memset(&fraction_range_table, 0, sizeof(fraction_range_table));
     fraction_range_table.type = GST_TYPE_FRACTION_RANGE;
+    fraction_range_table.klass = Qnil;
     fraction_range_table.get_superclass = fraction_range_get_superclass;
     fraction_range_table.type_init_hook = NULL;
     fraction_range_table.rvalue2gvalue = fraction_range_rvalue2gvalue;

data/ext/gstreamer/rbgst-x-overlay.c

@@ -1,29 +1,31 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2006 Sjoerd Simons <sjoerd@luon.net>
- * Copyright (C) 2005 Laurent Sansonetti <lrz@gnome.org>
+ *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Sjoerd Simons <sjoerd@luon.net>
+ *  Copyright (C) 2005  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
  */
 
 #ifdef HAVE_GST_OVERLAY
 
-#include "rbgst.h"
+#include "rbgst-private.h"
 #include <gst/interfaces/xoverlay.h>
 
+#define RG_TARGET_NAMESPACE mXOverlay
 #define SELF(o)           (GST_X_OVERLAY(RVAL2GOBJ(o)))
 
 static GQuark xoverlay_xid_data_quark;
@@ -68,9 +70,8 @@ xid_callback_data_destroy_cb(gpointer data)
     g_slice_free(struct xid_callback_data, data);
 }
 
-
 static VALUE
-rb_gst_x_overlay_set_xwindow_id_with_buswatch(VALUE self, VALUE bus,
+rg_set_xwindow_id_with_buswatch(VALUE self, VALUE bus,
                                               VALUE x_window_id)
 {
     struct xid_callback_data* xid_cb_data;
@@ -92,41 +93,41 @@ rb_gst_x_overlay_set_xwindow_id_with_buswatch(VALUE self, VALUE bus,
 }
 
 static VALUE
-rb_gst_x_overlay_set_xwindow_id(VALUE self, VALUE x_window_id)
+rg_set_xwindow_id(VALUE self, VALUE x_window_id)
 {
     gst_x_overlay_set_xwindow_id(SELF(self), NUM2ULONG(x_window_id));
     return self;
 }
 
 static VALUE
-rb_gst_x_overlay_expose(VALUE self)
+rg_expose(VALUE self)
 {
     gst_x_overlay_expose(SELF(self));
     return self;
 }
 
 static VALUE
-rb_gst_x_overlay_got_xwindow_id(VALUE self, VALUE x_window_id)
+rg_got_xwindow_id(VALUE self, VALUE x_window_id)
 {
     gst_x_overlay_got_xwindow_id(SELF(self), NUM2ULL(x_window_id));
     return self;
 }
 
 void
-Init_gst_x_overlay(void)
+Init_gst_x_overlay(VALUE mGst)
 {
-    VALUE i = G_DEF_INTERFACE(GST_TYPE_X_OVERLAY, "XOverlay", mGst);
-    
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GST_TYPE_X_OVERLAY, "XOverlay", mGst);
+
     xoverlay_xid_data_quark =
       g_quark_from_static_string("__rbgst_xoverlay_xid_data_quark__");
 
-    rb_define_method(i, "set_xwindow_id", rb_gst_x_overlay_set_xwindow_id, 1);
-    rb_define_method(i, "expose", rb_gst_x_overlay_expose, 0);
-   
-    rb_define_method(i, "got_xwindow_id", rb_gst_x_overlay_got_xwindow_id, 1);
-    rb_define_method(i, "set_xwindow_id_with_buswatch", rb_gst_x_overlay_set_xwindow_id_with_buswatch, 2);
-    
-    G_DEF_SETTERS(i);
+    RG_DEF_METHOD(set_xwindow_id, 1);
+    RG_DEF_METHOD(expose, 0);
+
+    RG_DEF_METHOD(got_xwindow_id, 1);
+    RG_DEF_METHOD(set_xwindow_id_with_buswatch, 2);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }
 
 #endif /* HAVE_GST_OVERLAY */