From: Martin Molnar <molnam1@fel.cvut.cz>
Date: Thu, 4 Dec 2008 18:54:56 +0000 (+0100)
Subject: Added frsh aquosa contract negotiation to camera demo. The contract for video thread... 
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/frsh.git/commitdiff_plain/4d29f7e1ea6a64059a9ed7b37e41dc385ff7cd25

Added frsh aquosa contract negotiation to camera demo. The contract for video thread is negotiated.
---

diff --git a/demo/camera/Makefile.omk b/demo/camera/Makefile.omk
index 3705968..4781243 100644
--- a/demo/camera/Makefile.omk
+++ b/demo/camera/Makefile.omk
@@ -1,9 +1,10 @@
 LDFLAGS+= -L/usr/X11R6/lib 
 C_INCLUDE_PATH = -I/usr/X11R6/include
 GLUT_LIBS = glut GL GLU 
-lib_LOADLIBES+= $(GLUT_LIBS) m 
+FRSH_LIBS = frshaqcpu frsh qreslib
+lib_LOADLIBES+= $(GLUT_LIBS) m pthread rt $(FRSH_LIBS)
 
 bin_PROGRAMS = camera
-camera_SOURCES = show_video_v4l_main.c show_video_v4l_capture.c capture_v4l.c\
-			extract_skin_color.c
-include_HEADERS = show_video_v4l.h capture_v4l.h extract_skin_color.h
+camera_SOURCES = camera.c show_video_v4l_main.c show_video_v4l_capture.c\
+			capture_v4l.c extract_skin_color.c
+include_HEADERS = show_video_v4l.h capture_v4l.h extract_skin_color.h camera.h
diff --git a/demo/camera/show_video_v4l_main.c b/demo/camera/show_video_v4l_main.c
index 17d1e27..ff7f242 100644
--- a/demo/camera/show_video_v4l_main.c
+++ b/demo/camera/show_video_v4l_main.c
@@ -8,11 +8,16 @@
 
 int extract_skin_color;	/* global variable for enabling image processing */
 
-int main( int argc , char *argv[] )
+#include <camera.h>
+//int main( int argc , char *argv[] )
+void* video_thread(void* args)
 {
-
+    video_args_t *video_args = (video_args_t*) args;
+    int argc = video_args->argc;
+    char** argv;
+    
+    argv = video_args->argv; 	
     static char window_title[1024]="Video Capture";
-
     int i,j;
     int video_input;