camorama r360 - in trunk: . src

[herzi svn gnome org]

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

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

	initialize the mmap() related parts of the cam structure properly

	* src/capture-strategy-mmap.c: (mmap_constructed): call init_cam()
	* src/main.c: (main): don't call init_cam() anymore


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

Modified: trunk/src/capture-strategy-mmap.c
==============================================================================
--- trunk/src/capture-strategy-mmap.c	(original)
+++ trunk/src/capture-strategy-mmap.c	Wed May 28 14:20:31 2008
@@ -62,6 +62,8 @@
 	}
 
 	g_return_if_fail (PRIV (object)->cam);
+
+	init_cam (PRIV (object)->cam);
 }
 
 static void

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed May 28 14:20:31 2008
@@ -246,7 +246,6 @@
     /* initialize cam and create the window */
     if (cam->read == FALSE) {
 	cam->capture = capture_strategy_mmap_new (cam);
-        init_cam (cam);
     } else {
 	cam->capture = capture_strategy_read_new ();
         printf ("using read()\n");