diff --git a/puredata/layer.pd b/puredata/layer.pd index d7b30a5..9e631ce 100644 --- a/puredata/layer.pd +++ b/puredata/layer.pd @@ -1732,11 +1732,11 @@ f f f f f f f f f; #X connect 111 0 108 0; #X connect 113 0 102 0; #X restore 610 -131 pd video_render; -#N canvas 650 90 511 649 texto 0; +#N canvas 646 90 511 649 texto 0; #X obj 190 -398 gemhead; #X msg 21 -129 font \$1; #X obj 190 -352 rotateXYZ; -#X obj 190 -41 text3d; +#X obj 190 -32 text3d; #X obj 190 -249 colorRGB; #X obj 190 -129 translateXYZ; #X obj 21 -484 inlet; @@ -1770,8 +1770,7 @@ f f f f f f f f f; #X obj 557 -161 t b; #X obj 524 -202 * 0.0078125; #X obj 611 -203 * 0.0078125; -#X msg 273 -104 1; -#X obj 273 -129 loadbang; +#X msg 292 -104 1; #X obj 611 -228 r \$0-c16; #X obj 190 -76 scale XY; #X obj 407 -250 r \$0-c17; @@ -1795,14 +1794,15 @@ f f f f f f f f f; #X obj 625 -108 float 0; #X obj 897 -320 r \$0-c10; #X obj 625 -149 r \$0-c11; -#X obj 190 -7 outlet; +#X obj 190 2 outlet; #X obj 190 -374 alpha; -#X connect 0 0 62 0; +#X obj 294 -507 loadbang; +#X connect 0 0 61 0; #X connect 1 0 3 0; #X connect 2 0 4 0; -#X connect 3 0 61 0; +#X connect 3 0 60 0; #X connect 4 0 5 0; -#X connect 5 0 40 0; +#X connect 5 0 39 0; #X connect 6 0 7 0; #X connect 7 0 1 0; #X connect 8 0 11 0; @@ -1833,38 +1833,39 @@ f f f f f f f f f; #X connect 31 0 4 2; #X connect 32 0 4 3; #X connect 33 0 4 4; -#X connect 34 0 44 0; -#X connect 35 0 44 0; +#X connect 34 0 43 0; +#X connect 35 0 43 0; #X connect 36 0 34 0; -#X connect 36 0 44 1; -#X connect 37 0 40 1; -#X connect 38 0 37 0; -#X connect 39 0 36 0; -#X connect 40 0 3 0; +#X connect 36 0 43 1; +#X connect 37 0 39 1; +#X connect 38 0 36 0; +#X connect 39 0 3 0; +#X connect 40 0 41 0; #X connect 41 0 42 0; -#X connect 42 0 43 0; -#X connect 43 0 5 3; -#X connect 44 0 40 2; -#X connect 45 0 46 0; -#X connect 46 0 3 0; -#X connect 47 0 45 0; -#X connect 47 0 55 0; +#X connect 42 0 5 3; +#X connect 43 0 39 2; +#X connect 44 0 45 0; +#X connect 45 0 3 0; +#X connect 46 0 44 0; +#X connect 46 0 54 0; +#X connect 47 0 46 0; #X connect 48 0 47 0; -#X connect 49 0 48 0; -#X connect 50 0 48 0; -#X connect 50 0 53 0; -#X connect 51 0 52 0; -#X connect 51 0 57 0; -#X connect 52 0 48 0; -#X connect 53 0 48 0; -#X connect 55 0 58 0; -#X connect 56 0 50 0; -#X connect 57 0 49 0; -#X connect 57 1 56 0; -#X connect 58 0 45 0; -#X connect 59 0 56 0; -#X connect 60 0 58 0; -#X connect 62 0 2 0; +#X connect 49 0 47 0; +#X connect 49 0 52 0; +#X connect 50 0 51 0; +#X connect 50 0 56 0; +#X connect 51 0 47 0; +#X connect 52 0 47 0; +#X connect 54 0 57 0; +#X connect 55 0 49 0; +#X connect 56 0 48 0; +#X connect 56 1 55 0; +#X connect 57 0 44 0; +#X connect 58 0 55 0; +#X connect 59 0 57 0; +#X connect 61 0 2 0; +#X connect 62 0 9 0; +#X connect 62 0 37 0; #X restore 939 -170 pd texto; #X obj 450 305 t b; #X obj 397 304 t b; diff --git a/puredata/layer_audio.pd b/puredata/layer_audio.pd index 30e56f3..5e36292 100644 --- a/puredata/layer_audio.pd +++ b/puredata/layer_audio.pd @@ -1,4 +1,4 @@ -#N canvas 350 98 904 417 10; +#N canvas 718 93 904 417 10; #N canvas 389 113 497 527 audio_player 0; #X msg 22 33 open \$1; #X msg 203 93 start; @@ -99,7 +99,7 @@ #X obj 708 -67 s \$0-c14; #X obj 763 -67 s \$0-c15; #X obj 825 -67 s \$0-c16; -#N canvas 678 268 412 197 selector 0; +#N canvas 687 100 412 197 selector 0; #X obj 193 -66 outlet; #X text 99 -210 folder; #X obj 95 -193 r \$0-c3; @@ -113,10 +113,12 @@ #X msg 340 -158 set \$1; #X obj 250 -192 loadbang; #X obj 95 -132 b; +#X symbolatom 77 -52 10 0 0 0 - - -; #X connect 2 0 7 0; #X connect 3 0 8 0; #X connect 4 0 10 0; #X connect 6 0 0 0; +#X connect 6 0 13 0; #X connect 7 0 6 0; #X connect 7 0 12 0; #X connect 8 0 6 0; @@ -126,7 +128,6 @@ #X connect 11 0 9 0; #X connect 12 0 6 0; #X restore 37 -342 pd selector; -#X obj 184 -277 list split 16; #X obj 184 -252 unpack f f f f f f f f f f f f f f f f; #X obj 42 -36 << 8; #X obj 42 5 +; @@ -137,7 +138,7 @@ #X text 184 -336 c1 Vol c2 pan c3 folder c4 file c5 playback c6 Control c7 Volumen fino 8 Entry point Coarse 9 Entry point fine; #X obj 5 -199 outlet; -#X connect 1 0 40 0; +#X connect 1 0 39 0; #X connect 2 0 25 0; #X connect 3 0 26 0; #X connect 4 0 27 0; @@ -145,40 +146,39 @@ c7 Volumen fino 8 Entry point Coarse 9 Entry point fine; #X connect 6 0 29 0; #X connect 7 0 30 0; #X connect 8 0 31 0; -#X connect 9 0 35 0; +#X connect 9 0 34 0; #X connect 10 0 19 0; #X connect 11 0 20 0; #X connect 12 0 21 0; #X connect 13 0 22 0; #X connect 14 0 23 0; -#X connect 15 0 37 0; -#X connect 16 0 38 0; +#X connect 15 0 36 0; +#X connect 16 0 37 0; #X connect 17 0 33 0; #X connect 32 0 0 0; -#X connect 32 0 42 0; -#X connect 33 0 34 0; -#X connect 34 0 9 0; -#X connect 34 1 10 0; -#X connect 34 2 11 0; -#X connect 34 3 12 0; -#X connect 34 4 13 0; -#X connect 34 5 14 0; -#X connect 34 6 15 0; -#X connect 34 7 16 0; -#X connect 34 8 1 0; -#X connect 34 9 2 0; -#X connect 34 10 3 0; -#X connect 34 11 4 0; -#X connect 34 12 5 0; -#X connect 34 13 6 0; -#X connect 34 14 7 0; -#X connect 34 15 8 0; -#X connect 35 0 36 0; -#X connect 36 0 18 0; -#X connect 37 0 36 0; -#X connect 37 1 36 1; -#X connect 38 0 39 0; -#X connect 39 0 24 0; -#X connect 40 0 39 0; -#X connect 40 1 39 1; +#X connect 32 0 41 0; +#X connect 33 0 9 0; +#X connect 33 1 10 0; +#X connect 33 2 11 0; +#X connect 33 3 12 0; +#X connect 33 4 13 0; +#X connect 33 5 14 0; +#X connect 33 6 15 0; +#X connect 33 7 16 0; +#X connect 33 8 1 0; +#X connect 33 9 2 0; +#X connect 33 10 3 0; +#X connect 33 11 4 0; +#X connect 33 12 5 0; +#X connect 33 13 6 0; +#X connect 33 14 7 0; +#X connect 33 15 8 0; +#X connect 34 0 35 0; +#X connect 35 0 18 0; +#X connect 36 0 35 0; +#X connect 36 1 35 1; +#X connect 37 0 38 0; +#X connect 38 0 24 0; +#X connect 39 0 38 0; +#X connect 39 1 38 1; #X coords 0 417 1 416 0 0 0; diff --git a/puredata/lms-audio.pd b/puredata/lms-audio.pd index 2c3a9dd..035a4d9 100644 --- a/puredata/lms-audio.pd +++ b/puredata/lms-audio.pd @@ -1,5 +1,5 @@ -#N canvas 208 296 838 411 10; -#N canvas 339 126 1016 356 dmx 0; +#N canvas 355 236 838 411 10; +#N canvas 347 121 1016 356 dmx 0; #X obj -7 -49 list split; #X obj 99 -57 list split; #X obj 50 -79 - 1; @@ -46,7 +46,6 @@ #X obj 615 -173 r layer6; #X obj 744 -170 r layer7; #X obj 833 -183 r layer8; -#X obj 21 -22 list split 32; #X obj 127 -19 list split 32; #X obj 230 -18 list split 32; #X obj 336 -53 list split 32; @@ -55,14 +54,15 @@ #X obj 703 -14 list split 32; #X obj 828 -18 list split 32; #X obj 507 -285 select 1; -#X connect 0 1 46 0; -#X connect 1 1 47 0; +#X obj 21 -22 list split 16; +#X connect 0 1 54 0; +#X connect 1 1 46 0; #X connect 2 0 0 1; #X connect 3 0 1 1; #X connect 4 0 9 0; -#X connect 5 1 48 0; +#X connect 5 1 47 0; #X connect 6 0 5 1; -#X connect 7 1 49 0; +#X connect 7 1 48 0; #X connect 8 0 7 1; #X connect 9 0 28 0; #X connect 9 0 29 0; @@ -74,13 +74,13 @@ #X connect 9 0 35 0; #X connect 10 0 9 0; #X connect 11 0 9 0; -#X connect 16 1 50 0; +#X connect 16 1 49 0; #X connect 17 0 16 1; -#X connect 19 1 51 0; +#X connect 19 1 50 0; #X connect 20 0 19 1; -#X connect 22 1 52 0; +#X connect 22 1 51 0; #X connect 23 0 22 1; -#X connect 25 1 53 0; +#X connect 25 1 52 0; #X connect 26 0 25 1; #X connect 28 0 0 0; #X connect 29 0 1 0; @@ -95,7 +95,7 @@ #X connect 37 0 10 0; #X connect 38 0 29 1; #X connect 38 0 3 0; -#X connect 39 0 54 0; +#X connect 39 0 53 0; #X connect 40 0 6 0; #X connect 40 0 30 1; #X connect 41 0 8 0; @@ -108,19 +108,19 @@ #X connect 44 0 23 0; #X connect 45 0 26 0; #X connect 45 0 35 1; -#X connect 46 0 12 0; -#X connect 47 0 13 0; -#X connect 48 0 14 0; -#X connect 49 0 15 0; -#X connect 50 0 18 0; -#X connect 51 0 21 0; -#X connect 52 0 24 0; -#X connect 53 0 27 0; -#X connect 54 0 11 0; -#X connect 54 1 4 0; +#X connect 46 0 13 0; +#X connect 47 0 14 0; +#X connect 48 0 15 0; +#X connect 49 0 18 0; +#X connect 50 0 21 0; +#X connect 51 0 24 0; +#X connect 52 0 27 0; +#X connect 53 0 11 0; +#X connect 53 1 4 0; +#X connect 54 0 12 0; #X coords 0 356 1 355 1 1 0; #X restore -23 190 pd dmx; -#X obj -297 248 layer_audio; +#X obj -297 249 layer_audio; #X msg 422 182 \; pd dsp 1; #X obj 422 137 loadbang; #X msg -297 267 send 1 \$1; @@ -147,7 +147,7 @@ #X obj 81 139 float; #X obj 140 139 float; #X obj 200 139 float; -#X obj 239 139 float; +#X obj 262 139 float; #X obj -220 159 s layer2; #X obj -160 159 s layer3; #X obj -100 159 s layer4; @@ -156,9 +156,10 @@ #X obj 81 159 s layer7; #X obj 140 159 s layer8; #X obj 200 159 s ola; -#X obj 239 159 s universe; +#X obj 262 159 s universe; #X obj 162 23 s path; #X obj -247 75 select 11 12 13 14 15 16 17 18 20 21; +#X obj 422 160 delay 500; #X obj -136 247 layer_audio; #X obj -56 247 layer_audio; #X obj 24 247 layer_audio; @@ -166,17 +167,16 @@ #X obj 104 247 layer_audio; #X obj 184 247 layer_audio; #X obj 265 247 layer_audio; -#X obj 422 160 delay 500; #X connect 0 0 1 0; -#X connect 0 1 43 0; -#X connect 0 2 40 0; -#X connect 0 3 41 0; -#X connect 0 4 42 0; -#X connect 0 5 44 0; -#X connect 0 6 45 0; -#X connect 0 7 46 0; +#X connect 0 1 44 0; +#X connect 0 2 41 0; +#X connect 0 3 42 0; +#X connect 0 4 43 0; +#X connect 0 5 45 0; +#X connect 0 6 46 0; +#X connect 0 7 47 0; #X connect 1 0 4 0; -#X connect 3 0 47 0; +#X connect 3 0 40 0; #X connect 3 0 15 0; #X connect 3 0 13 0; #X connect 4 0 5 0; @@ -223,11 +223,11 @@ #X connect 39 7 26 0; #X connect 39 8 27 0; #X connect 39 9 28 0; -#X connect 40 0 7 0; -#X connect 41 0 8 0; -#X connect 42 0 9 0; -#X connect 43 0 6 0; -#X connect 44 0 10 0; -#X connect 45 0 11 0; -#X connect 46 0 12 0; -#X connect 47 0 2 0; +#X connect 40 0 2 0; +#X connect 41 0 7 0; +#X connect 42 0 8 0; +#X connect 43 0 9 0; +#X connect 44 0 6 0; +#X connect 45 0 10 0; +#X connect 46 0 11 0; +#X connect 47 0 12 0; diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp index 1f0a711..68a7d21 100644 --- a/src/libremediaserver.cpp +++ b/src/libremediaserver.cpp @@ -1059,8 +1059,10 @@ void libreMediaServer::newconexion() bool libreMediaServer::sendPacket(const char *buffer, int bufferLen) { if (m_pd_write_video == NULL) { - qErrnoWarning("sendPacket:Socket not initialized:"); - return false; + if (ui.video->checkState()) { + qErrnoWarning("sendPacket:Socket not initialized:"); + } + return false; } if (QAbstractSocket::ConnectedState != m_pd_write_video->state()) { @@ -1069,7 +1071,7 @@ bool libreMediaServer::sendPacket(const char *buffer, int bufferLen) } if (bufferLen != m_pd_write_video->write((const char*)buffer, bufferLen)) { - qErrnoWarning("sendPacket:Can not write to socket::"); + qErrnoWarning("sendPacket:Can not write to socket:"); return false; } return true; @@ -1410,7 +1412,8 @@ void libreMediaServer::pdstart_audio() } // Arrancamos el proceso Pure Data QString arguments; - arguments.append("./puredata/pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./puredata/externals/ -open ./puredata/lms-audio.pd "); +// arguments.append("./puredata/pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./puredata/externals/ -open ./puredata/lms-audio.pd "); + arguments.append("./puredata/pd -channels 2 -stderr -nostdpath -path ./puredata/externals/ -open ./puredata/lms-audio.pd "); if (!m_gui) arguments.append("-nogui"); qDebug() << "PD Audio starts with argument: " << arguments; diff --git a/src/msex.cpp b/src/msex.cpp index 54565e0..02d88ab 100644 --- a/src/msex.cpp +++ b/src/msex.cpp @@ -33,8 +33,8 @@ msex::msex(QObject *parent) : QObject(parent), m_peerState(STATE), m_peerName(NAME), - m_listeningPort(LISTENTCPPORT) - + m_listeningPort(LISTENTCPPORT), + m_tcpSocket(NULL) { // Iniciamos la lista de estatus de layer LayerStatus layermodel; @@ -100,8 +100,9 @@ quint16 msex::peerListeningPort() const return m_listeningPort; } */ -bool msex::newPeer() +void msex::newPeer() { + if (m_tcpSocket != NULL) {return;} m_tcpSocket = m_tcpServer->nextPendingConnection(); connect(m_tcpSocket, SIGNAL(readyRead()), this, SLOT(handleReadyRead())); @@ -112,16 +113,16 @@ bool msex::newPeer() if (!buffer) { qDebug() << "msex::new peer:createSINFPacket() failed"; - return false; + return; } // Mandamos el paquete if (!msex::sendPacket(buffer, bufferLen)) { qDebug() << "msex::new peer: Send SInf Message failed"; - return false; + return; } qDebug() << "msex::new peer: SInf Sent..."; - return true; + return; /* Iniciamos el layer Status // Creamos un paquete LSTA m_bufferLen = sizeof(struct CITP_MSEX_12_LSta); diff --git a/src/msex.h b/src/msex.h index e854a0a..ee76774 100644 --- a/src/msex.h +++ b/src/msex.h @@ -98,7 +98,7 @@ protected slots: private slots: - bool newPeer(); + void newPeer(); signals: