From 3e93ca95bb5917dc421734bd909ca24d51b0b9e6 Mon Sep 17 00:00:00 2001 From: snt Date: Thu, 25 Apr 2024 16:58:02 +0200 Subject: [PATCH] =?UTF-8?q?mejor=20inicio,=20todav=C3=ADa=20=20no=20es=20b?= =?UTF-8?q?ueno=20porque=20manda=20el=20volumen=20antes=20de=20iniciar=20l?= =?UTF-8?q?as=20media,=20por=20lo=20que=20no=20hace=20caso=20a=20esa=20inf?= =?UTF-8?q?o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libremediaserver-audio.cpp | 5 ++--- src/medialibrary.cpp | 2 +- src/olathread.cpp | 9 --------- src/olathread.h | 3 --- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/libremediaserver-audio.cpp b/src/libremediaserver-audio.cpp index ab83519..0d595ec 100644 --- a/src/libremediaserver-audio.cpp +++ b/src/libremediaserver-audio.cpp @@ -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())); + 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() diff --git a/src/medialibrary.cpp b/src/medialibrary.cpp index 5834df0..8617d0f 100644 --- a/src/medialibrary.cpp +++ b/src/medialibrary.cpp @@ -51,7 +51,7 @@ QList 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; diff --git a/src/olathread.cpp b/src/olathread.cpp index 16c976f..ed0998b 100644 --- a/src/olathread.cpp +++ b/src/olathread.cpp @@ -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... "); diff --git a/src/olathread.h b/src/olathread.h index 148e859..91d78b6 100644 --- a/src/olathread.h +++ b/src/olathread.h @@ -43,7 +43,6 @@ private: int m_layers; int m_dmx[MAX_LAYERS][LAYER_CHANNELS]; QList m_dmxSettings; - /** * @brief Callback from ola. Control de errores en el registro de Universos en OLA * typedef SingleUseCallback1 ola::client::SetCallback @@ -96,6 +95,4 @@ signals: void universeReceived(int uni); }; -using namespace ola; - #endif // OLATHREAD_H