gstreamer 1.0.3 → 1.1.0

data/ext/gstreamer/rbgsttag.c

@@ -1,24 +1,27 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003-2005 Laurent Sansonetti <lrz@gnome.org>
+ *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-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
  */
 
-#include "rbgst.h"
+#include "rbgst-private.h"
+
+#define RG_TARGET_NAMESPACE mTag
 
 /* Module: Gst::Tag
  * Helper module to the tagging interface.
@@ -33,7 +36,7 @@
  * Returns: true if the tag is registered, false otherwise.
  */
 static VALUE
-rb_gst_tag_exists (VALUE self, VALUE tag)
+rg_m_exists_p (VALUE self, VALUE tag)
 {
     return CBOOL2RVAL (gst_tag_exists (RVAL2CSTR (tag)));
 }
@@ -48,7 +51,7 @@ rb_gst_tag_exists (VALUE self, VALUE tag)
  * Returns: true if the tag is fixed, false otherwise.
  */
 static VALUE
-rb_gst_tag_fixed (VALUE self, VALUE tag)
+rg_m_fixed_p (VALUE self, VALUE tag)
 {
     return CBOOL2RVAL (gst_tag_is_fixed (RVAL2CSTR (tag)));
 }
@@ -60,7 +63,7 @@ rb_gst_tag_fixed (VALUE self, VALUE tag)
  * Returns: the human-readable name of this tag.
  */
 static VALUE
-rb_gst_tag_get_nick (VALUE self, VALUE tag)
+rg_m_get_nick (VALUE self, VALUE tag)
 {
     return CSTR2RVAL (gst_tag_get_nick (RVAL2CSTR (tag)));
 }
@@ -72,7 +75,7 @@ rb_gst_tag_get_nick (VALUE self, VALUE tag)
  * Returns: the human-readable description of this tag.
  */
 static VALUE
-rb_gst_tag_get_description (VALUE self, VALUE tag)
+rg_m_get_description (VALUE self, VALUE tag)
 {
     return CSTR2RVAL (gst_tag_get_description (RVAL2CSTR (tag)));
 }
@@ -86,26 +89,25 @@ rb_gst_tag_get_description (VALUE self, VALUE tag)
  * Returns: the flag of this tag (see Gst::Tag::Flag).
  */
 static VALUE
-rb_gst_tag_get_flag (VALUE self, VALUE tag)
+rg_m_get_flag (VALUE self, VALUE tag)
 {
     return GFLAGS2RVAL (gst_tag_get_flag (RVAL2CSTR (tag)),
                         GST_TYPE_TAG_FLAG);
 }
 
 void
-Init_gst_tag (void)
+Init_gst_tag (VALUE mGst)
 {
-    VALUE m = rb_define_module_under (mGst, "Tag");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under (mGst, "Tag");
 
-    rb_define_module_function (m, "exists?", rb_gst_tag_exists, 1);
-    rb_define_module_function (m, "get_nick", rb_gst_tag_get_nick, 1);
-    rb_define_module_function (m, "get_description", 
-                                rb_gst_tag_get_description, 1);
-    rb_define_module_function (m, "get_flag", rb_gst_tag_get_flag, 1);
-    rb_define_module_function (m, "fixed?", rb_gst_tag_fixed, 1);
+    RG_DEF_MODFUNC_P(exists, 1);
+    RG_DEF_MODFUNC(get_nick, 1);
+    RG_DEF_MODFUNC(get_description, 1);
+    RG_DEF_MODFUNC(get_flag, 1);
+    RG_DEF_MODFUNC_P(fixed, 1);
 
-    G_DEF_CLASS (GST_TYPE_TAG_FLAG, "Flag", m);
-    G_DEF_CONSTANTS (m, GST_TYPE_TAG_FLAG, "GST_TAG_");
-    G_DEF_CLASS (GST_TYPE_TAG_MERGE_MODE, "MergeMode", m);
-    G_DEF_CONSTANTS (m, GST_TYPE_TAG_MERGE_MODE, "GST_TAG_");
+    G_DEF_CLASS (GST_TYPE_TAG_FLAG, "Flag", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS (RG_TARGET_NAMESPACE, GST_TYPE_TAG_FLAG, "GST_TAG_");
+    G_DEF_CLASS (GST_TYPE_TAG_MERGE_MODE, "MergeMode", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS (RG_TARGET_NAMESPACE, GST_TYPE_TAG_MERGE_MODE, "GST_TAG_");
 }

data/ext/gstreamer/rbgsttagsetter.c

@@ -1,24 +1,27 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003-2005 Laurent Sansonetti <lrz@gnome.org>
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-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
  */
 
-#include "rbgst.h"
+#include "rbgst-private.h"
+
+#define RG_TARGET_NAMESPACE mTagSetter
 
 /* Class: Gst::TagSetter
  * Element interface that allows the setting and retrieval of media metadata.
@@ -34,7 +37,7 @@
  * Returns: self.
  */
 static VALUE
-rb_gst_tag_setter_merge (VALUE self, VALUE structure, VALUE merge_mode)
+rg_merge (VALUE self, VALUE structure, VALUE merge_mode)
 {
     gst_tag_setter_merge_tags(RGST_TAG_SETTER(self),
                               RVAL2GST_STRUCT(structure),
@@ -43,8 +46,8 @@ rb_gst_tag_setter_merge (VALUE self, VALUE structure, VALUE merge_mode)
 }
 
 void
-Init_gst_tag_setter (void)
+Init_gst_tag_setter (VALUE mGst)
 {
-	VALUE c = G_DEF_INTERFACE (GST_TYPE_TAG_SETTER, "TagSetter", mGst);
-	rb_define_method (c, "merge", rb_gst_tag_setter_merge, 2);	
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE (GST_TYPE_TAG_SETTER, "TagSetter", mGst);
+    RG_DEF_METHOD(merge, 2);   
 }

data/ext/gstreamer/rbgstxml.c

@@ -1,24 +1,27 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2003, 2004 Laurent Sansonetti <lrz@gnome.org>
- *
- * 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  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 cXML
 
 /* Class: Gst::XML
  * Convert Gst::Element objects into an XML presentation. 
@@ -32,12 +35,12 @@
  * Returns: a newly created Gst::XML object.
  */
 static VALUE
-rb_gst_xml_new (VALUE self)
+rg_initialize (VALUE self)
 {
-	GstXML *xml = gst_xml_new ();
-	if (xml != NULL)
-		G_INITIALIZE (self, xml);
-	return Qnil;
+    GstXML *xml = gst_xml_new ();
+    if (xml != NULL)
+        G_INITIALIZE (self, xml);
+    return Qnil;
 }
 
 /*
@@ -51,15 +54,15 @@ rb_gst_xml_new (VALUE self)
  * Returns: true on success, false on failure.
  */
 static VALUE
-rb_gst_xml_write_file (VALUE self, VALUE element, VALUE filename)
+rg_s_write_file (VALUE self, VALUE element, VALUE filename)
 {
-	FILE *file = fopen (RVAL2CSTR (filename), "w");
-	gboolean ret = FALSE;
-	if (file != NULL) {
-		ret = gst_xml_write_file (RGST_ELEMENT (element), file) != -1; 
-		fclose (file);
-	}
-	return CBOOL2RVAL (ret);
+    FILE *file = fopen (RVAL2CSTR (filename), "w");
+    gboolean ret = FALSE;
+    if (file != NULL) {
+        ret = gst_xml_write_file (RGST_ELEMENT (element), file) != -1; 
+        fclose (file);
+    }
+    return CBOOL2RVAL (ret);
 }
 
 /*
@@ -80,13 +83,13 @@ rb_gst_xml_write_file (VALUE self, VALUE element, VALUE filename)
  * Returns: true on success, false on failure.
  */
 static VALUE
-rb_gst_xml_parse_file (int argc, VALUE *argv, VALUE self)
+rg_parse_file (int argc, VALUE *argv, VALUE self)
 {
-	VALUE fname, rootname;
-	rb_scan_args (argc, argv, "11", &fname, &rootname);	
-	return CBOOL2RVAL (gst_xml_parse_file (RGST_XML (self),
-					       (const guchar*) RVAL2CSTR (fname),
-					       (const guchar*)(NIL_P (rootname) 
+    VALUE fname, rootname;
+    rb_scan_args (argc, argv, "11", &fname, &rootname);    
+    return CBOOL2RVAL (gst_xml_parse_file (RGST_XML (self),
+                           (const guchar*) RVAL2CSTR (fname),
+                           (const guchar*)(NIL_P (rootname) 
                                                                ? NULL 
                                                                : RVAL2CSTR (rootname))));
 }
@@ -102,17 +105,17 @@ rb_gst_xml_parse_file (int argc, VALUE *argv, VALUE self)
  * Returns: true on success, false on failure.
  */
 static VALUE
-rb_gst_xml_parse_memory (int argc, VALUE *argv, VALUE self)
+rg_parse_memory (int argc, VALUE *argv, VALUE self)
 {
-	VALUE memory, rootname;
-	gchar *cstr;
-    
-	rb_scan_args (argc, argv, "11", &memory, &rootname);	
-	cstr = RVAL2CSTR (memory);
-	return CBOOL2RVAL (gst_xml_parse_memory (RGST_XML (self),
-						 (guchar*)cstr, 
-						 strlen (cstr), 
-						 (const gchar*)(NIL_P (rootname) 
+    VALUE memory, rootname;
+    gchar *cstr;
+
+    rb_scan_args (argc, argv, "11", &memory, &rootname);   
+    cstr = RVAL2CSTR (memory);
+    return CBOOL2RVAL (gst_xml_parse_memory (RGST_XML (self),
+                         (guchar*)cstr, 
+                         strlen (cstr), 
+                         (const gchar*)(NIL_P (rootname) 
                                                                 ? NULL 
                                                                 : RVAL2CSTR (rootname))));
 }
@@ -129,13 +132,13 @@ rb_gst_xml_parse_memory (int argc, VALUE *argv, VALUE self)
  * returns nil.
  */
 static VALUE
-rb_gst_xml_get_element (VALUE self, VALUE element_name)
+rg_get_element (VALUE self, VALUE element_name)
 {
-	GstElement *element = gst_xml_get_element (RGST_XML (self),
-						   (const guchar*)RVAL2CSTR (element_name));
-	return element != NULL
-		? RGST_ELEMENT_NEW (element)
-		: Qnil;
+    GstElement *element = gst_xml_get_element (RGST_XML (self),
+                           (const guchar*)RVAL2CSTR (element_name));
+    return element != NULL
+        ? RGST_ELEMENT_NEW (element)
+        : Qnil;
 }
 
 /*
@@ -146,17 +149,17 @@ rb_gst_xml_get_element (VALUE self, VALUE element_name)
  * Returns: an array of Gst::Element objects.
  */
 static VALUE
-rb_gst_xml_get_topelements (VALUE self)
+rg_topelements (VALUE self)
 {
-	GList *list;
-	VALUE arr;
+    GList *list;
+    VALUE arr;
 
-	arr = rb_ary_new ();
-	for (list = gst_xml_get_topelements (RGST_XML (self));
-	     list != NULL;
-	     list = g_list_next (list))
-		rb_ary_push (arr, RGST_ELEMENT_NEW (list->data)); 
-	return arr;
+    arr = rb_ary_new ();
+    for (list = gst_xml_get_topelements (RGST_XML (self));
+         list != NULL;
+         list = g_list_next (list))
+        rb_ary_push (arr, RGST_ELEMENT_NEW (list->data)); 
+    return arr;
 }
 
 /*
@@ -168,22 +171,22 @@ rb_gst_xml_get_topelements (VALUE self)
  * Returns: always nil.
  */
 static VALUE
-rb_gst_xml_each_topelement (VALUE self)
+rg_each_topelement (VALUE self)
 {
-	return rb_ary_yield (rb_gst_xml_get_topelements (self));
+    return rb_ary_yield (rg_topelements (self));
 }
 
 void
-Init_gst_xml (void)
+Init_gst_xml (VALUE mGst)
 {
-	VALUE c = G_DEF_CLASS (GST_TYPE_XML, "XML", mGst);
-	
-	rb_define_singleton_method (c, "write_file", rb_gst_xml_write_file, 2);
-	
-	rb_define_method (c, "initialize", rb_gst_xml_new, 0);
-	rb_define_method (c, "parse_file", rb_gst_xml_parse_file, -1);
-	rb_define_method (c, "parse_memory", rb_gst_xml_parse_memory, -1);
-	rb_define_method (c, "get_element", rb_gst_xml_get_element, 1);
-	rb_define_method (c, "topelements", rb_gst_xml_get_topelements, 0);
-	rb_define_method (c, "each_topelement", rb_gst_xml_each_topelement, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS (GST_TYPE_XML, "XML", mGst);
+
+    RG_DEF_SMETHOD(write_file, 2);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(parse_file, -1);
+    RG_DEF_METHOD(parse_memory, -1);
+    RG_DEF_METHOD(get_element, 1);
+    RG_DEF_METHOD(topelements, 0);
+    RG_DEF_METHOD(each_topelement, 0);
 }

data/lib/gst.rb

@@ -1,6 +1,20 @@
 require 'rational'
 require 'glib2'
-require 'gst.so'
+
+base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
+vendor_dir = base_dir + "vendor" + "local"
+vendor_bin_dir = vendor_dir + "bin"
+GLib.prepend_environment_path(vendor_bin_dir)
+if vendor_bin_dir.exist?
+  require 'pango'
+  require 'gdk_pixbuf2'
+end
+begin
+  major, minor, _ = RUBY_VERSION.split(/\./)
+  require "#{major}.#{minor}/gstreamer.so"
+rescue LoadError
+  require "gstreamer.so"
+end
 
 Gst.init
 

data/test/test_buffer.rb

@@ -64,7 +64,10 @@ class TestBuffer < Test::Unit::TestCase
     buffer = Gst::Buffer.new
     assert_nil(buffer.caps)
 
-    caps = Gst::Caps.new
+    structure = Gst::Structure.new("caps")
+    structure["width"] = 320
+    structure["height"] = 240
+    caps = Gst::Caps.new(structure)
     buffer.caps = caps
     assert_equal(caps, buffer.caps)
   end
@@ -161,7 +164,7 @@ class TestBuffer < Test::Unit::TestCase
 
     length = 7
     merged_buffer = buffer1.span(2, buffer2, length)
-    assert(length, merged_buffer.length)
+    assert_equal(length, merged_buffer.length)
   end
 
   def test_span?

data/test/test_element.rb

@@ -39,10 +39,10 @@ class TestElement < Test::Unit::TestCase
                  pipeline.get_state)
 
     pipeline.play
-    assert_equal([Gst::STATE_CHANGE_ASYNC,
+    assert_equal([Gst::STATE_CHANGE_FAILURE,
                   Gst::STATE_READY,
                   Gst::STATE_PLAYING],
-                 pipeline.get_state(10))
+                 pipeline.get_state(1000))
 
     pipeline.pause
     assert_equal([Gst::STATE_CHANGE_ASYNC,
@@ -54,15 +54,13 @@ class TestElement < Test::Unit::TestCase
     assert_equal([Gst::STATE_CHANGE_SUCCESS,
                   Gst::STATE_NULL,
                   Gst::STATE_VOID_PENDING],
-                 pipeline.get_state(10))
+                 pipeline.get_state(1000))
 
     pipeline.set_state(:playing)
-    pend("Async is correct behavior?") do
-      assert_equal([Gst::STATE_CHANGE_SUCCESS,
-                    Gst::STATE_PLAYING,
-                    Gst::STATE_VOID_PENDING],
-                   pipeline.get_state(10))
-    end
+    assert_equal([Gst::STATE_CHANGE_FAILURE,
+                  Gst::STATE_READY,
+                  Gst::STATE_PLAYING],
+                 pipeline.get_state(1000))
   end
 
   def test_query