- Images and Texts working
This commit is contained in:
Santi Noreña
parent
8da55d2b1a
commit
f67bfb43c8
8 changed files with 396 additions and 825 deletions
2
dmx.xlm
2
dmx.xlm
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<dmxSettings fileVersion="1" layersNumber="8" path="/home/santi/LMS/media_lms/video" universeNumber="1">
|
||||
<dmxSettings fileVersion="1" layersNumber="8" path="/home/santi/LMS/media_lms" universeNumber="1">
|
||||
<layer0 dmx="1" universe="0" />
|
||||
<layer1 dmx="65" universe="0" />
|
||||
<layer2 dmx="129" universe="0" />
|
||||
|
|
|
|||
|
|
@ -249,9 +249,8 @@ En los modos auto el inicio y fin de loop no son aplicables, se reproduce la pel
|
|||
7 Archivo / Fuente / Cámara
|
||||
8 Tipo de Media
|
||||
0-24: OFF
|
||||
25-49: Video
|
||||
50-75: Imágenes
|
||||
75-99: Texto
|
||||
25-49: Media files (Video and Pictures)
|
||||
50-75: Texto
|
||||
100-124: Video Cámara
|
||||
|
||||
9 Modos de Reproduccion (Sólo aplicable si canal 5 < 245):
|
||||
|
|
|
|||
|
|
@ -1,86 +1,42 @@
|
|||
#N canvas 144 135 1221 604 10;
|
||||
#X obj 156 227 change;
|
||||
#X obj 204 226 change;
|
||||
#X obj 282 142 change;
|
||||
#X obj 336 143 change;
|
||||
#X obj 390 142 change;
|
||||
#X obj 442 142 change;
|
||||
#X obj 496 143 change;
|
||||
#X obj 282 239 change;
|
||||
#X obj 337 238 change;
|
||||
#X obj 391 238 change;
|
||||
#X obj 445 239 change;
|
||||
#X obj 498 238 change;
|
||||
#X obj 567 144 change;
|
||||
#X obj 646 145 change;
|
||||
#X obj 698 146 change;
|
||||
#X obj 760 149 change;
|
||||
#X obj 813 149 change;
|
||||
#X obj 580 227 change;
|
||||
#X obj 116 31 change;
|
||||
#X obj 172 31 change;
|
||||
#X obj 228 30 change;
|
||||
#X obj 16 227 change;
|
||||
#X obj 62 227 change;
|
||||
#X obj 107 227 change;
|
||||
#N canvas 122 135 1221 604 10;
|
||||
#X obj 391 283 << 8;
|
||||
#X obj 391 325 +;
|
||||
#X obj 445 283 << 8;
|
||||
#X obj 445 325 +;
|
||||
#X obj 214 -241 inlet;
|
||||
#X obj 469 285 << 8;
|
||||
#X obj 469 325 +;
|
||||
#X obj 136 -297 inlet;
|
||||
#X obj -10 52 s \$0-c1;
|
||||
#X obj 53 54 s \$0-c2;
|
||||
#X obj 53 52 s \$0-c2;
|
||||
#X obj 116 52 s \$0-c3;
|
||||
#X obj 172 52 s \$0-c4;
|
||||
#X obj 228 51 s \$0-c5;
|
||||
#X obj 16 250 s \$0-c6;
|
||||
#X obj 62 249 s \$0-c7;
|
||||
#X obj 107 250 s \$0-c8;
|
||||
#X obj 156 249 s \$0-c9;
|
||||
#X obj 204 250 s \$0-c10;
|
||||
#X obj 282 163 s \$0-c11;
|
||||
#X obj 336 164 s \$0-c12;
|
||||
#X obj 390 163 s \$0-c13;
|
||||
#X obj 442 163 s \$0-c14;
|
||||
#X obj 496 164 s \$0-c15;
|
||||
#X obj 282 260 s \$0-c16;
|
||||
#X obj 337 259 s \$0-c17;
|
||||
#X obj 228 52 s \$0-c5;
|
||||
#X obj -13 143 s \$0-c6;
|
||||
#X obj 49 143 s \$0-c7;
|
||||
#X obj 103 143 s \$0-c8;
|
||||
#X obj 157 143 s \$0-c9;
|
||||
#X obj 210 143 s \$0-c10;
|
||||
#X obj 258 104 s \$0-c11;
|
||||
#X obj 321 104 s \$0-c12;
|
||||
#X obj 383 104 s \$0-c13;
|
||||
#X obj 446 104 s \$0-c14;
|
||||
#X obj 509 104 s \$0-c15;
|
||||
#X obj 249 257 s \$0-c16;
|
||||
#X obj 315 257 s \$0-c17;
|
||||
#X obj 391 367 s \$0-c18;
|
||||
#X obj 445 367 s \$0-c19;
|
||||
#X obj 580 250 s \$0-c26;
|
||||
#X obj 637 249 s \$0-c27;
|
||||
#X obj 689 249 s \$0-c28;
|
||||
#X obj 744 250 s \$0-c29;
|
||||
#X obj 801 251 s \$0-c30;
|
||||
#X obj 735 90 s \$0-c31;
|
||||
#X obj 856 102 s \$0-c32;
|
||||
#X obj 921 103 s \$0-c33;
|
||||
#X obj 976 103 s \$0-c34;
|
||||
#X obj 1034 104 s \$0-c35;
|
||||
#X obj 1090 105 s \$0-c36;
|
||||
#X obj 1148 106 s \$0-c37;
|
||||
#X obj 760 169 s \$0-c24;
|
||||
#X obj 813 170 s \$0-c25;
|
||||
#N canvas 81 154 300 418 imagen 0;
|
||||
#X obj 100 321 pix_image;
|
||||
#X msg 4 240 open \$1;
|
||||
#X obj 4 53 inlet;
|
||||
#X obj 100 43 inlet;
|
||||
#X obj 4 188 spigot;
|
||||
#X obj 100 381 outlet;
|
||||
#X msg 214 270 thread 0;
|
||||
#X obj 205 196 loadbang;
|
||||
#X obj 100 195 gemhead;
|
||||
#X connect 0 0 5 0;
|
||||
#X connect 1 0 0 0;
|
||||
#X connect 2 0 4 0;
|
||||
#X connect 3 0 4 1;
|
||||
#X connect 3 0 8 0;
|
||||
#X connect 4 0 1 0;
|
||||
#X connect 6 0 0 0;
|
||||
#X connect 7 0 6 0;
|
||||
#X connect 8 0 0 0;
|
||||
#X restore 586 -172 pd imagen;
|
||||
#X obj 469 367 s \$0-c19;
|
||||
#X obj 562 251 s \$0-c26;
|
||||
#X obj 629 251 s \$0-c27;
|
||||
#X obj 691 251 s \$0-c28;
|
||||
#X obj 755 251 s \$0-c29;
|
||||
#X obj 821 251 s \$0-c30;
|
||||
#X obj 702 83 s \$0-c31;
|
||||
#X obj 769 83 s \$0-c32;
|
||||
#X obj 674 24 s \$0-c33;
|
||||
#X obj 741 24 s \$0-c34;
|
||||
#X obj 802 24 s \$0-c35;
|
||||
#X obj 871 24 s \$0-c36;
|
||||
#X obj 934 24 s \$0-c37;
|
||||
#X obj 697 163 s \$0-c24;
|
||||
#X obj 767 163 s \$0-c25;
|
||||
#N canvas 1 90 1351 649 video 0;
|
||||
#X obj 116 224 gemhead;
|
||||
#X obj -9 155 spigot;
|
||||
|
|
@ -414,8 +370,8 @@
|
|||
#X connect 137 0 138 0;
|
||||
#X connect 139 0 137 0;
|
||||
#X connect 140 0 137 1;
|
||||
#X restore 410 -164 pd video;
|
||||
#N canvas 0 88 1366 680 video_render 0;
|
||||
#X restore 469 -163 pd video;
|
||||
#N canvas 1 90 701 649 video_render 0;
|
||||
#X obj 232 95 inlet;
|
||||
#X text 336 319 Green;
|
||||
#X text 255 317 Red;
|
||||
|
|
@ -444,7 +400,7 @@
|
|||
#X obj 869 940 pack f f 5;
|
||||
#X obj 1074 986 pack f f 5;
|
||||
#X obj 438 985 pack f f 5;
|
||||
#N canvas 263 96 528 679 fx 0;
|
||||
#N canvas 261 90 528 649 fx 0;
|
||||
#X obj 284 -71 inlet;
|
||||
#X obj 228 614 outlet;
|
||||
#X msg 23 -19 BackDropKeyVFX;
|
||||
|
|
@ -486,7 +442,7 @@
|
|||
#X msg 24 1053 TVPixelVFX;
|
||||
#X msg 20 1080 VectorizeVFX;
|
||||
#X msg 23 1109 WaveVFX;
|
||||
#N canvas 156 362 479 405 ef_halftone 0;
|
||||
#N canvas 154 334 479 405 ef_halftone 0;
|
||||
#X obj 122 269 pix_halftone;
|
||||
#X msg 380 225 style \$1;
|
||||
#X obj 380 169 / 64;
|
||||
|
|
@ -1397,7 +1353,7 @@
|
|||
#X msg 214 7 1;
|
||||
#X obj 215 -23 select 0;
|
||||
#X msg 256 5 2;
|
||||
#N canvas 836 175 433 592 ef_bitmask 0;
|
||||
#N canvas 832 147 433 592 ef_bitmask 0;
|
||||
#X obj 120 202 pix_bitmask;
|
||||
#X msg 242 163 \$1 \$2 \$3;
|
||||
#X obj 93 -5 inlet;
|
||||
|
|
@ -1550,6 +1506,8 @@
|
|||
#X obj 444 467 r \$0-c14;
|
||||
#X obj 230 1185 outlet;
|
||||
#X obj 167 971 delay 10;
|
||||
#X obj 363 928 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
|
||||
-1 -1;
|
||||
#X connect 0 0 8 0;
|
||||
#X connect 4 0 83 1;
|
||||
#X connect 5 0 4 0;
|
||||
|
|
@ -1594,6 +1552,7 @@
|
|||
#X connect 41 0 67 0;
|
||||
#X connect 42 0 68 0;
|
||||
#X connect 43 0 91 0;
|
||||
#X connect 43 0 114 0;
|
||||
#X connect 44 0 90 0;
|
||||
#X connect 45 0 89 0;
|
||||
#X connect 46 0 88 0;
|
||||
|
|
@ -1683,10 +1642,9 @@
|
|||
#X connect 110 0 107 0;
|
||||
#X connect 111 0 108 0;
|
||||
#X connect 113 0 102 0;
|
||||
#X restore 628 -117 pd video_render;
|
||||
#N canvas 644 90 511 649 texto 0;
|
||||
#X restore 586 -125 pd video_render;
|
||||
#N canvas 595 90 769 649 texto 0;
|
||||
#X obj 190 -398 gemhead;
|
||||
#X msg 21 -129 font \$1;
|
||||
#X obj 190 -352 rotateXYZ;
|
||||
#X obj 190 -32 text3d;
|
||||
#X obj 190 -249 colorRGB;
|
||||
|
|
@ -1696,118 +1654,109 @@
|
|||
#X obj 189 -514 inlet;
|
||||
#X msg 242 -436 0;
|
||||
#X text 523 -246 Size c15;
|
||||
#X obj 253 -402 r \$0-c12;
|
||||
#X obj 312 -402 r \$0-c13;
|
||||
#X obj 372 -401 r \$0-c14;
|
||||
#X obj 297 -352 r \$0-c2;
|
||||
#X obj 347 -352 r \$0-c3;
|
||||
#X obj 402 -352 r \$0-c4;
|
||||
#X obj 453 -352 r \$0-c1;
|
||||
#X obj 343 -250 r \$0-c19;
|
||||
#X obj 525 -226 r \$0-c15;
|
||||
#X obj 284 -250 r \$0-c18;
|
||||
#X obj 248 -213 - 32768;
|
||||
#X obj 342 -214 - 32768;
|
||||
#X obj 259 -402 r \$0-c12;
|
||||
#X obj 340 -402 r \$0-c13;
|
||||
#X obj 418 -401 r \$0-c14;
|
||||
#X obj 203 -322 r \$0-c2;
|
||||
#X obj 299 -324 r \$0-c3;
|
||||
#X obj 401 -323 r \$0-c4;
|
||||
#X obj 503 -326 r \$0-c1;
|
||||
#X obj 329 -219 r \$0-c19;
|
||||
#X obj 524 -225 r \$0-c15;
|
||||
#X obj 217 -219 r \$0-c18;
|
||||
#X obj 217 -197 - 32768;
|
||||
#X obj 329 -198 - 32768;
|
||||
#X obj 259 -380 - 128;
|
||||
#X obj 312 -380 - 128;
|
||||
#X obj 365 -380 - 128;
|
||||
#X obj 248 -176 * 0.000244141;
|
||||
#X obj 342 -176 * 0.000244141;
|
||||
#X obj 224 -320 * 0.0078125;
|
||||
#X obj 305 -320 * 0.0078125;
|
||||
#X obj 395 -320 * 0.0078125;
|
||||
#X obj 477 -320 * 0.00392157;
|
||||
#X obj 557 -161 t b;
|
||||
#X obj 340 -380 - 128;
|
||||
#X obj 418 -380 - 128;
|
||||
#X obj 217 -176 * 0.000244141;
|
||||
#X obj 329 -176 * 0.000244141;
|
||||
#X obj 203 -300 * 0.0078125;
|
||||
#X obj 299 -301 * 0.0078125;
|
||||
#X obj 401 -302 * 0.0078125;
|
||||
#X obj 503 -303 * 0.00392157;
|
||||
#X obj 540 -161 t b;
|
||||
#X obj 524 -202 * 0.0078125;
|
||||
#X obj 611 -203 * 0.0078125;
|
||||
#X msg 292 -104 1;
|
||||
#X obj 611 -228 r \$0-c16;
|
||||
#X msg 293 -115 1;
|
||||
#X obj 611 -225 r \$0-c16;
|
||||
#X obj 190 -76 scale XY;
|
||||
#X obj 407 -250 r \$0-c17;
|
||||
#X obj 428 -213 - 128;
|
||||
#X obj 428 -176 * 0.125;
|
||||
#X obj 545 -127 pack f f 1;
|
||||
#X obj 625 -80 coll;
|
||||
#X obj 451 -221 r \$0-c17;
|
||||
#X obj 451 -198 - 128;
|
||||
#X obj 451 -176 * 0.125;
|
||||
#X obj 524 -127 pack f f 1;
|
||||
#X obj -22 -154 coll;
|
||||
#C restore;
|
||||
#X obj 625 -54 prepend text;
|
||||
#X msg 738 -204 read \$1;
|
||||
#X text 626 -166 Texto;
|
||||
#X obj 738 -146 b;
|
||||
#X obj 625 -108 float 0;
|
||||
#X obj 625 -149 r \$0-c11;
|
||||
#X obj 190 2 outlet;
|
||||
#X text -21 -235 Texto;
|
||||
#X obj -65 -211 b;
|
||||
#X obj -22 -185 float 0;
|
||||
#X obj -22 -218 r \$0-c11;
|
||||
#X obj 190 -10 outlet;
|
||||
#X obj 190 -374 alpha;
|
||||
#X obj 294 -507 loadbang;
|
||||
#X connect 0 0 50 0;
|
||||
#X obj 21 -282 route fuente text;
|
||||
#X obj -22 -131 prepend text;
|
||||
#X connect 0 0 47 0;
|
||||
#X connect 1 0 3 0;
|
||||
#X connect 2 0 4 0;
|
||||
#X connect 3 0 49 0;
|
||||
#X connect 4 0 5 0;
|
||||
#X connect 5 0 37 0;
|
||||
#X connect 6 0 7 0;
|
||||
#X connect 7 0 1 0;
|
||||
#X connect 8 0 7 1;
|
||||
#X connect 2 0 46 0;
|
||||
#X connect 3 0 4 0;
|
||||
#X connect 4 0 36 0;
|
||||
#X connect 5 0 6 0;
|
||||
#X connect 6 0 49 0;
|
||||
#X connect 7 0 6 1;
|
||||
#X connect 7 0 0 0;
|
||||
#X connect 8 0 0 0;
|
||||
#X connect 9 0 0 0;
|
||||
#X connect 9 0 7 1;
|
||||
#X connect 8 0 6 1;
|
||||
#X connect 10 0 22 0;
|
||||
#X connect 11 0 23 0;
|
||||
#X connect 12 0 24 0;
|
||||
#X connect 13 0 25 0;
|
||||
#X connect 13 0 27 0;
|
||||
#X connect 14 0 28 0;
|
||||
#X connect 15 0 29 0;
|
||||
#X connect 16 0 30 0;
|
||||
#X connect 17 0 31 0;
|
||||
#X connect 18 0 22 0;
|
||||
#X connect 19 0 33 0;
|
||||
#X connect 20 0 21 0;
|
||||
#X connect 17 0 21 0;
|
||||
#X connect 18 0 32 0;
|
||||
#X connect 19 0 20 0;
|
||||
#X connect 20 0 25 0;
|
||||
#X connect 21 0 26 0;
|
||||
#X connect 22 0 27 0;
|
||||
#X connect 23 0 2 1;
|
||||
#X connect 24 0 2 2;
|
||||
#X connect 25 0 2 3;
|
||||
#X connect 26 0 5 1;
|
||||
#X connect 27 0 5 2;
|
||||
#X connect 28 0 4 1;
|
||||
#X connect 29 0 4 2;
|
||||
#X connect 30 0 4 3;
|
||||
#X connect 31 0 4 4;
|
||||
#X connect 32 0 41 0;
|
||||
#X connect 33 0 41 0;
|
||||
#X connect 34 0 32 0;
|
||||
#X connect 34 0 41 1;
|
||||
#X connect 35 0 37 1;
|
||||
#X connect 36 0 34 0;
|
||||
#X connect 37 0 3 0;
|
||||
#X connect 22 0 1 1;
|
||||
#X connect 23 0 1 2;
|
||||
#X connect 24 0 1 3;
|
||||
#X connect 25 0 4 1;
|
||||
#X connect 26 0 4 2;
|
||||
#X connect 27 0 3 1;
|
||||
#X connect 28 0 3 2;
|
||||
#X connect 29 0 3 3;
|
||||
#X connect 30 0 3 4;
|
||||
#X connect 31 0 40 0;
|
||||
#X connect 32 0 40 0;
|
||||
#X connect 33 0 31 0;
|
||||
#X connect 33 0 40 1;
|
||||
#X connect 34 0 36 1;
|
||||
#X connect 35 0 33 0;
|
||||
#X connect 36 0 2 0;
|
||||
#X connect 37 0 38 0;
|
||||
#X connect 38 0 39 0;
|
||||
#X connect 39 0 40 0;
|
||||
#X connect 40 0 5 3;
|
||||
#X connect 41 0 37 2;
|
||||
#X connect 42 0 43 0;
|
||||
#X connect 43 0 3 0;
|
||||
#X connect 44 0 42 0;
|
||||
#X connect 44 0 46 0;
|
||||
#X connect 46 0 47 0;
|
||||
#X connect 47 0 42 0;
|
||||
#X connect 48 0 47 0;
|
||||
#X connect 39 0 4 3;
|
||||
#X connect 40 0 36 2;
|
||||
#X connect 41 0 50 0;
|
||||
#X connect 43 0 44 0;
|
||||
#X connect 44 0 41 0;
|
||||
#X connect 45 0 44 0;
|
||||
#X connect 47 0 1 0;
|
||||
#X connect 48 0 8 0;
|
||||
#X connect 48 0 34 0;
|
||||
#X connect 49 0 2 0;
|
||||
#X connect 49 1 41 0;
|
||||
#X connect 49 1 43 0;
|
||||
#X connect 50 0 2 0;
|
||||
#X connect 51 0 9 0;
|
||||
#X connect 51 0 35 0;
|
||||
#X restore 785 -169 pd texto;
|
||||
#X obj 450 305 t b;
|
||||
#X restore 725 -162 pd texto;
|
||||
#X obj 504 302 t b;
|
||||
#X obj 397 304 t b;
|
||||
#X obj 646 167 s \$0-c22;
|
||||
#X obj 698 168 s \$0-c23;
|
||||
#X obj 628 -70 outlet;
|
||||
#X obj 553 163 s \$0-c22;
|
||||
#X obj 620 163 s \$0-c23;
|
||||
#X obj 586 -78 outlet;
|
||||
#X obj 601 -370 inlet;
|
||||
#X obj -10 31 change 2;
|
||||
#X obj 53 32 change 2;
|
||||
#X obj 637 227 change 2;
|
||||
#X obj 692 227 change 2;
|
||||
#X obj 744 230 change 2;
|
||||
#X obj 801 229 change 2;
|
||||
#X obj 735 68 change 2;
|
||||
#X text 14 -307 (c) 2012-2013 Santiago Noreña libremediaserver@gmail.com
|
||||
GPL License;
|
||||
#N canvas 909 209 450 530 live 0;
|
||||
#X obj 53 218 gemhead;
|
||||
#X obj 113 299 print info;
|
||||
|
|
@ -1829,18 +1778,16 @@ GPL License;
|
|||
#X connect 7 0 2 0;
|
||||
#X connect 8 0 7 0;
|
||||
#X connect 9 0 5 0;
|
||||
#X restore 913 -166 pd live;
|
||||
#X text 222 -216 DMX Channel;
|
||||
#X obj 214 -47 route 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;
|
||||
#X obj 788 10 route 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
|
||||
#X restore 913 -143 pd live;
|
||||
#X text 184 -296 DMX Channel;
|
||||
#X obj 842 -33 route 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;
|
||||
#X obj 878 138 s \$0-c38;
|
||||
#X obj 943 139 s \$0-c39;
|
||||
#X obj 998 139 s \$0-c40;
|
||||
#X obj 1056 140 s \$0-c41;
|
||||
#X obj 1112 141 s \$0-c42;
|
||||
#X obj 1170 142 s \$0-c43;
|
||||
#X obj 853 81 s \$0-c38;
|
||||
#X obj 918 82 s \$0-c39;
|
||||
#X obj 973 82 s \$0-c40;
|
||||
#X obj 1031 83 s \$0-c41;
|
||||
#X obj 1087 84 s \$0-c42;
|
||||
#X obj 1145 85 s \$0-c43;
|
||||
#X obj 871 181 s \$0-c44;
|
||||
#X obj 936 182 s \$0-c45;
|
||||
#X obj 991 182 s \$0-c46;
|
||||
|
|
@ -1854,173 +1801,125 @@ GPL License;
|
|||
#X obj 1127 220 s \$0-c55;
|
||||
#X obj 1185 221 s \$0-c56;
|
||||
#X text 650 -368 File to play;
|
||||
#X obj 913 -216 t b;
|
||||
#X msg 951 -195 0;
|
||||
#X obj 951 -217 t b;
|
||||
#X obj 522 -210 t b;
|
||||
#X msg 522 -186 1;
|
||||
#X obj 487 -210 t b;
|
||||
#X msg 487 -186 0;
|
||||
#X obj 522 -210 t b;
|
||||
#X msg 522 -186 1;
|
||||
#X obj 487 -210 t b;
|
||||
#X msg 487 -186 0;
|
||||
#X obj 661 -229 t b;
|
||||
#X obj 628 -229 t b;
|
||||
#X msg 628 -199 0;
|
||||
#X obj 856 -219 t b;
|
||||
#X obj 823 -220 t b;
|
||||
#X msg 823 -197 0;
|
||||
#X msg 856 -196 1;
|
||||
#X msg 661 -200 1;
|
||||
#X msg 913 -194 1;
|
||||
#X obj 601 -332 route 1 2 3 4;
|
||||
#X obj 913 -193 t b;
|
||||
#X msg 951 -172 0;
|
||||
#X obj 951 -194 t b;
|
||||
#X obj 607 -209 t b;
|
||||
#X msg 607 -185 1;
|
||||
#X obj 546 -209 t b;
|
||||
#X msg 546 -185 0;
|
||||
#X obj 607 -209 t b;
|
||||
#X msg 607 -185 1;
|
||||
#X obj 546 -209 t b;
|
||||
#X msg 546 -185 0;
|
||||
#X obj 796 -212 t b;
|
||||
#X obj 763 -213 t b;
|
||||
#X msg 763 -190 0;
|
||||
#X msg 796 -189 1;
|
||||
#X msg 913 -171 1;
|
||||
#X obj 951 -336 loadbang;
|
||||
#X connect 0 0 37 0;
|
||||
#X connect 1 0 38 0;
|
||||
#X connect 2 0 39 0;
|
||||
#X connect 3 0 40 0;
|
||||
#X connect 4 0 41 0;
|
||||
#X connect 5 0 42 0;
|
||||
#X connect 6 0 43 0;
|
||||
#X connect 7 0 44 0;
|
||||
#X connect 8 0 45 0;
|
||||
#X connect 9 0 24 0;
|
||||
#X connect 10 0 26 0;
|
||||
#X connect 11 0 67 0;
|
||||
#X connect 11 0 25 1;
|
||||
#X connect 12 0 66 0;
|
||||
#X connect 12 0 27 1;
|
||||
#X connect 13 0 68 0;
|
||||
#X connect 14 0 69 0;
|
||||
#X connect 15 0 60 0;
|
||||
#X connect 16 0 61 0;
|
||||
#X connect 17 0 48 0;
|
||||
#X connect 18 0 31 0;
|
||||
#X connect 19 0 32 0;
|
||||
#X connect 20 0 33 0;
|
||||
#X connect 21 0 34 0;
|
||||
#X connect 22 0 35 0;
|
||||
#X connect 23 0 36 0;
|
||||
#X connect 24 0 25 0;
|
||||
#X connect 25 0 46 0;
|
||||
#X connect 26 0 27 0;
|
||||
#X connect 27 0 47 0;
|
||||
#X connect 28 0 82 0;
|
||||
#X connect 62 0 64 0;
|
||||
#X connect 63 0 64 0;
|
||||
#X connect 64 0 70 0;
|
||||
#X connect 65 0 70 0;
|
||||
#X connect 66 0 27 0;
|
||||
#X connect 67 0 25 0;
|
||||
#X connect 71 0 123 0;
|
||||
#X connect 72 0 29 0;
|
||||
#X connect 73 0 30 0;
|
||||
#X connect 74 0 49 0;
|
||||
#X connect 75 0 50 0;
|
||||
#X connect 76 0 51 0;
|
||||
#X connect 77 0 52 0;
|
||||
#X connect 78 0 53 0;
|
||||
#X connect 80 0 64 0;
|
||||
#X connect 82 0 72 0;
|
||||
#X connect 82 1 73 0;
|
||||
#X connect 82 2 18 0;
|
||||
#X connect 82 3 19 0;
|
||||
#X connect 82 4 20 0;
|
||||
#X connect 82 5 21 0;
|
||||
#X connect 82 6 22 0;
|
||||
#X connect 82 7 23 0;
|
||||
#X connect 82 8 0 0;
|
||||
#X connect 82 9 1 0;
|
||||
#X connect 82 10 2 0;
|
||||
#X connect 82 11 3 0;
|
||||
#X connect 82 12 4 0;
|
||||
#X connect 82 13 5 0;
|
||||
#X connect 82 14 6 0;
|
||||
#X connect 82 15 7 0;
|
||||
#X connect 82 16 8 0;
|
||||
#X connect 82 17 9 0;
|
||||
#X connect 82 18 10 0;
|
||||
#X connect 82 19 11 0;
|
||||
#X connect 82 20 12 0;
|
||||
#X connect 82 21 13 0;
|
||||
#X connect 82 22 14 0;
|
||||
#X connect 82 23 15 0;
|
||||
#X connect 82 24 16 0;
|
||||
#X connect 82 25 17 0;
|
||||
#X connect 82 26 74 0;
|
||||
#X connect 82 27 75 0;
|
||||
#X connect 82 28 76 0;
|
||||
#X connect 82 29 77 0;
|
||||
#X connect 82 30 78 0;
|
||||
#X connect 82 31 54 0;
|
||||
#X connect 82 32 83 0;
|
||||
#X connect 83 0 55 0;
|
||||
#X connect 83 1 56 0;
|
||||
#X connect 83 2 57 0;
|
||||
#X connect 83 3 58 0;
|
||||
#X connect 83 4 59 0;
|
||||
#X connect 83 5 84 0;
|
||||
#X connect 83 6 85 0;
|
||||
#X connect 83 7 86 0;
|
||||
#X connect 83 8 87 0;
|
||||
#X connect 83 9 88 0;
|
||||
#X connect 83 10 89 0;
|
||||
#X connect 83 11 90 0;
|
||||
#X connect 83 12 91 0;
|
||||
#X connect 83 13 92 0;
|
||||
#X connect 83 14 93 0;
|
||||
#X connect 83 15 94 0;
|
||||
#X connect 83 16 95 0;
|
||||
#X connect 83 17 96 0;
|
||||
#X connect 83 18 97 0;
|
||||
#X connect 83 19 98 0;
|
||||
#X connect 83 20 99 0;
|
||||
#X connect 83 21 100 0;
|
||||
#X connect 83 22 101 0;
|
||||
#X connect 103 0 122 0;
|
||||
#X connect 104 0 80 0;
|
||||
#X connect 105 0 104 0;
|
||||
#X connect 106 0 107 0;
|
||||
#X connect 107 0 63 1;
|
||||
#X connect 108 0 109 0;
|
||||
#X connect 109 0 63 1;
|
||||
#X connect 110 0 111 0;
|
||||
#X connect 112 0 113 0;
|
||||
#X connect 114 0 121 0;
|
||||
#X connect 115 0 116 0;
|
||||
#X connect 116 0 62 1;
|
||||
#X connect 117 0 120 0;
|
||||
#X connect 118 0 119 0;
|
||||
#X connect 119 0 65 1;
|
||||
#X connect 120 0 65 1;
|
||||
#X connect 121 0 62 1;
|
||||
#X connect 122 0 80 0;
|
||||
#X connect 123 0 105 0;
|
||||
#X connect 123 0 106 0;
|
||||
#X connect 123 0 115 0;
|
||||
#X connect 123 0 118 0;
|
||||
#X connect 123 0 63 0;
|
||||
#X connect 123 1 105 0;
|
||||
#X connect 123 1 108 0;
|
||||
#X connect 123 1 114 0;
|
||||
#X connect 123 1 118 0;
|
||||
#X connect 123 1 62 0;
|
||||
#X connect 123 2 105 0;
|
||||
#X connect 123 2 108 0;
|
||||
#X connect 123 2 115 0;
|
||||
#X connect 123 2 117 0;
|
||||
#X connect 123 2 65 0;
|
||||
#X connect 123 3 105 0;
|
||||
#X connect 123 3 108 0;
|
||||
#X connect 123 3 115 0;
|
||||
#X connect 123 3 118 0;
|
||||
#X connect 123 3 103 0;
|
||||
#X connect 123 4 108 0;
|
||||
#X connect 123 4 115 0;
|
||||
#X connect 123 4 118 0;
|
||||
#X connect 124 0 105 0;
|
||||
#X connect 124 0 118 0;
|
||||
#X connect 124 0 115 0;
|
||||
#X connect 124 0 108 0;
|
||||
#X obj 601 -332 route 1 2 3;
|
||||
#X obj 136 -62 route 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;
|
||||
#X connect 0 0 1 0;
|
||||
#X connect 1 0 22 0;
|
||||
#X connect 2 0 3 0;
|
||||
#X connect 3 0 23 0;
|
||||
#X connect 4 0 87 0;
|
||||
#X connect 38 0 39 0;
|
||||
#X connect 39 0 45 0;
|
||||
#X connect 40 0 45 0;
|
||||
#X connect 41 0 3 0;
|
||||
#X connect 42 0 1 0;
|
||||
#X connect 46 0 86 0;
|
||||
#X connect 47 0 39 0;
|
||||
#X connect 49 0 31 0;
|
||||
#X connect 49 1 32 0;
|
||||
#X connect 49 2 33 0;
|
||||
#X connect 49 3 34 0;
|
||||
#X connect 49 4 35 0;
|
||||
#X connect 49 5 50 0;
|
||||
#X connect 49 6 51 0;
|
||||
#X connect 49 7 52 0;
|
||||
#X connect 49 8 53 0;
|
||||
#X connect 49 9 54 0;
|
||||
#X connect 49 10 55 0;
|
||||
#X connect 49 11 56 0;
|
||||
#X connect 49 12 57 0;
|
||||
#X connect 49 13 58 0;
|
||||
#X connect 49 14 59 0;
|
||||
#X connect 49 15 60 0;
|
||||
#X connect 49 16 61 0;
|
||||
#X connect 49 17 62 0;
|
||||
#X connect 49 18 63 0;
|
||||
#X connect 49 19 64 0;
|
||||
#X connect 49 20 65 0;
|
||||
#X connect 49 21 66 0;
|
||||
#X connect 49 22 67 0;
|
||||
#X connect 69 0 84 0;
|
||||
#X connect 70 0 47 0;
|
||||
#X connect 71 0 70 0;
|
||||
#X connect 72 0 73 0;
|
||||
#X connect 73 0 38 1;
|
||||
#X connect 74 0 75 0;
|
||||
#X connect 75 0 38 1;
|
||||
#X connect 76 0 77 0;
|
||||
#X connect 78 0 79 0;
|
||||
#X connect 80 0 83 0;
|
||||
#X connect 81 0 82 0;
|
||||
#X connect 82 0 40 1;
|
||||
#X connect 83 0 40 1;
|
||||
#X connect 84 0 47 0;
|
||||
#X connect 85 0 71 0;
|
||||
#X connect 85 0 81 0;
|
||||
#X connect 85 0 74 0;
|
||||
#X connect 86 0 71 0;
|
||||
#X connect 86 0 72 0;
|
||||
#X connect 86 0 81 0;
|
||||
#X connect 86 0 38 0;
|
||||
#X connect 86 1 71 0;
|
||||
#X connect 86 1 74 0;
|
||||
#X connect 86 1 80 0;
|
||||
#X connect 86 1 40 0;
|
||||
#X connect 86 2 74 0;
|
||||
#X connect 86 2 69 0;
|
||||
#X connect 86 2 81 0;
|
||||
#X connect 86 3 71 0;
|
||||
#X connect 86 3 74 0;
|
||||
#X connect 86 3 81 0;
|
||||
#X connect 87 0 5 0;
|
||||
#X connect 87 1 6 0;
|
||||
#X connect 87 2 7 0;
|
||||
#X connect 87 3 8 0;
|
||||
#X connect 87 4 9 0;
|
||||
#X connect 87 5 10 0;
|
||||
#X connect 87 6 11 0;
|
||||
#X connect 87 7 12 0;
|
||||
#X connect 87 8 13 0;
|
||||
#X connect 87 9 14 0;
|
||||
#X connect 87 10 15 0;
|
||||
#X connect 87 11 16 0;
|
||||
#X connect 87 12 17 0;
|
||||
#X connect 87 13 18 0;
|
||||
#X connect 87 14 19 0;
|
||||
#X connect 87 15 20 0;
|
||||
#X connect 87 16 21 0;
|
||||
#X connect 87 17 0 0;
|
||||
#X connect 87 18 2 0;
|
||||
#X connect 87 19 42 0;
|
||||
#X connect 87 19 1 1;
|
||||
#X connect 87 20 41 0;
|
||||
#X connect 87 20 3 1;
|
||||
#X connect 87 21 43 0;
|
||||
#X connect 87 22 44 0;
|
||||
#X connect 87 23 36 0;
|
||||
#X connect 87 24 37 0;
|
||||
#X connect 87 25 24 0;
|
||||
#X connect 87 26 25 0;
|
||||
#X connect 87 27 26 0;
|
||||
#X connect 87 28 27 0;
|
||||
#X connect 87 29 28 0;
|
||||
#X connect 87 30 29 0;
|
||||
#X connect 87 31 30 0;
|
||||
#X connect 87 32 49 0;
|
||||
#X coords 0 604 1 603 50 30 0;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#N canvas 734 140 611 350 10;
|
||||
#N canvas 59 348 240 272 fondo 0;
|
||||
#N canvas 718 220 611 350 10;
|
||||
#N canvas 57 385 240 272 fondo 0;
|
||||
#X obj -452 -118 color 0 0 0;
|
||||
#X obj -452 -150 alpha;
|
||||
#X text -486 -209 Pantalla fondo Negra;
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#X connect 5 0 7 0;
|
||||
#X connect 7 0 4 3;
|
||||
#X restore -309 -438 pd fondo;
|
||||
#N canvas 6 214 1351 525 receive 0;
|
||||
#N canvas 10 214 1351 525 receive 0;
|
||||
#X obj 656 -238 s winposx;
|
||||
#X obj 724 -238 s winposy;
|
||||
#X obj 792 -238 s winsizex;
|
||||
|
|
@ -26,7 +26,6 @@
|
|||
#X obj 207 -486 udserver;
|
||||
#X floatatom 260 -466 5 0 0 0 - - -;
|
||||
#X obj 781 -339 route 101 102 103 104 105 122 123;
|
||||
#X obj 207 -451 route 1 2 3 4 5 6 7 8;
|
||||
#X obj 412 -371 route 201 202 203 204 205 206 207 208;
|
||||
#X obj -197 -369 send dmx1;
|
||||
#X obj 332 -369 send dmx8;
|
||||
|
|
@ -44,7 +43,8 @@
|
|||
#X obj 418 -281 s file6;
|
||||
#X obj 480 -281 s file7;
|
||||
#X obj 540 -281 s file8;
|
||||
#X connect 7 0 10 0;
|
||||
#X obj 207 -451 route 0 1 2 3 4 5 6 7;
|
||||
#X connect 7 0 27 0;
|
||||
#X connect 7 1 8 0;
|
||||
#X connect 9 0 4 0;
|
||||
#X connect 9 1 0 0;
|
||||
|
|
@ -53,26 +53,26 @@
|
|||
#X connect 9 4 3 0;
|
||||
#X connect 9 5 5 0;
|
||||
#X connect 9 6 6 0;
|
||||
#X connect 10 0 12 0;
|
||||
#X connect 10 1 19 0;
|
||||
#X connect 10 2 18 0;
|
||||
#X connect 10 3 17 0;
|
||||
#X connect 10 4 16 0;
|
||||
#X connect 10 5 15 0;
|
||||
#X connect 10 6 14 0;
|
||||
#X connect 10 7 13 0;
|
||||
#X connect 10 8 11 0;
|
||||
#X connect 11 0 20 0;
|
||||
#X connect 11 1 21 0;
|
||||
#X connect 11 2 22 0;
|
||||
#X connect 11 3 23 0;
|
||||
#X connect 11 4 24 0;
|
||||
#X connect 11 5 25 0;
|
||||
#X connect 11 6 26 0;
|
||||
#X connect 11 7 27 0;
|
||||
#X connect 11 8 9 0;
|
||||
#X connect 10 0 19 0;
|
||||
#X connect 10 1 20 0;
|
||||
#X connect 10 2 21 0;
|
||||
#X connect 10 3 22 0;
|
||||
#X connect 10 4 23 0;
|
||||
#X connect 10 5 24 0;
|
||||
#X connect 10 6 25 0;
|
||||
#X connect 10 7 26 0;
|
||||
#X connect 10 8 9 0;
|
||||
#X connect 27 0 11 0;
|
||||
#X connect 27 1 18 0;
|
||||
#X connect 27 2 17 0;
|
||||
#X connect 27 3 16 0;
|
||||
#X connect 27 4 15 0;
|
||||
#X connect 27 5 14 0;
|
||||
#X connect 27 6 13 0;
|
||||
#X connect 27 7 12 0;
|
||||
#X connect 27 8 10 0;
|
||||
#X restore -249 -438 pd receive;
|
||||
#N canvas 816 198 450 333 window 0;
|
||||
#N canvas 814 208 450 333 window 0;
|
||||
#X msg 809 -348 color 0 0 0;
|
||||
#X msg 620 -350 print;
|
||||
#X msg 466 -352 border \$1;
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
#X restore -176 -379 pd layer_5;
|
||||
#X obj -298 -336 loadbang;
|
||||
#X obj -48 -231 print togui;
|
||||
#N canvas 801 221 450 300 layer_6 0;
|
||||
#N canvas 799 231 450 300 layer_6 0;
|
||||
#X msg -124 -32 1;
|
||||
#X msg -177 -33 0;
|
||||
#X obj -177 -55 select 0;
|
||||
|
|
@ -210,7 +210,7 @@
|
|||
#X connect 13 0 14 1;
|
||||
#X connect 14 0 3 0;
|
||||
#X restore -102 -379 pd layer_6;
|
||||
#N canvas 428 302 450 300 layer_7 0;
|
||||
#N canvas 426 312 450 300 layer_7 0;
|
||||
#X msg -124 -32 1;
|
||||
#X msg -177 -33 0;
|
||||
#X obj -177 -55 select 0;
|
||||
|
|
@ -245,7 +245,7 @@
|
|||
#X connect 13 0 14 1;
|
||||
#X connect 14 0 3 0;
|
||||
#X restore -28 -379 pd layer_7;
|
||||
#N canvas 891 309 450 300 layer_8 0;
|
||||
#N canvas 889 319 450 300 layer_8 0;
|
||||
#X msg -124 -41 1;
|
||||
#X msg -177 -42 0;
|
||||
#X obj -177 -64 select 0;
|
||||
|
|
@ -350,7 +350,7 @@
|
|||
#X connect 13 0 14 1;
|
||||
#X connect 14 0 3 0;
|
||||
#X restore -323 -379 pd layer_3;
|
||||
#N canvas 883 217 450 300 layer_2 0;
|
||||
#N canvas 881 227 450 300 layer_2 0;
|
||||
#X msg -86 -22 1;
|
||||
#X msg -139 -23 0;
|
||||
#X obj -139 -45 select 0;
|
||||
|
|
@ -385,7 +385,7 @@
|
|||
#X connect 13 0 14 1;
|
||||
#X connect 14 0 3 0;
|
||||
#X restore -396 -379 pd layer_2;
|
||||
#N canvas 911 249 450 300 layer_1 0;
|
||||
#N canvas 905 279 450 300 layer_1 1;
|
||||
#X obj -253 -28 layer;
|
||||
#X msg -61 -33 1;
|
||||
#X msg -114 -34 0;
|
||||
|
|
@ -421,14 +421,14 @@
|
|||
#X obj -298 -271 metro 1000;
|
||||
#X obj -298 -237 s metro;
|
||||
#X msg -298 -305 1;
|
||||
#X obj -124 -263 r textgui;
|
||||
#X obj -7 -264 r textgui;
|
||||
#X obj -476 -294 r preview;
|
||||
#X msg -48 -263 0;
|
||||
#X obj -476 -272 pix2jpg;
|
||||
#X text -384 -470 (c) 2012-2013 Santi Noreña libremediaserver@gmail.com
|
||||
GPL License;
|
||||
#X obj -418 -336 r previewswitch;
|
||||
#N canvas 1017 230 274 273 fps 0;
|
||||
#N canvas 1009 378 274 273 fps 0;
|
||||
#X obj 22 82 realtime;
|
||||
#X obj 22 57 t b b;
|
||||
#X obj 22 35 gemhead;
|
||||
|
|
@ -438,13 +438,13 @@ GPL License;
|
|||
#X obj 22 167 i;
|
||||
#X obj 22 242 s textgui;
|
||||
#X msg 22 216 9 \$1;
|
||||
#X obj 111 134 metro 500;
|
||||
#X msg 111 161 1;
|
||||
#X obj 22 192 spigot;
|
||||
#X obj 111 86 loadbang;
|
||||
#X msg 111 109 1;
|
||||
#X msg 111 108;
|
||||
#X msg 111 190 0;
|
||||
#X obj 111 134 metro 400;
|
||||
#X connect 0 0 3 0;
|
||||
#X connect 1 0 0 0;
|
||||
#X connect 1 1 0 1;
|
||||
|
|
@ -452,16 +452,16 @@ GPL License;
|
|||
#X connect 3 0 4 0;
|
||||
#X connect 4 0 5 0;
|
||||
#X connect 5 0 6 0;
|
||||
#X connect 6 0 11 0;
|
||||
#X connect 6 0 10 0;
|
||||
#X connect 8 0 7 0;
|
||||
#X connect 9 0 10 0;
|
||||
#X connect 10 0 11 1;
|
||||
#X connect 11 0 8 0;
|
||||
#X connect 11 0 15 0;
|
||||
#X connect 12 0 13 0;
|
||||
#X connect 12 0 14 0;
|
||||
#X connect 13 0 9 0;
|
||||
#X connect 15 0 11 1;
|
||||
#X connect 9 0 10 1;
|
||||
#X connect 10 0 8 0;
|
||||
#X connect 10 0 14 0;
|
||||
#X connect 11 0 12 0;
|
||||
#X connect 11 0 13 0;
|
||||
#X connect 12 0 15 0;
|
||||
#X connect 14 0 10 1;
|
||||
#X connect 15 0 9 0;
|
||||
#X restore -107 -438 pd fps;
|
||||
#X text -474 -219 This patch can not be run alone \, needs the libremediaserver
|
||||
GUI http://libremediaserver.googlecode.com;
|
||||
|
|
|
|||
|
|
@ -88,11 +88,6 @@ libreMediaServer::libreMediaServer(QStringList args, QWidget *parent)
|
|||
qErrnoWarning("libremediaserver::constructor: Can not listen on unix local server");
|
||||
}
|
||||
connect(m_server_vid, SIGNAL(newConnection()),this, SLOT(newPeer()));
|
||||
// Start preview Timer
|
||||
// m_preview = new QTimer(this);
|
||||
// Q_CHECK_PTR(m_preview);
|
||||
// m_preview->start(500);
|
||||
// connect(m_preview, SIGNAL(timeout()) ,this, SLOT(previewMaster()));
|
||||
// Iniciamos olad
|
||||
m_ola = new QProcess(this);
|
||||
Q_CHECK_PTR(m_ola);
|
||||
|
|
@ -109,7 +104,7 @@ libreMediaServer::libreMediaServer(QStringList args, QWidget *parent)
|
|||
m_olaInterface = new olaInterface();
|
||||
Q_CHECK_PTR(m_olaInterface);
|
||||
connect(m_olaInterface->m_msex->m_timer, SIGNAL(timeout()), this, SLOT(sendFrame()));
|
||||
connect(m_olaInterface, SIGNAL(sendDmx(int,int,int)), this, SLOT(sendPacket(int,int,int)));
|
||||
connect(m_olaInterface, SIGNAL(sendDmx(int,int,int)), this, SLOT(receiveDMX(int,int,int)));
|
||||
connect(m_olaInterface, SIGNAL(newFile(QString)), this, SLOT(newFile(QString)));
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +154,6 @@ void libreMediaServer::save_finish()
|
|||
{
|
||||
QFile file(CONF_FILE);
|
||||
save(&file);
|
||||
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////
|
||||
|
|
@ -177,6 +171,7 @@ void libreMediaServer::openFile()
|
|||
QFile file(fileNames.at(0));
|
||||
open(&file);
|
||||
}
|
||||
|
||||
// Save configuration File
|
||||
void libreMediaServer::saveFile()
|
||||
{
|
||||
|
|
@ -188,6 +183,7 @@ void libreMediaServer::saveFile()
|
|||
QFile file(fileNames.at(0));
|
||||
save(&file);
|
||||
}
|
||||
|
||||
// Change Media path
|
||||
void libreMediaServer::ChangeMediaPath()
|
||||
{
|
||||
|
|
@ -336,88 +332,6 @@ void libreMediaServer::on_winsizey_valueChanged()
|
|||
}
|
||||
}
|
||||
|
||||
// DMX address configuration
|
||||
|
||||
void libreMediaServer::on_layer1Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer1Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer2Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer2Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer3Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer3Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer4Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer4Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer5Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer5Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer6Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer6Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer7Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer7Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer8Check_stateChanged (int state)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void libreMediaServer::on_layer8Add_valueChanged()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Change the Frame Rate
|
||||
void libreMediaServer::on_fpsRate_valueChanged()
|
||||
{
|
||||
|
|
@ -604,7 +518,7 @@ bool libreMediaServer::sendPacket(const char *buffer, int bufferLen)
|
|||
}
|
||||
|
||||
// Send DMX Channel to Pure Data
|
||||
void libreMediaServer::sendPacket(int layer, int channel, int value)
|
||||
void libreMediaServer::receiveDMX(int layer, int channel, int value)
|
||||
{
|
||||
QString buffer = tr("%1 %2 %3;").arg(layer).arg(channel).arg(value);
|
||||
if (!sendPacket(buffer.toAscii().constData(), buffer.size()))
|
||||
|
|
@ -720,5 +634,5 @@ void libreMediaServer::stdout() {
|
|||
}
|
||||
return;
|
||||
}
|
||||
qDebug() << "PD Video: " << out;
|
||||
qDebug() << "PD debug| " << out;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ public slots:
|
|||
|
||||
void sendFrame();
|
||||
bool sendPacket(const char *buffer, int bufferLen);
|
||||
void sendPacket(int layer, int channel, int value);
|
||||
void receiveDMX(int layer, int channel, int value);
|
||||
bool newFile(QString file);
|
||||
|
||||
private slots:
|
||||
|
|
@ -108,22 +108,6 @@ private slots:
|
|||
void on_winpositiony_valueChanged();
|
||||
void on_winsizex_valueChanged();
|
||||
void on_winsizey_valueChanged();
|
||||
void on_layer1Add_valueChanged();
|
||||
void on_layer1Check_stateChanged (int state);
|
||||
void on_layer2Add_valueChanged();
|
||||
void on_layer2Check_stateChanged (int state);
|
||||
void on_layer3Add_valueChanged();
|
||||
void on_layer3Check_stateChanged (int state);
|
||||
void on_layer4Add_valueChanged();
|
||||
void on_layer4Check_stateChanged (int state);
|
||||
void on_layer5Add_valueChanged();
|
||||
void on_layer5Check_stateChanged (int state);
|
||||
void on_layer6Add_valueChanged();
|
||||
void on_layer6Check_stateChanged (int state);
|
||||
void on_layer7Add_valueChanged();
|
||||
void on_layer7Check_stateChanged (int state);
|
||||
void on_layer8Add_valueChanged();
|
||||
void on_layer8Check_stateChanged (int state);
|
||||
void on_fpsRate_valueChanged();
|
||||
void pdrestart();
|
||||
void stdout();
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>745</width>
|
||||
<height>636</height>
|
||||
<width>753</width>
|
||||
<height>457</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -58,37 +58,11 @@
|
|||
<attribute name="title">
|
||||
<string>Video</string>
|
||||
</attribute>
|
||||
<widget class="QSpinBox" name="layer5Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer6Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>410</x>
|
||||
<y>70</y>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 6</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="winsizex">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>290</y>
|
||||
<y>80</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
|
|
@ -104,7 +78,7 @@
|
|||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>320</y>
|
||||
<y>110</y>
|
||||
<width>101</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
|
|
@ -113,24 +87,11 @@
|
|||
<string>Window Size</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="layer6Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>410</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="window">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>260</y>
|
||||
<x>10</x>
|
||||
<y>200</y>
|
||||
<width>87</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
|
|
@ -139,76 +100,11 @@
|
|||
<string>Window</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="layer7Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>490</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="layer3Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>170</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer8Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>570</x>
|
||||
<y>70</y>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 8</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="layer2Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>90</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer4Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>70</y>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 4</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="winposLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>370</y>
|
||||
<y>160</y>
|
||||
<width>121</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
|
|
@ -217,50 +113,11 @@
|
|||
<string>Window Position</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer1Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>70</y>
|
||||
<width>71</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 1</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="layer1Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="layer8Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>570</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="winpositiony">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>70</x>
|
||||
<y>340</y>
|
||||
<y>130</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
|
|
@ -269,24 +126,11 @@
|
|||
<number>5000</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer7Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>490</x>
|
||||
<y>70</y>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 7</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="winsizey">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>70</x>
|
||||
<y>290</y>
|
||||
<y>80</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
|
|
@ -295,37 +139,11 @@
|
|||
<number>5000</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer5Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>70</y>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 5</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer3Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>170</x>
|
||||
<y>70</y>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 3</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="winpositionx">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>340</y>
|
||||
<y>130</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
|
|
@ -334,32 +152,6 @@
|
|||
<number>5000</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="layer4Add">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>100</y>
|
||||
<width>55</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>512</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="layer2Check">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>90</x>
|
||||
<y>70</y>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Layer 2</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="layer1Preview">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
|
|
@ -516,9 +308,9 @@
|
|||
<property name="geometry">
|
||||
<rect>
|
||||
<x>140</x>
|
||||
<y>150</y>
|
||||
<width>320</width>
|
||||
<height>210</height>
|
||||
<y>80</y>
|
||||
<width>160</width>
|
||||
<height>105</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
|
|
@ -532,10 +324,13 @@
|
|||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="previewLayer">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>480</x>
|
||||
<y>240</y>
|
||||
<x>310</x>
|
||||
<y>80</y>
|
||||
<width>131</width>
|
||||
<height>26</height>
|
||||
</rect>
|
||||
|
|
@ -544,14 +339,17 @@
|
|||
<string>Preview Layers</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="previewMaster">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>480</x>
|
||||
<y>270</y>
|
||||
<x>310</x>
|
||||
<y>110</y>
|
||||
<width>141</width>
|
||||
<height>26</height>
|
||||
</rect>
|
||||
|
|
@ -560,7 +358,7 @@
|
|||
<string>Preview Master</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoRepeat">
|
||||
<bool>false</bool>
|
||||
|
|
@ -569,8 +367,8 @@
|
|||
<widget class="QLCDNumber" name="fpsCounter">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>483</x>
|
||||
<y>322</y>
|
||||
<x>493</x>
|
||||
<y>92</y>
|
||||
<width>61</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
|
|
@ -582,8 +380,8 @@
|
|||
<widget class="QLabel" name="fpsLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>480</x>
|
||||
<y>370</y>
|
||||
<x>490</x>
|
||||
<y>140</y>
|
||||
<width>161</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
|
|
@ -595,8 +393,8 @@
|
|||
<widget class="QSpinBox" name="fpsRate">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>560</x>
|
||||
<y>320</y>
|
||||
<x>570</x>
|
||||
<y>90</y>
|
||||
<width>59</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
|
|
@ -615,43 +413,6 @@
|
|||
<number>30</number>
|
||||
</property>
|
||||
</widget>
|
||||
<zorder>layer7Check</zorder>
|
||||
<zorder>layer5Check</zorder>
|
||||
<zorder>layer3Check</zorder>
|
||||
<zorder>layer2Check</zorder>
|
||||
<zorder>layer5Add</zorder>
|
||||
<zorder>layer6Check</zorder>
|
||||
<zorder>winsizex</zorder>
|
||||
<zorder>winsizeLabel</zorder>
|
||||
<zorder>layer6Add</zorder>
|
||||
<zorder>window</zorder>
|
||||
<zorder>layer7Add</zorder>
|
||||
<zorder>layer3Add</zorder>
|
||||
<zorder>layer8Check</zorder>
|
||||
<zorder>layer2Add</zorder>
|
||||
<zorder>layer4Check</zorder>
|
||||
<zorder>winposLabel</zorder>
|
||||
<zorder>layer1Check</zorder>
|
||||
<zorder>layer1Add</zorder>
|
||||
<zorder>layer8Add</zorder>
|
||||
<zorder>winpositiony</zorder>
|
||||
<zorder>winsizey</zorder>
|
||||
<zorder>winpositionx</zorder>
|
||||
<zorder>layer4Add</zorder>
|
||||
<zorder>layer1Preview</zorder>
|
||||
<zorder>layer2Preview</zorder>
|
||||
<zorder>layer3Preview</zorder>
|
||||
<zorder>layer4Preview</zorder>
|
||||
<zorder>layer5Preview</zorder>
|
||||
<zorder>layer6Preview</zorder>
|
||||
<zorder>layer7Preview</zorder>
|
||||
<zorder>layer8Preview</zorder>
|
||||
<zorder>masterPreview</zorder>
|
||||
<zorder>previewLayer</zorder>
|
||||
<zorder>previewMaster</zorder>
|
||||
<zorder>fpsCounter</zorder>
|
||||
<zorder>fpsLabel</zorder>
|
||||
<zorder>fpsRate</zorder>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QPlainTextEdit" name="textEdit">
|
||||
|
|
@ -678,7 +439,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>745</width>
|
||||
<width>753</width>
|
||||
<height>29</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
|
|||
|
|
@ -56,10 +56,8 @@ void olaInterface::readDataFromXML() {
|
|||
QMessageBox::critical(NULL,"Load XML File Problem",
|
||||
"Couldn't open dmx.xml to load settings for olaInterface",
|
||||
QMessageBox::Ok);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
QXmlStreamReader* xmlReader = new QXmlStreamReader(xmlFile);
|
||||
int counter = 0;
|
||||
//Parse the XML until we reach end of it
|
||||
|
|
@ -121,9 +119,9 @@ void olaInterface::dmx(int layer, int channel, int value)
|
|||
// This qDebug slows all the program. Uncomment only for debugging purpouse and comment again in normal use
|
||||
// qDebug() << tr("olaInterface|") << "newdmx layer" << layer << "channel" << channel << "value" << value;
|
||||
switch(channel){
|
||||
case DMX_FOLDER:// Folder
|
||||
case DMX_FILE:// File
|
||||
requestNewFile(layer, 1);
|
||||
case DMX_FOLDER:// Folder / Text File
|
||||
case DMX_FILE:// File / Font File
|
||||
requestNewFile(layer, (worker->m_dmx[layer][DMX_SOURCETYPE] / 25));
|
||||
break;
|
||||
case DMX_SOURCETYPE:// Source type
|
||||
if(value < 25)
|
||||
|
|
@ -131,12 +129,10 @@ void olaInterface::dmx(int layer, int channel, int value)
|
|||
requestNewFile(layer, 0);
|
||||
} else if (value > 24 && value < 50) { // Create a video source
|
||||
requestNewFile(layer, 1);
|
||||
} else if (value > 49 && value < 75){ // Create a Picture
|
||||
} else if (value > 49 && value < 75){ // Render a text
|
||||
requestNewFile(layer, 2);
|
||||
} else if (value > 74 && value < 100) { // Text
|
||||
} else if (value > 74 && value < 100) { // Live Cam
|
||||
requestNewFile(layer, 3);
|
||||
} else if (value > 99 && value < 125) { // Cam
|
||||
requestNewFile(layer, 4);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
|
@ -149,30 +145,67 @@ void olaInterface::dmx(int layer, int channel, int value)
|
|||
void olaInterface::requestNewFile(int layer, int type){
|
||||
int cooki = layer + 201;
|
||||
QString newfile = tr("%1 %2 ").arg(cooki).arg(type);
|
||||
newfile.append("open ");
|
||||
// Select one mediafile from the media library
|
||||
int folder = worker->m_dmx[layer][DMX_FOLDER];
|
||||
int file = worker->m_dmx[layer][DMX_FILE];
|
||||
if (folder < m_media->size()) {
|
||||
if (file < m_media->at(folder).m_MediaInformation.size()) {
|
||||
newfile.append(m_media->at(folder).m_MediaInformation.at(file).MediaName);
|
||||
if (type == 1) {
|
||||
newfile.append("open ");
|
||||
// Select one mediafile from the media library
|
||||
if (folder < m_media->size()) {
|
||||
if (file < m_media->at(folder).m_MediaInformation.size()) {
|
||||
newfile.append(m_media->at(folder).m_MediaInformation.at(file).MediaName);
|
||||
newfile.append(";");
|
||||
emit newFile(newfile);
|
||||
} else {
|
||||
qDebug() << tr("olaInterface|") << "Requested file is greater than files in library";
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
qDebug() << tr("olaInterface|") << "Requested file is greater than files in library";
|
||||
qDebug() << tr("olaInterface|") << "Requested folder is greater than media libraries";
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
qDebug() << tr("olaInterface|") << "Requested folder is greater than media libraries";
|
||||
return;
|
||||
} else if (type == 2) {
|
||||
newfile.append("fuente font ");
|
||||
QDir dir;
|
||||
if (!dir.cd(m_pathmedia)) {
|
||||
qWarning() << "olaInterface::initMediaLibrary| Can not cd to the path: " << m_pathmedia;
|
||||
return;
|
||||
}
|
||||
if (!dir.cd("font")) {
|
||||
qWarning() << "olaInterface::initMediaLibrary| Can not cd to the media folder: " << m_pathmedia;
|
||||
return;
|
||||
}
|
||||
dir.setFilter(QDir::Files);
|
||||
QFileInfoList filelist = dir.entryInfoList();
|
||||
QFileInfo fileInfo = filelist.at(worker->m_dmx[layer][DMX_FILE]);
|
||||
newfile.append(fileInfo.absoluteFilePath().toAscii());
|
||||
newfile.append(";");
|
||||
emit newFile(newfile);
|
||||
newfile.clear();
|
||||
newfile = tr("%1 %2 ").arg(cooki).arg(type);
|
||||
newfile.append("text read ");
|
||||
dir.cdUp();
|
||||
if (!dir.cd("text")){
|
||||
qWarning() << "olaInterface::initMediaLibrary| Can not cd to text folder: " << m_pathmedia;
|
||||
}
|
||||
filelist = dir.entryInfoList();
|
||||
fileInfo = filelist.at(worker->m_dmx[layer][DMX_FOLDER]);
|
||||
newfile.append(fileInfo.absoluteFilePath().toAscii());
|
||||
newfile.append(";");
|
||||
emit newFile(newfile);
|
||||
} else if (type == 3) {
|
||||
|
||||
}
|
||||
newfile.append(";");
|
||||
emit newFile(newfile);
|
||||
}
|
||||
|
||||
// Initializes the media library and the media information from the path to media in m_pathmedia
|
||||
void olaInterface::initMediaLibrary() {
|
||||
QDir dir;
|
||||
if (!dir.cd(m_pathmedia)) {
|
||||
qWarning() << "olaInterface::initMediaLibrary| Can not cd to the path to media: " << m_pathmedia;
|
||||
qWarning() << "olaInterface::initMediaLibrary| Can not cd to the path: " << m_pathmedia;
|
||||
return;
|
||||
}
|
||||
if (!dir.cd("media")) {
|
||||
qWarning() << "olaInterface::initMediaLibrary| Can not cd to the media folder: " << m_pathmedia;
|
||||
return;
|
||||
}
|
||||
m_media = new QList<MediaLibrary>;
|
||||
|
|
@ -212,8 +245,10 @@ QList<MediaInformation> olaInterface::getMediaInformation(QDir dir)
|
|||
if (!dir.mkdir("thumbs"))
|
||||
{
|
||||
qWarning() << tr("olaInterface|") << "Can not create thumbs folder in " << dir.path();
|
||||
}
|
||||
} else {
|
||||
folder = true;
|
||||
dir.cd("thumbs");
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < filelist.size(); ++i) {
|
||||
fileInfo = filelist.at(i);
|
||||
|
|
@ -295,6 +330,7 @@ olaWorker::~olaWorker() {
|
|||
void olaWorker::olastart() {
|
||||
// set up ola connection
|
||||
m_client = new OlaCallbackClientWrapper;
|
||||
Q_CHECK_PTR(m_client);
|
||||
if (!m_client->Setup()) {qErrnoWarning("olaInterface::open: m_client.Setup:");}
|
||||
m_clientpointer = m_client->GetClient();
|
||||
m_clientpointer->SetDmxCallback(ola::NewCallback(this, &olaWorker::NewDmx));
|
||||
|
|
@ -379,30 +415,8 @@ void olaWorker::RegisterComplete(const string &error) {
|
|||
* - Change the DMX address of each layer
|
||||
* - Change the universe to bind in ola
|
||||
* - Write and read different xml configuration files for different setups
|
||||
* - Open the olad web setup page in localhost:9090 or patch directly from xml configuration file
|
||||
* - Start and stop the dmx reading
|
||||
|
||||
|
||||
void GLMixer::on_actionOLASetup_triggered(){
|
||||
QWebView *view = new QWebView();
|
||||
view->load(QUrl("http://localhost:9090/ola.html"));
|
||||
view->show();
|
||||
}
|
||||
|
||||
// Changing the path to the media folder tree
|
||||
void UserPreferencesDialog::on_ChangeMediaPath_clicked(){
|
||||
QFileDialog dialog(this);
|
||||
dialog.setFileMode(QFileDialog::Directory);
|
||||
QStringList fileNames;
|
||||
if (!dialog.exec())
|
||||
return;
|
||||
fileNames = dialog.selectedFiles();
|
||||
QString file = fileNames.at(0);
|
||||
MediaPath->setText(file);
|
||||
QString desc = tr("Media Path Changed to: %1").arg(file);
|
||||
qDebug() << desc;
|
||||
}
|
||||
|
||||
void savesetttingtoxml{
|
||||
// Habrá que salvar las settings en algún sitio
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue