Small bugfixes

- Audio arguments changed to allow pd choose audio driver
- msex resending SInf bug fix
- pd text initialization black out
This commit is contained in:
Santi Noreña 2013-05-09 21:51:47 +02:00
parent 2d38d5f10f
commit 333c40f188
6 changed files with 128 additions and 123 deletions

View file

@ -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;

View file

@ -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);

View file

@ -98,7 +98,7 @@ protected slots:
private slots:
bool newPeer();
void newPeer();
signals: