[PD-cvs] SF.net SVN: pure-data: [9874] trunk/externals/pdvjtools/videogrid

[lluisbigorda at users.sourceforge.net]

Revision: 9874
          http://pure-data.svn.sourceforge.net/pure-data/?rev=9874&view=rev
Author:   lluisbigorda
Date:     2008-05-23 15:34:00 -0700 (Fri, 23 May 2008)

Log Message:
-----------
change the code to be in single file
added ffmpeg support

Modified Paths:
--------------
    trunk/externals/pdvjtools/videogrid/Makefile
    trunk/externals/pdvjtools/videogrid/videogrid-help.pd

Modified: trunk/externals/pdvjtools/videogrid/Makefile
===================================================================
--- trunk/externals/pdvjtools/videogrid/Makefile	2008-05-23 21:17:06 UTC (rev 9873)
+++ trunk/externals/pdvjtools/videogrid/Makefile	2008-05-23 22:34:00 UTC (rev 9874)
@@ -1,4 +1,5 @@
-PD_SRC=../../src
+PD_SRC=../../../pd/src
+FFMPEG_HEADERS=-I/usr/include/ffmpeg
 
 NAME=videogrid
 CSYM=videogrid
@@ -19,19 +20,15 @@
 LINUXINCLUDE =  -I$(PD_SRC) -I/usr/include/
 
 .c.pd_linux:
-	cc -fPIC -c -ansi -O -Wall -Wmissing-prototypes cua.c
-	cc -fPIC -c -O -Wall -Wmissing-prototypes -o qtconverter.o -c qtconverter.c
+	g++  $(FFMPEG_HEADERS) -fPIC -c -O -o videogrid.o videogrid.cpp
 # 	./tk2c.bash < $*.tk > $*.tk2c
-	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
-	ld -export_dynamic  -shared -o $*.pd_linux $*.o cua.o qtconverter.o -lc -lm -lquicktime
-	strip --strip-unneeded $*.pd_linux
-	rm -f $*.o ../$*.pd_linux
-	ln -s $*/$*.pd_linux ..
+	g++ $(FFMPEG_HEADERS) -export_dynamic  -shared -o videogrid.pd_linux videogrid.o -lavformat -lavcodec -lavutil -lavcodec -lavutil -lquicktime -lgsm -lz -lm
+	rm -f $*.o 
 
 # ----------------------------------------------------------
 
 install:
-	cp *-help.pd ../../doc/5.reference
+	cp *-help.pd ../../../doc/5.reference
 
 clean:
 	rm -f *.o *.pd_* so_locations

Modified: trunk/externals/pdvjtools/videogrid/videogrid-help.pd
===================================================================
--- trunk/externals/pdvjtools/videogrid/videogrid-help.pd	2008-05-23 21:17:06 UTC (rev 9873)
+++ trunk/externals/pdvjtools/videogrid/videogrid-help.pd	2008-05-23 22:34:00 UTC (rev 9874)
@@ -3,19 +3,22 @@
 #X obj 26 110 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
 #X text 24 13 VIDEOGRID;
-#X obj 72 178 videogrid videogrid1 3 5 #F0F0F0 #0F0F0F /usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov|/usr/local/lib/pd/extra/videogrid/videos/dscn0248.mov|
-;
 #X text 154 63 ADD VIDEO;
 #X text 154 113 ADD VIDEOS FROM FOLDER;
 #X text 25 29 Object to select the path location of a video quiktime
 added in the grid \, in form of image of its first frame.;
 #X text 74 344 LOCATION OF THE SELECTED VIDEO;
 #X text 24 93 LIST STDOUT;
-#X msg 156 77 putvideo /usr/local/lib/pd/extra/videogrid/videos/dscn0241.mov
-;
 #X msg 156 127 putvideodir /usr/local/lib/pd/extra/videogrid/videos
 ;
-#X connect 1 0 3 0;
-#X connect 3 0 0 0;
-#X connect 9 0 3 0;
-#X connect 10 0 3 0;
+#X obj 83 159 videogrid videogrid2 3 5 #F0F0F0 #0F0F0F #F1882B;
+#X msg 156 77 putvideo \$1;
+#X obj 268 74 openpanel;
+#X obj 348 73 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X connect 1 0 9 0;
+#X connect 8 0 9 0;
+#X connect 9 0 0 0;
+#X connect 10 0 9 0;
+#X connect 11 0 10 0;
+#X connect 12 0 11 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.