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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
src/libremediaserver.cpp
View file

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

2
src/libremediaserver.h
View file

@ -39,7 +39,7 @@
#include "MSEXDefines.h" #include "MSEXDefines.h"
#include "ui_libremediaserver.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 COPYRIGHT "(C) 2012-2013 Santi Norena libremediaserver@gmail.com"
#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details" #define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"

2
src/libremediaserver.pro
View file

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

7
src/msex.cpp
View file

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

3
src/msex.h
View file

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