/*
- * $Id: rb_timer.c 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_timer.c 27 2004-07-08 18:25:05Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
return (r != Qfalse);
}
-static VALUE c_init (VALUE self, VALUE interval)
-{
- RbEcoreTimer *timer = NULL;
-
- Data_Get_Struct (self, RbEcoreTimer, timer);
-
- timer->cb = (void *) rb_block_proc ();
- timer->timer = ecore_timer_add (NUM2DBL (interval),
- on_timer, timer);
-
- return self;
-}
-
static void c_free (RbEcoreTimer *timer)
{
if (timer->timer && !timer->deleted)
ecore_timer_del (timer->timer);
+ ecore_shutdown ();
+
free (timer);
}
static VALUE c_new (VALUE klass, VALUE interval)
{
- VALUE self, argv[1];
+ VALUE self;
RbEcoreTimer *timer;
+ if (!rb_block_given_p ())
+ return Qnil;
+
self = Data_Make_Struct (klass, RbEcoreTimer, NULL, c_free, timer);
- argv[0] = interval;
- rb_obj_call_init (self, 1, argv);
+ ecore_init ();
+
+ timer->cb = (void *) rb_block_proc ();
+ timer->timer = ecore_timer_add (NUM2DBL (interval),
+ on_timer, timer);
+
+ rb_obj_call_init (self, 0, NULL);
return self;
}
cTimer = rb_define_class_under (mEcore, "Timer", rb_cObject);
rb_define_singleton_method (cTimer, "new", c_new, 1);
- rb_define_method (cTimer, "initialize", c_init, 1);
rb_define_method (cTimer, "delete", c_delete, 0);
}