X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore%2Frb_timer.c;h=fa9ab155cb960d0a10482272215e00b945a1fad2;hb=f805cf241a9d1fb9765892f0af48ede8359e9b65;hp=315a65a56e4e0a3d9d38a6ec6d039f30ad049dd8;hpb=98ce45a70b8b219b738bb804297417aae0ae9baa;p=ruby-ecore.git

diff --git a/src/ecore/rb_timer.c b/src/ecore/rb_timer.c
index 315a65a..fa9ab15 100644
--- a/src/ecore/rb_timer.c
+++ b/src/ecore/rb_timer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_timer.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_timer.c 50 2004-08-01 10:18:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -19,26 +19,24 @@
  */
 
 #include <ruby.h>
+#include <stdbool.h>
 
 #include <Ecore.h>
-#include <stdbool.h>
 
 #include "rb_ecore.h"
 
 typedef struct {
-	Ecore_Timer *timer;
-	void *cb;
+	Ecore_Timer *real;
+	VALUE callback;
 	bool deleted;
-} RbEcoreTimer;
-
-static VALUE cTimer;
+} RbTimer;
 
 static int on_timer (void *data)
 {
 	VALUE r;
-	RbEcoreTimer *timer = data;
+	RbTimer *timer = data;
 
-	r = rb_funcall ((VALUE) timer->cb, rb_intern ("call"), 0);
+	r = rb_funcall (timer->callback, rb_intern ("call"), 0);
 
 	/* if the callback returns false, we return 0 and Ecore
 	 * will remove the timer
@@ -49,10 +47,15 @@ static int on_timer (void *data)
 	return (r != Qfalse);
 }
 
-static void c_free (RbEcoreTimer *timer)
+static void c_mark (RbTimer *timer)
+{
+	rb_gc_mark (timer->callback);
+}
+
+static void c_free (RbTimer *timer)
 {
-	if (timer->timer && !timer->deleted)
-		ecore_timer_del (timer->timer);
+	if (timer->real && !timer->deleted)
+		ecore_timer_del (timer->real);
 
 	ecore_shutdown ();
 
@@ -62,18 +65,18 @@ static void c_free (RbEcoreTimer *timer)
 static VALUE c_new (VALUE klass, VALUE interval)
 {
 	VALUE self;
-	RbEcoreTimer *timer;
+	RbTimer *timer = NULL;
 
 	if (!rb_block_given_p ())
 		return Qnil;
 
-	self = Data_Make_Struct (klass, RbEcoreTimer, NULL, c_free, timer);
+	self = Data_Make_Struct (klass, RbTimer, c_mark, c_free, timer);
 
 	ecore_init ();
 
-	timer->cb = (void *) rb_block_proc ();
-	timer->timer = ecore_timer_add (NUM2DBL (interval),
-	                                on_timer, timer);
+	timer->callback = rb_block_proc ();
+	timer->real = ecore_timer_add (NUM2DBL (interval),
+	                               on_timer, timer);
 
 	rb_obj_call_init (self, 0, NULL);
 
@@ -82,13 +85,11 @@ static VALUE c_new (VALUE klass, VALUE interval)
 
 static VALUE c_delete (VALUE self)
 {
-	RbEcoreTimer *timer = NULL;
+	GET_OBJ (self, RbTimer, timer);
 
-	Data_Get_Struct (self, RbEcoreTimer, timer);
-
-	if (timer->timer && !timer->deleted) {
-		ecore_timer_del (timer->timer);
-		timer->timer = NULL;
+	if (timer->real && !timer->deleted) {
+		ecore_timer_del (timer->real);
+		timer->real = NULL;
 		timer->deleted = true;
 	} else
 		rb_raise (rb_eException, "Timer already deleted!");
@@ -98,9 +99,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Timer (void)
 {
-	cTimer = rb_define_class_under (mEcore, "Timer", rb_cObject);
+	VALUE c = rb_define_class_under (mEcore, "Timer", rb_cObject);
 
-	rb_define_singleton_method (cTimer, "new", c_new, 1);
-	rb_define_method (cTimer, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-