diff --git a/src/libremediaserver-audio.cpp b/src/libremediaserver-audio.cpp index a559b6f..2cb133a 100755 --- a/src/libremediaserver-audio.cpp +++ b/src/libremediaserver-audio.cpp @@ -30,6 +30,9 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent) Q_UNUSED(args); ui.setupUi(this); + // Lee la configuración por defecto + Settings::getInstance()->readFile(); + // Inicia la lectura de dmx a través de ola ola = new olaThread(); Q_CHECK_PTR(ola); @@ -148,7 +151,7 @@ void libreMediaServerAudio::ChangeMediaPath() fileNames = dialog.selectedFiles(); QString file = fileNames.at(0); Settings::getInstance()->setPathMedia(file); - QString desc = tr("Media Path Changed to: %1").arg(m_pathmedia); + QString desc = tr("Media Path Changed to: %1").arg(file); qDebug(desc.toLatin1().constData()); } diff --git a/src/libremediaserver-audio.h b/src/libremediaserver-audio.h index 5d90eff..94cdcc2 100755 --- a/src/libremediaserver-audio.h +++ b/src/libremediaserver-audio.h @@ -55,8 +55,6 @@ public: protected: - QString m_pathmedia; // Path to Medias - private: // void MessageHandler(QtMsgType type, const QMessageLogContext &logcontext, const QString &msg); diff --git a/src/medialibrary.cpp b/src/medialibrary.cpp index 198fa4d..9efde18 100644 --- a/src/medialibrary.cpp +++ b/src/medialibrary.cpp @@ -25,6 +25,7 @@ MediaLibrary::MediaLibrary(QObject *parent) : */ void MediaLibrary::initMediaLibrary() { + qDebug("starting the media library"); QDir dir; if (!dir.cd(Settings::getInstance()->getPathMedia())) { qWarning("Can not cd to the path: %s", Settings::getInstance()->getPathMedia().toLatin1().constData()); diff --git a/src/olathread.cpp b/src/olathread.cpp index 97bd459..64a9ba5 100644 --- a/src/olathread.cpp +++ b/src/olathread.cpp @@ -74,7 +74,6 @@ void olaThread::NewDmx(const ola::client::DMXMetadata &data, if (m_dmx[i.layer][j] != value) { // Compare the new value with the old value. emit dmxOutput(i.layer,j,value); m_dmx[i.layer][j] = value; - } } } diff --git a/src/olathread.h b/src/olathread.h index a65be31..80a8c9c 100644 --- a/src/olathread.h +++ b/src/olathread.h @@ -61,10 +61,10 @@ private: */ inline void RegisterComplete(const ola::client::Result &error) { if (error.Success()) { -// qDebug("Register Universe success"); + qDebug("Register Universe success"); emit toTerminal("Register Universe success"); } else { -// qWarning("Register command failed: %s", error.Error().c_str()); + qWarning("Register command failed: %s", error.Error().c_str()); emit toTerminal("olaThread| Register command failed " + QString::fromStdString(error.Error())); } } @@ -109,7 +109,11 @@ public slots: * @param universe */ inline void registerUniverse(int universe) { - m_client->RegisterUniverse(universe, ola::client::REGISTER,ola::NewSingleCallback(this, &olaThread::RegisterComplete)); + qDebug("Registering universe %d", universe); + m_client->RegisterUniverse(universe, + ola::client::REGISTER, + ola::NewSingleCallback + (this, &olaThread::RegisterComplete)); } /** @@ -117,7 +121,8 @@ public slots: * */ inline void registerUniverse() { - for (int universe = 0; universe < Settings::getInstance()->getUniverseNumber(); universe++) { + QSet unis = Settings::getInstance()->getUniverses(); + foreach (const int &universe, unis) { registerUniverse(universe); } } diff --git a/src/settings.cpp b/src/settings.cpp index 289bd75..1eb9854 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -11,19 +11,16 @@ Settings *Settings::getInstance() { return _instance; } +Settings::Settings(QObject *parent) : + QObject(parent) +{ + m_layersNumber = 0; +} + void Settings::setPathMedia(QString path) { m_pathmedia = path; MediaLibrary::getInstance()->rescanMediaLibrary(); - m_layersNumber = 0; -} - -Settings::Settings(QObject *parent) : - QObject(parent) -{ -// m_universe = new QSet(); -// m_settings = new QList(); - readFile(); } // Read the dmx settings for dmx.xml At the moment we need: diff --git a/src/settings.h b/src/settings.h index d5f0f21..f6f44a8 100644 --- a/src/settings.h +++ b/src/settings.h @@ -57,6 +57,11 @@ public: inline int getUniverseNumber() { return m_universe.size(); } + /** + * @brief readDefaultFile + */ + void readFile(); + private: static Settings *_instance; @@ -95,11 +100,6 @@ private: */ void readFromFile(QString file); - /** - * @brief readDefaultFile - */ - void readFile(); - /** * @brief writeFile * @param filename