mejor inicio, todavía no es bueno porque manda el volumen antes de
iniciar las media, por lo que no hace caso a esa info.
This commit is contained in:
parent
66c2850e06
commit
3e93ca95bb
4 changed files with 3 additions and 16 deletions
|
@ -47,12 +47,11 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
|
|||
connect(m_ola, SIGNAL (universeReceived(int)), m_dmxWidget, SLOT(updateWatchDMX(int)));
|
||||
connect(m_ola, SIGNAL(dmxOutput(int, int, int)), this, SLOT(dmxInput(int, int, int)));
|
||||
m_ola->registerUniverse();
|
||||
m_ola->start(QThread::TimeCriticalPriority );
|
||||
connect(ui.actionLaunch_OLA_Setup, SIGNAL(triggered()), this, SLOT(olasetup()));
|
||||
m_aw->startEngine();
|
||||
qDebug("Init Complete.");
|
||||
m_ola->blockSignals(false);
|
||||
m_ola->resendDmx();
|
||||
m_ola->start(QThread::TimeCriticalPriority );
|
||||
}
|
||||
|
||||
libreMediaServerAudio::~libreMediaServerAudio()
|
||||
|
|
|
@ -51,7 +51,7 @@ QList<MediaFile> MediaLibrary::getMediaInformation(QDir dir)
|
|||
|
||||
QString MediaLibrary::requestNewFile(int folder, int file){
|
||||
if (!m_media) {
|
||||
qWarning("MediaLibrary is not init. Set a correct path to media library");
|
||||
qWarning("MediaLibrary is not init, set a correct path.");
|
||||
return NULL;
|
||||
}
|
||||
QString newfile;
|
||||
|
|
|
@ -125,15 +125,6 @@ bool olaThread::CheckDataLoss() {
|
|||
return true;
|
||||
}
|
||||
|
||||
void olaThread::resendDmx()
|
||||
{
|
||||
for (int i = 0; i < m_layers; i++) {
|
||||
for (int j = 0; j < LAYER_CHANNELS; j++){
|
||||
emit dmxOutput(i, j, m_dmx[i][j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void olaThread::socketClosed()
|
||||
{
|
||||
qWarning("ola closed connection. Try reopening it... ");
|
||||
|
|
|
@ -43,7 +43,6 @@ private:
|
|||
int m_layers;
|
||||
int m_dmx[MAX_LAYERS][LAYER_CHANNELS];
|
||||
QList<dmxSetting> m_dmxSettings;
|
||||
|
||||
/**
|
||||
* @brief Callback from ola. Control de errores en el registro de Universos en OLA
|
||||
* typedef SingleUseCallback1<void, const Result&> ola::client::SetCallback
|
||||
|
@ -96,6 +95,4 @@ signals:
|
|||
void universeReceived(int uni);
|
||||
};
|
||||
|
||||
using namespace ola;
|
||||
|
||||
#endif // OLATHREAD_H
|
||||
|
|
Loading…
Add table
Reference in a new issue