SF.net SVN: pure-data: [9948] trunk/externals/pidip - Pd-cvs

30 May 2008

Revision: 9948
          http://pure-data.svn.sourceforge.net/pure-data/?rev=9948&view=rev
Author:   sevyves
Date:     2008-05-30 11:39:27 -0700 (Fri, 30 May 2008)
Log Message:
-----------
added pdp_v4l2
Modified Paths:
--------------
    trunk/externals/pidip/CHANGES.LOG
    trunk/externals/pidip/configure.ac
    trunk/externals/pidip/include/pidip_config.h.in
    trunk/externals/pidip/modules/Makefile.in
    trunk/externals/pidip/modules/pdp_colorgrid.c
    trunk/externals/pidip/patches/collage.pd
    trunk/externals/pidip/system/pidip.c
Modified: trunk/externals/pidip/CHANGES.LOG
===================================================================

--- trunk/externals/pidip/CHANGES.LOG	2008-05-30 18:20:28 UTC (rev 9947)
+++ trunk/externals/pidip/CHANGES.LOG	2008-05-30 18:39:27 UTC (rev 9948)
@@ -1,3 +1,8 @@
+0.12.23 ( codename My Mum's Cam )
+  added pdp_v4l2 : video 4 linux 2 object
+  ( code template from pdp_v4l and xawtv ( v4l2 driver ),
+    thanks to Tom Schouten & Gerd Knorr kraxel@bytesex.org )
+
 0.12.22 ( codename Visual Junk )
   added pdp_dot : matrix printer effect
Modified: trunk/externals/pidip/configure.ac
===================================================================
--- trunk/externals/pidip/configure.ac	2008-05-30 18:20:28 UTC (rev 9947)
+++ trunk/externals/pidip/configure.ac	2008-05-30 18:39:27 UTC (rev 9948)
@@ -4,7 +4,7 @@
 AC_CANONICAL_HOST
 AC_CONFIG_HEADER(include/pidip_config.h)
-PDP_PIDIP_VERSION="0.12.22"
+PDP_PIDIP_VERSION="0.12.23"
 PD_DIR=/usr/local/pd
 PDP_DIR=/usr/local/pd/pdp
 FFMPEG_SOURCE_DIR=/SOURCES/ffmpeg
@@ -223,13 +223,19 @@
if test $enable_lcapture == yes;
 then
-    PDP_CAPTURE_OBJECT="pdp_capture.o"
+    PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_capture.o"
     AC_DEFINE(HAVE_IMAGE_MAGICK, 1, image magick capture capability)
     PDP_PIDIP_LIBS="$MAGICK_LIBS $PDP_PIDIP_LIBS"
     PDP_PIDIP_INCLUDES="$MAGICK_CFLAGS $PDP_PIDIP_INCLUDES"
     echo "building pdp_capture."
 fi
+AC_CHECK_HEADER(linux/videodev2.h,
+                PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_v4l2.o"
+                AC_DEFINE(HAVE_V4L2, 1, build pdp_v4l2),
+                echo "   linux/videodev2.h not found: not building pdp_v4l2")
+
+
 if test $enable_ffmpeg == yes;
 then
   echo -n "looking for ffmpeg sources (required) ... "
Modified: trunk/externals/pidip/include/pidip_config.h.in
===================================================================
--- trunk/externals/pidip/include/pidip_config.h.in	2008-05-30 18:20:28 UTC (rev 9947)
+++ trunk/externals/pidip/include/pidip_config.h.in	2008-05-30 18:39:27 UTC (rev 9948)
@@ -9,3 +9,6 @@
/* Define to 1 if you have mpeg4ip source tree */
 #undef HAVE_PIDIP_MPEG4IP
+
+/* Define to 1 if you have video 4 linux 2 */
+#undef HAVE_V4L2
Modified: trunk/externals/pidip/modules/Makefile.in
===================================================================
--- trunk/externals/pidip/modules/Makefile.in	2008-05-30 18:20:28 UTC (rev 9947)
+++ trunk/externals/pidip/modules/Makefile.in	2008-05-30 18:39:27 UTC (rev 9948)
@@ -20,7 +20,7 @@
           pdp_disintegration.o pdp_distance.o pdp_theorin~.o \
           pdp_theorout~.o pdp_cropper.o pdp_background.o \
           pdp_mapper.o pdp_theonice~.o pdp_icedthe~.o\
-          pdp_fdiff.o pdp_hue.o pdp_dot.o pdp_qtext.o \
-	  @PDP_CAPTURE_OBJECT@ @PDP_STREAMING_OBJECTS@ # pdp_xcanvas.o pdp_aa.o
+          pdp_fdiff.o pdp_hue.o pdp_dot.o pdp_qtext.o\
+         @PDP_CAPTURE_OBJECT@ @PDP_STREAMING_OBJECTS@ # pdp_xcanvas.o pdp_aa.o
all_modules: $(OBJECTS)
Modified: trunk/externals/pidip/modules/pdp_colorgrid.c
===================================================================
--- trunk/externals/pidip/modules/pdp_colorgrid.c	2008-05-30 18:20:28 UTC (rev 9947)
+++ trunk/externals/pidip/modules/pdp_colorgrid.c	2008-05-30 18:39:27 UTC (rev 9948)
@@ -313,7 +313,7 @@
static void pdp_colorgrid_output_current(t_pdp_colorgrid* x)
 {
-  t_float ox=0, oy=0, hue, saturation, value, red, green, blue ;
+  t_float ox=0, oy=0, hue, saturation, value, red=0, green=0, blue=0 ;
/* These values need to be the same as those that produced the spectrum image:*/
Modified: trunk/externals/pidip/patches/collage.pd
===================================================================
--- trunk/externals/pidip/patches/collage.pd	2008-05-30 18:20:28 UTC (rev 9947)
+++ trunk/externals/pidip/patches/collage.pd	2008-05-30 18:39:27 UTC (rev 9948)
@@ -15,7 +15,7 @@
 #X obj 399 107 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
 #X msg 401 196 clear;
-#X obj 579 191 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+#X obj 587 193 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
 -1 -1 0 1;
 #X obj 485 193 pdp_imgloader;
 #X msg 399 158 load $1;
@@ -43,7 +43,7 @@
 #X obj 196 20 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1
 -1;
 #X msg 55 85 loop $1;
-#X obj 56 63 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1
+#X obj 56 63 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1
 ;
 #X msg 100 54 open $1;
 #X obj 99 30 openpanel;
@@ -52,7 +52,7 @@
 #X msg 159 18 stop;
 #X obj 176 51 metro 70;
 #X obj 171 83 pdp_yqt;
-#X msg 246 392 cursor 1;
+#X msg 298 359 cursor 1;
 #X obj 321 424 route press;
 #X obj 324 91 pdp_cache;
 #X msg 154 143 unhide $1;
@@ -140,7 +140,6 @@
 #X connect 28 0 30 0;
 #X connect 29 0 30 3;
 #X connect 30 0 32 0;
-#X connect 30 0 42 0;
 #X connect 31 0 30 0;
 #X connect 32 0 43 0;
 #X connect 33 0 40 0;
@@ -152,6 +151,7 @@
 #X connect 39 0 40 0;
 #X connect 40 0 41 0;
 #X connect 41 0 44 0;
+#X connect 42 0 32 0;
 #X connect 43 0 70 0;
 #X connect 44 0 6 0;
 #X connect 45 0 6 0;
Modified: trunk/externals/pidip/system/pidip.c
===================================================================
--- trunk/externals/pidip/system/pidip.c	2008-05-30 18:20:28 UTC (rev 9947)
+++ trunk/externals/pidip/system/pidip.c	2008-05-30 18:39:27 UTC (rev 9948)
@@ -81,8 +81,12 @@
     void pdp_hue_setup(void);
     void pdp_dot_setup(void);
+#ifdef HAVE_V4L2
+    void pdp_v4l2_setup(void);
+#endif
+
 #ifdef __APPLE__
-       void pdp_ieee1394_setup(void);
+    void pdp_ieee1394_setup(void);
 #endif
#ifdef HAVE_IMAGE_MAGICK
@@ -176,6 +180,10 @@
     pdp_hue_setup();
     pdp_dot_setup();
+#ifdef HAVE_V4L2
+    pdp_v4l2_setup();
+#endif
+
 #ifdef __APPLE__
        pdp_ieee1394_setup();
 #endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    