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

- New CITP/MSEx menu. Init protocol and make thumbs options

Browse source
This commit is contained in:
Santi Noreña 2013-02-12 15:07:08 +01:00
parent ef52ae20d8
commit 2d1bbe0e37
12 changed files with 674 additions and 727 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libremediaserver.cpp
View file

@ -140,10 +140,11 @@ libreMediaServer::libreMediaServer(QWidget *parent)
connect(ui.actionOpen_conf, SIGNAL(triggered()), this, SLOT(openFile()));
connect(ui.actionSave_conf, SIGNAL(triggered()), this, SLOT(saveFile()));
connect(ui.actionChange_Media_Path, SIGNAL(triggered()), this, SLOT(ChangeMediaPath()));
connect(ui.actionInitMSEX, SIGNAL(triggered()), this, SLOT(InitMSEX()));
connect(ui.actionInitMSEX, SIGNAL(triggered()), this, SLOT(initMSEX()));
connect(ui.actionMake_Thumbs, SIGNAL(triggered()), this, SLOT(makeThumbs()));
// Load the configuration
open_start();
// Connect MSEx
// Connect MSEx Timer
connect(m_msex,SIGNAL(frameRequest()), this, SLOT(sendFrame()));
}
@ -346,7 +347,8 @@ void libreMediaServer::open(QFile *file)
qDebug()<<(desc);
file->close();
delete buffer;
// delete fileconf; // Comment due to Seg Fault
// delete file;
// delete fileconf; // Comment due to Seg Fault
}
void libreMediaServer::save(QFile *file)
@ -430,12 +432,6 @@ void libreMediaServer::olastart()
// connect(ola, SIGNAL(finished(int)), this, SLOT(olastart()));
}
/*
* User Interface Stuff
*/
///////////////////////////////////////////////////////////////////
// Menu CITP/MSEx
///////////////////////////////////////////////////////////////////
@ -471,14 +467,14 @@ void libreMediaServer::initMSEX()
ipadd = ipadd + i;
m_msex->startCitp(ipadd);
}
//void setIPAdd();
// Generates the thumbs to transmit by CITP/MSEx
void libreMediaServer::makeThumbs()
{
QProcess *script = new QProcess ();
QStringList arguments;
arguments << m_pathmedia;
script->execute("./scripts/make_thumbs.sh", arguments);
script->execute("../scripts/make_thumbs.sh", arguments);
}
///////////////////////////////////////////////////////////////////
@ -870,10 +866,10 @@ void libreMediaServer::stdout() {
{
ui.textEdit->appendPlainText("Can not read DMX data.");
}
if (out.indexOf("watchdog",0) != -1)
/* if (out.indexOf("watchdog",0) != -1)
{
ui.textEdit->appendPlainText("PD video watchdog detected.");
}
}*/
int j = out.indexOf("togui: ",0);
if ((j >= 0) && (out.size() > (j+7)))
{
@ -931,7 +927,7 @@ void libreMediaServer::stdout() {
}
}
}
// Restart the Pure Data process if crash. Connected wit signal finished of QProcess
// Restart the Pure Data process if crash. Connected with signal finished of QProcess
void libreMediaServer::pdrestart()
{
@ -941,7 +937,7 @@ void libreMediaServer::pdrestart()
}
save_finish();
qDebug()<<"Restarting PD";
ui.textEdit->appendPlainText("PD Restarting...");
ui.textEdit->appendPlainText("PD Video Restarting.");
disconnect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart()));
pdstart();
}
@ -1048,7 +1044,7 @@ void libreMediaServer::newconexion()
{
// Iniciamos el socket
m_pd_write_video->connectToHost(QHostAddress::LocalHost, PDPORTW);
m_pd_write_video->waitForConnected(300000);
m_pd_write_video->waitForConnected(3000);
if (!(m_pd_write_video->isOpen())){
qErrnoWarning("newconexion:pd write socket not open!:");
return;