diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp index 6d86e75..5f2f702 100644 --- a/src/libremediaserver.cpp +++ b/src/libremediaserver.cpp @@ -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())); } /////////////////////////////////////////////////////////////////// diff --git a/src/libremediaserver.h b/src/libremediaserver.h index 54f27be..110fd4e 100644 --- a/src/libremediaserver.h +++ b/src/libremediaserver.h @@ -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" diff --git a/src/libremediaserver.pro b/src/libremediaserver.pro index b90147d..7d7b599 100644 --- a/src/libremediaserver.pro +++ b/src/libremediaserver.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = libremediaserver QT += network script webkit -CONFIG += debug +CONFIG += release DESTDIR = ./debug HEADERS += libremediaserver.h \ diff --git a/src/msex.cpp b/src/msex.cpp index 760ef76..54565e0 100644 --- a/src/msex.cpp +++ b/src/msex.cpp @@ -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(); -} diff --git a/src/msex.h b/src/msex.h index 92853f5..e854a0a 100644 --- a/src/msex.h +++ b/src/msex.h @@ -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