diff --git a/manual_es.txt b/manual_es.txt index 87c58ca..1e72400 100644 --- a/manual_es.txt +++ b/manual_es.txt @@ -72,6 +72,7 @@ A la derecha de la ventana de Preview: J. IP Adress. Dirección IP de la interface que queremos usar para el CITP/MSEx. Dejar en 0.0.0.0 para todas las interfaces. K. Preview Master Check Box: Habilita/deshabilita la vista previa de la mezcla final. L. Preview Layers: Habilita/deshabilita la vista previa por capa. +M. Contador de FPS. Indica la tasa actual de renderizado. Menu File: @@ -221,7 +222,7 @@ Puedes definir hasta 255 frases editando con un editor ASCII el fichero text.txt 7, evita las fuentes muy pesadas; 255, última frase que se puede usar; -Para cambiar de frase usa el parámetro Folder. Para cambiar de fuente el parámetro File. Renderizar cualquier fuente True Type que esté en el directorio "fonts". +Para cambiar de frase usa el canal 11 (en Video exit Point). Para cambiar de fuente con los parámetros File y Folder. Cambia de fichero con el canal 10 (en video Entry Point). Puede renderizar cualquier fuente True Type que esté en el directorio "fonts". ******************************************************************************* diff --git a/puredata/layer.pd b/puredata/layer.pd index 6206704..64419b4 100644 --- a/puredata/layer.pd +++ b/puredata/layer.pd @@ -64,14 +64,14 @@ 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 735 394 492 333 selector 0; +#N canvas 733 404 492 333 selector 0; #X obj 102 161 outlet; -#X obj 373 157 outlet; +#X obj 329 157 outlet; #X obj 312 -8 / 25; -#X msg 388 108 1; -#X msg 424 109 2; -#X msg 460 109 3; -#X msg 353 107 0; +#X msg 344 108 1; +#X msg 380 109 2; +#X msg 416 109 3; +#X msg 309 107 0; #X text 80 -64 folder; #X text 152 -63 file; #X obj 78 -47 r \$0-c6; @@ -86,29 +86,20 @@ f f f f f f f f f; #X msg 149 6 file \$1; #X msg 212 6 type \$1; #X obj 226 81 b; -#X obj 78 -23 spigot; #X obj 309 63 select 0 1 2 3; -#X msg 247 171 0; -#X msg 295 174 1; -#X symbolatom 35 210 80 0 0 0 - - -; -#X floatatom 24 141 5 0 0 0 - - -; -#X floatatom 20 80 5 0 0 0 - - -; #X connect 2 0 13 0; #X connect 3 0 1 0; #X connect 4 0 1 0; #X connect 5 0 1 0; #X connect 6 0 1 0; -#X connect 9 0 21 0; -#X connect 9 0 27 0; +#X connect 9 0 17 0; #X connect 10 0 18 0; -#X connect 10 0 26 0; #X connect 11 0 2 0; #X connect 11 0 19 0; #X connect 12 0 16 0; #X connect 13 0 14 0; -#X connect 14 0 22 0; +#X connect 14 0 21 0; #X connect 15 0 0 0; -#X connect 15 0 25 0; #X connect 16 0 15 0; #X connect 17 0 15 0; #X connect 17 0 20 0; @@ -117,17 +108,11 @@ f f f f f f f f f; #X connect 19 0 15 0; #X connect 19 0 20 0; #X connect 20 0 15 0; -#X connect 21 0 17 0; -#X connect 22 0 6 0; -#X connect 22 1 3 0; -#X connect 22 1 24 0; -#X connect 22 2 4 0; -#X connect 22 2 24 0; -#X connect 22 3 5 0; -#X connect 22 3 23 0; -#X connect 22 4 6 0; -#X connect 23 0 21 1; -#X connect 24 0 21 1; +#X connect 21 0 6 0; +#X connect 21 1 3 0; +#X connect 21 2 4 0; +#X connect 21 3 5 0; +#X connect 21 4 6 0; #X restore 621 -227 pd selector; #N canvas 1 112 300 418 imagen 0; #X obj 100 321 pix_image; @@ -1759,7 +1744,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 48 90 951 649 texto 0; +#N canvas 46 90 951 649 texto 0; #X obj 421 -381 gemhead; #X msg 252 -31 font \$1; #X obj 421 -307 rotateXYZ; @@ -1783,7 +1768,6 @@ 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 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; @@ -1832,12 +1816,13 @@ f f f f f f f f f; #X obj 1019 -199 t b b; #X obj 856 -10 float 0; #X obj 1128 -222 r \$0-c10; +#X obj 856 -51 r \$0-c11; #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 51 0; +#X connect 6 0 50 0; #X connect 7 0 8 0; #X connect 8 0 1 0; #X connect 9 0 12 0; @@ -1847,58 +1832,58 @@ 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 23 0 69 0; +#X connect 23 0 35 0; #X connect 24 0 36 0; #X connect 25 0 37 0; -#X connect 26 0 38 0; +#X connect 26 0 40 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 35 0; -#X connect 32 0 46 0; -#X connect 33 0 34 0; +#X connect 30 0 34 0; +#X connect 31 0 45 0; +#X connect 32 0 33 0; +#X connect 33 0 38 0; #X connect 34 0 39 0; -#X connect 35 0 40 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 35 0 2 1; +#X connect 36 0 2 2; +#X connect 37 0 2 3; +#X connect 38 0 6 1; +#X connect 39 0 6 2; +#X connect 40 0 5 1; +#X connect 41 0 5 2; +#X connect 42 0 5 3; +#X connect 43 0 5 4; +#X connect 44 0 54 0; +#X connect 45 0 54 0; +#X connect 46 0 44 0; +#X connect 46 0 54 1; +#X connect 47 0 50 1; +#X connect 48 0 47 0; +#X connect 49 0 46 0; +#X connect 50 0 3 0; +#X connect 51 0 52 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 57 0; -#X connect 57 0 3 0; -#X connect 58 0 56 0; -#X connect 58 0 66 0; +#X connect 53 0 6 3; +#X connect 54 0 50 2; +#X connect 55 0 56 0; +#X connect 56 0 3 0; +#X connect 57 0 55 0; +#X connect 57 0 65 0; +#X connect 58 0 57 0; #X connect 59 0 58 0; -#X connect 60 0 59 0; -#X connect 61 0 59 0; -#X connect 61 0 64 0; -#X connect 62 0 63 0; -#X connect 62 0 68 0; -#X connect 63 0 59 0; -#X connect 64 0 59 0; -#X connect 66 0 69 0; -#X connect 67 0 61 0; -#X connect 68 0 60 0; -#X connect 68 1 67 0; -#X connect 69 0 56 0; -#X connect 70 0 67 0; +#X connect 60 0 58 0; +#X connect 60 0 63 0; +#X connect 61 0 62 0; +#X connect 61 0 67 0; +#X connect 62 0 58 0; +#X connect 63 0 58 0; +#X connect 65 0 68 0; +#X connect 66 0 60 0; +#X connect 67 0 59 0; +#X connect 67 1 66 0; +#X connect 68 0 55 0; +#X connect 69 0 66 0; +#X connect 70 0 68 0; #X restore 742 -97 pd texto; #X obj 450 350 t b; #X obj 397 349 t b; diff --git a/src/fileselector/fileselector.c b/src/fileselector/fileselector.c index c64e045..f56bdb2 100644 --- a/src/fileselector/fileselector.c +++ b/src/fileselector/fileselector.c @@ -131,7 +131,35 @@ static void fileselector_output(t_fileselector* x) if((x->x_type > 74) && (x->x_type<100)) // Make the fonts path { strncat(path,"/fonts/*",8); - } + 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_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; + } + } if(x->x_type == 256) // Make the path sound { strncat(path,"/sound/*",8); @@ -233,7 +261,6 @@ void fileselector_setup(void) fileselector_class = class_new(gensym("fileselector"),(t_newmethod)fileselector_new,0,sizeof(t_fileselector),0,A_DEFSYMBOL,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT, 0); /* add inlet datatype methods */ class_addbang(fileselector_class,(t_method) fileselector_output); -// class_addsymbol(fileselector_class,(t_method) fileselector_symbol); /* add inlet message methods */ class_addmethod(fileselector_class,(t_method)fileselector_set,gensym("set"),A_DEFSYMBOL, 0); // add inlet folder diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp index a4f6129..2d34ff7 100644 --- a/src/libremediaserver.cpp +++ b/src/libremediaserver.cpp @@ -88,11 +88,10 @@ quint8 universe_audio; bool audioCheck; }; +/////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////// - - libreMediaServer::libreMediaServer(QStringList args, QWidget *parent) : QMainWindow(parent), m_startvideo(0), @@ -850,9 +849,7 @@ void libreMediaServer::on_video_stateChanged(int state) } /////////////////////////////////////////////////////////////////// -// // Pure Data Video -// /////////////////////////////////////////////////////////////////// // Start the PD Process, open the ports and connects stdout de Pure Data. @@ -1362,9 +1359,7 @@ void libreMediaServer::on_audio_stateChanged(int state) } /////////////////////////////////////////////////////////////////// -// // Pure Data Audio -// /////////////////////////////////////////////////////////////////// // Start the PD Process, open the ports and connects stdout de Pure Data. @@ -1550,9 +1545,7 @@ void libreMediaServer::errorsending_audio() { } /////////////////////////////////////////////////////////////////// -// // Previews -// /////////////////////////////////////////////////////////////////// // GUI @@ -1561,6 +1554,7 @@ void libreMediaServer::previewMaster() QPixmap preview = QPixmap::grabWindow(QApplication::desktop()->winId(), ui.winpositionx->value() , ui.winpositiony->value(),ui.winsizex->value(),ui.winsizey->value()); ui.masterPreview->setPixmap(preview); } + // CITP/MSEx 1.0 void libreMediaServer::sendFrame() { @@ -1651,12 +1645,9 @@ void libreMediaServer::on_previewLayer_stateChanged (int state) } } - /////////////////////////////////////////////////////////////////// -// // Terminal and Log -// -/////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////// // Sacamos la salida de Pure Data Audio en la terminal void libreMediaServer::stdout_audio() { @@ -1735,11 +1726,7 @@ void libreMediaServer::stdout() { break; case '9': out.remove(0,9); - qDebug() <display(fps); + ui.fpsCounter->display(out.toInt()); break; default: qDebug()<<"stdout:Invalid cookie received"< - 493 - 320 + 483 + 322 61 - 23 + 41 @@ -702,8 +702,8 @@ - 500 - 350 + 550 + 340 31 21