- Connect msex timer eith sendFrame slot directly. Version changed to v0.04-4

This commit is contained in:
Santi Noreña 2013-05-06 18:15:35 +02:00
parent 7fcb9ae204
commit 1534cece64
5 changed files with 4 additions and 12 deletions

View file

@ -164,7 +164,7 @@ libreMediaServer::libreMediaServer(QStringList args, QWidget *parent)
// Load the configuration
open_start();
// Connect MSEx Timer
connect(m_msex,SIGNAL(frameRequest()), this, SLOT(sendFrame()));
connect(m_msex->n_timer, SIGNAL(timeout()), this, SLOT(sendFrame()));
}
///////////////////////////////////////////////////////////////////

View file

@ -39,7 +39,7 @@
#include "MSEXDefines.h"
#include "ui_libremediaserver.h"
#define VERSION "LibreMediaServer Version 0.04-2"
#define VERSION "LibreMediaServer Version 0.04-4-DebianWheezy"
#define COPYRIGHT "(C) 2012-2013 Santi Norena libremediaserver@gmail.com"
#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"

View file

@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = libremediaserver
QT += network script webkit
CONFIG += debug
CONFIG += release
DESTDIR = ./debug
HEADERS += libremediaserver.h \

View file

@ -78,7 +78,6 @@ msex::~msex()
{
if (m_tcpServer)
m_tcpServer->close();
}
/*
QString msex::peerName() const
@ -475,7 +474,6 @@ void msex::parseRQSTPacket(const QByteArray &byteArray)
if (!n_timer->isActive()) {
n_timer->setInterval(1000 * Packet->fps);
n_timer->start();
connect(n_timer, SIGNAL(timeout()), this, SLOT(sendFrame()));
}
}
@ -607,8 +605,3 @@ void msex::startCitp(quint32 ipadd)
qDebug()<<("CreatePeerInformationSocket failed");
}
}
void msex::sendFrame()
{
emit frameRequest();
}

View file

@ -99,10 +99,9 @@ protected slots:
private slots:
bool newPeer();
void sendFrame(); // Slot temporizado para mandar una señal a libremediaserver::sendframe() para mandar un frame
signals:
void frameRequest(); // Request a frame of the master preview
};
#endif // MEDIASERVER_H