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

mejor inicio, todavía no es bueno porque manda el volumen antes de

Browse source 
iniciar las media, por lo que no hace caso a esa info.
This commit is contained in:
snt 2024-04-25 16:58:02 +02:00
parent 66c2850e06
commit 3e93ca95bb
4 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libremediaserver-audio.cpp
View file

@ -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 (universeReceived(int)), m_dmxWidget, SLOT(updateWatchDMX(int)));
connect(m_ola, SIGNAL(dmxOutput(int, int, int)), this, SLOT(dmxInput(int, int, int))); connect(m_ola, SIGNAL(dmxOutput(int, int, int)), this, SLOT(dmxInput(int, int, int)));
m_ola->registerUniverse(); 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(); m_aw->startEngine();
qDebug("Init Complete."); qDebug("Init Complete.");
m_ola->blockSignals(false); m_ola->blockSignals(false);
m_ola->resendDmx(); m_ola->start(QThread::TimeCriticalPriority );
} }
libreMediaServerAudio::~libreMediaServerAudio() libreMediaServerAudio::~libreMediaServerAudio()

2
src/medialibrary.cpp
View file

@ -51,7 +51,7 @@ QList<MediaFile> MediaLibrary::getMediaInformation(QDir dir)
QString MediaLibrary::requestNewFile(int folder, int file){ QString MediaLibrary::requestNewFile(int folder, int file){
if (!m_media) { 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; return NULL;
} }
QString newfile; QString newfile;

9
src/olathread.cpp
View file

@ -125,15 +125,6 @@ bool olaThread::CheckDataLoss() {
return true; 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() void olaThread::socketClosed()
{ {
qWarning("ola closed connection. Try reopening it... "); qWarning("ola closed connection. Try reopening it... ");

3
src/olathread.h
View file

@ -43,7 +43,6 @@ private:
int m_layers; int m_layers;
int m_dmx[MAX_LAYERS][LAYER_CHANNELS]; int m_dmx[MAX_LAYERS][LAYER_CHANNELS];
QList<dmxSetting> m_dmxSettings; QList<dmxSetting> m_dmxSettings;
/** /**
* @brief Callback from ola. Control de errores en el registro de Universos en OLA * @brief Callback from ola. Control de errores en el registro de Universos en OLA
* typedef SingleUseCallback1<void, const Result&> ola::client::SetCallback * typedef SingleUseCallback1<void, const Result&> ola::client::SetCallback
@ -96,6 +95,4 @@ signals:
void universeReceived(int uni); void universeReceived(int uni);
}; };
using namespace ola;
#endif // OLATHREAD_H #endif // OLATHREAD_H