camorama r343 - in trunk: . src

[herzi svn gnome org]

Author: herzi
Date: Wed May 28 11:22:13 2008
New Revision: 343
URL: http://svn.gnome.org/viewvc/camorama?rev=343&view=rev

Log:
2008-05-27  Sven Herzberg  <sven imendio com>

	use updated signatures for the timeout functions

	* src/callbacks.c: (read_timeout_func), (timeout_func):
	* src/callbacks.h:


Modified:
   trunk/ChangeLog
   trunk/src/callbacks.c
   trunk/src/callbacks.h

Modified: trunk/src/callbacks.c
==============================================================================
--- trunk/src/callbacks.c	(original)
+++ trunk/src/callbacks.c	Wed May 28 11:22:13 2008
@@ -534,7 +534,7 @@
 /*
  * get image from cam - does all the work ;) 
  */
-gint
+gboolean
 read_timeout_func(cam* cam) {
     int i, count = 0;
     GdkGC *gc;
@@ -569,11 +569,11 @@
 
     gtk_widget_queue_draw_area (glade_xml_get_widget (cam->xml, "da"), 0,
                                 0, cam->x, cam->y);
-    return 1;
-
+    return TRUE; /* call this function again */
 }
 
-gint timeout_func (cam * cam)
+gint
+timeout_func (cam * cam)
 {
     int i, count = 0;
     GdkGC *gc;
@@ -644,7 +644,7 @@
 
     frames2++;
     g_object_unref ((gpointer) gc);
-    return 1;
+    return TRUE; /* call this function again */
 }
 
 gint fps (GtkWidget * sb)

Modified: trunk/src/callbacks.h
==============================================================================
--- trunk/src/callbacks.h	(original)
+++ trunk/src/callbacks.h	Wed May 28 11:22:13 2008
@@ -46,8 +46,8 @@
 void init_cam (GtkWidget * capture, cam * cam);
 gint timeout_capture_func (cam *);
 gint fps (GtkWidget *);
-gint timeout_func (cam *);
-gint read_timeout_func (cam *);
+gboolean timeout_func      (cam * application);
+gboolean read_timeout_func (cam * application);
 void edge_func1 (GtkToggleButton *, gpointer);
 void sobel_func (GtkToggleButton *, gpointer);
 void fix_colour_func (GtkToggleButton *, char *);