camorama r356 - in trunk: . src

[herzi svn gnome org]

Author: herzi
Date: Wed May 28 14:20:07 2008
New Revision: 356
URL: http://svn.gnome.org/viewvc/camorama?rev=356&view=rev

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

	Set the vfunc in the implementation

	* src/capture-strategy-read.c: (implement_capture_strategy): set the
	vfunc here
	* src/main.c: (main): don't set the vfunc here


Modified:
   trunk/ChangeLog
   trunk/src/capture-strategy-read.c
   trunk/src/main.c

Modified: trunk/src/capture-strategy-read.c
==============================================================================
--- trunk/src/capture-strategy-read.c	(original)
+++ trunk/src/capture-strategy-read.c	Wed May 28 14:20:07 2008
@@ -23,10 +23,14 @@
 
 #include "capture-strategy-read.h"
 
+#include "callbacks.h"
+
 /* GType Implementation */
 
+static void implement_capture_strategy (CaptureStrategyIface* iface);
 G_DEFINE_TYPE_WITH_CODE (CaptureStrategyRead, capture_strategy_read, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (CAMORAMA_TYPE_CAPTURE_STRATEGY, NULL));
+			 G_IMPLEMENT_INTERFACE (CAMORAMA_TYPE_CAPTURE_STRATEGY,
+						implement_capture_strategy));
 
 static void
 capture_strategy_read_init (CaptureStrategyRead* self)
@@ -45,3 +49,11 @@
 			     NULL);
 }
 
+/* Capture Strategy Implementation */
+
+static void
+implement_capture_strategy (CaptureStrategyIface* iface)
+{
+	iface->capture = read_timeout_func;
+}
+

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed May 28 14:20:07 2008
@@ -250,7 +250,6 @@
         init_cam (cam);
     } else {
 	cam->capture = capture_strategy_read_new ();
-	CAMORAMA_CAPTURE_STRATEGY_GET_IFACE(cam->capture)->capture = read_timeout_func;
         printf ("using read()\n");
         cam->pic =
             realloc (cam->pic,