aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlluís gómez i bigordà <lluisbigorda@users.sourceforge.net>2008-05-24 00:35:19 +0000
committerlluís gómez i bigordà <lluisbigorda@users.sourceforge.net>2008-05-24 00:35:19 +0000
commitfa9840b5b799af8bab5f35d3ef790721084d9c67 (patch)
tree8b03b642441278b04f05b5b3de1b4c457ebad857
parent403760eaaf879f6030d0665b1f4aa5c95b3deef0 (diff)
svn path=/trunk/externals/pdvjtools/; revision=9887
-rwxr-xr-xvideogrid/Makefile6
-rwxr-xr-xvideogrid/videogrid-help.pd8
2 files changed, 10 insertions, 4 deletions
diff --git a/videogrid/Makefile b/videogrid/Makefile
index 5855ff6..1fbcab9 100755
--- a/videogrid/Makefile
+++ b/videogrid/Makefile
@@ -19,10 +19,10 @@ LINUXCFLAGS = -fPIC -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointe
LINUXINCLUDE = -I$(PD_SRC) -I/usr/include/
-.c.pd_linux:
- g++ $(FFMPEG_HEADERS) -fPIC -c -O -o videogrid.o videogrid.cpp
+.cpp.pd_linux:
+ g++ $(FFMPEG_HEADERS) -I$(PD_SRC) -fPIC -c -O -o videogrid.o videogrid.cpp
# ./tk2c.bash < $*.tk > $*.tk2c
- g++ $(FFMPEG_HEADERS) -export_dynamic -shared -o videogrid.pd_linux videogrid.o -lavformat -lavcodec -lavutil -lavcodec -lavutil -lquicktime -lgsm -lz -lm
+ g++ $(FFMPEG_HEADERS) -export_dynamic -shared -o videogrid.pd_linux videogrid.o -lavformat -lavcodec -lavutil -lquicktime
rm -f $*.o
# ----------------------------------------------------------
diff --git a/videogrid/videogrid-help.pd b/videogrid/videogrid-help.pd
index 0d4eff4..68da1a3 100755
--- a/videogrid/videogrid-help.pd
+++ b/videogrid/videogrid-help.pd
@@ -11,14 +11,20 @@ added in the grid \, in form of image of its first frame.;
#X text 24 93 LIST STDOUT;
#X msg 156 127 putvideodir /usr/local/lib/pd/extra/videogrid/videos
;
-#X obj 83 159 videogrid videogrid2 3 5 #F0F0F0 #0F0F0F #F1882B;
+#X obj 83 159 videogrid videogrid1 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 msg 16 160 clear;
+#X msg 13 212 seek \$1;
+#X floatatom 19 185 5 0 0 0 - - -;
#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;
+#X connect 13 0 9 0;
+#X connect 14 0 9 0;
+#X connect 15 0 14 0;