camorama r370 - in trunk: . src

[herzi svn gnome org]

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

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

	Some code improvements

	* src/v4l.h: added G_BEGIN_DECLS and G_END_DECLS markers; added a note
	for an upcoming field move; changed the order of the functions to be
	more intuitive


Modified:
   trunk/ChangeLog
   trunk/src/v4l.h

Modified: trunk/src/v4l.h
==============================================================================
--- trunk/src/v4l.h	(original)
+++ trunk/src/v4l.h	Wed May 28 16:16:02 2008
@@ -19,11 +19,17 @@
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
 
+G_BEGIN_DECLS
+
 typedef struct camera cam;
 
+G_END_DECLS
+
 #include "camorama-filter-chain.h"
 #include "capture-strategy.h"
 
+G_BEGIN_DECLS
+
 typedef enum {
 	PICMAX = 0,
 	PICMIN = 1,
@@ -49,8 +55,8 @@
     struct video_capability vid_cap;
     struct video_picture vid_pic;
     struct video_window vid_win;
-    struct video_mbuf vid_buf;
-    struct video_mmap vid_map;
+    struct video_mbuf vid_buf; // FIXME: move into CaptureStrategyMmapPrivate
+    struct video_mmap vid_map; // FIXME: could be moved into CaptureStrategyMmapPrivate
     char *video_dev;
     unsigned char *image;
     gchar *capturefile, *rcapturefile;
@@ -76,10 +82,12 @@
 };
 
 void camera_cap (cam *);
+void get_win_info (cam *);
 void set_win_info (cam * cam);
 void get_pic_info (cam *);
 void set_pic_info (cam *);
-void get_win_info (cam *);
+
+G_END_DECLS
 
 #endif /* !CAMORAMA_V4L_H */