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

- empty

Browse source
This commit is contained in:
Santi Noreña 2013-02-21 13:33:19 +01:00
parent c2af0c91ab
commit 39999df6a8
4 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libremediaserver.cpp
View file

@ -156,6 +156,7 @@ libreMediaServer::libreMediaServer(QWidget *parent)
connect(m_msex,SIGNAL(frameRequest()), this, SLOT(sendFrame()));
}
///////////////////////////////////////////////////////////////////
// Destructor
///////////////////////////////////////////////////////////////////
@ -204,7 +205,7 @@ libreMediaServer::~libreMediaServer()
}
socket.remove();
qDebug() << "PD Video starts: " << m_startvideo << " PD Audio starts: " << m_startaudio;
qDebug() << "Date: " << QDate::currentDate() << "Time: "<< QTime::currentTime();
qDebug() << QDate::currentDate() << QTime::currentTime();
qDebug() << "******************************************************************************************************";
return;
}
@ -499,6 +500,7 @@ void libreMediaServer::makeThumbs()
///////////////////////////////////////////////////////////////////
// Window Configuration
void libreMediaServer::on_window_stateChanged(int state)
{
if ((state == 2)) {
@ -792,7 +794,6 @@ void libreMediaServer::on_layer8Add_valueChanged()
}
// Open the connection with OLA and start reading DMX
void libreMediaServer::on_readDMX_stateChanged(int state)
{
if ((state == 0)) {
@ -818,8 +819,7 @@ void libreMediaServer::on_readDMX_stateChanged(int state)
}
}
// Open the video process
// Start the video process
void libreMediaServer::on_video_stateChanged(int state)
{
if ((state == 0))
@ -839,13 +839,12 @@ void libreMediaServer::on_video_stateChanged(int state)
}
///////////////////////////////////////////////////////////////////
/*
* Pure Data Video Stuff
*/
//
// Pure Data Video
//
///////////////////////////////////////////////////////////////////
// Start the PD Process, open the ports and connects stdout de Pure Data.
void libreMediaServer::pdstart()
{
if (m_pd_video->state() != 0)
@ -875,7 +874,6 @@ void libreMediaServer::pdstart()
}
// Restart the Pure Data process if crash. Connected with signal finished of QProcess
void libreMediaServer::pdrestart()
{
if (m_pd_video->state())
@ -890,7 +888,6 @@ void libreMediaServer::pdrestart()
}
// New conexion on TCP Server
void libreMediaServer::newPeer()
{
m_read_vid = m_server_vid->nextPendingConnection();
@ -899,7 +896,6 @@ void libreMediaServer::newPeer()
}
// New message in a TCP socket stablished connection
void libreMediaServer::newmessage()
{
if (m_read_vid == NULL)
@ -1023,7 +1019,6 @@ void libreMediaServer::newconexion()
}
// Sends packets to Pure Data video
bool libreMediaServer::sendPacket(const char *buffer, int bufferLen)
{
if (m_pd_write_video == NULL) {
@ -1044,7 +1039,6 @@ bool libreMediaServer::sendPacket(const char *buffer, int bufferLen)
}
// Function error sending packets to PD video
void libreMediaServer::errorsending() {
if (ui.video->checkState())
{
@ -1350,14 +1344,14 @@ void libreMediaServer::on_audio_stateChanged(int state)
pdstart_audio();
}
}
///////////////////////////////////////////////////////////////////
/*
* Pure Data Audio Stuff
*/
//
// Pure Data Audio
//
///////////////////////////////////////////////////////////////////
// Start the PD Process, open the ports and connects stdout de Pure Data.
void libreMediaServer::pdstart_audio()
{
if (m_pd_audio->state() != 0)