camorama r365 - in trunk: . src

[herzi svn gnome org]

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

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

	merged init_cam() and constructed()

	* src/capture-strategy-mmap.c: (mmap_constructed):


Modified:
   trunk/ChangeLog
   trunk/src/capture-strategy-mmap.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:57 2008
@@ -54,9 +54,17 @@
 						  CaptureStrategyMmapPrivate);
 }
 
-static
-void init_cam (cam * cam)
+static void
+mmap_constructed (GObject* object)
 {
+	cam* cam = PRIV(object)->cam;
+
+	if (G_OBJECT_CLASS (capture_strategy_mmap_parent_class)->constructed) {
+		G_OBJECT_CLASS (capture_strategy_mmap_parent_class)->constructed (object);
+	}
+
+	g_return_if_fail (PRIV (object)->cam);
+
     cam->pic =
         mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
               MAP_SHARED, cam->dev, 0);
@@ -86,18 +94,6 @@
 }
 
 static void
-mmap_constructed (GObject* object)
-{
-	if (G_OBJECT_CLASS (capture_strategy_mmap_parent_class)->constructed) {
-		G_OBJECT_CLASS (capture_strategy_mmap_parent_class)->constructed (object);
-	}
-
-	g_return_if_fail (PRIV (object)->cam);
-
-	init_cam (PRIV (object)->cam);
-}
-
-static void
 mmap_finalize (GObject* object)
 {
 	PRIV (object)->cam = NULL;