/*
- * $Id: ext.c 50 2005-05-30 20:38:34Z tilman $
+ * $Id: ext.c 52 2005-06-02 18:29:51Z tilman $
*
* Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
*
static VALUE cStream, cChunk,
eEetError, eNameError, ePropError,
sym_lossy, sym_level, sym_quality;
-static ID id_include, id_serialize, id_push, id_empty,
+static ID id_include, id_serialize, id_push, id_keys,
id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
id_tag, id_data;
c_to_eet (VALUE self)
{
VALUE props, name, stream, chunk, args[2];
+#ifndef HAVE_RB_HASH_FOREACH
+ struct RArray *keys;
+ long i;
+#endif
props = rb_funcall (self, id_to_eet_properties, 0);
if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
- rb_funcall (props, id_empty, 0) == Qtrue)
+ !RHASH (props)->tbl->num_entries)
rb_raise (ePropError, "invalid EET properties");
name = rb_funcall (self, id_to_eet_name, 0);
StringValue (name);
- if (rb_funcall (name, id_include, 1, INT2FIX (0)) == Qtrue ||
- rb_funcall (name, id_empty, 0) == Qtrue)
+ if (!RSTRING (name)->len ||
+ rb_funcall (name, id_include, 1, INT2FIX (0)))
rb_raise (eNameError, "invalid EET name");
stream = rb_class_new_instance (0, NULL, cStream);
+#ifdef HAVE_RB_HASH_FOREACH
rb_hash_foreach (props, for_each_prop, stream);
+#else
+ keys = RARRAY (rb_funcall (props, id_keys, 0));
+
+ for (i = 0; i < keys->len; i++)
+ for_each_prop (keys->ptr[i],
+ rb_hash_aref (props, keys->ptr[i]),
+ stream);
+#endif
args[0] = name;
args[1] = rb_funcall (stream, id_serialize, 0);
id_include = rb_intern ("include?");
id_serialize = rb_intern ("serialize");
id_push = rb_intern ("push");
- id_empty = rb_intern ("empty?");
+ id_keys = rb_intern ("keys");
id_to_eet_chunks = rb_intern ("to_eet_chunks");
id_to_eet_name = rb_intern ("to_eet_name");
id_to_eet_properties = rb_intern ("to_eet_properties");