LibreMediaServer/lms-audio
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleaning

Browse source
This commit is contained in:
santi 2014-09-24 13:50:33 +02:00
parent 6756a32647
commit 38233b8940
3 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libremediaserver-audio.cpp
View file

@ -33,7 +33,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
// Lee la configuración por defecto // Lee la configuración por defecto
Settings::getInstance()->readFile(); Settings::getInstance()->readFile();
// Inicia la lectura de dmx a través de ola // Inicia el objeto de conexión a ola
ola = new olaThread(); ola = new olaThread();
Q_CHECK_PTR(ola); Q_CHECK_PTR(ola);
/* /*
@ -56,7 +56,6 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
textEdit, SLOT(append(QString)), Qt::QueuedConnection); textEdit, SLOT(append(QString)), Qt::QueuedConnection);
*/ */
this->setWindowTitle(VERSION); this->setWindowTitle(VERSION);
// qDebug() << QDate::currentDate().toString() << " "<< QTime::currentTime().toString(); // qDebug() << QDate::currentDate().toString() << " "<< QTime::currentTime().toString();
@ -88,8 +87,9 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
connect(ola, SIGNAL (layerReceived()), connect(ola, SIGNAL (layerReceived()),
amw, SLOT(updateWatchDMX())); amw, SLOT(updateWatchDMX()));
// Inicia la mediaLibrary // Inicia la media Library
MediaLibrary::getInstance()->initMediaLibrary(); MediaLibrary::getInstance()->initMediaLibrary();
// Inicia la lectura de datos DMX // Inicia la lectura de datos DMX
ola->start(QThread::TimeCriticalPriority ); ola->start(QThread::TimeCriticalPriority );
ola->blockSignals(false); ola->blockSignals(false);
@ -105,12 +105,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
libreMediaServerAudio::~libreMediaServerAudio() 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; break;
} }
} }
/**
* Send the DMX info to Pure Data in init
*
*
void libreMediaServerAudio::loadbang() {
ola->resendDmx();
}*/

4
src/libremediaserver-audio.pro
View file

@ -3,8 +3,8 @@ TARGET = libremediaserver-audio
QT += webkitwidgets widgets QT += webkitwidgets widgets
CONFIG += debug CONFIG += release
DESTDIR = ./debug DESTDIR = ./release
HEADERS += libremediaserver-audio.h \ HEADERS += libremediaserver-audio.h \
medialibrary.h \ medialibrary.h \

4
src/olathread.cpp
View file

@ -15,7 +15,7 @@ olaThread::olaThread(QObject *parent)
m_dmx[i][j] = 0; m_dmx[i][j] = 0;
} }
} }
init(); init(); // start the ola connection
} }
// --- DECONSTRUCTOR --- // --- DECONSTRUCTOR ---
@ -118,7 +118,6 @@ void olaThread::socketClosed()
{ {
qWarning("Can not stop the ola client"); qWarning("Can not stop the ola client");
} }
m_clientWrapper->GetSelectServer()->Terminate(); m_clientWrapper->GetSelectServer()->Terminate();
delete m_client; delete m_client;
m_client = NULL; m_client = NULL;
@ -127,6 +126,7 @@ void olaThread::socketClosed()
// set up ola connection // set up ola connection
init(); init();
// register all universes // register all universes
registerUniverse(); registerUniverse();