From d20808b04feb328272a35ee2b03f4ae19db23fbe Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 20 Apr 2006 15:51:37 +0000
Subject: cleanup DEBUG code

---
 src/ivyglutloop.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/ivyglutloop.c')

diff --git a/src/ivyglutloop.c b/src/ivyglutloop.c
index a777a30..372c268 100755
--- a/src/ivyglutloop.c
+++ b/src/ivyglutloop.c
@@ -39,6 +39,7 @@
 
 #include <GL/glut.h>
 
+#include "ivydebug.h"
 #include "ivychannel.h"
 #include "ivyglutloop.h"
 
@@ -83,18 +84,14 @@ void IvyGlutChannelClose( Channel channel )
 static void IvyGlutHandleChannelRead( int source, GLUTInputId id, void *data )
 {
 	Channel channel = (Channel)data;
-#ifdef DEBUG
-	printf("Handle Channel read %d\n",source );
-#endif
+	TRACE("Handle Channel read %d\n",source );
 	(*channel->handle_read)(channel,source,channel->data);
 }
 
 static void IvyGlutHandleChannelDelete( int source, GLUTInputId id, void *data )
 {
 	Channel channel = (Channel)data;
-#ifdef DEBUG
-	printf("Handle Channel delete %d\n",source );
-#endif
+	TRACE("Handle Channel delete %d\n",source );
 	(*channel->handle_delete)(channel->data);
 }
 
-- 
cgit v1.1


From 1e48ff652b95379376044b0a7187e1c75fb76d42 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Fri, 21 Apr 2006 16:34:15 +0000
Subject: cleanup sur channel et main loop

---
 src/ivyglutloop.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/ivyglutloop.c')

diff --git a/src/ivyglutloop.c b/src/ivyglutloop.c
index 372c268..b383d8f 100755
--- a/src/ivyglutloop.c
+++ b/src/ivyglutloop.c
@@ -54,12 +54,7 @@ struct _channel {
 
 static int channel_initialized = 0;
 
-ChannelInit channel_init = IvyGlutChannelInit;
-ChannelSetUp channel_setup = IvyGlutChannelSetUp;
-ChannelClose channel_close = IvyGlutChannelClose;
-
-
-void IvyGlutChannelInit(void)
+void IvyChannelInit(void)
 {
 
 	if ( channel_initialized ) return;
@@ -71,7 +66,7 @@ void IvyGlutChannelInit(void)
 	channel_initialized = 1;
 }
 
-void IvyGlutChannelClose( Channel channel )
+void IvyChannelRemove( Channel channel )
 {
 
 	if ( channel->handle_delete )
@@ -95,7 +90,7 @@ static void IvyGlutHandleChannelDelete( int source, GLUTInputId id, void *data )
 	(*channel->handle_delete)(channel->data);
 }
 
-Channel IvyGlutChannelSetUp(HANDLE fd, void *data,
+Channel IvyChannelAdd(HANDLE fd, void *data,
 				ChannelHandleDelete handle_delete,
 				ChannelHandleRead handle_read
 				)						
@@ -121,7 +116,7 @@ Channel IvyGlutChannelSetUp(HANDLE fd, void *data,
 
 
 void
-IvyStop ()
+IvyChannelStop ()
 {
   /* To be implemented */
 }
-- 
cgit v1.1