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

Fixed sigsev on init. Added AudioMasterWidget only with receiving dmx

Browse source 
checkbox.
Protected requestNewFile for NULL on m_media
Settings::readtFile returns bool now.
This commit is contained in:
santi 2014-07-24 13:46:55 +02:00
parent 87e1a22e47
commit 061f58aee4
4 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libremediaserver-audio.cpp
View file

@ -34,6 +34,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
// Inicia el User Interface
ui.setupUi(this);
this->setWindowTitle(VERSION);
// Inicia el widget Terminal
textEdit = new QTextEdit(this);
textEdit->append(QString::fromAscii(VERSION));
@ -46,12 +47,10 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
addDockWidget(Qt::BottomDockWidgetArea, bottomWidget);
// Inicia el widget central de audio
aw = new AudioWidget(this);
setCentralWidget(aw);
// Inicia el widget Master. No implementado todavía
// Inicia el widget Master.
amw = new AudioMasterWidget(this);
QDockWidget *topWidget = new QDockWidget(tr("Master"), this);
topWidget->setAllowedAreas(Qt::TopDockWidgetArea);
@ -71,7 +70,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
if (args.contains("-log"))
{
textEdit->append("Log to file");
textEdit->append("Logging to file");
}
// Conectamos los menus
@ -97,8 +96,10 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
ola, SLOT( setDMXConf(dmxSetting) ) );
// Lee la configuración por defecto
set->readDefaultFile();
while (!set->readDefaultFile()) {
// Dar la oportunidad de cargar otro fichero de configuración
// Crear el fichero por defecto.
}
// Iniciamos Pure Data
AudioMotor::getInstance()->init();