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

- added gpan in audio_player

Browse source 
- Clean audio patches
- Fixed destructor. Now exits correctly
- Small audio bugfixes

	modified:   libremediaserver/libremediaserver.cpp
	modified:   libremediaserver/libremediaserver.ui
	deleted:    libremediaserver/pd/gpan~.pd
	modified:   libremediaserver/pd/layer_audio.pd
	modified:   libremediaserver/pd/pms-audio.pd
	modified:   libremediaserver/pd/pms-video.pd
	modified:   libremediaserver/scripts/install_precise.sh
This commit is contained in:
Santi Noreña 2013-01-10 20:18:21 +01:00
parent f0b9f0126b
commit a17d9e4a6c
7 changed files with 347 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libremediaserver/libremediaserver.cpp
View file

@ -185,6 +185,7 @@ libreMediaServer::~libreMediaServer()
{
m_pd_read_audio->close();
}
return;
}
@ -1345,14 +1346,14 @@ void libreMediaServer::on_audio_stateChanged(int state)
disconnect(m_pd_write_audio, SIGNAL(connected()),this, SLOT(newconexion_audio()));
m_pd_write_audio->close();
delete m_pd_write_audio;
m_pd_write_audio == NULL;
m_pd_write_audio = NULL;
}
if (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();
delete m_pd_read_audio;
m_pd_write_audio == NULL;
m_pd_read_audio = NULL;
}
}
if ((state == 2))
@ -1394,13 +1395,14 @@ void libreMediaServer::pdstart_audio()
qDebug()<<"error listening tcpServer";
}
// Arrancamos el proceso Pure Data
m_pd_audio->start("pd -nogui -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./pd pms-video.pd");
m_pd_audio->start("pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./pd pms-audio.pd");
if (m_pd_audio->waitForStarted(3000)){
ui.textEdit->appendPlainText("PD Audio started.");
}
else
{
ui.textEdit->appendPlainText("PD Audio not started!");
qErrnoWarning("Can not init PD Audio: ");
return;
}
connect(m_pd_audio, SIGNAL(readyReadStandardError()), this, SLOT(stdout_audio()));
@ -1562,7 +1564,7 @@ bool libreMediaServer::sendPacket_audio(const char *buffer, int bufferLen)
void libreMediaServer::errorsending_audio() {
if (ui.audio->checkState())
{
ui.textEdit->appendPlainText("Can not send packets to PD Video");
ui.textEdit->appendPlainText("Can not send packets to PD Audio");
}
}