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

Moved defines to defines.h

Browse source 
Work on sigsev alt init media library without path, not fixed yet.
This commit is contained in:
santi 2014-07-23 18:23:10 +02:00
parent 7616d963fa
commit 87e1a22e47
13 changed files with 108 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/libremediaserver-audio.cpp
View file

@ -45,27 +45,19 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
bottomWidget->setWidget(textEdit);
addDockWidget(Qt::BottomDockWidgetArea, bottomWidget);
// Inicia la lectura de dmx a través de ola
ola = new olaThread();
Q_CHECK_PTR(ola);
connect(ola, SIGNAL(toTerminal(QString)),
this, SLOT(toTerminal(QString)));
ola->start(QThread::TimeCriticalPriority );
ola->blockSignals(true);
// Inicia el widget central de audio
aw = new AudioWidget(this);
setCentralWidget(aw);
// Inicia el widget Master. No implementado todavía
/*
amw = new AudioMasterWidget(this);
QDockWidget *topWidget = new QDockWidget(tr("Master"), this);
topWidget->setAllowedAreas(Qt::TopDockWidgetArea);
topWidget->setWidget(amw);
addDockWidget(Qt::TopDockWidgetArea, topWidget);
*/
// Parse the command line options
if (args.contains("-gui"))
{
@ -90,8 +82,13 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
Settings *set = new Settings();
// Iniciamos Pure Data
AudioMotor::getInstance()->init();
// Inicia la lectura de dmx a través de ola
ola = new olaThread();
Q_CHECK_PTR(ola);
connect(ola, SIGNAL(toTerminal(QString)),
this, SLOT(toTerminal(QString)));
ola->start(QThread::TimeCriticalPriority );
ola->blockSignals(true);
connect(set, SIGNAL( layersNumber(int)),
ola, SLOT( setLayersNumber(int)));
@ -99,6 +96,12 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
connect(set, SIGNAL( DMXConf(dmxSetting ) ),
ola, SLOT( setDMXConf(dmxSetting) ) );
// Lee la configuración por defecto
set->readDefaultFile();
// Iniciamos Pure Data
AudioMotor::getInstance()->init();
connect(AudioMotor::getInstance(), SIGNAL(mediaLoaded(int, QString, QString)),
aw, SLOT(mediaLoaded(int, QString, QString)));
@ -111,8 +114,9 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
connect(ola, SIGNAL( dmxOutput(int, int, int) ),
this, SLOT( dmxInput(int, int, int) ) );
// Lee la configuración por defecto
set->readDefaultFile();
connect(ola, SIGNAL(universeReceived(uint)),
amw, SLOT(updateWatchDMX()));
ola->blockSignals(false);
}