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

Cleaned old code. Changed the GUI refresh. Now there is a global receive

Browse source 
dmx instead one by layer
This commit is contained in:
santi 2014-08-13 22:51:25 +02:00
parent 90f3b093c0
commit d7db568784
10 changed files with 78 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/libremediaserver-audio.cpp
View file

@ -18,7 +18,7 @@
*/
#include "libremediaserver-audio.h"
QTextEdit * libreMediaServerAudio::textEdit = 0;
// QTextEdit * libreMediaServerAudio::textEdit = 0;
/**
/ Constructor
@ -33,7 +33,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
// Inicia la lectura de dmx a través de ola
ola = new olaThread();
Q_CHECK_PTR(ola);
/*
if (args.contains("-log")) {
// Inicia el widget Terminal
textEdit = new QTextEdit;
@ -44,7 +44,16 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
addDockWidget(Qt::BottomDockWidgetArea, bottomWidget);
connect(ola, SIGNAL(toTerminal(QString)),
textEdit, SLOT(append(QString)), Qt::QueuedConnection);
}
}*/
/* connect(MediaLibrary::getInstance(), SIGNAL(debug(QString)),
textEdit, SLOT(append(QString)), Qt::QueuedConnection);
connect(MediaLibrary::getInstance(), SIGNAL(warning(QString)),
textEdit, SLOT(append(QString)), Qt::QueuedConnection);
*/
this->setWindowTitle(VERSION);
// qDebug() << QDate::currentDate().toString() << " "<< QTime::currentTime().toString();
@ -60,12 +69,6 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
ola->blockSignals(true);
ola->start(QThread::TimeCriticalPriority );
/* connect(MediaLibrary::getInstance(), SIGNAL(debug(QString)),
textEdit, SLOT(append(QString)), Qt::QueuedConnection);
connect(MediaLibrary::getInstance(), SIGNAL(warning(QString)),
textEdit, SLOT(append(QString)), Qt::QueuedConnection);
*/
// Inicia el widget Master.
amw = new AudioMasterWidget(this);
QDockWidget *topWidget = new QDockWidget(tr("Master"), this);
@ -85,8 +88,8 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
ola, SLOT( setLayersNumber(int)));
connect(set, SIGNAL( DMXConf(dmxSetting ) ),
ola, SLOT( setDMXConf(dmxSetting) ) );
connect(ola, SIGNAL (layerReceived(int)),
aw, SLOT(layerReceived(int)));
connect(ola, SIGNAL (layerReceived()),
amw, SLOT(updateWatchDMX()));
// Lee la configuración por defecto
set->readDefaultFile();
@ -224,7 +227,7 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
/**
* Send the DMX info to Pure Data in init
*
*/
*
void libreMediaServerAudio::loadbang() {
ola->resendDmx();
}
}*/