浏览代码

added mapping controls

titiChose 8 年之前
父节点
当前提交
ad7033ce31
共有 4 个文件被更改,包括 119 次插入113 次删除
  1. 36 34
      extra/tl.preset
  2. 16 16
      extra/video.preset
  3. 0 0
      grada.pd
  4. 67 63
      main.pd

+ 36 - 34
extra/tl.preset

@@ -28,36 +28,36 @@ light7var value% 0 128 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0;
-light6var value% 0 128 0 54.6763 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+light6var value% 37.0527 128 0 54.6763 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0;
+0 0 0 0 0 0 0 0 0 0;
 light5var value% 0 128 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0;
-light3var value% 21.5827 128 0 21.5827 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+light3var value% 19.9283 128 0 21.5827 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0;
-light4var value% 50 128 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+light4var value% 0 128 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0;
-light2var value% 35.9712 128 0 35.9712 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0;
+light2var value% 68.3453 128 0 43.1655 52.518 68.3453 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0;
-light1var value% 15.1511 128 0 44.6043 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0;
+light1var value% 9.92853 128 0 0.799669 13.1939 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0;
+0 0 0 0 0 0 0 0 0 0 0 0 0;
 sound name Ambianceville3-R.wav 128 Ambianceville3-R.wav _ _ _ _ _
 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
@@ -68,11 +68,12 @@ movie scale 0 128 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0;
-movie name fingers.mov 128 fingers.mov smoke.mov fingers.mov _ _ _
+movie name Orion_mjpeg_320x240.avi 128 fingers.mov smoke.mov fingers.mov
+Orion_mjpeg_320x240.avi _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _;
+;
 Song t15 mute 0 0;
 Song t15 tn 100 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
@@ -360,20 +361,20 @@ Song t5 tu 100 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0;
 Song t3 mute 0 0;
-Song t3 tn 100 0% 44% 34% 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
-19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
-42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
-65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
-88 89 90 91 92 93 94 95 96 97 98 99 0 _;
-Song t3 name _ 0 _;
+Song t3 tn 100 0% 0% 13% 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
+43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
+66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88
+89 90 91 92 93 94 95 96 97 98 99 0 _;
+Song t3 name circ1f1 0 _;
 Song t3 B 0 0;
 Song t3 G 0 0;
 Song t3 R 0 0;
-Song t3 tl 100 0.02 11.983 10.3582 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+Song t3 tl 100 0.02 0 2.86603 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0 0 0 0 0;
-Song t3 tt 100 0 3.24963 20.3102 -100000 -100000 -100000 -100000 -100000
+0 0 0 0 0 0 0 0 0 0 0;
+Song t3 tt 100 0 -100000 56.0616 -100000 -100000 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000
@@ -381,25 +382,26 @@ Song t3 tt 100 0 3.24963 20.3102 -100000 -100000 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0;
-Song t3 tu 100 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+Song t3 tu 100 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0;
 Song t2 mute 0 0;
-Song t2 tn 100 fingers.mov smoke.mov fingers.mov 3 4 5 6 7 8 9 10 11
-12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
-35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
-58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
-81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 0 _;
+Song t2 tn 100 fingers.mov smoke.mov fingers.mov Orion_mjpeg_320x240.avi
+4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
+29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
+52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
+75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
+98 99 0 _;
 Song t2 name movie 0 _;
 Song t2 B 255 0;
 Song t2 G 30.1181 0;
 Song t2 R 150.591 0;
-Song t2 tl 100 6.53121 6.53121 2.09015 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+Song t2 tl 100 6.53121 6.53121 2.09015 17.9186 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0;
-Song t2 tt 100 0.979681 10.2308 26.1812 -100000 -100000 -100000 -100000
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0;
+Song t2 tt 100 0.979681 10.2308 26.1812 107.28 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000
@@ -407,17 +409,17 @@ Song t2 tt 100 0.979681 10.2308 26.1812 -100000 -100000 -100000 -100000
 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0;
-Song t2 tu 100 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+Song t2 tu 100 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0;
 Song t4 mute 0 0;
-Song t4 tn 100 0% 35% 0% 0% 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
+Song t4 tn 100 0% 43% 52% 68% 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
 88 89 90 91 92 93 94 95 96 97 98 99 0 _;
-Song t4 name _ 0 _;
+Song t4 name circ2f1 0 _;
 Song t4 B 0 0;
 Song t4 G 0 0;
 Song t4 R 0 0;
@@ -437,8 +439,8 @@ Song t4 tu 100 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 0 0 0 0 0 0;
-Song s 0.000164 0;
-Song z 69.3202 0;
+Song s 0.000524645 0;
+Song z 2.95008 0;
 Song t1 mute 0 0;
 Song t1 tn 100 Ambianceville3-R.wav 1 2 3 4 5 6 7 8 9 10 11 12 13 14
 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37

+ 16 - 16
extra/video.preset

@@ -34,7 +34,7 @@
 /ev/pro/r/state 1
 /ev/pro/r/texture/weight/y 0
 /ev/pro/r/texture/weight/x 0
-/ev/pro/r/shade/left 0.0153061
+/ev/pro/r/shade/left 0.0258469
 /ev/pro/r/shade/bottom 0
 /ev/pro/r/shade/right 0
 /ev/pro/r/shade/top 0
@@ -48,12 +48,12 @@
 /ev/pro/r/texture/top/left/x 1000
 /ev/pro/r/vertex/bottom/right/y -3.68
 /ev/pro/r/vertex/bottom/right/x 9.8
-/ev/pro/r/vertex/bottom/left/y -3.52
-/ev/pro/r/vertex/bottom/left/x 1.56
+/ev/pro/r/vertex/bottom/left/y -3.49917
+/ev/pro/r/vertex/bottom/left/x 0.257917
 /ev/pro/r/vertex/top/right/y 3.3
 /ev/pro/r/vertex/top/right/x 8.66
-/ev/pro/r/vertex/top/left/y 3.3
-/ev/pro/r/vertex/top/left/x -0.22
+/ev/pro/r/vertex/top/left/y 3.22708
+/ev/pro/r/vertex/top/left/x 0.134167
 /ev/pro/l/grid/res/y 16
 /ev/pro/l/grid/res/x 16
 /ev/pro/l/grid/width 2
@@ -73,7 +73,7 @@
 /ev/pro/l/texture/weight/x 0
 /ev/pro/l/shade/left 0
 /ev/pro/l/shade/bottom 0
-/ev/pro/l/shade/right 0.027551
+/ev/pro/l/shade/right 0.0258469
 /ev/pro/l/shade/top 0
 /ev/pro/l/texture/bottom/right/y 0
 /ev/pro/l/texture/bottom/right/x 1048
@@ -83,14 +83,14 @@
 /ev/pro/l/texture/top/right/x 1048
 /ev/pro/l/texture/top/left/y 768
 /ev/pro/l/texture/top/left/x 0
-/ev/pro/l/vertex/bottom/right/y -3.7
-/ev/pro/l/vertex/bottom/right/x -1.16
+/ev/pro/l/vertex/bottom/right/y -3.56458
+/ev/pro/l/vertex/bottom/right/x -0.0245833
 /ev/pro/l/vertex/bottom/left/y -3.42
 /ev/pro/l/vertex/bottom/left/x -9.66
-/ev/pro/l/vertex/top/right/y 3.22
-/ev/pro/l/vertex/top/right/x -0.86
-/ev/pro/l/vertex/top/left/y 3.3
-/ev/pro/l/vertex/top/left/x -9.48
+/ev/pro/l/vertex/top/right/y 3.43875
+/ev/pro/l/vertex/top/right/x -1.51625
+/ev/pro/l/vertex/top/left/y 3.74792
+/ev/pro/l/vertex/top/left/x -9.605
 /ev/buf/0/color 0 0 0 0
 /ev/buf/0/shift/z 0
 /ev/buf/0/scale/z 1
@@ -106,10 +106,10 @@
 /ev/buf/0/scale/x 1
 /ev/mouse/texture/sensitivity 50
 /ev/mouse/select_radius 0.1
-/ev/gemwin/border 1
+/ev/gemwin/border 0
 /ev/gemwin/lighting 0
 /ev/gemwin/frame 25
 /ev/gemwin/offset/y 0
-/ev/gemwin/offset/x 0
-/ev/gemwin/dimen/y 400
-/ev/gemwin/dimen/x 1067
+/ev/gemwin/offset/x 1360
+/ev/gemwin/dimen/y 768
+/ev/gemwin/dimen/x 2048

LaChose.pd → grada.pd


+ 67 - 63
main.pd

@@ -1,4 +1,4 @@
-#N canvas 273 85 1167 819 10;
+#N canvas 193 81 1167 687 10;
 #X declare -lib libdir -lib ggee -stdpath ggee;
 #X declare -lib libdir -lib ggee -stdpath ggee;
 #X declare -path extra/evt/data -path extra/evt/data -path extra/evt/ev-in
@@ -211,21 +211,6 @@ extra/moonlib;
 ;
 #X declare -stdpath zexy;
 #X declare -lib ../extra/zexy -lib zexy;
-#X declare -stdpath Fraise;
-#X declare -lib ../extra/getdir;
-#X declare -stdpath ggee;
-#X declare -lib ../extra/getdir;
-#X declare -stdpath ggee;
-#X declare -stdpath moonlib;
-#X declare -stdpath hcs;
-#X declare -stdpath ggee;
-#X declare -lib ../extra/s2f -lib ../extra/slist;
-#X declare -lib ../extra/getdir -lib ../extra/shell;
-#X declare -lib ../extra/comport;
-#X declare -lib ../extra/folder_list -lib ../extra/stat -lib ../extra/uname
-;
-#X declare -stdpath zexy;
-#X declare -lib ../extra/zexy -lib zexy;
 #X declare -lib ../extra/getdir;
 #X declare -stdpath ggee;
 #X declare -lib ../extra/getdir;
@@ -266,7 +251,7 @@ extra/moonlib;
 #X declare -lib libdir -lib ggee -stdpath ggee;
 #X declare -lib libdir -lib ggee -stdpath ggee;
 #X declare -lib libdir -lib ggee -stdpath ggee;
-#N canvas 1 59 1178 884 VIDEO 0;
+#N canvas 65 101 1178 687 VIDEO 0;
 #X obj 4 7 cnv 15 400 350 empty empty empty 20 12 0 14 -261682 -66577
 0;
 #X obj 13 52 ev_gemwin;
@@ -300,7 +285,7 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X obj 959 127 pix_texture;
 #X obj 959 149 rectangle 10.6667 4;
 #X obj 505 122 vradio 15 1 0 3 video_mode empty empty 0 -8 0 10 -262144
--1 -1 0;
+-1 -1 2;
 #X text 522 137 mirrors;
 #X text 522 152 quads;
 #X obj 959 86 spigot;
@@ -339,6 +324,11 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X obj 764 738 square 4;
 #X obj 765 648 spigot 1;
 #X obj 765 151 spigot 1;
+#X obj 584 114 vsl 12 50 0 0.05 0 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 2500 1;
+#X obj 584 172 s /ev/pro/l/shade/right;
+#X obj 584 192 s /ev/pro/r/shade/left;
+#X obj 589 72 r /ev/pro/l/shade/right;
 #X connect 6 0 55 0;
 #X connect 6 1 48 0;
 #X connect 7 0 22 0;
@@ -387,8 +377,11 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X connect 60 0 61 0;
 #X connect 62 0 58 0;
 #X connect 63 0 24 0;
-#X coords 0 -1 1 1 85 70 1 500 100;
-#X restore 37 -115 pd VIDEO;
+#X connect 64 0 65 0;
+#X connect 64 0 66 0;
+#X connect 67 0 64 0;
+#X coords 0 -1 1 1 100 70 1 500 100;
+#X restore 17 -107 pd VIDEO;
 #N canvas 1251 366 575 300 init 0;
 #X obj 182 172 bng 15 250 50 0 empty empty load 17 7 0 10 -4034 -1
 -1;
@@ -411,34 +404,33 @@ extra/evt/ev-pro -path extra/evt/libs/gil -path extra/evt/libs/kollabs
 #X connect 0 0 5 0;
 #X connect 1 0 5 1;
 #X coords 0 -1 1 1 85 40 1 180 150;
-#X restore 37 -40 pd init;
-#X obj 134 -115 tlSong15 \$0-Master Song;
-#X obj 154 306 tlTransport \$0-Master Song;
-#X obj 845 111 unpack f f f f;
-#X floatatom 845 226 5 0 0 3 eventNum - -, f 5;
-#X floatatom 872 194 5 0 0 3 eventTime - -, f 5;
-#X floatatom 899 165 5 0 0 3 normalizedTime - -, f 5;
-#X floatatom 926 132 5 0 0 3 eventLength - -, f 5;
-#X obj 845 47 speedlim 50;
-#X obj 868 -39 print;
-#X obj 847 -114 r \$0-Master-song-Song-snd;
-#X obj 847 -92 route 0;
-#X obj 936 -66 route 4;
-#X obj 936 -44 route get;
-#X msg 936 -22 \$1;
-#X obj 936 0 change;
-#X floatatom 870 273 5 0 0 0 - - -, f 5;
-#X obj 844 24 r \$0-Master-song-Song-rcv;
-#X obj 845 69 route i;
-#X floatatom 845 91 5 0 0 0 - - -, f 5;
-#X obj 899 91 print masterSongRCV;
-#X obj 1214 307 print masterSongSND;
-#X obj 857 322 s 1003-Master-song-Song-rcv;
-#X msg 857 300 4 0 l \$1;
-#X obj 578 306 tlMovie \$0-Master movie Song 2;
-#X obj 355 306 tlSound \$0-Master sound Song 1;
-#X obj 918 418 LaChose;
-#N canvas 168 120 450 657 Fraise 0;
+#X restore 17 -32 pd init;
+#X obj 134 -107 tlSong15 \$0-Master Song;
+#X obj 154 314 tlTransport \$0-Master Song;
+#X obj 845 119 unpack f f f f;
+#X floatatom 845 234 5 0 0 3 eventNum - -, f 5;
+#X floatatom 872 202 5 0 0 3 eventTime - -, f 5;
+#X floatatom 899 173 5 0 0 3 normalizedTime - -, f 5;
+#X floatatom 926 140 5 0 0 3 eventLength - -, f 5;
+#X obj 845 55 speedlim 50;
+#X obj 868 -31 print;
+#X obj 847 -106 r \$0-Master-song-Song-snd;
+#X obj 847 -84 route 0;
+#X obj 936 -58 route 4;
+#X obj 936 -36 route get;
+#X msg 936 -14 \$1;
+#X obj 936 8 change;
+#X floatatom 870 281 5 0 0 0 - - -, f 5;
+#X obj 844 32 r \$0-Master-song-Song-rcv;
+#X obj 845 77 route i;
+#X floatatom 845 99 5 0 0 0 - - -, f 5;
+#X obj 899 99 print masterSongRCV;
+#X obj 938 277 print masterSongSND;
+#X obj 857 330 s 1003-Master-song-Song-rcv;
+#X msg 857 308 4 0 l \$1;
+#X obj 578 314 tlMovie \$0-Master movie Song 2;
+#X obj 355 314 tlSound \$0-Master sound Song 1;
+#N canvas 165 124 450 657 Fraise 0;
 #X obj 21 38 pied/pied 0 41424;
 #X obj 21 112 fruit/fruit 1 dimmer1 10 dimmer1;
 #X obj 21 160 fruit/fruit 1 dimmer2 11 dimmer2;
@@ -468,7 +460,11 @@ extra/evt/ev-pro -path extra/evt/libs/gil -path extra/evt/libs/kollabs
 #X obj 60 460 pack f f;
 #X msg 60 485 c 40 c \$1 i \$2;
 #X obj 60 508 fruit/send dimmer1;
-#X obj 237 451 moses;
+#X obj 99 377 moses 8;
+#X obj 146 399 - 8;
+#X obj 206 459 pack f f;
+#X msg 206 484 c 40 c \$1 i \$2;
+#X obj 206 507 fruit/send dimmer1;
 #X connect 3 0 4 0;
 #X connect 4 0 5 0;
 #X connect 5 0 6 0;
@@ -481,22 +477,30 @@ extra/evt/ev-pro -path extra/evt/libs/gil -path extra/evt/libs/kollabs
 #X connect 16 0 17 0;
 #X connect 17 1 19 0;
 #X connect 19 0 18 0;
+#X connect 19 0 25 0;
+#X connect 20 0 22 1;
+#X connect 20 0 27 1;
 #X connect 21 0 20 0;
 #X connect 22 0 23 0;
 #X connect 23 0 24 0;
-#X restore 37 4 pd Fraise;
-#X obj 151 401 tlLight \$0-Master light1 Song 3;
-#X obj 373 401 tlLight \$0-Master light2 Song 4;
-#X obj 151 467 tlLight \$0-Master light4 Song 6;
-#X obj 595 401 tlLight \$0-Master light3 Song 5;
-#X obj 373 467 tlLight \$0-Master light5 Song 7;
-#X obj 595 467 tlLight \$0-Master light6 Song 8;
-#X obj 151 531 tlLight \$0-Master light7 Song 9;
-#X obj 373 531 tlLight \$0-Master light8 Song 10;
-#X obj 595 531 tlLight \$0-Master light9 Song 11;
-#X obj 151 597 tlLight \$0-Master light10 Song 12;
-#X obj 373 597 tlLight \$0-Master light11 Song 13;
-#X obj 595 597 tlLight \$0-Master light12 Song 14;
+#X connect 25 0 22 0;
+#X connect 25 1 26 0;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 28 0 29 0;
+#X restore 17 12 pd Fraise;
+#X obj 151 409 tlLight \$0-Master light1 Song 3;
+#X obj 373 409 tlLight \$0-Master light2 Song 4;
+#X obj 151 475 tlLight \$0-Master light4 Song 6;
+#X obj 595 409 tlLight \$0-Master light3 Song 5;
+#X obj 373 475 tlLight \$0-Master light5 Song 7;
+#X obj 595 475 tlLight \$0-Master light6 Song 8;
+#X obj 151 539 tlLight \$0-Master light7 Song 9;
+#X obj 373 539 tlLight \$0-Master light8 Song 10;
+#X obj 595 539 tlLight \$0-Master light9 Song 11;
+#X obj 151 605 tlLight \$0-Master light10 Song 12;
+#X obj 373 605 tlLight \$0-Master light11 Song 13;
+#X obj 595 605 tlLight \$0-Master light12 Song 14;
 #X connect 4 0 5 0;
 #X connect 4 1 6 0;
 #X connect 4 2 7 0;
@@ -512,4 +516,4 @@ extra/evt/ev-pro -path extra/evt/libs/gil -path extra/evt/libs/kollabs
 #X connect 19 0 20 0;
 #X connect 19 1 21 0;
 #X connect 24 0 23 0;
-#X coords 0 819 1 818 85 60 0;
+#X coords 0 687 1 686 85 60 0;