diff --git a/src/libremediaserver-audio.cpp b/src/libremediaserver-audio.cpp index 2cb133a..18852a7 100755 --- a/src/libremediaserver-audio.cpp +++ b/src/libremediaserver-audio.cpp @@ -33,7 +33,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent) // Lee la configuración por defecto Settings::getInstance()->readFile(); - // Inicia la lectura de dmx a través de ola + // Inicia el objeto de conexión a ola ola = new olaThread(); Q_CHECK_PTR(ola); /* @@ -56,7 +56,6 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent) textEdit, SLOT(append(QString)), Qt::QueuedConnection); */ - this->setWindowTitle(VERSION); // qDebug() << QDate::currentDate().toString() << " "<< QTime::currentTime().toString(); @@ -88,8 +87,9 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent) connect(ola, SIGNAL (layerReceived()), amw, SLOT(updateWatchDMX())); - // Inicia la mediaLibrary + // Inicia la media Library MediaLibrary::getInstance()->initMediaLibrary(); + // Inicia la lectura de datos DMX ola->start(QThread::TimeCriticalPriority ); ola->blockSignals(false); @@ -105,12 +105,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent) libreMediaServerAudio::~libreMediaServerAudio() { -// save_finish(); -// delete MediaLibrary::getInstance(); -// ola->stop(); -// qDebug() << QDate::currentDate().toString() << " " << QTime::currentTime().toString(); -// qDebug() << "********************************************************************************"; -// return; + } /////////////////////////////////////////////////////////////////// @@ -222,11 +217,3 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value) break; } } - -/** - * Send the DMX info to Pure Data in init - * - * -void libreMediaServerAudio::loadbang() { - ola->resendDmx(); -}*/ diff --git a/src/libremediaserver-audio.pro b/src/libremediaserver-audio.pro index b3f43ca..205ca43 100755 --- a/src/libremediaserver-audio.pro +++ b/src/libremediaserver-audio.pro @@ -3,8 +3,8 @@ TARGET = libremediaserver-audio QT += webkitwidgets widgets -CONFIG += debug -DESTDIR = ./debug +CONFIG += release +DESTDIR = ./release HEADERS += libremediaserver-audio.h \ medialibrary.h \ diff --git a/src/olathread.cpp b/src/olathread.cpp index 64a9ba5..a8ab25d 100644 --- a/src/olathread.cpp +++ b/src/olathread.cpp @@ -15,7 +15,7 @@ olaThread::olaThread(QObject *parent) m_dmx[i][j] = 0; } } - init(); + init(); // start the ola connection } // --- DECONSTRUCTOR --- @@ -118,7 +118,6 @@ void olaThread::socketClosed() { qWarning("Can not stop the ola client"); } - m_clientWrapper->GetSelectServer()->Terminate(); delete m_client; m_client = NULL; @@ -127,6 +126,7 @@ void olaThread::socketClosed() // set up ola connection init(); + // register all universes registerUniverse();