LibreMediaServer/lms-video
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Audio Bug Fixes. Running in Ubuntu

Browse source 
modified:   libremediaserver/doc/manual_es.txt
	modified:   libremediaserver/doc/todo.txt
	modified:   libremediaserver/layer_audio.pd
	modified:   libremediaserver/libremediaserver.cpp
	modified:   libremediaserver/libremediaserver.pro
	modified:   libremediaserver/libremediaserver.ui
	modified:   libremediaserver/pms-audio.pd
This commit is contained in:
Santi Noreña 2013-01-08 19:29:51 +01:00
parent 801c29865a
commit fb02f89934
7 changed files with 87 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libremediaserver/doc/manual_es.txt
View file

@ -111,9 +111,21 @@ El árbol de ficheros tiene el siguiente esquema:
+255.ultimapeli.mov +255.ultimapeli.mov
+ audio + audio
+ 000-mifichero.ogg + 000-miprimealbum
- 000-mifichero.ogg
...
- 255-miultimofichero.ogg
+ 001-misegundoalbum
- 000-mifichero.ogg
...
- 255-miultimofichero.ogg
... ...
+ 255-miultimofichero.ogg + 255-miultimoalbum
- 000-mifichero.ogg
...
- 255-miultimofichero.ogg
+ fonts + fonts
- 000-mifuente.ttf - 000-mifuente.ttf

1
libremediaserver/doc/todo.txt
View file

@ -36,6 +36,7 @@ Próximas versiones:
- Audio: Música fractal mediante generadores de fx de las mesas - Audio: Música fractal mediante generadores de fx de las mesas
- Audio: Tarjetas con varias salidas y varias mezclas. - Audio: Tarjetas con varias salidas y varias mezclas.
- Video: Live input - Video: Live input
- Empaquetar en .deb
----------------- -----------------

168
libremediaserver/layer_audio.pd
View file

@ -1,10 +1,5 @@
<<<<<<< .mine #N canvas 339 118 1016 665 10;
#N canvas 341 102 1016 665 10; #N canvas 347 96 1016 665 audio_player 0;
#N canvas 349 88 1016 665 audio_player 0;
=======
#N canvas 343 102 1016 665 10;
#N canvas 349 88 1016 665 audio_player 0;
>>>>>>> .r153
#X msg 239 357 open \$1; #X msg 239 357 open \$1;
#X msg 383 478 start; #X msg 383 478 start;
#X msg 438 479 stop; #X msg 438 479 stop;
@ -107,9 +102,9 @@
#X obj 701 321 s \$0-c14; #X obj 701 321 s \$0-c14;
#X obj 756 321 s \$0-c15; #X obj 756 321 s \$0-c15;
#X obj 818 321 s \$0-c16; #X obj 818 321 s \$0-c16;
#N canvas 0 88 1366 680 selector 0; #N canvas 1 104 1366 680 selector 0;
#X obj 669 -356 loadbang; #X obj 669 -356 loadbang;
#X obj 222 474 outlet; #X obj 221 455 outlet;
#X obj 591 -142 outlet; #X obj 591 -142 outlet;
#X obj 559 -423 / 25; #X obj 559 -423 / 25;
#X obj 280 -218 spigot; #X obj 280 -218 spigot;
@ -125,7 +120,6 @@
#X text 280 -296 folder; #X text 280 -296 folder;
#X obj 559 -383 int; #X obj 559 -383 int;
#X obj 332 -198 symbol; #X obj 332 -198 symbol;
#X obj 252 262 hcs/folder_list;
#X obj 341 301 t l; #X obj 341 301 t l;
#X obj 253 413 list split 1; #X obj 253 413 list split 1;
#X obj 222 394 list split; #X obj 222 394 list split;
@ -137,7 +131,6 @@
#X obj 252 302 list prepend; #X obj 252 302 list prepend;
#X obj 384 167 b; #X obj 384 167 b;
#X msg 332 -130 symbol \$1; #X msg 332 -130 symbol \$1;
#X obj 245 -77 hcs/folder_list;
#X obj 202 -124 b; #X obj 202 -124 b;
#X obj 361 -34 t l; #X obj 361 -34 t l;
#X obj 224 -3 list; #X obj 224 -3 list;
@ -151,19 +144,23 @@
#X msg 115 224 0; #X msg 115 224 0;
#X msg 149 224 1; #X msg 149 224 1;
#X obj 81 267 metro 100; #X obj 81 267 metro 100;
#X obj 143 391 b; #X obj 189 408 b;
#X obj 222 434 symbol; #X obj 221 434 symbol;
#X obj 81 361 select 1; #X obj 81 361 select 1;
#X obj 332 -158 makefilename %s/sound/*; #X obj 332 -158 makefilename %s/sound/*;
#X obj 280 -258 r \$0-c3; #X obj 280 -258 r \$0-c3;
#X obj 498 100 r \$0-c4; #X obj 498 100 r \$0-c4;
#X text 445 -75 Tipo de media: 0 Off 1 Playback; #X text 531 -95 Tipo de media: 0 Off 1 Playback;
#X obj 559 -463 r \$0-c6; #X obj 559 -463 r \$0-c6;
#X obj 332 -238 r path; #X obj 332 -238 r path;
#X obj 245 -77 folder_list;
#X obj 252 262 folder_list;
#X symbolatom 657 55 80 0 0 0 - - -;
#X symbolatom 676 308 80 0 0 0 - - -;
#X connect 0 0 12 0; #X connect 0 0 12 0;
#X connect 3 0 15 0; #X connect 3 0 15 0;
#X connect 4 0 34 1; #X connect 4 0 32 1;
#X connect 4 0 30 0; #X connect 4 0 28 0;
#X connect 5 0 4 1; #X connect 5 0 4 1;
#X connect 6 0 4 1; #X connect 6 0 4 1;
#X connect 7 0 2 0; #X connect 7 0 2 0;
@ -182,57 +179,59 @@
#X connect 11 4 6 0; #X connect 11 4 6 0;
#X connect 11 4 12 0; #X connect 11 4 12 0;
#X connect 12 0 2 0; #X connect 12 0 2 0;
#X connect 13 0 21 0; #X connect 13 0 20 0;
#X connect 15 0 11 0; #X connect 15 0 11 0;
#X connect 16 0 46 0; #X connect 16 0 44 0;
#X connect 17 0 26 0; #X connect 17 0 25 1;
#X connect 18 0 26 1; #X connect 18 0 42 1;
#X connect 19 0 44 1; #X connect 19 1 18 0;
#X connect 20 1 19 0; #X connect 20 0 22 0;
#X connect 21 0 23 0; #X connect 20 0 39 0;
#X connect 21 0 41 0; #X connect 20 1 21 0;
#X connect 21 1 22 0; #X connect 21 0 51 1;
#X connect 22 0 17 1; #X connect 22 0 24 0;
#X connect 23 0 25 0; #X connect 22 1 23 0;
#X connect 23 1 24 0; #X connect 23 0 51 0;
#X connect 24 0 17 0; #X connect 23 1 25 1;
#X connect 24 1 26 1; #X connect 24 0 19 0;
#X connect 25 0 20 0; #X connect 25 0 17 0;
#X connect 26 0 18 0; #X connect 25 0 24 1;
#X connect 26 0 25 1; #X connect 26 0 24 0;
#X connect 27 0 25 0; #X connect 26 0 39 0;
#X connect 27 0 41 0; #X connect 27 0 28 0;
#X connect 28 0 29 1; #X connect 27 0 50 1;
#X connect 28 0 31 1;
#X connect 28 0 30 0; #X connect 28 0 30 0;
#X connect 29 0 33 0; #X connect 28 0 50 0;
#X connect 30 0 29 0; #X connect 29 0 31 1;
#X connect 30 0 33 1;
#X connect 30 0 32 0; #X connect 30 0 32 0;
#X connect 31 0 33 1; #X connect 31 0 29 0;
#X connect 32 0 34 0; #X connect 31 0 30 1;
#X connect 33 0 31 0; #X connect 32 1 33 0;
#X connect 33 0 32 1; #X connect 33 0 34 0;
#X connect 34 1 35 0; #X connect 33 0 52 0;
#X connect 34 0 13 0;
#X connect 35 0 36 0; #X connect 35 0 36 0;
#X connect 36 0 13 0; #X connect 35 0 43 0;
#X connect 37 0 38 0; #X connect 36 0 35 1;
#X connect 37 0 45 0; #X connect 37 0 35 1;
#X connect 38 0 37 1; #X connect 38 0 40 0;
#X connect 39 0 37 1; #X connect 39 0 40 0;
#X connect 40 0 42 0; #X connect 40 0 35 0;
#X connect 41 0 42 0; #X connect 41 0 42 0;
#X connect 42 0 37 0; #X connect 42 0 1 0;
#X connect 43 0 44 0; #X connect 42 0 53 0;
#X connect 44 0 1 0; #X connect 43 0 38 0;
#X connect 45 0 40 0; #X connect 43 0 37 0;
#X connect 45 0 39 0; #X connect 43 0 41 0;
#X connect 45 0 43 0; #X connect 44 0 27 0;
#X connect 46 0 28 0; #X connect 45 0 4 0;
#X connect 47 0 4 0; #X connect 46 0 19 1;
#X connect 48 0 20 1; #X connect 46 0 26 0;
#X connect 48 0 27 0; #X connect 48 0 3 0;
#X connect 50 0 3 0; #X connect 49 0 16 0;
#X connect 51 0 16 0; #X connect 50 0 31 0;
#X connect 51 0 25 0;
#X restore 37 -94 pd selector; #X restore 37 -94 pd selector;
#X obj 177 111 list split 16; #X obj 177 111 list split 16;
#X obj 177 136 unpack f f f f f f f f f f f f f f f f; #X obj 177 136 unpack f f f f f f f f f f f f f f f f;
@ -244,17 +243,9 @@
#X obj 430 343 t b f; #X obj 430 343 t b f;
#X text 185 -46 c1 Vol c2 pan c3 folder c4 file c5 playback c6 Control #X text 185 -46 c1 Vol c2 pan c3 folder c4 file c5 playback c6 Control
c7 Volumen fino 8 Entry point Coarse 9 Entry point fine; c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
<<<<<<< .mine
#X obj 5 49 outlet;
#X floatatom 163 425 5 0 0 0 - - -;
#X obj 32 202 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
-1;
#X connect 1 0 40 0;
=======
#X obj 5 49 outlet; #X obj 5 49 outlet;
#X floatatom 163 425 5 0 0 0 - - -; #X floatatom 163 425 5 0 0 0 - - -;
#X connect 1 0 40 0; #X connect 1 0 40 0;
>>>>>>> .r153
#X connect 2 0 25 0; #X connect 2 0 25 0;
#X connect 3 0 26 0; #X connect 3 0 26 0;
#X connect 4 0 27 0; #X connect 4 0 27 0;
@ -262,12 +253,8 @@ c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
#X connect 6 0 29 0; #X connect 6 0 29 0;
#X connect 7 0 30 0; #X connect 7 0 30 0;
#X connect 8 0 31 0; #X connect 8 0 31 0;
<<<<<<< .mine
#X connect 9 0 35 0;
=======
#X connect 9 0 35 0; #X connect 9 0 35 0;
#X connect 9 0 43 0; #X connect 9 0 43 0;
>>>>>>> .r153
#X connect 10 0 19 0; #X connect 10 0 19 0;
#X connect 11 0 20 0; #X connect 11 0 20 0;
#X connect 12 0 21 0; #X connect 12 0 21 0;
@ -279,26 +266,6 @@ c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
#X connect 32 0 0 0; #X connect 32 0 0 0;
#X connect 32 0 42 0; #X connect 32 0 42 0;
#X connect 32 1 0 1; #X connect 32 1 0 1;
<<<<<<< .mine
#X connect 33 0 34 0;
#X connect 34 0 9 0;
#X connect 34 0 44 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 33 0 34 0; #X connect 33 0 34 0;
#X connect 34 0 9 0; #X connect 34 0 9 0;
#X connect 34 1 10 0; #X connect 34 1 10 0;
@ -316,19 +283,7 @@ c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
#X connect 34 13 6 0; #X connect 34 13 6 0;
#X connect 34 14 7 0; #X connect 34 14 7 0;
#X connect 34 15 8 0; #X connect 34 15 8 0;
>>>>>>> .r153
#X connect 35 0 36 0; #X connect 35 0 36 0;
<<<<<<< .mine
#X connect 36 0 18 0;
#X connect 36 0 43 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 coords 0 665 1 664 0 0 0;
=======
#X connect 36 0 18 0; #X connect 36 0 18 0;
#X connect 37 0 36 0; #X connect 37 0 36 0;
#X connect 37 1 36 1; #X connect 37 1 36 1;
@ -337,4 +292,3 @@ c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
#X connect 40 0 39 0; #X connect 40 0 39 0;
#X connect 40 1 39 1; #X connect 40 1 39 1;
#X coords 0 665 1 664 0 0 0; #X coords 0 665 1 664 0 0 0;
>>>>>>> .r153

21
libremediaserver/libremediaserver.cpp
View file

@ -1330,24 +1330,7 @@ void libreMediaServer::on_audio_stateChanged(int state)
{ {
if ((state == 0)) if ((state == 0))
{ {
if (m_pd_write_audio != NULL) disconnect(m_pd_audio, SIGNAL(readyReadStandardError()), this, SLOT(stdout_audio()));
{
m_pd_write_audio->close();
disconnect(m_pd_write_audio, SIGNAL(connected()),this, SLOT(newconexion_audio()));
m_pd_write_audio == NULL;
}
if (m_pd_read_audio != NULL)
{
disconnect(m_pd_read_audio, SIGNAL(newConnection()),this, SLOT(newPeer_audio()));
m_pd_read_audio->close();
m_pd_read_audio == NULL;
}
if (m_tcpsocket_audio != NULL)
{
m_tcpsocket_audio->close();
m_tcpsocket_audio == NULL;
}
disconnect(m_pd_audio, SIGNAL(finished(int)), this, SLOT(pdrestart_audio())); disconnect(m_pd_audio, SIGNAL(finished(int)), this, SLOT(pdrestart_audio()));
m_pd_audio->terminate(); m_pd_audio->terminate();
m_pd_audio = NULL; m_pd_audio = NULL;
@ -1391,7 +1374,7 @@ void libreMediaServer::pdstart_audio()
qDebug()<<"error listening tcpServer"; qDebug()<<"error listening tcpServer";
} }
// Arrancamos el proceso Pure Data // Arrancamos el proceso Pure Data
m_pd_audio->start("pd -path /usr/lib/pd/extra/pdogg -path /usr/lib/pd/extra/pan pms-audio.pd"); m_pd_audio->start("pd -nogui -alsa -channels 2 -audiodev 1 pms-audio.pd");
if (m_pd_audio->waitForStarted(3000)){ if (m_pd_audio->waitForStarted(3000)){
ui.textEdit->appendPlainText("PD Audio started."); ui.textEdit->appendPlainText("PD Audio started.");
} }

2
libremediaserver/libremediaserver.pro
View file

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = libremediaserver TARGET = libremediaserver
QT += network script QT += network script
CONFIG += debug qtestlib CONFIG += debug
DESTDIR = ./debug DESTDIR = ./debug
HEADERS += libremediaserver.h \ HEADERS += libremediaserver.h \

4
libremediaserver/libremediaserver.ui
View file

@ -1105,8 +1105,8 @@
</rect> </rect>
</property> </property>
<property name="plainText"> <property name="plainText">
<string>Pure Media Server 0.0.6 <string>LibreMediaServer 0.01-1
(C) 2012 Santiago Noreña puremediaserver@gmail.com (C) 2012 Santiago Noreña libremediaserver@gmail.com
This program comes with ABSOLUTELY NO WARRANTY</string> This program comes with ABSOLUTELY NO WARRANTY</string>
</property> </property>
</widget> </widget>

18
libremediaserver/pms-audio.pd
View file

@ -1,5 +1,5 @@
#N canvas 55 126 838 622 10; #N canvas 475 220 838 622 10;
#N canvas 345 102 1016 665 dmx 0; #N canvas 341 118 1016 665 dmx 0;
#X obj -7 437 list split; #X obj -7 437 list split;
#X obj 99 444 list split; #X obj 99 444 list split;
#X obj 50 385 - 1; #X obj 50 385 - 1;
@ -138,7 +138,7 @@
#X obj -249 348 layer_audio; #X obj -249 348 layer_audio;
#X msg 433 64 \; pd dsp 1; #X msg 433 64 \; pd dsp 1;
#X msg 509 64 \; pd dsp 0; #X msg 509 64 \; pd dsp 0;
#X obj 433 38 loadbang; #X obj 431 -3 loadbang;
#X msg -249 380 send 1 \$1; #X msg -249 380 send 1 \$1;
#X obj -16 560 netsend; #X obj -16 560 netsend;
#X msg -136 387 send 2 \$1; #X msg -136 387 send 2 \$1;
@ -183,6 +183,7 @@
#X obj 237 350 layer_audio; #X obj 237 350 layer_audio;
#X obj 336 340 layer_audio; #X obj 336 340 layer_audio;
#X obj 434 337 layer_audio; #X obj 434 337 layer_audio;
#X obj 427 34 delay 500;
#X connect 0 0 1 0; #X connect 0 0 1 0;
#X connect 0 1 45 0; #X connect 0 1 45 0;
#X connect 0 2 42 0; #X connect 0 2 42 0;
@ -191,8 +192,7 @@
#X connect 0 5 46 0; #X connect 0 5 46 0;
#X connect 0 6 47 0; #X connect 0 6 47 0;
#X connect 0 7 48 0; #X connect 0 7 48 0;
#X connect 1 0 5 0; #X connect 4 0 49 0;
#X connect 4 0 2 0;
#X connect 5 0 6 0; #X connect 5 0 6 0;
#X connect 7 0 6 0; #X connect 7 0 6 0;
#X connect 8 0 6 0; #X connect 8 0 6 0;
@ -239,10 +239,4 @@
#X connect 41 7 28 0; #X connect 41 7 28 0;
#X connect 41 8 29 0; #X connect 41 8 29 0;
#X connect 41 9 30 0; #X connect 41 9 30 0;
#X connect 42 0 8 0; #X connect 49 0 2 0;
#X connect 43 0 9 0;
#X connect 44 0 10 0;
#X connect 45 0 7 0;
#X connect 46 0 11 0;
#X connect 47 0 12 0;
#X connect 48 0 13 0;