libremediaserver-audio.pro

@@ -12,6 +12,8 @@ HEADERS += src/libremediaserver-audio.h \
     src/audiowidget.h \
     src/defines.h \
     src/settings.h \
+    src/settingsdialog.h \
+    src/layersettingswidget.h \
     src/slidergroup.h
 SOURCES += src/main.cpp \
     src/dmxwidget.cpp \
@@ -23,8 +25,12 @@ SOURCES += src/main.cpp \
     src/audiolayerwidget.cpp \
     src/audiowidget.cpp \
     src/settings.cpp \
+    src/settingsdialog.cpp \
+    src/layersettingswidget.cpp \
     src/slidergroup.cpp
-FORMS += src/libremediaserver-audio.ui
+FORMS += src/libremediaserver-audio.ui \
+    src/settingsdialog.ui \
+    src/layersettingswidget.ui
 CCFLAG += -msse2 -mavx2 #-fsanitize=address -g -O0
 QMAKE_CXXFLAGS += $$(CXXFLAG)
 #QMAKE_CXXFLAGS += -fsanitize=address -g -O0

src/audiolayerwidget.h

@@ -1,9 +1,20 @@
 #ifndef AUDIOLAYERWIDGET_H
 #define AUDIOLAYERWIDGET_H
 
-#include <QPushButton>
+#include <iostream>
-#include <QTimeEdit>
+
+#include <QDebug>
+#include <QTime>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QPushButton>
+#include <QSlider>
+#include <QTimer>
+#include <QTimeEdit>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QSpinBox>
 
 #include "defines.h"
 #include "slidergroup.h"

src/audiowidget.h

@@ -1,15 +1,22 @@
 #ifndef AUDIOWIDGET_H
 #define AUDIOWIDGET_H
 
-#include <QTimer>
+#include <QObject>
+#include <QWidget>
+#include <QDialog>
 
+#include "dmxwidget.h"
 #include "audiolayerwidget.h"
 #include "settings.h"
 #include "miniaudioengine.h"
-#include "defines.h" // MAX_LAYERS
+#include "defines.h"
+
 
 class AudioWidget : public QWidget
 {
+    friend class libreMediaServerAudio;
+    friend class AudioLayerWidget;
+
     Q_OBJECT
 
 public:
@@ -17,6 +24,8 @@ public:
     bool startEngine();
     bool startEngine(int id);
     void stopEngine();
+
+protected:
     void mediaLoaded(int layer, QString media );
     void volChanged(int layer, float vol);
     void panChanged(int layer, int pan);

src/defines.h

@@ -1,10 +1,13 @@
 #ifndef DEFINES_H
 #define DEFINES_H
 
-//#define VERSION "LibreMediaServerAudio 0.2.0 Antigona Release"
+#include <QString>
-#define VERSION "Kike Substitutor - No AI required - v0.2.0"
+#include <QList>
-#define COPYRIGHT "(C) 2014-2024 Santi Noreña <lms@criptomart.net>"
+#include <QtGlobal>
-#define LICENSE "GPL 3 Licensed. See LICENSE.txt.\nSound guys are not allowed to use this software."
+
+#define VERSION "LibreMediaServerAudio 0.2.0 Antigona Release"
+#define COPYRIGHT "(C) 2014-2024 Santi Norena lms@criptomart.net"
+#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"
 #define DEFAULT_FILE "lms-audio.xlm"
 #define MAX_LAYERS 16
 #define UI_REFRESH_TIME 200
@@ -12,10 +15,26 @@
 // struct where save the DMX settings for each layer
 struct dmxSetting {
     int address;
-    unsigned int universe;
+    quint8 universe;
+    bool updated;
     int layer;
 };
 
+// Media Information for MELIn packages. v1.0
+struct MediaFile {
+    quint8 Number; // 0-based contiguous index of the media.
+    QString MediaName;// Media name.
+    quint32 MediaLength;// Media length (in frames).
+};
+
+// Media Library for ELin packages v1.0
+struct MediaFolder {
+    quint8 m_Id; // Library id.
+    QString m_Name;// Library name.
+    quint8 m_ElementCount;// Number of elements in the library.
+    QList<MediaFile> m_MediaInformation; // Pointer to the Medias Information List of this Library
+};
+
 enum Status
 {
     Stopped,
@@ -30,7 +49,7 @@ static const char* StatusStr[] =
     "Pause",
     "Playing One",
     "Playing Loop",
-    0x0
+    NULL
 };
 
 enum Slider

src/dmxPersonality.h

@@ -21,8 +21,9 @@
 11 - Pitch
 */
 
-// ToDo: Mejor inicializacion, primero folder, file, después params, ultimo playback.7
+// ToDo: Tiene bastante sentido cambiar estos defines por un enum
-// quitar CONTROL no usado
+// ¿Ganaría algo en eficiencia? En claridad del código sí.
+
 #define VOLUME_COARSE 0
 #define PAN 1
 #define DMX_FOLDER 2

src/dmxwidget.cpp

@@ -7,7 +7,7 @@ dmxWidget::dmxWidget(QWidget *parent) :
 {
     this->setFocusPolicy(Qt::FocusPolicy::NoFocus);
     QVBoxLayout *vbox = new QVBoxLayout;
-    m_receiveDMX->setText("DMX Signal");
+    m_receiveDMX->setText("DMX signal");
     vbox->addWidget(m_receiveDMX);
     this->setLayout(vbox);
     connect(m_watchDMX, SIGNAL(timeout()),

src/dmxwidget.h

@@ -1,10 +1,13 @@
 #ifndef DMXWIDGET_H
 #define DMXWIDGET_H
 
+#include <QtGui>
+#include <QLabel>
+#include <QSlider>
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QVBoxLayout>
-#include <QTimer>
+#include <QWidget>
 
 class dmxWidget : public QGroupBox
 {

src/libremediaserver-audio.cpp

@@ -25,39 +25,73 @@ 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();
-    m_mediaLibrary = new MediaLibrary;
+    connect(set, SIGNAL(audioDeviceChanged(int)), this, SLOT(audioDeviceChanged(int)));
-    m_mediaLibrary->initMediaLibrary();
+    this->setWindowTitle(VERSION);
-    m_aw = new AudioWidget;
+    qDebug() << VERSION;
-    setCentralWidget(m_aw);
+    qDebug() << COPYRIGHT;
+    qDebug() << LICENSE;
+    MediaLibrary::getInstance()->initMediaLibrary();
+    aw = new AudioWidget;
+    setCentralWidget(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);
-    m_ola = new olaThread(this, set->getLayersNumber());
+    ola = new olaThread(this, set->getLayersNumber());
-    Q_CHECK_PTR(m_ola);
+    Q_CHECK_PTR(ola);
-    m_ola->blockSignals(true);
+    ola->blockSignals(true);
-    connect(m_ola, SIGNAL (universeReceived(int)), m_dmxWidget, SLOT(updateWatchDMX(int)));
+    connect(set, SIGNAL(registerUniverse(int)), ola, SLOT(registerUniverse(int)));
-    connect(m_ola, SIGNAL(dmxOutput(int, int, int)), this, SLOT(dmxInput(int, int, int)));
+    connect(ola, SIGNAL (universeReceived(int)), m_dmxWidget, SLOT(updateWatchDMX(int)));
-    m_ola->registerUniverse();
+    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()));
-    m_aw->startEngine();
+    aw->startEngine();
     qDebug("Init Complete.");
-    m_ola->blockSignals(false);
+    ola->blockSignals(false);
-    m_ola->start(QThread::TimeCriticalPriority );
+    ola->resendDmx();
 }
 
 libreMediaServerAudio::~libreMediaServerAudio()
 {
-    m_ola->stop();
+    ola->stop();
-    m_aw->stopEngine();
+    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();
 }
 
 void libreMediaServerAudio::olasetup()
@@ -75,30 +109,30 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
     int aux;
     switch(channel){
     case DMX_FOLDER:
-        aux = m_ola->getValue(layer, DMX_FILE);
+        aux = ola->getValue(layer, DMX_FILE);
-        mediaFile = m_mediaLibrary->requestNewFile(value, aux);
+        mediaFile = MediaLibrary::getInstance()->requestNewFile(value, aux);
         if (QFile::exists(mediaFile))
-            m_aw->mediaLoaded(layer, mediaFile);
+            aw->mediaLoaded(layer, mediaFile);
         break;
     case DMX_FILE:
-        aux = m_ola->getValue(layer, DMX_FOLDER);
+        aux = ola->getValue(layer, DMX_FOLDER);
-        mediaFile = m_mediaLibrary->requestNewFile(aux, value);
+        mediaFile = MediaLibrary::getInstance()->requestNewFile(aux, value);
         if (QFile::exists(mediaFile))
-            m_aw->mediaLoaded(layer, mediaFile);
+            aw->mediaLoaded(layer, mediaFile);
         break;
     case VOLUME_COARSE:
     case VOLUME_FINE:
-        m_aw->volChanged(layer, (value / 65025.0f));
+        aw->volChanged(layer, (value / 65025.0f));
         break;
     case PAN:
-        m_aw->panChanged(layer, value);
+        aw->panChanged(layer, value);
         break;
     case PITCH:
-        m_aw->pitchChanged(layer, value);
+        aw->pitchChanged(layer, value);
         break;
     case ENTRY_POINT_COARSE:
     case ENTRY_POINT_FINE:
-        m_aw->entryPointChanged(layer, value);
+        aw->entryPointChanged(layer, value);
         break;
     case PLAYBACK:
         if (value == 0)
@@ -106,16 +140,16 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
         aux = value / 25;
         switch (aux) {
         case 0 :
-            m_aw->playbackChanged(layer, PlayingOnce);
+            aw->playbackChanged(layer, PlayingOnce);
             break;
         case 1 :
-            m_aw->playbackChanged(layer, Stopped);
+            aw->playbackChanged(layer, Stopped);
             break;
         case 2 :
-            m_aw->playbackChanged(layer, Paused);
+            aw->playbackChanged(layer, Paused);
             break;
         case 3 :
-            m_aw->playbackChanged(layer, PlayingLoop);
+            aw->playbackChanged(layer, PlayingLoop);
             break;
         default :
             break;
@@ -124,3 +158,9 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
         break;
     }
 }
+
+void libreMediaServerAudio::audioDeviceChanged(int id)
+{
+     aw->stopEngine();
+     aw->startEngine(id);
+}

src/libremediaserver-audio.h

@@ -20,17 +20,31 @@
 #ifndef LIBREMEDIASERVERAUDIO_H
 #define LIBREMEDIASERVERAUDIO_H
 
+#include <QMainWindow>
 #include <QDockWidget>
+#include <QFile>
+#include <QFileInfo>
+#include <QFileDialog>
+#include <QTextStream>
 #include <QWebView>
+#include <QApplication>
+#include <QVBoxLayout>
+#include <QString>
+#include <QList>
+#include <QtGlobal>
 
 #include "audiowidget.h"
 #include "medialibrary.h"
 #include "olathread.h"
 #include "settings.h"
 #include "dmxwidget.h"
+#include "settingsdialog.h"
 #include "defines.h"
+
 #include "ui_libremediaserver-audio.h"
 
+class QMenu;
+
 class libreMediaServerAudio : public QMainWindow
 {
     Q_OBJECT
@@ -41,14 +55,25 @@ public:
     Ui::LibreMediaServerAudio ui;
 
 private:
-    AudioWidget *m_aw;
+    AudioWidget *aw;
     dmxWidget *m_dmxWidget;
-    olaThread *m_ola;
+    olaThread *ola;
-    MediaLibrary *m_mediaLibrary;
+
+    void open_start();
+    void save_finish();
+    void open(QFile *file);
+    void save(QFile *file);
+
+public slots:
+   void audioDeviceChanged(int id);
 
 private slots:
     void olasetup();
     void dmxInput(int layer, int channel, int value);
+    void openFile();
+    void saveFile();
+    void settings();
+
 };
 
 #endif // LIBREMEDIASERVERAUDIO_H

src/libremediaserver-audio.ui

@@ -28,9 +28,18 @@
     <property name="title">
      <string>File</string>
     </property>
+    <addaction name="actionOpen_conf"/>
+    <addaction name="actionSave_conf"/>
+    <addaction name="action_Settings"/>
     <addaction name="actionLaunch_OLA_Setup"/>
    </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+   </widget>
    <addaction name="menuFile"/>
+   <addaction name="menuHelp"/>
   </widget>
   <action name="actionExit">
    <property name="text">

src/medialibrary.cpp

@@ -1,5 +1,15 @@
 #include "medialibrary.h"
 
+MediaLibrary *MediaLibrary::_instance = 0;
+
+MediaLibrary *MediaLibrary::getInstance() {
+
+    if (_instance == 0) {
+        _instance = new MediaLibrary();
+        Q_CHECK_PTR(_instance);
+    }
+    return _instance;
+}
 
 MediaLibrary::MediaLibrary(QObject *parent) :
     QObject(parent)
@@ -51,7 +61,7 @@ QList<MediaFile> MediaLibrary::getMediaInformation(QDir dir)
 
 QString MediaLibrary::requestNewFile(int folder, int file){
     if (!m_media) {
-        qWarning("MediaLibrary is not init, set a correct path.");
+        qWarning("MediaLibrary is not init. Set a correct path to media library");
         return NULL;
     }
     QString newfile;

src/medialibrary.h

@@ -1,32 +1,25 @@
 #ifndef MEDIALIBRARY_H
 #define MEDIALIBRARY_H
 
+#include <QObject>
 #include <QDir>
+#include <QDebug>
 
-#include "settings.h"
 #include "defines.h"
-
+#include "settings.h"
-// Media Information for MELIn packages. v1.0
-struct MediaFile {
-    quint8 Number; // 0-based contiguous index of the media.
-    QString MediaName;// Media name.
-    quint32 MediaLength;// Media length (in frames).
-};
-
-// Media Library for ELin packages v1.0
-struct MediaFolder {
-    quint8 m_Id; // Library id.
-    QString m_Name;// Library name.
-    quint8 m_ElementCount;// Number of elements in the library.
-    QList<MediaFile> m_MediaInformation; // Pointer to the Medias Information List of this Library
-};
 
 class MediaLibrary : public QObject
 {
+
     Q_OBJECT
 
+    friend class libreMediaserverAudio; // Not working... WHY?
+    friend class Settings; // working...
+
 public:
-    MediaLibrary(QObject *parent = 0);
+
+    static MediaLibrary *getInstance();
+
     /**
      * @brief request a new file from the media library
      * @param int folder - the folder required
@@ -34,12 +27,43 @@ public:
      * @return QString the file required with full path
      */
     QString requestNewFile(int folder, int layer);
+
+    /**
+     * @brief Inicia la biblioteca de medios
+     */
     void initMediaLibrary();
 
-private:
+protected:
-    QList<MediaFolder> *m_media;
-    QList<MediaFile> getMediaInformation(QDir dir);
 
+    /**
+    * @brief Reload the media library on change of path or change the media files
+    */
+    inline void rescanMediaLibrary() {
+       if (m_media != NULL)
+           delete m_media;
+       initMediaLibrary();
+   }
+
+private:
+
+    explicit MediaLibrary(QObject *parent = 0);
+    static MediaLibrary *_instance;
+
+// Wich structure is more efficient for us?
+// QList, QMap, QSet, QVector?
+    QList<MediaFolder> *m_media; // Library to save the folders/media libraries and index each media file inside
+
+    /**
+     * @brief Returns a list withe the medias contained in a folder
+     * @param QDir - the directory when are the media
+     * @return QList<MediaFile> The list with the medias in a folder
+     */
+    QList<MediaFile> getMediaInformation(QDir dir); // Get all the information of each media file in a dir
+
+signals:
+    
+public slots:
+    
 };
 
 #endif // MEDIALIBRARY_H

src/miniaudioengine.cpp

@@ -183,11 +183,15 @@ ma_result MiniAudioEngine::printFormatInfo(int layer)
     return result;
 }
 
-// Expects between 0 and 1 vol value
+// Expects between 0 and 1 vol value in db
 void MiniAudioEngine::volChanged(int layer, float vol)
 {
+    //float result;
+
     if (m_mediaLoaded[layer] == false)
         return;
+    //result = ma_volume_linear_to_db(1.00000000 + (vol / 8.0));
+    //qInfo("vol %f %f", vol, result);
     ma_sound_group_set_volume(&m_currentSound[layer], vol);
 }
 

src/miniaudioengine.h

@@ -3,8 +3,8 @@
 
 #define MINIAUDIO_IMPLEMENTATION
 #include "miniaudio.h"
-#include "defines.h" // MAX_LAYERS
+#include "defines.h" //MAX_LAYERS
-#include <QDebug>    // prints messages
+#include <stdio.h> // for printf
 
 class MiniAudioEngine
 {

src/olathread.cpp

@@ -73,27 +73,27 @@ void olaThread::NewDmx(const ola::client::DMXMetadata &data,
           if (m_dmx[i.layer][j] != value) {
             m_dmx[i.layer][j] = value;
             switch (j) {
-            case VOLUME_COARSE:
+            case 0:
-                value = (value * 0x100) + buffer.Get(i.address + VOLUME_FINE);
+                value = (value * 0x100) + buffer.Get(i.address + 6);
                 emit dmxOutput(i.layer,j,value);
                 volSent = true;
                 break;
-            case ENTRY_POINT_COARSE:
+            case 7:
-                value = (value * 0x100) + buffer.Get(i.address + ENTRY_POINT_FINE);
+                value = (value * 0x100) + buffer.Get(i.address + 8);
                 emit dmxOutput(i.layer,j,value);
                 entrySent = true;
                 break;
-            case VOLUME_FINE:
+            case 6:
                 if (volSent == false)
                 {
-                    value = (buffer.Get(i.address + VOLUME_COARSE) * 0x100) + value;
+                    value = (buffer.Get(i.address) * 0x100) + value;
                     emit dmxOutput(i.layer,j,value);
                 }
                 break;
-            case ENTRY_POINT_FINE:
+            case 8:
                 if (entrySent == false)
                 {
-                    value = (buffer.Get(i.address + ENTRY_POINT_COARSE) * 0x100) + value;
+                    value = (buffer.Get(i.address + 7) * 0x100) + value;
                     emit dmxOutput(i.layer,j,value);
                 }
                 break;
@@ -125,6 +125,15 @@ 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... ");

src/olathread.h

@@ -1,6 +1,9 @@
 #ifndef OLATHREAD_H
 #define OLATHREAD_H
 
+#include <string>
+
+#include <QObject>
 #include <QThread>
 
 #include <ola/DmxBuffer.h>
@@ -11,9 +14,9 @@
 #include <ola/client/ClientTypes.h>
 #include <ola/Callback.h>
 
+#include "defines.h"
 #include "dmxPersonality.h"
 #include "settings.h"
-#include "defines.h"
 
 class olaThread : public QThread
 {
@@ -32,9 +35,11 @@ public:
     inline int getValue(int layer, int channel) {
         return m_dmx[layer][channel];
     }
+
     void resendDmx();
 
 private:
+
     void run ();
     ola::client::OlaClientWrapper *m_clientWrapper;
     ola::client::OlaClient *m_client;
@@ -43,6 +48,7 @@ private:
     int m_layers;
     int m_dmx[MAX_LAYERS][LAYER_CHANNELS];
     QList<dmxSetting> m_dmxSettings;
+
     /**
      *  @brief Callback from ola. Control de errores en el registro de Universos en OLA
      *         typedef SingleUseCallback1<void, const Result&> ola::client::SetCallback
@@ -95,4 +101,6 @@ signals:
     void universeReceived(int uni);
 };
 
+using namespace ola;
+
 #endif // OLATHREAD_H

src/settings.cpp

@@ -17,6 +17,12 @@ Settings::Settings(QObject *parent) :
     m_layersNumber = 0;
 }
 
+void Settings::setPathMedia(QString path)
+{
+    m_pathmedia = path;
+    MediaLibrary::getInstance()->rescanMediaLibrary();
+}
+
 // Read the dmx settings for dmx.xml At the moment we need:
 // - The path to the medias folder tree
 // - The number of sources/layers controlled by DMX
@@ -86,3 +92,60 @@ void Settings::readFromFile(QString file) {
 void Settings::readFile() {
     readFromFile(DEFAULT_FILE);
 }
+
+void Settings::changeLayerSetup(int layer, int universe, int address)
+{
+    dmxSetting temp;
+    temp.address = address;
+    temp.universe = universe;
+    temp.layer = layer;
+    m_settings.replace(layer, temp);
+    if (!m_universe.contains(temp.universe)) {
+        m_universe.insert(temp.universe);
+    }
+}
+
+void Settings::addLayer()
+{
+    dmxSetting temp;
+    temp.address = -1;
+    temp.universe = -1;
+    temp.layer = -1;
+    m_settings.append(temp);
+}
+
+void Settings::removeLayer(int layer)
+{
+   m_settings.removeAt(layer);
+}
+
+/*
+void Settings::writeFile(QString filename)
+{
+    QFile* xmlFile = new QFile(filename);
+    if (!xmlFile->open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QMessageBox::critical(NULL,"Load XML File Problem",
+                              QString("Couldn't open %1 to load settings for olaInterface").arg(file),
+                              QMessageBox::Ok);
+        return;
+    }
+    QXmlStreamWriter* xmlWriter = new QXmlStreamWriter(xmlFile);
+
+    QXmlStreamWriter stream(&output);
+      stream.setAutoFormatting(true);
+      stream.writeStartDocument();
+
+      stream.writeStartElement("dmxSettings");
+      stream.writeAttribute("href", "http://qt.nokia.com/");
+      stream.writeTextElement("title", "Qt Home");
+      stream.writeEndElement();
+
+      stream.writeEndDocument();
+
+}
+
+void Settings::writeFile()
+{
+    writeFile(DEFAULT_FILE);
+}
+*/

src/settings.h

@@ -1,6 +1,7 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
+#include <QObject>
 #include <QXmlStreamReader>
 #include <QFile>
 #include <QMessageBox>
@@ -18,10 +19,23 @@ public:
     static Settings *getInstance();
     inline QSet<int> getUniverses() { return m_universe; }
     inline QString getPathMedia() { return m_pathmedia; }
+    void setPathMedia(QString path);
     inline QList<dmxSetting> getDmxSettings() { return m_settings; }
     inline int getLayersNumber() { return m_layersNumber; }
+    inline int getUniverseNumber() { return m_universe.size(); }
     void readFile();
+    void changeLayerSetup(int layer, int universe, int address);
+    void removeLayer(int layer);
+    void addLayer();
+    inline void setLayersNumber(int layersNumber)
+    {
+       if (layersNumber <= MAX_LAYERS)
+           m_layersNumber = layersNumber;
+       else
+           m_layersNumber = MAX_LAYERS;
+    }
     inline int getAudioDeviceId() { return m_audioDeviceId; }
+    inline void setAudioDeviceId(int id) { m_audioDeviceId = id; }
 
 private:
    static Settings *_instance;
@@ -33,7 +47,14 @@ private:
 
    explicit Settings(QObject *parent = 0);
    void readFromFile(QString file);
+//    void writeFile(QString filename);    // Not implemented yet
+//    void writeFile();    // Not implemented yet
 
+signals:
+    void pathChanged(QString path);
+    void layersNumber(int number);
+    void registerUniverse(int universe);
+    void audioDeviceChanged(int id);
 };
 
 #endif // SETTINGS_H

src/settingsdialog.h

@@ -4,8 +4,8 @@
 #include <QDialog>
 #include <QVBoxLayout>
 #include <QFileDialog>
-
 #include "settings.h"
+#include "layersettingswidget.h"
 
 namespace Ui {
 class SettingsDialog;

src/slidergroup.h

@@ -2,10 +2,17 @@
 #define SLIDERGROUP_H
 
 #include <QGroupBox>
-#include <QDoubleSpinBox>
+#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QLabel>
+#include <QBoxLayout>
 #include <QSlider>
 
+QT_BEGIN_NAMESPACE
+class QDial;
+class QScrollBar;
+class QSlider;
+QT_END_NAMESPACE
+
 class SliderGroup : public QGroupBox
 {
     Q_OBJECT