X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fcomments.c;h=03a237b104f87d0fbfd77f78e165dae2a828fb34;hb=c623a45b47d3061c47eac5abd4867913c9230b36;hp=cdaf576ae7e697571297a7b2a573525a8edf1e02;hpb=397b4a686511cb3fb5fb9a7a82277487f750c86d;p=ruby-vorbistagger.git

diff --git a/ext/comments.c b/ext/comments.c
index cdaf576..03a237b 100644
--- a/ext/comments.c
+++ b/ext/comments.c
@@ -24,7 +24,7 @@
 
 #include "vcedit.h"
 
-static ID id_casecmp, id_replace, id_compare;
+static ID id_casecmp, id_replace, id_each, id_compare;
 
 void
 comments_init (VALUE self, vcedit_state *state)
@@ -35,8 +35,8 @@ comments_init (VALUE self, vcedit_state *state)
 
 	vc = vcedit_comments (state);
 
-	items = rb_ary_new2 (vc->comments);
-	rb_iv_set (self, "items", items);
+	items = rb_iv_get (self, "items");
+	rb_ary_clear (items);
 
 	for (i = 0; i < vc->comments; i++) {
 		VALUE k, v, pair;
@@ -79,6 +79,19 @@ comments_sync (VALUE self, vcedit_state *state)
 		                        StringValuePtr (pair->ptr[1]));
 	}
 }
+/*
+ * call-seq:
+ *  Ogg::Vorbis::Comments.new -> object
+ *
+ * Creates an Ogg::Vorbis::Comments object.
+ */
+static VALUE
+c_init (VALUE self)
+{
+	rb_iv_set (self, "items", rb_ary_new ());
+
+	return self;
+}
 
 /*
  * call-seq:
@@ -332,31 +345,52 @@ c_has_key (VALUE self, VALUE key)
 	return Qfalse;
 }
 
-static int
-merge_cb (VALUE key, VALUE value, VALUE self)
+static VALUE
+merge_cb (VALUE ar, VALUE self)
 {
-	c_aset (self, key, value);
+	struct RArray *pair = RARRAY (ar);
+
+	c_aset (self, pair->ptr[0], pair->ptr[1]);
 
-	return ST_CONTINUE;
+	return Qnil;
 }
 
 /*
  * call-seq:
- *  object.merge!(hash) -> object
+ *  object.merge!(arg) -> object
  *
- * Adds the key-value pairs from *hash* to *object*, overwriting existing
+ * Adds the key-value pairs from *arg* to *object*, overwriting existing
  * values if a key already existed in *object*.
+ *
+ * Note that *arg*'s each method needs to yield key-value pairs for this
+ * to work. This means that e.g. hashes and Ogg::Vorbis::Comments objects
+ * are supported as arguments.
  */
 static VALUE
-c_merge (VALUE self, VALUE hash)
+c_merge (VALUE self, VALUE arg)
 {
-	Check_Type (hash, T_HASH);
+	if (!rb_respond_to (arg, id_each))
+		rb_raise (rb_eArgError, "invalid argument");
 
-	rb_hash_foreach (hash, merge_cb, self);
+	rb_iterate (rb_each, arg, merge_cb, self);
 
 	return self;
 }
 
+/*
+ * call-seq:
+ *  object.shift(hash) -> array or nil
+ *
+ * Removes the first key-value pair from *object* and returns it
+ * as the two-item array [key, value].
+ * If *object* is empty, +nil+ is returned.
+ */
+static VALUE
+c_shift (VALUE self)
+{
+	return rb_ary_shift (rb_iv_get (self, "items"));
+}
+
 /*
  * call-seq:
  *  object <=> other -> -1, 0 or 1
@@ -479,6 +513,7 @@ Init_Comments (VALUE mVorbis)
 
 	c = rb_define_class_under (mVorbis, "Comments", rb_cObject);
 
+	rb_define_method (c, "initialize", c_init, 0);
 	rb_define_method (c, "inspect", c_inspect, 0);
 	rb_define_method (c, "clear", c_clear, 0);
 	rb_define_method (c, "delete", c_delete, 1);
@@ -490,6 +525,7 @@ Init_Comments (VALUE mVorbis)
 	rb_define_method (c, "keys", c_keys, 0);
 	rb_define_method (c, "values", c_values, 0);
 	rb_define_method (c, "merge!", c_merge, 1);
+	rb_define_method (c, "shift", c_shift, 0);
 
 	rb_include_module (c, rb_mComparable);
 	rb_define_method (c, "<=>", c_compare, 1);
@@ -507,6 +543,7 @@ Init_Comments (VALUE mVorbis)
 
 	id_casecmp = rb_intern ("casecmp");
 	id_replace = rb_intern ("replace");
+	id_each = rb_intern ("each");
 	id_compare = rb_intern ("<=>");
 
 	return c;