Si vous constatez la perte de tickets, de commentaires ou de projets, veuillez consulter la page https://status.framasoft.org/incident/626.

Commit 09252171 authored by J Reso's avatar J Reso

rename video-in to video-camera

parent 69be25b2
Pipeline #3371 skipped
# La Malinette
A Free Open Source Kit To Simplify Programming Interactivity
- Version: 1.beta
- Version: 1.0.beta
- Languages: English, French
- Date: 15/10/2015
- Contact: contact_at_reso-nance.org
......
......@@ -2,4 +2,4 @@ audio-in
arduino-in
key-char
mouse
video-in
video-camera
......@@ -2,7 +2,7 @@ track-motion
video-color
video-effects
video-images
video-in
video-camera
video-object
video-out
video-sampler
......
......@@ -13,7 +13,7 @@
#X obj 198 29 cnv 15 100 20 empty empty ARDUINO 20 11 1 9 -261504 -1
0;
#X obj 29 97 audio-in;
#X obj 29 57 video-in;
#X obj 29 57 video-camera;
#X obj 30 187 key-char;
#X obj 30 227 key-makey;
#N canvas 311 168 602 392 _COLORS_ 0;
......
......@@ -20,7 +20,7 @@
;
#X obj 33 200 cnv 15 140 20 empty empty OUTPUT 20 11 1 9 -262110 -1
0;
#X obj 36 70 video-in;
#X obj 36 70 video-camera;
#X obj 35 229 video-out;
#X obj 35 279 video-text;
#X obj 35 324 video-object;
......
......@@ -78,7 +78,7 @@
#X msg 251 418 file areas.txt;
#X obj 387 33 cnv 15 300 60 empty empty MOUSE_INTERACTIONS_(drag&drop):
10 15 1 14 -257985 -66577 0;
#X obj 78 360 video-in;
#X obj 78 360 video-camera;
#X text 297 386 Number of areas (1-16 max);
#X obj 250 353 hradio 15 1 0 8 empty empty empty 0 -8 0 10 -262144
-1 -1 0;
......
......@@ -5,7 +5,7 @@
#X text 437 236 <- off;
#X msg 358 212 dimen 640 480 \, create \, 1;
#X obj 61 236 track-color;
#X obj 61 194 video-in;
#X obj 61 194 video-camera;
#X text 60 22 track-color \; -------------- \; Track a color area \;
Move a red \, green \, blue \, yellow object in front of the camera
\; \; Outlets \; 1: gemList \; 2: X (0-1 float) \; 3: Y (0-1 float)
......
......@@ -25,7 +25,7 @@
1;
#X msg 236 204 debug \$1;
#X obj 61 274 track-motion;
#X obj 61 223 video-in;
#X obj 61 223 video-camera;
#X text 52 5 track-motion \; ----------- \; Track motion of pixels
(blob) \; A blob is an aera of pixels \; \; Outlets \; 1: X (0-1 float)
\; 2: Y (0-1 float) \; 3: movement (0 = no movement ... more = movement)
......
#N canvas 346 138 608 459 10;
#N canvas 344 137 608 459 10;
#X msg 378 193 create \, 1;
#X obj 378 247 gemwin;
#X msg 388 218 0 \, destroy;
......@@ -10,10 +10,10 @@
-1 0 1;
#X msg 175 182 render 70;
#X msg 179 210 on 0;
#X obj 71 242 video-in 0;
#X obj 71 242 video-camera 0;
#X obj 71 316 video-out;
#X text 64 17 video-in \; -------- \; Get video from a camera \; Argument
\; \$1: camera (integer);
#X text 64 17 video-camera \; ------------ \; Get video from a camera
\; Argument \; \$1: camera (integer);
#X connect 0 0 1 0;
#X connect 2 0 1 0;
#X connect 5 0 1 0;
......
......@@ -34,7 +34,7 @@ a file \;;
...;
#X text 246 206 ! Absolute paths;
#X msg 252 226 file-absolute /home/jr/Bureau/record.mov;
#X obj 74 192 video-in;
#X obj 74 192 video-camera;
#X connect 0 0 2 0;
#X connect 1 0 2 0;
#X connect 11 0 18 1;
......
......@@ -14,7 +14,7 @@
#X text 406 175 Gem window;
#X text 492 199 <- on;
#X text 494 221 <- off;
#X obj 79 192 video-in;
#X obj 79 192 video-camera;
#X obj 413 47 ../include;
#N canvas 267 98 908 444 _ALL_MESSAGES_ 0;
#X msg -901 247 auto-stop \$1;
......
......@@ -101,7 +101,7 @@
#X text 521 282 #2 - Record 2 seconds of images;
#X text 519 518 #4 - Stopmotion;
#X msg 522 541 reset \, stop \, play \, ms 100;
#X obj 59 168 video-in;
#X obj 59 168 video-camera;
#X obj 59 408 video-out;
#X obj 524 320 onoff 2000;
#X obj 125 353 route length frame;
......
......@@ -12,7 +12,7 @@
0;
#X obj 7 171 cnv 1 786 1 empty empty IN 2 -6 1 12 -228856 -191407 0
;
#X obj 73 199 video-in;
#X obj 73 199 video-camera;
#N canvas 810 151 450 520 croprepeat 0;
#X obj 107 314 pix_texture;
#X obj 107 277 pix_crop;
......
......@@ -33,7 +33,7 @@ de retard;
#X obj 254 487 synth-drums;
#X obj 737 11 ../../abstractions/include;
#X obj 39 444 video-out;
#X obj 39 233 video-in;
#X obj 39 233 video-camera;
#X msg 132 313 invert;
#X obj 186 314 rand 1;
#X floatatom 186 339 5 0 0 0 - - -;
......
......@@ -12,7 +12,7 @@
0;
#X obj 7 171 cnv 1 786 1 empty empty IN 2 -6 1 12 -228856 -191407 0
;
#X obj 73 199 video-in;
#X obj 73 199 video-camera;
#N canvas 810 151 450 520 croprepeat 0;
#X obj 107 314 pix_texture;
#X obj 107 277 pix_crop;
......
......@@ -41,7 +41,7 @@ de retard;
#X text 495 590 < sorties audio;
#X obj 737 11 ../../abstractions/include;
#X obj 39 444 video-out;
#X obj 39 233 video-in;
#X obj 39 233 video-camera;
#X text 493 369 < rotation du plan de la vidéo en degrés;
#X text 495 456 < affichage de la video;
#X msg 132 313 invert;
......
......@@ -9,7 +9,7 @@
#X obj 61 413 audio-in;
#X obj 361 181 key-char;
#X obj 59 185 mouse;
#X obj 360 394 video-in;
#X obj 360 394 video-camera;
#X obj 597 401 arduino-in;
#X obj 59 285 oscilloscope;
#X obj 361 225 rand 10;
......
......@@ -20,7 +20,7 @@ de retard;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
#X restore 705 29 pd OPEN_VIDEO;
#X obj 155 145 video-in;
#X obj 155 145 video-camera;
#X floatatom 269 289 5 0 0 0 - - -;
#X obj 738 11 ../../abstractions/include;
#X obj 269 185 loadbang;
......
......@@ -15,7 +15,7 @@ de retard;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
#X restore 706 29 pd OPEN_VIDEO;
#X obj 101 344 video-in;
#X obj 101 344 video-camera;
#X obj 738 11 ../../abstractions/include;
#X obj 332 343 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
......
......@@ -15,7 +15,7 @@ de retard;
#X connect 1 0 3 0;
#X restore 704 30 pd OPEN_VIDEO;
#X obj 738 11 ../../abstractions/include;
#X obj 54 239 video-in;
#X obj 54 239 video-camera;
#X obj 147 291 init 1;
#X msg 147 355 rx \$1;
#X obj 147 310 seq-count 360 50;
......
......@@ -14,7 +14,7 @@ de retard;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
#X restore 651 12 pd OPEN_VIDEO;
#X obj 80 175 video-in;
#X obj 80 175 video-camera;
#X floatatom 173 293 5 0 0 0 - - -;
#X obj 738 11 ../../abstractions/include;
#X obj 80 553 video-object 0 2;
......
......@@ -6,7 +6,7 @@
#X declare -path ../../abstractions/seq;
#X obj 743 27 ../../abstractions/include;
#X text 717 7 Don't delete;
#X obj 248 248 video-in;
#X obj 248 248 video-camera;
#X obj 341 208 loadbang;
#X msg 596 326 diff 0.05;
#X msg 598 353 threshold 0.4;
......
......@@ -9,7 +9,7 @@
#X obj 61 440 audio-in;
#X obj 370 187 key-char;
#X obj 63 191 mouse;
#X obj 367 434 video-in;
#X obj 367 434 video-camera;
#X obj 604 441 arduino-in;
#X obj 63 291 oscilloscope;
#X text 60 166 Souris de l'ordinateur;
......
......@@ -22,7 +22,7 @@ de retard;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
#X restore 488 5 pd OPEN_VIDEO;
#X obj 155 145 video-in;
#X obj 155 145 video-camera;
#X floatatom 269 289 5 0 0 0 - - -;
#X text 496 146 < caméra vidéo;
#X text 496 233 < séquenceur qui boucle de 0 à 360;
......
......@@ -15,7 +15,7 @@ de retard;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
#X restore 705 29 pd OPEN_VIDEO;
#X obj 84 359 video-in;
#X obj 84 359 video-camera;
#X obj 738 11 ../../abstractions/include;
#X obj 315 341 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
......
......@@ -17,7 +17,7 @@ de retard;
#X obj 738 11 ../../abstractions/include;
#X text 496 510 Changer le modèle 3D;
#X text 170 562 Changer la taille;
#X obj 54 239 video-in;
#X obj 54 239 video-camera;
#X obj 147 291 init 1;
#X msg 147 355 rx \$1;
#X obj 147 310 seq-count 360 50;
......
......@@ -14,7 +14,7 @@ de retard;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
#X restore 651 12 pd OPEN_VIDEO;
#X obj 78 202 video-in;
#X obj 78 202 video-camera;
#X floatatom 171 325 5 0 0 0 - - -;
#X obj 738 11 ../../abstractions/include;
#X obj 78 585 video-object 0 2;
......
......@@ -6,7 +6,7 @@
#X declare -path ../../abstractions/seq;
#X obj 743 27 ../../abstractions/include;
#X text 717 7 Don't delete;
#X obj 258 258 video-in;
#X obj 258 258 video-camera;
#X obj 351 218 loadbang;
#X msg 606 336 diff 0.05;
#X msg 608 363 threshold 0.4;
......
#! /bin/sh
# rename objects
mv "../../abstractions/$1.pd" "../../abstractions/$2.pd"
mv "../../abstractions/$1-help.pd" "../../abstractions/$2-help.pd"
################### ARCHIVES ######################
#filename1="${$1##*/}"
#dirname1="${$1%/*}"
file1=$(basename "$1")
file2=$(basename "$2")
dir1=$(dirname "$1")
dir2=$(dirname "$2")
#dir_old=$(dirname "$1")
#dir_new=$(dirname "$2")
sed -i "s/$file1/$file2/g" "../../abstractions/$2-help.pd"
DIR1=$(echo $dir1 | tr [a-z] [A-Z])
......@@ -19,3 +12,16 @@ cd ../../examples/
find . -name "*.pd" -type f -exec sed -i "s/$file1\([; ]\)/$file2\1/g" {} \;
cd ../projects/
find . -name "*.pd" -type f -exec sed -i "s/$file1\([; ]\)/$file2\1/g" {} \;
echo $file1
echo $file2
echo $dir1
echo $dir2
# Example with abstractions/video/video-in.pd > video-camera
sed -i -e 's/^\(#X obj [0-9]\+ [0-9]\+\) video-in\([ ;]\)/\1 video-camera\2/' *.pd
sed -i -e 's/^\(#X obj [0-9]\+ [0-9]\+\) video-in\([ ;]\)/\1 video-camera\2/' abstractions/video/*.pd
sed -i -e 's/^\(#X obj [0-9]\+ [0-9]\+\) video-in\([ ;]\)/\1 video-camera\2/' examples/examples-fr/*.pd
sed -i -e 's/^\(#X obj [0-9]\+ [0-9]\+\) video-in\([ ;]\)/\1 video-camera\2/' examples/examples-en/*.pd
sed -i -e 's/^\(#X obj [0-9]\+ [0-9]\+\) video-in\([ ;]\)/\1 video-camera\2/' examples/manual-fr/*.pd
sed -i -e 's/^\(#X obj [0-9]\+ [0-9]\+\) video-in\([ ;]\)/\1 video-camera\2/' examples/manual-en/*.pd
#! /bin/sh
# Rename abstractions into files
# Usage : bash rename_abstraction.sh folder/abstraction_old folder/abstraction_new
# Example : bash rename_abstraction.sh video/video-in video/video-camera
# Get filenames
file_old=$(basename "$1")
file_new=$(basename "$2")
# Change the name of the file
mv "../../abstractions/$1.pd" "../../abstractions/$2.pd"
mv "../../abstractions/$1-help.pd" "../../abstractions/$2-help.pd"
# Change the name into all other files (patchs) : abstractions, examples, projects
pattern="../../*/*/*.pd"
for file in $(ls -R -d $pattern) ; do
sed -i -e "s/^\(#X obj [0-9]\+ [0-9]\+\) $file_old\([ ;]\)/\1 $file_new\2/" $file
done
# Todo : change the title in the help patch + change the name in the default list
#N canvas 147 77 800 687 10;
#N canvas 145 77 800 687 10;
#X declare -path ../../abstractions/in -path ../../abstractions/out
-path ../../abstractions/numbers -path ../../abstractions/video -path
../../abstractions/audio -path ../../abstractions/core -path ../../abstractions/brutbox
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment