From 84c85d5b366f59c600bfe0c5b62675cd05246ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santi=20Nore=C3=B1a?= Date: Fri, 1 Mar 2013 16:15:11 +0100 Subject: [PATCH] - Added support for different text files. Now the files are in Media Tree Folder --- externals/fileselector.pd_linux | Bin 14451 -> 14563 bytes patches/layer.pd | 104 ++++++----- patches/lms-video.pd | 302 ++++++++++++++++---------------- patches/text.txt | 78 --------- src/fileselector/fileselector.c | 72 ++++---- src/libremediaserver.pro.user | 2 +- todo.txt | 4 +- 7 files changed, 254 insertions(+), 308 deletions(-) delete mode 100644 patches/text.txt diff --git a/externals/fileselector.pd_linux b/externals/fileselector.pd_linux index 9b19c191ee619833b4305125654af812059f789a..40484c9f856f4b255ab89fdb10fde54ec5541a86 100644 GIT binary patch delta 3746 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 Pv_h#PyS;qc3-Z4K7UxBJ diff --git a/patches/layer.pd b/patches/layer.pd index c77c554..e8c5288 100644 --- a/patches/layer.pd +++ b/patches/layer.pd @@ -64,7 +64,7 @@ f f f f f f f f f; #X obj 1148 151 s \$0-c37; #X obj 760 214 s \$0-c24; #X obj 813 215 s \$0-c25; -#N canvas 739 374 492 333 selector 1; +#N canvas 735 394 492 333 selector 0; #X obj 102 161 outlet; #X obj 373 157 outlet; #X obj 312 -8 / 25; @@ -1759,7 +1759,7 @@ f f f f f f f f f; #X connect 111 0 108 0; #X connect 113 0 102 0; #X restore 579 -65 pd video_render; -#N canvas 361 96 951 665 texto 0; +#N canvas 66 90 951 649 texto 0; #X obj 421 -381 gemhead; #X msg 252 -31 font \$1; #X obj 421 -307 rotateXYZ; @@ -1773,7 +1773,6 @@ f f f f f f f f f; #X msg 466 -434 0; #X msg 420 -438 1; #X obj 420 -476 select 3; -#X text 851 -478 Texto c6; #X text 942 -478 c12; #X text 981 -478 c13; #X text 1025 -478 c14; @@ -1784,7 +1783,7 @@ f f f f f f f f f; #X text 1322 -475 c18; #X text 1384 -475 c19; #X text 754 -148 Size c15; -#X obj 853 -454 r \$0-c6; +#X obj 856 -51 r \$0-c6; #X obj 925 -454 r \$0-c12; #X obj 984 -454 r \$0-c13; #X obj 1044 -453 r \$0-c14; @@ -1812,22 +1811,32 @@ f f f f f f f f f; #X msg 504 -6 1; #X obj 504 -31 loadbang; #X obj 842 -130 r \$0-c16; -#X msg 932 -70 read text.txt; #X obj 421 22 scale XY; #X obj 1440 -454 r \$0-c17; #X obj 659 -115 - 128; #X obj 659 -78 * 0.125; #X obj 776 -29 pack f f 1; -#X obj 932 -112 loadbang; -#X obj 856 -29 coll; +#X obj 980 -203 loadbang; +#X obj 856 8 coll; #C restore; -#X obj 856 -3 prepend text; +#X obj 856 34 prepend text; +#X msg 932 -70 read \$1; +#X obj 932 -100 fileselector; +#X msg 980 -181 type 257; +#X msg 1057 -182 file \$1; +#X obj 1057 -205 r \$0-c9; +#X obj 921 -202 r path; +#X msg 921 -180 set \$1; +#X obj 1149 -143 b; +#X text 857 -68 Texto; +#X obj 856 -20 float; +#X obj 946 -48 b; #X connect 0 0 4 0; #X connect 1 0 3 0; #X connect 2 0 5 0; #X connect 4 0 2 0; #X connect 5 0 6 0; -#X connect 6 0 53 0; +#X connect 6 0 51 0; #X connect 7 0 8 0; #X connect 8 0 1 0; #X connect 9 0 12 0; @@ -1837,44 +1846,55 @@ f f f f f f f f f; #X connect 11 0 8 1; #X connect 12 0 11 0; #X connect 12 1 10 0; -#X connect 24 0 59 0; +#X connect 23 0 68 0; +#X connect 24 0 36 0; #X connect 25 0 37 0; #X connect 26 0 38 0; -#X connect 27 0 39 0; +#X connect 27 0 41 0; #X connect 28 0 42 0; #X connect 29 0 43 0; #X connect 30 0 44 0; -#X connect 31 0 45 0; -#X connect 32 0 36 0; -#X connect 33 0 47 0; -#X connect 34 0 35 0; +#X connect 31 0 35 0; +#X connect 32 0 46 0; +#X connect 33 0 34 0; +#X connect 34 0 39 0; #X connect 35 0 40 0; -#X connect 36 0 41 0; -#X connect 37 0 2 1; -#X connect 38 0 2 2; -#X connect 39 0 2 3; -#X connect 40 0 6 1; -#X connect 41 0 6 2; -#X connect 42 0 5 1; -#X connect 43 0 5 2; -#X connect 44 0 5 3; -#X connect 45 0 5 4; -#X connect 46 0 57 0; -#X connect 47 0 57 0; -#X connect 48 0 46 0; -#X connect 48 0 57 1; -#X connect 49 0 53 1; -#X connect 50 0 49 0; -#X connect 51 0 48 0; -#X connect 52 0 59 0; -#X connect 53 0 3 0; -#X connect 54 0 55 0; -#X connect 55 0 56 0; -#X connect 56 0 6 3; -#X connect 57 0 53 2; -#X connect 58 0 52 0; -#X connect 59 0 60 0; -#X connect 60 0 3 0; +#X connect 36 0 2 1; +#X connect 37 0 2 2; +#X connect 38 0 2 3; +#X connect 39 0 6 1; +#X connect 40 0 6 2; +#X connect 41 0 5 1; +#X connect 42 0 5 2; +#X connect 43 0 5 3; +#X connect 44 0 5 4; +#X connect 45 0 55 0; +#X connect 46 0 55 0; +#X connect 47 0 45 0; +#X connect 47 0 55 1; +#X connect 48 0 51 1; +#X connect 49 0 48 0; +#X connect 50 0 47 0; +#X connect 51 0 3 0; +#X connect 52 0 53 0; +#X connect 53 0 54 0; +#X connect 54 0 6 3; +#X connect 55 0 51 2; +#X connect 56 0 61 0; +#X connect 57 0 58 0; +#X connect 58 0 3 0; +#X connect 59 0 57 0; +#X connect 59 0 69 0; +#X connect 60 0 59 0; +#X connect 61 0 60 0; +#X connect 62 0 60 0; +#X connect 62 0 66 0; +#X connect 63 0 62 0; +#X connect 64 0 65 0; +#X connect 65 0 60 0; +#X connect 66 0 60 0; +#X connect 68 0 57 0; +#X connect 69 0 68 0; #X restore 742 -97 pd texto; #X obj 450 350 t b; #X obj 397 349 t b; @@ -1910,7 +1930,7 @@ f f f f f f f f f; #X obj 1034 126 change 2; #X obj 1090 127 change 2; #X obj 1148 128 change 2; -#X text 18 -232 (c) 2012 Santiago Noreña libremediaserver@gmail.com +#X text 18 -232 (c) 2012-2013 Santiago Noreña libremediaserver@gmail.com GPL License; #X connect 0 0 90 0; #X connect 0 1 91 0; diff --git a/patches/lms-video.pd b/patches/lms-video.pd index 172685e..3e03c9b 100644 --- a/patches/lms-video.pd +++ b/patches/lms-video.pd @@ -1,4 +1,4 @@ -#N canvas 576 176 611 318 10; +#N canvas 574 186 611 318 10; #N canvas 315 169 952 599 dmx 0; #X obj -7 437 list split; #X obj 99 444 list split; @@ -314,7 +314,6 @@ #X connect 41 0 34 0; #X restore -175 -438 pd window; #N canvas 820 209 450 300 layer_5 0; -#X obj -338 -28 layer; #X msg -209 -32 1; #X msg -262 -33 0; #X obj -262 -55 select 0; @@ -331,32 +330,32 @@ #X msg -320 112 layerimage 15; #X obj -191 -107 delay 500; #X obj -191 -128 r metro; -#X connect 0 0 13 0; -#X connect 0 1 4 0; -#X connect 1 0 4 1; -#X connect 2 0 4 1; -#X connect 3 0 2 0; -#X connect 3 1 1 0; -#X connect 4 0 5 0; -#X connect 5 0 8 0; -#X connect 5 0 10 0; -#X connect 6 0 5 1; -#X connect 7 0 5 1; -#X connect 8 0 6 0; -#X connect 8 0 10 0; -#X connect 8 0 14 0; -#X connect 11 0 0 0; -#X connect 12 0 3 0; -#X connect 12 0 0 1; +#X obj -338 -28 layer; +#X connect 0 0 3 1; +#X connect 1 0 3 1; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 3 0 4 0; +#X connect 4 0 7 0; +#X connect 4 0 9 0; +#X connect 5 0 4 1; +#X connect 6 0 4 1; +#X connect 7 0 5 0; +#X connect 7 0 9 0; +#X connect 7 0 13 0; +#X connect 10 0 16 0; +#X connect 11 0 2 0; +#X connect 11 0 16 1; +#X connect 12 0 8 0; #X connect 13 0 9 0; -#X connect 14 0 10 0; -#X connect 15 0 7 0; -#X connect 16 0 15 0; +#X connect 14 0 6 0; +#X connect 15 0 14 0; +#X connect 16 0 12 0; +#X connect 16 1 3 0; #X restore -176 -379 pd layer_5; #X obj -298 -336 loadbang; #X obj -407 -259 print togui; #N canvas 803 211 450 300 layer_6 0; -#X obj -253 -28 layer; #X msg -124 -32 1; #X msg -177 -33 0; #X obj -177 -55 select 0; @@ -373,30 +372,30 @@ #X msg -242 116 layerimage 16; #X obj -106 -120 r metro; #X obj -106 -97 delay 600; -#X connect 0 0 13 0; -#X connect 0 1 4 0; -#X connect 1 0 4 1; -#X connect 2 0 4 1; -#X connect 3 0 2 0; -#X connect 3 1 1 0; -#X connect 4 0 5 0; -#X connect 5 0 8 0; -#X connect 5 0 10 0; -#X connect 6 0 5 1; -#X connect 7 0 5 1; -#X connect 8 0 6 0; -#X connect 8 0 14 0; -#X connect 8 0 10 0; -#X connect 11 0 0 0; -#X connect 12 0 3 0; -#X connect 12 0 0 1; +#X obj -253 -28 layer; +#X connect 0 0 3 1; +#X connect 1 0 3 1; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 3 0 4 0; +#X connect 4 0 7 0; +#X connect 4 0 9 0; +#X connect 5 0 4 1; +#X connect 6 0 4 1; +#X connect 7 0 5 0; +#X connect 7 0 13 0; +#X connect 7 0 9 0; +#X connect 10 0 16 0; +#X connect 11 0 2 0; +#X connect 11 0 16 1; +#X connect 12 0 8 0; #X connect 13 0 9 0; -#X connect 14 0 10 0; -#X connect 15 0 16 0; -#X connect 16 0 7 0; +#X connect 14 0 15 0; +#X connect 15 0 6 0; +#X connect 16 0 12 0; +#X connect 16 1 3 0; #X restore -102 -379 pd layer_6; #N canvas 430 292 450 300 layer_7 0; -#X obj -253 -28 layer; #X msg -124 -32 1; #X msg -177 -33 0; #X obj -177 -55 select 0; @@ -413,30 +412,30 @@ #X msg -244 117 layerimage 17; #X obj -106 -97 delay 700; #X obj -106 -120 r metro; -#X connect 0 0 13 0; -#X connect 0 1 4 0; -#X connect 1 0 4 1; -#X connect 2 0 4 1; -#X connect 3 0 2 0; -#X connect 3 1 1 0; -#X connect 4 0 5 0; -#X connect 5 0 8 0; -#X connect 5 0 10 0; -#X connect 6 0 5 1; -#X connect 7 0 5 1; -#X connect 8 0 6 0; -#X connect 8 0 14 0; -#X connect 8 0 10 0; -#X connect 11 0 0 0; -#X connect 12 0 3 0; -#X connect 12 0 0 1; +#X obj -253 -28 layer; +#X connect 0 0 3 1; +#X connect 1 0 3 1; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 3 0 4 0; +#X connect 4 0 7 0; +#X connect 4 0 9 0; +#X connect 5 0 4 1; +#X connect 6 0 4 1; +#X connect 7 0 5 0; +#X connect 7 0 13 0; +#X connect 7 0 9 0; +#X connect 10 0 16 0; +#X connect 11 0 2 0; +#X connect 11 0 16 1; +#X connect 12 0 8 0; #X connect 13 0 9 0; -#X connect 14 0 10 0; -#X connect 15 0 7 0; -#X connect 16 0 15 0; +#X connect 14 0 6 0; +#X connect 15 0 14 0; +#X connect 16 0 12 0; +#X connect 16 1 3 0; #X restore -28 -379 pd layer_7; #N canvas 895 289 450 300 layer_8 0; -#X obj -253 -37 layer; #X msg -124 -41 1; #X msg -177 -42 0; #X obj -177 -64 select 0; @@ -453,30 +452,30 @@ #X obj -84 -81 delay 800; #X obj -84 -112 r metro; #X obj -177 -89 r layer8; -#X connect 0 0 13 0; -#X connect 0 1 4 0; -#X connect 1 0 4 1; -#X connect 2 0 4 1; -#X connect 3 0 2 0; -#X connect 3 1 1 0; -#X connect 4 0 5 0; -#X connect 5 0 8 0; -#X connect 5 0 10 0; -#X connect 6 0 5 1; -#X connect 7 0 5 1; -#X connect 8 0 6 0; -#X connect 8 0 12 0; -#X connect 8 0 10 0; -#X connect 11 0 0 0; -#X connect 12 0 10 0; -#X connect 13 0 9 0; -#X connect 14 0 7 0; -#X connect 15 0 14 0; -#X connect 16 0 3 0; -#X connect 16 0 0 1; +#X obj -253 -37 layer; +#X connect 0 0 3 1; +#X connect 1 0 3 1; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 3 0 4 0; +#X connect 4 0 7 0; +#X connect 4 0 9 0; +#X connect 5 0 4 1; +#X connect 6 0 4 1; +#X connect 7 0 5 0; +#X connect 7 0 11 0; +#X connect 7 0 9 0; +#X connect 10 0 16 0; +#X connect 11 0 9 0; +#X connect 12 0 8 0; +#X connect 13 0 6 0; +#X connect 14 0 13 0; +#X connect 15 0 2 0; +#X connect 15 0 16 1; +#X connect 16 0 12 0; +#X connect 16 1 3 0; #X restore 46 -379 pd layer_8; #N canvas 901 332 450 300 layer_4 0; -#X obj -253 -28 layer; #X msg -124 -32 1; #X msg -177 -33 0; #X obj -177 -55 select 0; @@ -493,30 +492,30 @@ #X msg -231 104 layerimage 14; #X obj -106 -88 delay 400; #X obj -106 -116 r metro; -#X connect 0 0 13 0; -#X connect 0 1 4 0; -#X connect 1 0 4 1; -#X connect 2 0 4 1; -#X connect 3 0 2 0; -#X connect 3 1 1 0; -#X connect 4 0 5 0; -#X connect 5 0 8 0; -#X connect 5 0 10 0; -#X connect 6 0 5 1; -#X connect 7 0 5 1; -#X connect 8 0 6 0; -#X connect 8 0 14 0; -#X connect 8 0 10 0; -#X connect 11 0 0 0; -#X connect 12 0 3 0; -#X connect 12 0 0 1; +#X obj -253 -28 layer; +#X connect 0 0 3 1; +#X connect 1 0 3 1; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 3 0 4 0; +#X connect 4 0 7 0; +#X connect 4 0 9 0; +#X connect 5 0 4 1; +#X connect 6 0 4 1; +#X connect 7 0 5 0; +#X connect 7 0 13 0; +#X connect 7 0 9 0; +#X connect 10 0 16 0; +#X connect 11 0 2 0; +#X connect 11 0 16 1; +#X connect 12 0 8 0; #X connect 13 0 9 0; -#X connect 14 0 10 0; -#X connect 15 0 7 0; -#X connect 16 0 15 0; +#X connect 14 0 6 0; +#X connect 15 0 14 0; +#X connect 16 0 12 0; +#X connect 16 1 3 0; #X restore -250 -379 pd layer_4; #N canvas 822 157 450 300 layer_3 0; -#X obj -253 -28 layer; #X msg -124 -32 1; #X msg -177 -33 0; #X obj -177 -55 select 0; @@ -533,30 +532,30 @@ #X msg -327 95 layerimage 13; #X obj -106 -81 delay 300; #X msg -253 10 3 \$1; -#X connect 0 0 16 0; -#X connect 0 1 4 0; -#X connect 1 0 4 1; -#X connect 2 0 4 1; -#X connect 3 0 2 0; -#X connect 3 1 1 0; -#X connect 4 0 6 0; -#X connect 5 0 15 0; -#X connect 6 0 9 0; -#X connect 6 0 11 0; -#X connect 7 0 6 1; -#X connect 8 0 6 1; -#X connect 9 0 7 0; -#X connect 9 0 14 0; -#X connect 9 0 11 0; -#X connect 12 0 3 0; -#X connect 12 0 0 1; -#X connect 13 0 0 0; -#X connect 14 0 11 0; -#X connect 15 0 8 0; -#X connect 16 0 10 0; +#X obj -253 -28 layer; +#X connect 0 0 3 1; +#X connect 1 0 3 1; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 3 0 5 0; +#X connect 4 0 14 0; +#X connect 5 0 8 0; +#X connect 5 0 10 0; +#X connect 6 0 5 1; +#X connect 7 0 5 1; +#X connect 8 0 6 0; +#X connect 8 0 13 0; +#X connect 8 0 10 0; +#X connect 11 0 2 0; +#X connect 11 0 16 1; +#X connect 12 0 16 0; +#X connect 13 0 10 0; +#X connect 14 0 7 0; +#X connect 15 0 9 0; +#X connect 16 0 15 0; +#X connect 16 1 3 0; #X restore -323 -379 pd layer_3; #N canvas 782 439 450 300 layer_2 0; -#X obj -253 -28 layer; #X msg -124 -32 1; #X msg -177 -33 0; #X obj -177 -55 select 0; @@ -573,29 +572,30 @@ #X msg -253 10 2 \$1; #X msg -235 112 layerimage 12; #X msg -65 -86 delay 900; -#X connect 0 0 14 0; -#X connect 0 1 4 0; -#X connect 1 0 4 1; -#X connect 2 0 4 1; -#X connect 3 0 2 0; -#X connect 3 1 1 0; -#X connect 4 0 6 0; -#X connect 5 0 16 0; -#X connect 6 0 9 0; -#X connect 6 0 11 0; -#X connect 7 0 6 1; -#X connect 8 0 6 1; -#X connect 9 0 7 0; -#X connect 9 0 15 0; -#X connect 9 0 11 0; -#X connect 12 0 0 0; -#X connect 13 0 3 0; -#X connect 13 0 0 1; +#X obj -253 -28 layer; +#X connect 0 0 3 1; +#X connect 1 0 3 1; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 3 0 5 0; +#X connect 4 0 15 0; +#X connect 5 0 8 0; +#X connect 5 0 10 0; +#X connect 6 0 5 1; +#X connect 7 0 5 1; +#X connect 8 0 6 0; +#X connect 8 0 14 0; +#X connect 8 0 10 0; +#X connect 11 0 16 0; +#X connect 12 0 2 0; +#X connect 12 0 16 1; +#X connect 13 0 9 0; #X connect 14 0 10 0; -#X connect 15 0 11 0; -#X connect 16 0 8 0; +#X connect 15 0 7 0; +#X connect 16 0 13 0; +#X connect 16 1 3 0; #X restore -396 -379 pd layer_2; -#N canvas 386 130 450 300 layer_1 0; +#N canvas 384 140 450 300 layer_1 0; #X obj -253 -28 layer; #X msg -124 -32 1; #X msg -177 -33 0; diff --git a/patches/text.txt b/patches/text.txt deleted file mode 100644 index 7797da2..0000000 --- a/patches/text.txt +++ /dev/null @@ -1,78 +0,0 @@ -0,Esta noche; -1,David Data; -2,Vs.; -3,Borja Salazar; -4,Piramide; -5,Sound Club; -6,Deep Tech; -7,&&; -8,Techno; -9,Music; -10,Pinchando; -11,A; -12,B; -13,C; -14,D; -15,E; -16,F; -17,G; -18,H; -19,I; -20,J; -21,K; -22,L; -23,M; -24,N; -25,N; -26,O; -27,P; -28,Q; -29,R; -30,S; -31,T; -32,U; -33,V; -34,W; -35,X; -36,Y; -37,Z; -38,a; -39,b; -40,c; -41,d; -42,e; -43,f; -44,g; -45,h; -46,i; -47,j; -48,k; -49,l; -50,m; -51,n; -52,n; -53,o; -54,p; -55,q; -56,r; -57,s; -58,t; -59,u; -60,v; -61,w; -62,x; -63,y; -64,z; -65,0; -66,1; -67,2; -68,3; -69,4; -70,5; -71,6; -72,7; -73,8; -74,9; -253,Q; -254,R; -255,S; diff --git a/src/fileselector/fileselector.c b/src/fileselector/fileselector.c index 4f52660..c64e045 100644 --- a/src/fileselector/fileselector.c +++ b/src/fileselector/fileselector.c @@ -132,7 +132,7 @@ static void fileselector_output(t_fileselector* x) { strncat(path,"/fonts/*",8); } - if(x->x_type > 255) // Make the path sound + if(x->x_type == 256) // Make the path sound { strncat(path,"/sound/*",8); switch(glob(path, GLOB_TILDE, NULL, &glob_buffer)) @@ -150,43 +150,47 @@ static void fileselector_output(t_fileselector* x) pd_error(x,"[fileselector] nothing found for %s ",path); break; # endif - } - i = x->x_folder; - if (i < glob_buffer.gl_pathc) - { - strncpy(path, glob_buffer.gl_pathv[i],strnlen(glob_buffer.gl_pathv[i],FILENAME_MAX)); - strncat(path, "/*", 2); - } - else - { + } + i = x->x_folder; + if (i < glob_buffer.gl_pathc) + { + strncpy(path, glob_buffer.gl_pathv[i],strnlen(glob_buffer.gl_pathv[i],FILENAME_MAX)); + strncat(path, "/*", 2); + } + else + { post("fileselector: folder is greater than the number of folders"); globfree(&glob_buffer); return; - } - } - // Look for the file - switch(glob(path, GLOB_TILDE, NULL,&glob_buffer)) - { - case GLOB_NOSPACE: - pd_error(x,"[fileselector] out of memory for \"%s\"",path); - break; - # ifdef GLOB_ABORTED - case GLOB_ABORTED: + } + } + if(x->x_type == 257) // Make the path to texts files + { + strncat(path,"/texts/*",8); + } + // Look for the file + switch(glob(path, GLOB_TILDE, NULL,&glob_buffer)) + { + case GLOB_NOSPACE: + pd_error(x,"[fileselector] out of memory for \"%s\"",path); + break; + # ifdef GLOB_ABORTED + case GLOB_ABORTED: pd_error(x,"[fileselector] aborted \"%s\"",path); - break; - # endif - # ifdef GLOB_NOMATCH - case GLOB_NOMATCH: - pd_error(x,"[fileselector] nothing found for \"%s\"",path); - break; - # endif - } - i = x->x_file; - if (i < glob_buffer.gl_pathc) - { - outlet_symbol(x->x_out, gensym(glob_buffer.gl_pathv[i])); - } - } + break; + # endif + # ifdef GLOB_NOMATCH + case GLOB_NOMATCH: + pd_error(x,"[fileselector] nothing found for \"%s\"",path); + break; + # endif + } + i = x->x_file; + if (i < glob_buffer.gl_pathc) + { + outlet_symbol(x->x_out, gensym(glob_buffer.gl_pathv[i])); + } + } globfree( &(glob_buffer) ); } diff --git a/src/libremediaserver.pro.user b/src/libremediaserver.pro.user index 89daa57..b5ab411 100644 --- a/src/libremediaserver.pro.user +++ b/src/libremediaserver.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/todo.txt b/todo.txt index 6674f99..e495fc2 100644 --- a/todo.txt +++ b/todo.txt @@ -33,7 +33,7 @@ Próximas versiones: - Conectividad: CITP/MSEx 1.1. Thumbs y previews de imágenes --> Esperar a 1.2 en MagicQ? + Pure Data: Carpetas para imágenes -- Text: Diferentes ficheros de texto ++ Text: Diferentes ficheros de texto - Pure Data: sincronismo de audio con videos --> Parece que hay que hacer un script para separar el audio del video, y luego ejecutarlos juntos. Un poco chapu, la verdad. La aternativa es volver a pdp mediante pdp2gem (inviable, demasiado proceso) --> De momento separando el .ogg del video, ejecutando en auto, y mandando play a la vez debería de estar sincronizados. Ahora mismo se podría separando el audio en un fichero .ogg y presionando el play a la vez en modo auto @@ -59,7 +59,7 @@ Próximas versiones: --> Cortar la lectura DMX o apagar la ventana --> Depurar a saco las condiciones del reinicio - Scripts: script para formatear archivos de texto - +- GUI: avisar cuando no se pueda leer un archivo de texto ----------------- Para considerar: