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

limpieza código no usado e includes

Browse source
This commit is contained in:
snt 2024-04-25 16:29:33 +02:00
parent 3613d8fa51
commit 66c2850e06
19 changed files with 83 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

107
src/libremediaserver-audio.cpp
View file

@ -25,73 +25,40 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
: QMainWindow(parent)
{
Q_UNUSED(args);
qDebug() << VERSION;
qDebug() << COPYRIGHT;
qDebug() << LICENSE;
ui.setupUi(this);
this->setWindowTitle(VERSION);
Settings *set = Settings::getInstance();
set->readFile();
connect(set, SIGNAL(audioDeviceChanged(int)), this, SLOT(audioDeviceChanged(int)));
this->setWindowTitle(VERSION);
qDebug() << VERSION;
qDebug() << COPYRIGHT;
qDebug() << LICENSE;
MediaLibrary::getInstance()->initMediaLibrary();
aw = new AudioWidget;
setCentralWidget(aw);
m_mediaLibrary = new MediaLibrary;
m_mediaLibrary->initMediaLibrary();
m_aw = new AudioWidget;
setCentralWidget(m_aw);
m_dmxWidget = new dmxWidget(this);
QDockWidget *topWidget = new QDockWidget(tr("Master"), this);
topWidget->setAllowedAreas(Qt::TopDockWidgetArea);
topWidget->setWidget(m_dmxWidget);
addDockWidget(Qt::TopDockWidgetArea, topWidget);
ola = new olaThread(this, set->getLayersNumber());
Q_CHECK_PTR(ola);
ola->blockSignals(true);
connect(set, SIGNAL(registerUniverse(int)), ola, SLOT(registerUniverse(int)));
connect(ola, SIGNAL (universeReceived(int)), m_dmxWidget, SLOT(updateWatchDMX(int)));
connect(ola, SIGNAL(dmxOutput(int, int, int)), this, SLOT(dmxInput(int, int, int)));
ola->registerUniverse();
ola->start(QThread::TimeCriticalPriority );
connect(ui.actionOpen_conf, SIGNAL(triggered()), this, SLOT(openFile()));
connect(ui.actionSave_conf, SIGNAL(triggered()), this, SLOT(saveFile()));
connect(ui.action_Settings, SIGNAL(triggered()), this, SLOT(settings()));
connect(ui.actionLaunch_OLA_Setup, SIGNAL(triggered()), this, SLOT(olasetup()));
aw->startEngine();
m_ola = new olaThread(this, set->getLayersNumber());
Q_CHECK_PTR(m_ola);
m_ola->blockSignals(true);
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.");
ola->blockSignals(false);
ola->resendDmx();
m_ola->blockSignals(false);
m_ola->resendDmx();
}
libreMediaServerAudio::~libreMediaServerAudio()
{
ola->stop();
aw->stopEngine();
}
void libreMediaServerAudio::openFile()
{
QFileDialog dialog(this);
if (!dialog.exec())
return;
QStringList fileNames;
fileNames = dialog.selectedFiles();
QFile file(fileNames.at(0));
// open(&file);
}
void libreMediaServerAudio::saveFile()
{
QFileDialog dialog(this);
if (!dialog.exec())
return;
QStringList fileNames;
fileNames = dialog.selectedFiles();
QFile file(fileNames.at(0));
// save(&file);
}
void libreMediaServerAudio::settings()
{
SettingsDialog *sd = new SettingsDialog();
sd->show();
m_ola->stop();
m_aw->stopEngine();
}
void libreMediaServerAudio::olasetup()
@ -109,30 +76,30 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
int aux;
switch(channel){
case DMX_FOLDER:
aux = ola->getValue(layer, DMX_FILE);
mediaFile = MediaLibrary::getInstance()->requestNewFile(value, aux);
aux = m_ola->getValue(layer, DMX_FILE);
mediaFile = m_mediaLibrary->requestNewFile(value, aux);
if (QFile::exists(mediaFile))
aw->mediaLoaded(layer, mediaFile);
m_aw->mediaLoaded(layer, mediaFile);
break;
case DMX_FILE:
aux = ola->getValue(layer, DMX_FOLDER);
mediaFile = MediaLibrary::getInstance()->requestNewFile(aux, value);
aux = m_ola->getValue(layer, DMX_FOLDER);
mediaFile = m_mediaLibrary->requestNewFile(aux, value);
if (QFile::exists(mediaFile))
aw->mediaLoaded(layer, mediaFile);
m_aw->mediaLoaded(layer, mediaFile);
break;
case VOLUME_COARSE:
case VOLUME_FINE:
aw->volChanged(layer, (value / 65025.0f));
m_aw->volChanged(layer, (value / 65025.0f));
break;
case PAN:
aw->panChanged(layer, value);
m_aw->panChanged(layer, value);
break;
case PITCH:
aw->pitchChanged(layer, value);
m_aw->pitchChanged(layer, value);
break;
case ENTRY_POINT_COARSE:
case ENTRY_POINT_FINE:
aw->entryPointChanged(layer, value);
m_aw->entryPointChanged(layer, value);
break;
case PLAYBACK:
if (value == 0)
@ -140,16 +107,16 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
aux = value / 25;
switch (aux) {
case 0 :
aw->playbackChanged(layer, PlayingOnce);
m_aw->playbackChanged(layer, PlayingOnce);
break;
case 1 :
aw->playbackChanged(layer, Stopped);
m_aw->playbackChanged(layer, Stopped);
break;
case 2 :
aw->playbackChanged(layer, Paused);
m_aw->playbackChanged(layer, Paused);
break;
case 3 :
aw->playbackChanged(layer, PlayingLoop);
m_aw->playbackChanged(layer, PlayingLoop);
break;
default :
break;
@ -158,9 +125,3 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
break;
}
}
void libreMediaServerAudio::audioDeviceChanged(int id)
{
aw->stopEngine();
aw->startEngine(id);
}