diff options
| author | lluís gómez i bigordà <lluisbigorda@users.sourceforge.net> | 2008-05-23 22:34:00 +0000 |
|---|---|---|
| committer | lluís gómez i bigordà <lluisbigorda@users.sourceforge.net> | 2008-05-23 22:34:00 +0000 |
| commit | ee4a29be8af139f5c94b80e1e4a9159f92a51738 (patch) | |
| tree | c63665685aad969eb935c4d3a8d9218f2c4257d0 | |
| parent | 3c16d736a2c76a2f21337996e802972fb67c04e1 (diff) | |
change the code to be in single file
added ffmpeg support
svn path=/trunk/externals/pdvjtools/; revision=9874
| -rwxr-xr-x | videogrid/Makefile | 15 | ||||
| -rwxr-xr-x | videogrid/videogrid-help.pd | 19 |
2 files changed, 17 insertions, 17 deletions
diff --git a/videogrid/Makefile b/videogrid/Makefile index 53e3d32..5855ff6 100755 --- a/videogrid/Makefile +++ b/videogrid/Makefile @@ -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 @@ LINUXCFLAGS = -fPIC -DPD -DUNIX -DICECAST -O2 -funroll-loops -fomit-frame-pointe 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 diff --git a/videogrid/videogrid-help.pd b/videogrid/videogrid-help.pd index cd556c1..0d4eff4 100755 --- a/videogrid/videogrid-help.pd +++ b/videogrid/videogrid-help.pd @@ -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; |