camorama r368 - in trunk: . src

[herzi svn gnome org]

Author: herzi
Date: Wed May 28 16:15:53 2008
New Revision: 368
URL: http://svn.gnome.org/viewvc/camorama?rev=368&view=rev

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

	Moved the buffer initialization into the mmap() based capture
	implementation

	* src/capture-strategy-mmap.c: (mmap_constructed): initialize buffers
	* src/main.c: (main): don't initialize buffers here 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 16:15:53 2008
@@ -66,6 +66,9 @@
 
 	g_return_if_fail (PRIV (object)->cam);
 
+	/* set the buffer size */
+	set_buffer (PRIV(object)->cam);
+
 	PRIV(object)->pic = mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
 				  MAP_SHARED, cam->dev, 0);
 

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed May 28 16:15:53 2008
@@ -240,9 +240,6 @@
 
     /* initialize cam and create the window */
     if (cam->read == FALSE) {
-	/* set the buffer size */
-        set_buffer (cam);
-
 	cam->capture = capture_strategy_mmap_new (cam);
     } else {
 	cam->capture = capture_strategy_read_new (cam);