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

- Modified log filename and folder.

Browse source
This commit is contained in:
Santi Noreña 2013-02-24 14:12:02 +01:00
parent 4d31605318
commit fdf73f25d5
8 changed files with 45 additions and 2378 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libremediaserver.cpp
View file

@ -18,20 +18,6 @@
*/
#include "libremediaserver.h"
#include "CITPDefines.h"
#include "MSEXDefines.h"
#include "msex.h"
#include <QObject>
#include <QApplication>
#include <QDesktopWidget>
#include <QtDebug>
#include <QtNetwork>
#include <QFileInfo>
#include <QFileDialog>
#include <QLocalServer>
#include <QFile>
#include <QTextStream>
// Esto habrá que cambiarlo para poder utilizar varias instancias
#define PDPORTW 9195
@ -39,7 +25,7 @@
#define PDPORTW_AUDIO 9197
#define PDPORTR_AUDIO 9198
#define SOCKET "/tmp/pmspipe" // Pipe wicho PD sends the files for preview in the GUI
#define SOCKET "/tmp/pmspipe" // Pipe wich PD sends the files for preview in the GUI
#define CONF_FILE "lms.conf" // File when save/restore the configuration on exit/open
@ -105,6 +91,8 @@ bool audioCheck;
// Constructor
///////////////////////////////////////////////////////////////////
libreMediaServer::libreMediaServer(QWidget *parent)
: QMainWindow(parent),
m_startvideo(0),
@ -851,13 +839,12 @@ void libreMediaServer::pdstart()
{
return;
}
qDebug()<<"Starting PD Video:" << ++m_startvideo;
// Creamos los sockets para la conexión a Pure Data
m_pd_write_video = new QTcpSocket(this);
Q_CHECK_PTR(m_pd_write_video);
connect(m_pd_write_video, SIGNAL(connected()),this, SLOT(newconexion()));
// Arrancamos el proceso Pure Data
m_pd_video->start("./pd -noaudio -lib Gem -stderr -nostdpath -path ./externals/ lms-video.pd");
m_pd_video->start("./pd -noaudio -lib Gem -stderr -nostdpath -path ./externals/ ./patches/lms-video.pd");
if (m_pd_video->waitForStarted(3000)){
ui.textEdit->appendPlainText("Video Engine started.");
}
@ -881,6 +868,7 @@ void libreMediaServer::pdrestart()
return;
}
save_finish();
qDebug()<<"Starting PD Video:" << ++m_startvideo;
ui.textEdit->appendPlainText("PD Video Restarting.");
disconnect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart()));
pdstart();
@ -1358,7 +1346,6 @@ void libreMediaServer::pdstart_audio()
{
return;
}
qDebug()<<"Starting PD Audio:" << ++m_startaudio;
// Creamos los sockets para la conexión a Pure Data
m_pd_write_audio = new QTcpSocket(this);
Q_CHECK_PTR(m_pd_write_audio);
@ -1375,7 +1362,7 @@ void libreMediaServer::pdstart_audio()
qDebug()<<"error listening tcpServer";
}
// Arrancamos el proceso Pure Data
m_pd_audio->start("./pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./externals/ lms-audio.pd");
m_pd_audio->start("./pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./externals/ ./patches/lms-audio.pd");
if (m_pd_audio->waitForStarted(3000)){
ui.textEdit->appendPlainText("PD Audio started.");
}
@ -1392,6 +1379,7 @@ void libreMediaServer::pdstart_audio()
void libreMediaServer::pdrestart_audio()
{
save_finish();
qDebug()<<"Starting PD Audio:" << ++m_startaudio;
ui.textEdit->appendPlainText("PD audio Restarting...");
if (m_pd_audio->state())
{