diff --git a/docs/LibreMediaServer_Audio.hed b/docs/LibreMediaServer_Audio.hed index 90b0781..82be283 100644 --- a/docs/LibreMediaServer_Audio.hed +++ b/docs/LibreMediaServer_Audio.hed @@ -1,99 +1,55 @@ -ް׆ˌĠ򝤫鿰맫͓Ԕ -ҊÅЁͽ -Щܰ -Χ -쏎՚ -ڥ -з -򗹡 -֐ -ᬡ䨳͘ -۽Ӣ - -ԙ - -ا࠭ -Ϡɮ -򃡺쏎 -Ē - -ջо -󕐙ޗ - -Ѵد߯ -ںԻϩ -񖝋ޕ -㓜 -Ѹڱ -ܯԕ - -ĉ -ⷶ -šҔ -㰽 -С׃ -苩ܑ -ٿ뺻 -ڧӴ̧Ӈ -똫䅭̝ԛʂ -껺 -۾ - -Κ - - -Dž -ꬡ˞“ -̾ -虤刬Ⓨ̀ -㨳 - - - -҂ - - -鱤 - -ً - -ۄ -í - - - - - - - - -𓎍 -̀ - -Řϒ -݁׺ - -րɂÈ -񺥤 -ଛ - -ܕ - - - - - -쏒 - - -稳 - - - - - -ٕ - - - - +ް׆ˌĠ򝤫鿰맫͓ԔҊÅЁ +ܥ +ңә +鿡 + +Ŷ +툢 +Ս + +߿ԁ +ö +ś— +髶 + + + + + + + + +х + + +ܛ + + + + +ǐ + + +ً + +ۃ + +붪 + + +܎ +Ė +쾡 +Ǖ + +𓎍 +ł + + + + + + + + + diff --git a/docs/changelog.txt b/docs/changelog.txt index 5cd2ca3..4ecb84b 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -1,49 +1,35 @@ ******************************************************************************* -LibreMediaServer Audio - An open source media server for arts and performing. -(c) Criptomart - Santiago Noreña 2012-2024 -https://git.criptomart.net/libremediaserver +Libre Media Server Audio - An Open source Media Server for arts and performing. +(c) Santiago Noreña 2012-2024 +Code: https://git.criptomart.net/libremediaserver ******************************************************************************* -LibreMediaServer Changelog +Lbre Media Server ChangeLog -v 0.2.0 Antígona (26/05/2024) -+ Change audio engine to miniaudio because is imposible pan in SFML and it has not access to low API and audio processing. -+ Refactor all audio methods to MiniAudioEngine class. -+ Select sound device output. -+ Pan. -+ Show faders values. New SliderGroup class. -+ Entry Point 16 bits. -+ Refactor AudioMasterWidget to dmxWidget. -+ Read mp3, flac, wav (mp3 has given some errors seeking cursors...). Audio Engine is working at 48Khz and 32 bits pcm float, if media files are encoding at same configuration, it saves a resampling operation later live. -+ Removed settings dialog, only read xml conf file at startup. -+ Real dynamic variable number of layers based on conf file setting. -+ OlaThread send double channels (volume, entry point, load media) only once for each dmx frame buffer. -+ Terminal mode without graphical interface. All audio methods has been refactorized out of QWidget world. -+ Compilation without GUI (-DNOGUI). -+ New DMX personality version, better sort for audio needs (first load media, set vol, pan, etc, last playback order); -+ No QtSignals for sending data, better performance about 20% in my machine. Now, libremediaserver only updates values in AudioWidget, ui refresh is doing with a timer in audiowidget, so there is not problems between graphical and ola thread (the callback). Signals are used only from Ui to libreMediaServer to notify user interactions and Qtimers. -+ Load media files from ui clicking in the media labels. -+ New Play Modes: - - Play all medias found in one folder. - - Play all medias in one folder consecutevily. - - Play all medias in one folder randomly. -+ Multi audio devices output. -+ Vumeter for each layer -+ Show device name on Ui and ouput bus slider. +v 0.1.3 (28/05/2024) -v 0.1.3 Leúcade (19/04/2024) + Ubuntu 22.04 jammy. ++ Use SFML as audio engine. + Qt 5.15.3. -+ Pitch. -+ Loop. ++ pitch. ++ loop. +- pan. +- Show faders values. + --> Hacer UI por fader: mute/centrado, valor, visualizador: + --> Hacer UI con la visualización de tiempos. +- SettingsDialog. +- Load/save conf file. -v 0.1.2 Mayordomo (12/08/2015) -+ GUI config. -+ Variable layers. -+ SFML as audio engine. +v 0.1.2 (12/08/2015) + +- GUI config +- Several bugs tested in real world +- variable layers +- SFML as audio engine + +v 0.1.1 (24/09/2014) + ++ First Version: 4 layers playing .ogg ++ Needs Open Lighting Arquitecture => 0.9.0 ++ Pure Data as audio engine -v 0.1.1 Pascual (24/09/2014) -+ First Version: 4 layers playing .ogg. -+ Needs Open Lighting Arquitecture => 0.9.0. -+ Pure Data as audio engine. -+ Qt4 diff --git a/docs/compiling.txt b/docs/compiling.txt index 0648d90..d44317b 100644 --- a/docs/compiling.txt +++ b/docs/compiling.txt @@ -1,6 +1,6 @@ ******************************************************************************* -Libre Media Server Audio - An Open source Media Server for arts and performing. -(c) Criptomart - Santiago Noreña 2012-2024 +Libre Media Server Audio - An Open source Media Server. +(c) Santiago Noreña 2014-2024 https://git.criptomart.net/libremediaserver ******************************************************************************* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. diff --git a/docs/lms-audio.xlm b/docs/lms-audio.xlm index b2ea7ed..37e53c9 100644 --- a/docs/lms-audio.xlm +++ b/docs/lms-audio.xlm @@ -1,8 +1,7 @@ - - - - - - - + + + + + + diff --git a/docs/roadmap.txt b/docs/roadmap.txt index 9e4f017..4dde0af 100644 --- a/docs/roadmap.txt +++ b/docs/roadmap.txt @@ -1,44 +1,51 @@ ******************************************************************************* Libre Media Server Audio - An Open source Media Server for arts and performing. -(c) Criptomart - Santiago Noreña 2012-2024 -https://git.criptomart.net/libremediaserver +(c) Santiago Noreña 2012-2024 +Code: https://git.criptomart.net/libremediaserver ******************************************************************************* Libre Media Server Roadmap +(or a whislist...) -v 0.3.0 -- Ui/Ux: skin, style. -- Ui/Ux; Keyboards strokes. -- Ui/Ux: Dar la opción clickeando en el widget de tiempo de poner una cuenta atrás en vez de hacia delante. -- Ui/Ux: seek cursor playback +v 0.2.1 +- skin, UI/UX - live input. -- remove ola and use sACN directly. + +v 0.2.0 +- Use sACN directly. + la instalación de OLA es mediante compilación, el repo de paquetes no está actualizado, nada user-friendly. + hay que empaquetar OLA, incluirlo en el binario, o implementar sACN y linkarlo estáticamente. + https://github.com/ETCLabs/sACN - Qt6. -- CIPT/MSex. +- audio processing (eq, rev, compresor, ...). +- CIPT/MSex, send icons play-pause-stop. - Rasp build. - Octopus Sound Card support (6 outputs - 8 inputs). -- Master Bus Layer: - - mute/panic. - - fader + value - - pan - - magicq personality .hed - - audio device linked, outputs will be redirected there. - - dmx address + universe settings. - - compresor/limiter. -- Layer: - - audio procesadores (compresor, reveb, delay). - - mute/panic. -- Rose noise and sine generator. -- Logs, verbosity, timestamp. -- New play mode without pitch control, it saves resources. MA_SOUND_FLAG_NO_PITCH + +v 1.5 +- Select sound device output. +- Multi device output, router layers to devices and audio outputs. + - Jack/pipewire integration? +- Rose noise and sine generator in menu to test system. +- Play Mode: + - Play all medias found in folder consecutevily or random, with loop. + - Play all medias, consecutevily and random, with loop. +- mute/panic on layer. +- loop points. +- play offset. ¿stop offset? +- number of layers configured in conf file, up to 256. +- Dar la opción clickeando en el widget de tiempo de poner una cuenta atrás en vez de hacia delante. +- Master Layer: + - Mute. + - Pan. +- Keyboards strokes, select files from ui. +- LOGs y entrada de comandos. +- Bufgix: depurar errores cuando no carga la librería de medias, cambia el númmero de capas, cambia el universo, etc. + +v 1.4 +- pan. +- Show faders values. + --> Hacer UI por fader: mute/centrado, valor, visualizador: + --> Hacer UI con la visualización de tiempos. - SettingsDialog. - Load/save conf file. -- ¿Exit Point? is it needed? -- Hardening: check return errors, try/catch exceptions, i'm too happy.... -- Tests: errors on wrong conf file. -- ampliar writer para recibir un número n de entradas y escribirlas cada una en un buffer -- aislar miniaudio del callback dmx tal como hemos hecho con la Ui, al menos las operaciones lentas como cargar medios. -- en load media usar un fence para actualizar mediaLoaded. diff --git a/libremediaserver-audio.pro b/libremediaserver-audio.pro index 67c50c5..e3c5816 100644 --- a/libremediaserver-audio.pro +++ b/libremediaserver-audio.pro @@ -2,49 +2,35 @@ TEMPLATE = app TARGET = libremediaserver-audio QT += webkitwidgets widgets HEADERS += src/libremediaserver-audio.h \ - src/clickabledoublespinbox.h \ - src/clickablelabel.h \ - src/clickableslider.h \ - src/dmxwidget.h \ - src/filterbankwidget.h \ - src/libremediaserver-audio-gui.h \ - src/ma_writer_node.h \ - src/main.h \ src/medialibrary.h \ - src/miniaudio.h \ - src/ma_writer_node.h \ - src/miniaudioengine.h \ src/olathread.h \ src/audiolayerwidget.h \ src/dmxPersonality.h \ src/audiowidget.h \ + src/audiomasterwidget.h \ src/defines.h \ src/settings.h \ - src/slidergroup.h + src/settingsdialog.h \ + src/layersettingswidget.h SOURCES += src/main.cpp \ - src/clickabledoublespinbox.cpp \ - src/clickablelabel.cpp \ - src/clickableslider.cpp \ - src/dmxwidget.cpp \ - src/filterbankwidget.cpp \ - src/libremediaserver-audio-gui.cpp \ src/libremediaserver-audio.cpp \ src/medialibrary.cpp \ - src/miniaudio.c \ - src/miniaudioengine.cpp \ - src/ma_writer_node.c \ src/olathread.cpp \ src/audiolayerwidget.cpp \ src/audiowidget.cpp \ + src/audiomasterwidget.cpp \ src/settings.cpp \ - src/slidergroup.cpp -FORMS += src/libremediaserver-audio-gui.ui -CCFLAG += -msse2 -mavx2 -QMAKE_CXXFLAGS += $$(CXXFLAG) -QMAKE_CFLAGS += $$(CCFLAG) -QMAKE_LFLAGS += $$(LDFLAG) -LIBS += -lola -lolacommon -ldl -lpthread -lm + src/settingsdialog.cpp \ + src/layersettingswidget.cpp +FORMS += src/libremediaserver-audio.ui \ + src/settingsdialog.ui \ + src/layersettingswidget.ui +LIBS += -lola -lolacommon # -lcitp +LIBS += -L$$PWD/SFML/lib/ -lsfml-audio -lsfml-system +INCLUDEPATH += $$PWD/SFML/include +DEPENDPATH += $$PWD/SFML/include +PRE_TARGETDEPS += $$PWD/SFML/lib/libsfml-audio.so $$PWD/SFML/lib/libsfml-system.so OTHER_FILES += \ LICENSE.txt \ docs/compiling.txt \ diff --git a/src/audiolayerwidget.cpp b/src/audiolayerwidget.cpp index 9b6ecf7..a989031 100644 --- a/src/audiolayerwidget.cpp +++ b/src/audiolayerwidget.cpp @@ -1,360 +1,291 @@ #include "audiolayerwidget.h" -#include "dmxPersonality.h" -#include -#include +#include -AudioLayerWidget::AudioLayerWidget(QWidget *parent, int layer): - QWidget(parent) - , m_oldStatus(Status::PlayingLoop) - , m_layer(layer) +#include +#include +#include +#include + +AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name): + QGroupBox(parent) , m_suspendResumeButton(0) + , m_watchDMX(new QTimer(this)) + , m_currentMedia(" ") + , m_running(false) { + + this->setTitle(name); + QVBoxLayout *layout = new QVBoxLayout; - m_folderValue = new ClickableLabel; - m_folderValue->setAlignment(Qt::AlignLeft); - m_folderValue->setFocusPolicy(Qt::NoFocus); - m_folderValue->setMinimumWidth(MIN_WIDTH); - m_folderValue->setMaximumWidth(MAX_WIDTH); - m_folderValue->setContentsMargins(3,1,3,1); - m_folderValue->setText("Click to open media file (mp3, wav, flac)"); - m_folderValue->setStyleSheet( - "margin: 0px;" - "color: white;" - "background-color: black;" - "font-size: 12px;" - ); - layout->addWidget(m_folderValue); - m_fileValue = new ClickableLabel; - m_fileValue->setAlignment(Qt::AlignLeft); - m_fileValue->setFocusPolicy(Qt::NoFocus); - m_fileValue->setMinimumWidth(MIN_WIDTH); - m_fileValue->setMaximumWidth(MAX_WIDTH); - m_fileValue->setContentsMargins(3,1,3,1); - m_fileValue->setText("++ empty ++"); - connect(m_fileValue, SIGNAL(clicked()), this, SLOT(openMediaDialog())); - connect(m_folderValue, SIGNAL(clicked()), this, SLOT(openMediaDialog())); - m_fileValue->setStyleSheet( - "margin: 0px;" - "color: white;" - "background-color: black;" - "font-size: 14px;" - ); - layout->addWidget(m_fileValue); + QHBoxLayout *status = new QHBoxLayout; + m_statusLabel = new QLabel; + m_statusLabel->setText(STATUS_LABEL); + m_statusValue = new QLabel; +// m_receiveDMX = new QCheckBox("Receiving DMX", this); +// m_receiveDMX->setChecked(false); +// status->addWidget(m_receiveDMX); + status->addWidget(m_statusLabel); + status->addWidget(m_statusValue); + m_loopCheck = new QCheckBox(); + m_loopCheckLabel = new QLabel; + m_loopCheckLabel->setText("Loop"); + connect(m_loopCheck, SIGNAL(stateChanged(int)), this, SLOT(loopChanged(int))); + status->addWidget(m_loopCheck); + status->addWidget(m_loopCheckLabel); + layout->addLayout(status); + + QHBoxLayout *folderLoaded = new QHBoxLayout; + m_folderLabel = new QLabel; + m_folderLabel->setText(FOLDER_LABEL); + m_folderValue = new QLabel; + m_folderValue->setMaximumWidth(200); + folderLoaded->addWidget(m_folderLabel); + folderLoaded->addWidget(m_folderValue); + layout->addLayout(folderLoaded); + + QHBoxLayout *fileLoaded = new QHBoxLayout; + m_fileLabel = new QLabel; + m_fileLabel->setText(FILE_LABEL); + m_fileValue = new QLabel; + m_fileValue->setMaximumWidth(200); + fileLoaded->addWidget(m_fileLabel); + fileLoaded->addWidget(m_fileValue); + layout->addLayout(fileLoaded); + + QGridLayout *volumeBox = new QGridLayout; + m_volumeLabel = new QLabel; + m_volumeLabel->setText(tr(VOLUME_LABEL)); + m_volumeSlider = new QSlider(Qt::Horizontal); + m_volumeSlider->setMinimum(0); + m_volumeSlider->setMaximum(90); + m_volumeSlider->setSingleStep(1); + m_volumeIndicator = new QLabel; + volumeBox->addWidget(m_volumeLabel, 0, 0); + volumeBox->addWidget(m_volumeSlider, 0, 1); + volumeBox->addWidget(m_volumeIndicator, 0, 2); + connect(m_volumeSlider, SIGNAL(valueChanged(int)), this, SLOT(volumeChanged(int))); + connect(m_volumeSlider, &QSlider::valueChanged, this, [=] () { + m_volumeIndicator->setText(QString::number(m_volumeSlider->value())); + }); + m_panLabel = new QLabel; + m_panLabel->setText("Pan"); + m_panSlider = new QSlider(Qt::Horizontal); + m_panSlider->setMinimum(0); + m_panSlider->setMaximum(255); + m_panSlider->setSingleStep(1); + connect(m_panSlider, SIGNAL(valueChanged(int)), this, SLOT(panChanged(int))); + volumeBox->addWidget(m_panLabel, 1, 0); + volumeBox->addWidget(m_panSlider, 1, 1); + m_pitchLabel = new QLabel; + m_pitchLabel->setText("Pitch"); + m_pitchSlider = new QSlider(Qt::Horizontal); + m_pitchSlider->setMinimum(0); + m_pitchSlider->setMaximum(255); + m_pitchSlider->setSingleStep(1); + connect(m_pitchSlider, SIGNAL(valueChanged(int)), this, SLOT(pitchChanged(int))); + volumeBox->addWidget(m_pitchLabel, 2, 0); + volumeBox->addWidget(m_pitchSlider, 2, 1); + layout->addLayout(volumeBox); + + QHBoxLayout *progressTime = new QHBoxLayout; + m_progressTimeLabel = new QLabel; + m_progressTimeLabel->setText(PROGRESS_TIME_LABEL); + m_progressTime = new QTimeEdit; + m_progressTime->text(); + m_progressTime->setDisplayFormat("h:mm:ss:zzz"); + m_progressTime->setReadOnly(true); + m_progressTime->setButtonSymbols(QAbstractSpinBox::NoButtons); + m_progressTime->setMaximumWidth(120); + progressTime->addWidget(m_progressTimeLabel); + progressTime->addWidget(m_progressTime); + m_totalTimeLabel = new QLabel; + m_totalTimeLabel->setText(TOTAL_TIME_LABEL); + m_totalTimeValue = new QTimeEdit; + m_totalTimeValue->setDisplayFormat("h:mm:ss:zzz"); + m_totalTimeValue->setReadOnly(true); + m_totalTimeValue->setButtonSymbols(QAbstractSpinBox::NoButtons); + m_totalTimeValue->setMaximumWidth(120); + progressTime->addWidget(m_totalTimeLabel); + progressTime->addWidget(m_totalTimeValue); + layout->addLayout(progressTime); + + QHBoxLayout *progressSlider = new QHBoxLayout; + m_progressLabel = new QLabel; + m_progressLabel->setText(PROGRESS_LABEL); + m_progressSlider = new QSlider(Qt::Horizontal); + progressSlider->addWidget(m_progressLabel); + progressSlider->addWidget(m_progressSlider); + layout->addLayout(progressSlider); m_suspendResumeButton = new QPushButton(this); - m_suspendResumeButton->setText(statusToString(Status::Iddle)); + m_suspendResumeButton->setText(tr(SUSPEND_LABEL)); connect(m_suspendResumeButton, SIGNAL(clicked()), SLOT(toggleSuspendResume())); layout->addWidget(m_suspendResumeButton); - m_progress = new QProgressBar(this); - m_progress->setOrientation(Qt::Horizontal); - m_progress->setFocusPolicy(Qt::NoFocus); - m_progress->setAlignment(Qt::AlignHCenter); - m_progress->setContentsMargins(0, 1, 0, 1); - m_progress->setMinimumWidth(MIN_WIDTH); - m_progress->setMaximumWidth(MAX_WIDTH); - m_progress->setMaximumHeight(15); - m_progress->setRange(0, 0); - m_progress->setValue(0); - m_progress->setFormat("%v / %m"); - m_progress->setStyleSheet( - "margin: 0px;" - "font-size: 10px;" - "background-color: black;" - ); - layout->addWidget(m_progress); - - m_progressTime = new QTimeEdit; - m_progressTime->setToolTip("Current Time"); - m_progressTime->setObjectName("Current Time"); - m_progressTime->setDisplayFormat("mm:ss:zzz"); - m_progressTime->setReadOnly(true); - m_progressTime->setButtonSymbols(QAbstractSpinBox::NoButtons); - m_progressTime->setFocusPolicy(Qt::NoFocus); - m_progressTime->setAlignment(Qt::AlignHCenter); - m_progressTime->setContentsMargins(0,0,0,0); - m_progressTime->setMinimumWidth(MIN_WIDTH); - m_progressTime->setMaximumWidth(MAX_WIDTH); - m_progressTime->setStyleSheet( - "margin: 0px;" - "color: white;" - "background-color: black;" - "font-size: 16px;" - ); - m_totalTimeValue = new QTimeEdit; - m_totalTimeValue->setObjectName("Track Length"); - m_totalTimeValue->setToolTip("Track Length"); - m_totalTimeValue->setDisplayFormat("mm:ss:zzz"); - m_totalTimeValue->setReadOnly(true); - m_totalTimeValue->setButtonSymbols(QAbstractSpinBox::NoButtons); - m_totalTimeValue->setFocusPolicy(Qt::NoFocus); - m_totalTimeValue->setAlignment(Qt::AlignHCenter); - m_totalTimeValue->setContentsMargins(0,0,0,0); - m_totalTimeValue->setMinimumWidth(MIN_WIDTH); - m_totalTimeValue->setMaximumWidth(MAX_WIDTH); - m_totalTimeValue->setStyleSheet( - "margin: 0px;" - "color: white;" - "background-color: black;" - "font-size: 16px;" - ); - QHBoxLayout *status = new QHBoxLayout; - status->addWidget(m_progressTime); - status->addWidget(m_totalTimeValue); - layout->addLayout(status); - - m_filterBank = new FilterBankWidget(this); - m_filterBank->setMaximumWidth(MAX_WIDTH); - m_filterBank->setMinimumWidth(MIN_WIDTH); - connect(m_filterBank, SIGNAL(setBypass(bool)), this, SLOT(setBypass(bool))); - layout->addWidget(m_filterBank); - m_pitch = new SliderGroup("Pitch", 0 , 255, 0, NULL); - layout->addWidget(m_pitch); - connect(m_pitch, SIGNAL(valueChanged(int)), this, SLOT(pitchChanged(int))); - m_pan = new SliderGroup("Pan", 0 , 255, 0, NULL); - layout->addWidget(m_pan); - connect(m_pan, SIGNAL(valueChanged(int)), this, SLOT(panChanged(int))); - - QHBoxLayout *volumeBox = new QHBoxLayout; - m_volume = new SliderGroup("Vol", 0, 65535, 2, NULL); - volumeBox->addWidget(m_volume); - connect(m_volume, SIGNAL(valueChanged(int)), this, SLOT(volumeChanged(int))); - m_bus1 = new SliderGroup("Bus 1", 0, 65535, 2, NULL); - volumeBox->addWidget(m_bus1); - connect(m_bus1, SIGNAL(valueChanged(int)), this, SLOT(bus1VolumeChanged(int))); - m_bus2 = new SliderGroup("Bus 2", 0, 65535, 2, NULL); - volumeBox->addWidget(m_bus2); - connect(m_bus2, SIGNAL(valueChanged(int)), this, SLOT(bus2VolumeChanged(int))); - volumeBox->setSpacing(0); - volumeBox->setContentsMargins(0, 0, 0, 0); - layout->addLayout(volumeBox); - QHBoxLayout *labelsBox = new QHBoxLayout; - m_level = new QLabel("-inf"); - m_level->setStyleSheet("border: 1px solid #CFB0C9;" - "margin: 0px;" - "background-color: black;" - "color: white;" - "text-align: center;" - "font-size: 15px;"); - m_level->setMinimumWidth(MIN_WIDTH / 2); - m_level->setMaximumWidth(MAX_WIDTH / 3); - m_level->setMinimumHeight(25); - m_level->setAlignment(Qt::AlignHCenter); - m_level->setContentsMargins(0, 4, 0, 4); - labelsBox->addWidget(m_level); - m_bus1Label = new QLabel("dummy"); - m_bus1Label->setAlignment(Qt::AlignHCenter); - m_bus1Label->setContentsMargins(0, 6, 0, 6); - m_bus1Label->setMinimumHeight(25); - m_bus1Label->setMinimumWidth(MIN_WIDTH / 4); - m_bus1Label->setMaximumWidth(MAX_WIDTH / 3); - m_bus1Label->setStyleSheet("border: 1px solid #CFB0C9;" - "margin: 0px;" - "background-color: black;" - "color: white;" - "font-size: 10px;"); - labelsBox->addWidget(m_bus1Label); - m_bus2Label = new QLabel("dummy"); - m_bus2Label->setAlignment(Qt::AlignHCenter); - m_bus2Label->setMinimumWidth(MIN_WIDTH / 4); - m_bus2Label->setMaximumWidth(MAX_WIDTH / 3); - m_bus2Label->setContentsMargins(0, 6, 0, 6); - m_bus2Label->setMinimumHeight(25); - m_bus2Label->setStyleSheet("border: 1px solid #CFB0C9;" - "margin: 0px;" - "background-color: black;" - "color: white;" - "font-size: 10px;"); - labelsBox->addWidget(m_bus2Label); - labelsBox->setSpacing(0); - layout->setContentsMargins(0, 0, 0, 0); - layout->addLayout(labelsBox); - layout->setAlignment(Qt::AlignHCenter); - layout->setSpacing(1); this->setLayout(layout); + + connect(m_watchDMX, SIGNAL(timeout()), + this, SLOT(refreshGUI())); + m_watchDMX->start(100); + + m_music.setAttenuation(0); } -AudioLayerWidget::~AudioLayerWidget() {} +AudioLayerWidget::~AudioLayerWidget() +{ + +} -// From UI. void AudioLayerWidget::volumeChanged(int value) { - emit(uiSliderChanged(m_layer, Slider::Volume, value)); -} - -void AudioLayerWidget::bus1VolumeChanged(int value) -{ - emit(uiSliderChanged(m_layer, Slider::Bus1, value)); -} - -void AudioLayerWidget::bus2VolumeChanged(int value) -{ - emit(uiSliderChanged(m_layer, Slider::Bus2, value)); + m_music.setVolume(value); } void AudioLayerWidget::panChanged(int value) { - emit(uiSliderChanged(m_layer, Slider::Pan, value)); + m_music.setRelativeToListener(true); + sf::Vector3f pos = m_music.getPosition(); + //m_music.setSpati(0, 0, 0); + qreal pan = (value - 128) / 64.0f; + qWarning("change pan %f", pan); + //m_music.setPosition(pan, 0.0, sqrtf(1.0 + pan*pan)); + m_music.setPosition(pan, 0.0f, -1.0f); + //pos = m_music.getPosition(); + qWarning("%f %f %f", pos.x, pos.y, pos.z); + qWarning("is rel %i", m_music.isRelativeToListener()); } void AudioLayerWidget::pitchChanged(int value) { - emit(uiSliderChanged(m_layer, Slider::Pitch, value)); + m_music.setPitch(qreal(value / 128.0 )); } -void AudioLayerWidget::setBypass(bool value) +void AudioLayerWidget::loopChanged(int value) { - emit(uiSliderChanged(m_layer, Slider::Bypass, value)); + m_music.setLoop(value); } - -void AudioLayerWidget::toggleSuspendResume() +void AudioLayerWidget::setVol(qreal vol) { - switch (m_status) { - case Status::PlayingLoop: - case Status::PlayingOnce: - case Status::PlayingFolder: - case Status::PlayingFolderLoop: - case Status::PlayingFolderRandom: - m_oldStatus = m_status; - this->setPlaybackStatus(Status::Paused); - emit uiPlaybackChanged(m_layer, Status::Paused); - break; - case Status::Paused: - case Status::Stopped: - this->setPlaybackStatus(m_oldStatus); - emit uiPlaybackChanged(m_layer, m_oldStatus); - case Status::Iddle: - break; - } + m_music.setVolume(vol); + m_volumeSlider->blockSignals(true); + m_volumeSlider->setValue(vol); + m_volumeIndicator->setText(QString::number(vol)); + m_volumeSlider->blockSignals(false); } -void AudioLayerWidget::openMediaDialog() +void AudioLayerWidget::setPan(qreal pan) { - QFileDialog dialog(this); - dialog.setFileMode(QFileDialog::ExistingFile); - dialog.setNameFilter(tr("Sound Tracks (*.mp3 *.mp3 *.flac *.wav")); - dialog.setViewMode(QFileDialog::Detail); - dialog.setDirectory(Settings::getInstance()->getPathMedia()); - if (!dialog.exec()) + this->panChanged(pan); + m_panSlider->blockSignals(true); + m_panSlider->setValue(pan); + m_panSlider->blockSignals(false); +} + +void AudioLayerWidget::setPitch(qreal pitch) +{ + m_music.setPitch(float(pitch / 128 )); + m_pitchSlider->blockSignals(true); + m_pitchSlider->setValue(pitch); + m_pitchSlider->blockSignals(false); +} + +void AudioLayerWidget::loadMedia(QString file) +{ + if (m_currentMedia.compare(file) == 0 ) { return; - QStringList fileNames; - fileNames = dialog.selectedFiles(); - emit uiLoadMedia(m_layer, fileNames.at(0)); - this->setMediaFile(fileNames.at(0)); - this->setPlaybackStatus(Status::Stopped); + } + if (!QFile::exists(file)) { + qWarning("Can not access to file %s", file.toLatin1().constData()); + return; + } + // Load an ogg music file + if (!m_music.openFromFile(file.toStdString())) { + qWarning("Can not open file %s", file.toLatin1().constData()); + return; + } + + m_currentMedia = file; + durationChanged(m_music.getDuration().asMilliseconds()); + fileLoaded(file); + + // Display music informations + std::cout << "File loaded: " << file.toLatin1().constData() << " : " << std::endl; + std::cout << " " << m_music.getDuration().asSeconds() << " seconds"; + std::cout << " " << m_music.getSampleRate() << " samples / sec"; + std::cout << " " << m_music.getChannelCount() << " channels" << std::endl; } -// from DMX signals -void AudioLayerWidget::setVol(float vol) -{ - m_volume->blockSignals(true); - m_volume->setValue(vol); - m_volume->blockSignals(false); -} - -void AudioLayerWidget::setPan(int pan) -{ - m_pan->blockSignals(true); - m_pan->setValue(pan); - m_pan->blockSignals(false); -} - -void AudioLayerWidget::setPitch(int pitch) -{ - m_pitch->blockSignals(true); - m_pitch->setValue(pitch); - m_pitch->blockSignals(false); -} - -void AudioLayerWidget::setMediaFile(QString file) +void AudioLayerWidget::fileLoaded(QString file) { QStringList list = file.split("/"); int size = list.size(); if (size >= 2) { - QString tmp = list.at(size - 2); - tmp.truncate(60); - m_folderValue->setText(tmp); - tmp = list.at(size - 1); - tmp.truncate(40); - m_fileValue->setText(tmp); + m_folderValue->setText(list.at(size - 2)); + m_fileValue->setText(list.at(size - 1)); } } -void AudioLayerWidget::setPlaybackStatus(Status s) +void AudioLayerWidget::durationChanged(qint64 dur) { - m_suspendResumeButton->blockSignals(true); - m_status = s; - m_suspendResumeButton->setText(statusToString(s)); - m_suspendResumeButton->blockSignals(false); -} - -void AudioLayerWidget::setDuration(float dur) -{ - m_progress->blockSignals(true); - m_progressTime->blockSignals(true); - m_totalTimeValue->blockSignals(true); - m_progress->setRange(0, dur); - m_progress->setValue(0); - m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(0)); + m_progressSlider->setMaximum(dur); m_totalTimeValue->setTime(QTime::fromMSecsSinceStartOfDay(dur)); - m_progress->blockSignals(false); - m_progressTime->blockSignals(false); - m_totalTimeValue->blockSignals(false); } -void AudioLayerWidget::setCurrentTime(float progress) +void AudioLayerWidget::play(bool loop) { - progress *= 1000; - m_progress->blockSignals(true); - m_progressTime->blockSignals(true); - m_progress->setValue(progress); - m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(progress)); - m_progress->blockSignals(false); - m_progressTime->blockSignals(false); + m_music.play(); + m_music.setLoop(loop); + m_loopCheck->blockSignals(true); + m_loopCheck->setChecked(m_music.getLoop()); + m_loopCheck->blockSignals(false); } -void AudioLayerWidget::setFilterParam(int channel, int value) +void AudioLayerWidget::pause() { - if (channel <= FILTER_BANK_GAIN - HP_FREQ){ - m_filterBank->blockSignals(true); - m_filterBank->setValue(channel, value); - m_filterBank->blockSignals(false); - } else if (channel == SEND1 - HP_FREQ) { - m_bus1->blockSignals(true); - m_bus1->setValue((value * 256) + 255); - m_bus1->blockSignals(false); - } else if (channel == SEND2 - HP_FREQ) { - m_bus2->blockSignals(true); - m_bus2->setValue(value * 256 + 255); - m_bus2->blockSignals(false); + m_music.pause(); +} + +void AudioLayerWidget::stop() +{ + m_music.stop(); +} + +void AudioLayerWidget::refreshGUI() { +// m_receiveDMX->setChecked(false); + int progress; + switch (m_music.getStatus()) { + case sf::SoundSource::Playing: + progress = m_music.getPlayingOffset().asMilliseconds(); + m_progressSlider->setValue(progress); + m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(progress)); + m_statusValue->setText(PLAY_LABEL); + m_suspendResumeButton->setText(tr(SUSPEND_LABEL)); + break; + case sf::SoundSource::Paused: + m_statusValue->setText(PAUSE_LABEL); + m_suspendResumeButton->setText(tr(RESUME_LABEL)); + break; + case sf::SoundSource::Stopped: + m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(0)); + m_statusValue->setText(STOP_LABEL); + m_suspendResumeButton->setText(tr(RESUME_LABEL)); + m_progressSlider->setValue(0); + break; + } + //m_loopCheck->blockSignals(true); + //m_loopCheck->setChecked(m_music.getLoop()); + //m_loopCheck->blockSignals(false); +} + +void AudioLayerWidget::toggleSuspendResume() +{ + if (m_music.getStatus() == sf::SoundSource::Playing) { + m_music.pause(); + } else { + m_music.play(); } } -void AudioLayerWidget::setLevel(float db) -{ - m_level->blockSignals(true); - if (db > -140) - - m_level->setText(QString::number(db, 'f', 2)); - else - m_level->setText("-inf"); - m_level->blockSignals(false); -} - -void AudioLayerWidget::setBusName(uint bus, char *name) -{ - if (name && strlen(name) > 17) - name[16] = '\0'; - if (bus == 0) { - m_bus1Label->blockSignals(true); - m_bus1Label->setText(name); - m_bus1Label->blockSignals(false); - } else if (bus == 1) { - m_bus2Label->blockSignals(true); - m_bus2Label->setText(name); - m_bus2Label->blockSignals(false); - } -} diff --git a/src/audiolayerwidget.h b/src/audiolayerwidget.h index bc7010f..2d214d2 100644 --- a/src/audiolayerwidget.h +++ b/src/audiolayerwidget.h @@ -1,71 +1,152 @@ #ifndef AUDIOLAYERWIDGET_H #define AUDIOLAYERWIDGET_H +#include + +#include +#include #include +#include +#include +#include #include -#include +#include +#include + +#include +#include #include "defines.h" -#include "slidergroup.h" -#include "clickablelabel.h" -#include "settings.h" -#include "filterbankwidget.h" -class AudioLayerWidget : public QWidget +class AudioLayerWidget : public QGroupBox { Q_OBJECT public: - explicit AudioLayerWidget(QWidget *parent = 0, int layer = 0); + + explicit AudioLayerWidget(QWidget *parent = 0, QString name = "Layer"); ~AudioLayerWidget(); - // From OLA -> LibreMediaServer -> AudioWidget - void setMediaFile(QString file); - void setDuration(float dur); - void setCurrentTime(float progress); - void setPlaybackStatus(Status status); - void setVol(float vol); - void setPan(int pan); - void setPitch(int pitch); - void setFilterParam(int channel, int value); - void setLevel(float db); - void setBusName(uint bus, char *name); + /** + * @brief load a new media file + * @param file name with full path + */ + void loadMedia(QString file); + + /** + * @brief play + */ + void play(bool loop); + + /** + * @brief stop + */ + void stop(); + + /** + * @brief pause + */ + void pause(); + + /** + * @brief set the Volume + * @param vol volume range 0 -100 + */ + void setVol(qreal vol); + + /** + * @brief resume + */ + void resume(); + + void setPan(qreal pan); + + void setPitch(qreal pitch); + + void setLoop(bool on); + + //void setEntryPoint(qreal entry); + + //void setEndPoint(qreal end); + +public slots: + + /** + * @brief connected with the button + */ + void toggleSuspendResume(); + + /** + * @brief Connected with the slider + * @param volume 0 -100 range + */ + void volumeChanged(int vol); + void panChanged(int vol); + void pitchChanged(int vol); + void loopChanged(int vol); private: - Status m_status; - Status m_oldStatus; - int m_layer; + QPushButton *m_suspendResumeButton; - ClickableLabel *m_fileValue; - ClickableLabel * m_folderValue; - SliderGroup *m_volume; - SliderGroup *m_pan; - SliderGroup *m_pitch; - SliderGroup *m_bus1; - SliderGroup *m_bus2; + + QLabel *m_statusLabel; + QLabel * m_statusValue; + + QLabel *m_volumeLabel; + QSlider *m_volumeSlider; + QLabel *m_volumeIndicator; + + QLabel *m_panLabel; + QSlider *m_panSlider; + + QLabel *m_pitchLabel; + QSlider *m_pitchSlider; + + QLabel *m_loopCheckLabel; + QCheckBox *m_loopCheck; + + QLabel * m_progressLabel; + QSlider *m_progressSlider; + + QLabel *m_progressTimeLabel; QTimeEdit *m_progressTime; + + QLabel *m_totalTimeLabel; QTimeEdit *m_totalTimeValue; - QProgressBar *m_progress; - FilterBankWidget *m_filterBank; - QLabel *m_level; - QLabel *m_bus1Label; - QLabel *m_bus2Label; -// From Ui + QLabel *m_fileLabel; + QLabel *m_fileValue; + + QLabel * m_folderLabel; + QLabel * m_folderValue; + + //QCheckBox *m_receiveDMX; + QTimer *m_watchDMX; + + QString m_currentMedia; + + bool m_running; + + sf::Music m_music; + private slots: - void openMediaDialog(); - void toggleSuspendResume(); - void volumeChanged(int vol); - void bus1VolumeChanged(int vol); - void bus2VolumeChanged(int vol); - void panChanged(int pan); - void pitchChanged(int pitch); - void setBypass(bool value); -signals: - void uiPlaybackChanged(int layer, Status s); - void uiSliderChanged(int layer, Slider s, int value); - void uiLoadMedia(int layer, QString s); + /** + * @brief Update the GUI elements with the name of the new file loaded + * @param file + */ + void fileLoaded(QString file); + + /** + * @brief Update the GUI elements with the duration of the new file loaded + * @param dur The duration of the track in miliseconds + */ + void durationChanged(qint64 dur); + + /** + * @brief Update the variable elements in GUI + */ + void refreshGUI(); }; #endif // AUDIOLAYERWIDGET_H diff --git a/src/audiomasterwidget.cpp b/src/audiomasterwidget.cpp new file mode 100644 index 0000000..4d0f1bb --- /dev/null +++ b/src/audiomasterwidget.cpp @@ -0,0 +1,39 @@ +#include "audiomasterwidget.h" + +#include + +AudioMasterWidget::AudioMasterWidget(QWidget *parent) : + QGroupBox(parent) + //, m_file(new QLabel) + //, m_folder(new QLabel) + //, m_vol(new QSlider) + //, m_mute(new QCheckBox) + //, m_status(new QLabel) + , m_receiveDMX(new QCheckBox) + , m_watchDMX(new QTimer) +{ + QVBoxLayout *vbox = new QVBoxLayout; + //vbox->addWidget(m_status); + //vbox->addWidget(m_vol); + //vbox->addWidget(m_mute); + m_receiveDMX->setText("Receiving DMX"); + vbox->addWidget(m_receiveDMX); + this->setLayout(vbox); + connect(m_watchDMX, SIGNAL(timeout()), + this, SLOT(watchDMXExpired())); + m_watchDMX->start(1000); +} + +AudioMasterWidget::~AudioMasterWidget() +{ + +} + +void AudioMasterWidget::watchDMXExpired() { + m_receiveDMX->setChecked(false); +} + +void AudioMasterWidget::updateWatchDMX() +{ + m_receiveDMX->setChecked(true); +} diff --git a/src/audiomasterwidget.h b/src/audiomasterwidget.h new file mode 100644 index 0000000..4df388c --- /dev/null +++ b/src/audiomasterwidget.h @@ -0,0 +1,44 @@ +#ifndef AUDIOMASTERWIDGET_H +#define AUDIOMASTERWIDGET_H + +#include +#include +#include +#include +#include + + +//#include "ui_audiomasterwidget.h" + +/* +namespace Ui { +class AudioMasterWidget; +}*/ + +class AudioMasterWidget : public QGroupBox //, public Ui::AudioMasterWidget +{ + Q_OBJECT + +public: + AudioMasterWidget(QWidget *parent); + + ~AudioMasterWidget(); + +public slots: + void updateWatchDMX(); + +private: + //QLabel *m_file; + //QLabel *m_folder; + //QSlider *m_vol; + //QCheckBox *m_mute; + //QLabel *m_status; + QCheckBox *m_receiveDMX; + QTimer *m_watchDMX; + +private slots: + void watchDMXExpired(); + +}; + +#endif // AUDIOMASTERWIDGET_H diff --git a/src/audiowidget.cpp b/src/audiowidget.cpp index ec96a9e..1d7ddc8 100644 --- a/src/audiowidget.cpp +++ b/src/audiowidget.cpp @@ -1,135 +1,74 @@ #include "audiowidget.h" -#include "dmxPersonality.h" -AudioWidget::AudioWidget(QWidget *parent) : - QWidget(parent) - , m_layout(new QHBoxLayout()) -{ - m_layers = Settings::getInstance()->getLayersNumber(); - for (uint i= 0; i < m_layers; i++ ) { - AudioLayerWidget *alw = new AudioLayerWidget(this, i); - m_layout->insertWidget(i, alw); - connect(alw, SIGNAL(uiSliderChanged(int, Slider, int)), this, SIGNAL(uiSliderChanged(int, Slider, int))); - connect(alw, SIGNAL(uiPlaybackChanged(int, Status)), this, SIGNAL(uiPlaybackChanged(int, Status))); - connect(alw, SIGNAL(uiLoadMedia(int, QString)), this, SIGNAL(uiLoadMedia(int, QString))); - m_layerUpdate[i].status = Status::Iddle; - m_layerUpdate[i].duration = -1; - m_layerUpdate[i].media = ""; - m_layerUpdate[i].vol = -1; - m_layerUpdate[i].pan = -1; - m_layerUpdate[i].pitch = -1; - m_layerUpdate[i].cursor = -1; - m_layerUpdate[i].level = 100; - for (int j = 0; j < FILTER_CHANNELS; j++) - m_filtersUpdate[i][j] = -1; +AudioWidget *AudioWidget::_instance = 0; + +AudioWidget *AudioWidget::getInstance() { + + if (_instance == 0) { + _instance = new AudioWidget(); + Q_CHECK_PTR(_instance); } - m_layout->setSpacing(0); - m_layout->setContentsMargins(0, 0, 0, 0); - this->setStyleSheet("margin: 2px;"); - setLayout(m_layout); - m_refreshUi = new QTimer(this); - connect(m_refreshUi, SIGNAL(timeout()), this, SLOT(refreshUi())); - m_refreshUi->start(UI_REFRESH_TIME * 1.5); + return _instance; } -void AudioWidget::mediaLoaded(int layer, QString file, float duration) +AudioWidget::AudioWidget() { - m_layerUpdate[layer].media = file; - m_layerUpdate[layer].duration = duration; - m_layerUpdate[layer].updated = true; + layout = new QHBoxLayout(); + for (int i= 0; i < Settings::getInstance()->getLayersNumber(); i++ ) { + layout->insertWidget(i, new AudioLayerWidget(this, tr("Layer %1").arg(i))); + } + setLayout(layout); +// qDebug( "Init AudioWidget"); } -void AudioWidget::volChanged(int layer, float vol) { - m_layerUpdate[layer].vol = vol; - m_layerUpdate[layer].updated = true; +void AudioWidget::mediaLoaded(int layer, QString media) +{ + QLayoutItem * const item = layout->itemAt(layer); + dynamic_cast(item->widget())->loadMedia(media); +// qDebug() << "AudioWidget::mediaLoaded Received layer: " << layer +// << "Media: " << media; } -void AudioWidget::panChanged(int layer, int pan) { - m_layerUpdate[layer].pan = pan; - m_layerUpdate[layer].updated = true; +void AudioWidget::volChanged(int layer, qreal vol) { + QLayoutItem * const item = layout->itemAt(layer); + dynamic_cast(item->widget())->setVol(vol); +// qDebug() << "AudioWidget::volChanged Received layer: " << layer +// << "Vol : " << vol; + } -void AudioWidget::pitchChanged(int layer, int pitch) { +void AudioWidget::panChanged(int layer, qreal vol) { + QLayoutItem * const item = layout->itemAt(layer); + dynamic_cast(item->widget())->setPan(vol); +} - m_layerUpdate[layer].pitch = pitch; - m_layerUpdate[layer].updated = true; +void AudioWidget::pitchChanged(int layer, qreal vol) { + QLayoutItem * const item = layout->itemAt(layer); + dynamic_cast(item->widget())->setPitch(vol); } void AudioWidget::playbackChanged(int layer, Status status) { - m_layerUpdate[layer].status = status; - m_layerUpdate[layer].updated = true; -} - -void AudioWidget::cursorChanged(int layer, float cursor) -{ - m_layerUpdate[layer].cursor = cursor; - m_layerUpdate[layer].updated = true; -} - -void AudioWidget::refreshUi() -{ - for (uint i = 0; i < m_layers; i++) - { - if (m_layerUpdate[i].updated) { - QLayoutItem *item = m_layout->itemAt(i); - AudioLayerWidget *alw = dynamic_cast(item->widget()); - if (m_layerUpdate[i].vol > -1) { - alw->setVol(m_layerUpdate[i].vol); - m_layerUpdate[i].vol = -1; - } - if (m_layerUpdate[i].cursor > -1) { - alw->setCurrentTime(m_layerUpdate[i].cursor); - m_layerUpdate[i].cursor = -1; - } - if (m_layerUpdate[i].pan > -1) { - alw->setPan(m_layerUpdate[i].pan); - m_layerUpdate[i].pan = -1; - } - if (m_layerUpdate[i].pitch > -1) { - alw->setPitch(m_layerUpdate[i].pitch); - m_layerUpdate[i].pitch = -1; - } - if (m_layerUpdate[i].status != Status::Iddle) { - alw->setPlaybackStatus(m_layerUpdate[i].status); - m_layerUpdate[i].status = Status::Iddle; - } - if (m_layerUpdate[i].duration > -1) { - alw->setMediaFile(m_layerUpdate[i].media); - alw->setDuration(m_layerUpdate[i].duration); - m_layerUpdate[i].duration = -1; - } - for (int j = 0; j < FILTER_CHANNELS; j++) { - if (m_filtersUpdate[i][j] > -1) - alw->setFilterParam(j, m_filtersUpdate[i][j]); - m_filtersUpdate[i][j] = -1; - } - if (m_layerUpdate[i].level < 100) { - alw->setLevel(m_layerUpdate[i].level); - m_layerUpdate[i].level = 100; - } - m_layerUpdate[i].updated = false; - } + QLayoutItem * const item = layout->itemAt(layer); + switch (status) { + case PlayingOnce: + dynamic_cast(item->widget())->play(false); + break; + case Stopped: + dynamic_cast(item->widget())->stop(); + break; + case Paused: + dynamic_cast(item->widget())->pause(); + break; + case PlayingLoop: + dynamic_cast(item->widget())->play(true); + break; } } - -void AudioWidget::filterParamChanged(int layer, int channel, int value) +/* +void AudioWidget::layerReceived(int layer) { - m_filtersUpdate[layer][channel - HP_FREQ] = value; - m_layerUpdate[layer].updated = true; -} + QLayoutItem * const item = layout->itemAt(layer); + dynamic_cast(item->widget())->updateWatchDMX(true); +}*/ -void AudioWidget::levelChanged(int layer, float db) -{ - m_layerUpdate[layer].level = db; - m_layerUpdate[layer].updated = true; -} - -void AudioWidget::busNameChanged(uint bus, char* name) -{ - for (uint i = 0; i < m_layers; i++) { - QLayoutItem *item = m_layout->itemAt(i); - AudioLayerWidget *alw = dynamic_cast(item->widget()); - alw->setBusName(bus, name); - } -} diff --git a/src/audiowidget.h b/src/audiowidget.h index 238ead2..2243a34 100644 --- a/src/audiowidget.h +++ b/src/audiowidget.h @@ -1,44 +1,43 @@ #ifndef AUDIOWIDGET_H #define AUDIOWIDGET_H -#include -#include - +#include +#include +#include +#include "audiomasterwidget.h" #include "audiolayerwidget.h" +#include "defines.h" #include "settings.h" -#include "defines.h" // MAX_LAYERS + +#include "SFML/Audio/SoundSource.hpp" class AudioWidget : public QWidget { + friend class libreMediaServerAudio; + Q_OBJECT public: - AudioWidget(QWidget *parent = nullptr); - void filterParamChanged(int layer, int channel, int value); - void levelChanged(int layer, float db); - void busNameChanged(uint bus, char *name); -private: - QHBoxLayout *m_layout; - layerData m_layerUpdate[MAX_LAYERS]; - QTimer *m_refreshUi; - uint m_layers; - int m_filtersUpdate[MAX_LAYERS][FILTER_CHANNELS]; +protected: -public slots: - void volChanged(int layer, float vol); - void panChanged(int layer, int pan); - void pitchChanged(int layer, int pitch); - void cursorChanged(int layer, float cursor); - void mediaLoaded(int layer, QString media, float duration); + static AudioWidget *getInstance(); + void mediaLoaded(int layer, QString media ); + void volChanged(int layer, qreal vol); + void panChanged(int layer, qreal pan); + void pitchChanged(int layer, qreal pitch); void playbackChanged(int layer, Status status); -private slots: - void refreshUi(); +private: + + static AudioWidget *_instance; + AudioWidget(); + QHBoxLayout *layout; + signals: - void uiPlaybackChanged(int layer, Status s); - void uiSliderChanged(int layer, Slider s, int vol); - void uiLoadMedia(int layer, QString s); + +public slots: + }; #endif // AUDIOWIDGET_H diff --git a/src/clickabledoublespinbox.cpp b/src/clickabledoublespinbox.cpp deleted file mode 100644 index 76feb8b..0000000 --- a/src/clickabledoublespinbox.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "clickabledoublespinbox.h" - -#include - -ClickableDoubleSpinBox::ClickableDoubleSpinBox(QWidget *parent) - : QDoubleSpinBox(parent) -{ - setFocusPolicy(Qt::NoFocus); - setButtonSymbols(QAbstractSpinBox::NoButtons); - setValue(-1); - setDecimals(1); - setAlignment(Qt::AlignHCenter); - setContentsMargins(0, 0, 0, 0); - setMaximumWidth(66); - setMinimumWidth(25); -} - diff --git a/src/clickabledoublespinbox.h b/src/clickabledoublespinbox.h deleted file mode 100644 index 81bcb76..0000000 --- a/src/clickabledoublespinbox.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef CLICKABLEDOUBLESPINBOX_H -#define CLICKABLEDOUBLESPINBOX_H - -#include -#include -#include -#include - -class ClickableDoubleSpinBox : public QDoubleSpinBox -{ - Q_OBJECT -public: - explicit ClickableDoubleSpinBox(QWidget *parent = nullptr); -protected: - void mousePressEvent ( QMouseEvent * event ) { - if (event->button() == Qt::LeftButton) { - emit click(); - } - event->accept(); - } -signals: - void click(); -}; - -#endif // CLICKABLEDOUBLESPINBOX_H diff --git a/src/clickablelabel.cpp b/src/clickablelabel.cpp deleted file mode 100644 index 623493d..0000000 --- a/src/clickablelabel.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "clickablelabel.h" - -ClickableLabel::ClickableLabel(QWidget *parent, Qt::WindowFlags f) - : QLabel{parent} -{ - Q_UNUSED(f); -} - -ClickableLabel::~ClickableLabel() {} - -void ClickableLabel::mousePressEvent(QMouseEvent* event) { - Q_UNUSED(event); - emit clicked(); -} diff --git a/src/clickablelabel.h b/src/clickablelabel.h deleted file mode 100644 index e75aae7..0000000 --- a/src/clickablelabel.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef CLICKABLELABEL_H -#define CLICKABLELABEL_H - -#include -#include -#include - -class ClickableLabel : public QLabel -{ - Q_OBJECT -public: - explicit ClickableLabel(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); - ~ClickableLabel(); - -signals: - void clicked(); - -protected: - void mousePressEvent(QMouseEvent* event); -}; - -#endif // CLICKABLELABEL_H diff --git a/src/clickableslider.cpp b/src/clickableslider.cpp deleted file mode 100644 index 2c34478..0000000 --- a/src/clickableslider.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "clickableslider.h" - -ClickableSlider::ClickableSlider(QWidget *parent) : QSlider{parent} {} diff --git a/src/clickableslider.h b/src/clickableslider.h deleted file mode 100644 index af34c91..0000000 --- a/src/clickableslider.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef CLICKABLESLIDER_H -#define CLICKABLESLIDER_H - -#include -#include -#include -#include - -class ClickableSlider : public QSlider -{ - Q_OBJECT -public: - ClickableSlider(QWidget *parent = nullptr); - -protected: - void mousePressEvent ( QMouseEvent * event ) - { - if (event->button() == Qt::RightButton) - { - if (this->isEnabled()) { - qDebug() << "disabling slider"; - this->setDisabled(true); - } - event->accept(); - } - QSlider::mousePressEvent(event); - } -}; - -#endif // CLICKABLESLIDER_H diff --git a/src/defines.h b/src/defines.h index e9d4bf2..961ec69 100644 --- a/src/defines.h +++ b/src/defines.h @@ -1,26 +1,60 @@ #ifndef DEFINES_H #define DEFINES_H -#define VERSION "LibreMediaServerAudio v0.2.0 Antigona" -#define COPYRIGHT "(C) 2014-2024 Santi Noreña " -#define LICENSE "GPL3 Licensed. See LICENSE.txt." -#define DEFAULT_FILE "lms-audio.xlm" -#define MAX_LAYERS 4 -#define MAX_AUDIODEVICES 8 -#define FORMAT ma_format_f32 /* Must always be f32. */ -#define CHANNELS 2 -#define SAMPLE_RATE 48000 -#define UI_REFRESH_TIME 123 -#define FADE_TIME 25 -#define FILTER_CHANNELS 16 // number of dmx channels dedicated to filters by layer -#define MAX_WIDTH 500 -#define MIN_WIDTH 50 +#define VERSION "LibreMediaServer-Audio 0.1.3" +#define COPYRIGHT "(C) 2014-2024 Santi Norena lms@criptomart.net" +#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details" +#define LAYERS_NUMBER 4 // esto tiene que desaparecer + +#define DEFAULT_FILE "lms-audio.xlm" + +const int DurationSeconds = 1; +const int ToneSampleRateHz = 600; +const int DataSampleRateHz = 44100; +const int BufferSize = 262144; + +#define SUSPEND_LABEL "Pause playback" +#define RESUME_LABEL "Resume playback" + +#define PLAY_LABEL "Playing" +#define STOP_LABEL "Stopped" +#define PAUSE_LABEL "Pause" +#define IDDLE_LABEL "Iddle playback" + +#define VOLUME_LABEL "Volume" +#define PROGRESS_LABEL "Progress" +#define PROGRESS_TIME_LABEL "Current" +#define REMAINING_TIME "Remaining Time: " +#define TOTAL_TIME_LABEL "Total" +#define FILE_LABEL "File:" +#define FOLDER_LABEL "Folder:" +#define STATUS_LABEL "Status: " + +#define NOTIFY_INTERVAL 150 +#define PULL_TIMER_INTERVAL 10 + +// struct where save the DMX settings for each layer struct dmxSetting { int address; - unsigned int universe; + uint universe; + bool updated; int layer; - int audioDevice; +}; + +// 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 m_MediaInformation; // Pointer to the Medias Information List of this Library }; enum Status @@ -29,55 +63,7 @@ enum Status Paused, PlayingOnce, PlayingLoop, - Iddle, - PlayingFolder, - PlayingFolderLoop, - PlayingFolderRandom }; -enum Slider -{ - Volume, - Pan, - Pitch, - Bypass, - Bus1, - Bus2 -}; - -#ifdef __cplusplus -constexpr const char* statusToString(Status e) noexcept -{ - switch (e) - { - case Status::Stopped: return "Stop"; - case Status::Paused: return "Paused"; - case Status::PlayingOnce: return "Play 1"; - case Status::PlayingLoop: return "Play Loop"; - case Status::Iddle: return "Iddle"; - case Status::PlayingFolder: return "Play Folder"; - case Status::PlayingFolderLoop: return "Play Folder Loop"; - case Status::PlayingFolderRandom: return "Playing Folder Random"; - default: return "--++--"; - } -} - -#include -struct layerData { - QString media; - Status status; - bool updated; - float vol; - float cursor; - int pan; - int pitch; - float duration; - int address; - unsigned int universe; - int device; - int bus1Vol; - int bus2Vol; - float level; -}; -#endif // __cplusplus #endif // DEFINES_H + diff --git a/src/dmxPersonality.h b/src/dmxPersonality.h index d08671a..f17231e 100644 --- a/src/dmxPersonality.h +++ b/src/dmxPersonality.h @@ -1,52 +1,40 @@ #ifndef DMXPERSONALITY_H #define DMXPERSONALITY_H -#define DMX_FOLDER 0 -#define DMX_FILE 1 -#define VOLUME_FINE 2 -#define VOLUME_COARSE 3 -#define ENTRY_POINT_FINE 4 -#define ENTRY_POINT_COARSE 5 -#define PAN 6 -#define PITCH 7 -#define PLAYBACK 8 -#define HP_FREQ 9 -#define LOW_FREQ 10 -#define LOW_Q 11 -#define LOW_GAIN 12 -#define MIDLOW_FREQ 13 -#define MIDLOW_Q 14 -#define MIDLOW_GAIN 15 -#define MIDHIGH_FREQ 16 -#define MIDHIGH_Q 17 -#define MIDHIGH_GAIN 18 -#define HIGH_FREQ 19 -#define HIGH_Q 20 -#define HIGH_GAIN 21 -#define FILTER_BANK_GAIN 22 -#define SEND1 23 -#define SEND2 24 -#define LAYER_CHANNELS 25 +/** Define the DMX personality to avoid dealing with + * numbers and change it easyly in case + * +1 - Volumen Coarse +2 - Pan +3 - Folder +4 - File +5 - Playback + 0-24 : Play once. + 25-49: Stop. Returns to start of file. + 50-74: Pause. It keeps the time of reproductions. + 75-99: Play loop. +6 - Control - Reservado, sin uso en este momento. +7 - Volume Fine +8 - Entry Point Coarse - Punto de entrada de reproducción. +9 - Entry Point Fine - El valor de estos dos canales en centésimas de segundo. +10 - Pan +11 - Pitch +*/ -constexpr const char* dmxChannelToString(int e) noexcept -{ - switch (e) { - case HP_FREQ: return "High Pass Cutoff Frec"; - case LOW_FREQ: return "Low Cutoff Frec"; - case LOW_Q: return "Low Slope"; - case LOW_GAIN: return "Low Gain"; - case MIDLOW_FREQ: return "Mid Low Frec"; - case MIDLOW_Q: return "Mid Low Q"; - case MIDLOW_GAIN: return "Mid Low Gain"; - case MIDHIGH_FREQ: return "Mid High Frec"; - case MIDHIGH_Q: return "Mid High Q"; - case MIDHIGH_GAIN: return "Mid High Gain"; - case HIGH_FREQ: return "High Cutoff Frec"; - case HIGH_Q: return "High Slope"; - case HIGH_GAIN: return "High Gain"; - case FILTER_BANK_GAIN: return "Post Filters Gain"; - default: return "++--++--++"; - } -} +// ToDo: Tiene bastante sentido cambiar estos defines por un enum +// ¿Ganaría algo en eficiencia? En claridad del código sí. + +#define VOLUME_COARSE 0 +#define PAN 1 +#define DMX_FOLDER 2 +#define DMX_FILE 3 +#define PLAYBACK 4 +#define CONTROL 5 +#define VOLUME_FINE 6 +#define ENTRY_POINT_COARSE 7 +#define ENTRY_POINT_FINE 8 +#define PITCH 9 + +#define LAYER_CHANNELS 10 #endif // DMXPERSONALITY_H diff --git a/src/dmxwidget.cpp b/src/dmxwidget.cpp deleted file mode 100644 index c5b4150..0000000 --- a/src/dmxwidget.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "dmxwidget.h" - -dmxWidget::dmxWidget(QWidget *parent) : - QGroupBox(parent) - , m_receiveDMX(new QCheckBox) - , m_watchDMX(new QTimer) -{ - this->setFocusPolicy(Qt::FocusPolicy::NoFocus); - QVBoxLayout *vbox = new QVBoxLayout; - m_receiveDMX->setText("DMX Signal"); - vbox->addWidget(m_receiveDMX); - vbox->setSpacing(1); - vbox->setContentsMargins(1, 1, 1, 1); - this->setLayout(vbox); - connect(m_watchDMX, SIGNAL(timeout()), - this, SLOT(watchDMXExpired())); - m_watchDMX->start(2000); -} - -dmxWidget::~dmxWidget() -{ - -} - -void dmxWidget::watchDMXExpired() { - m_receiveDMX->setChecked(false); -} - -void dmxWidget::updateWatchDMX(int uni) -{ - (void)uni; - if (m_receiveDMX->isChecked() == false) - m_receiveDMX->setChecked(true); -} diff --git a/src/dmxwidget.h b/src/dmxwidget.h deleted file mode 100644 index f3a6d7f..0000000 --- a/src/dmxwidget.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef DMXWIDGET_H -#define DMXWIDGET_H - -#include -#include -#include -#include - -class dmxWidget : public QGroupBox -{ - Q_OBJECT - -public: - dmxWidget(QWidget *parent); - ~dmxWidget(); - -public slots: - void updateWatchDMX(int uni); - -private: - QCheckBox *m_receiveDMX; - QTimer *m_watchDMX; - -private slots: - void watchDMXExpired(); - -}; - -#endif // DMXWIDGET_H diff --git a/src/filterbankwidget.cpp b/src/filterbankwidget.cpp deleted file mode 100644 index 098e591..0000000 --- a/src/filterbankwidget.cpp +++ /dev/null @@ -1,103 +0,0 @@ -#include "filterbankwidget.h" - -#include -#include "dmxPersonality.h" -#include "defines.h" - -#define BORDER "#CFB0C9;" -#define BACK "#281024;" - -FilterBankWidget::FilterBankWidget(QWidget *parent) - : QWidget{parent} -{ - QHBoxLayout *layout = new QHBoxLayout; - layout->setAlignment(Qt::AlignHCenter); - layout->setSpacing(0); - layout->setContentsMargins(0, 0, 0, 0); - this->setStyleSheet("border: 1px solid #CFB0C9;" - "margin: 0px;" - "background-color: #080402;" - "font-size: 13px;"); - for (int i = 0; i < 13; i++) { - fb[i] = new ClickableDoubleSpinBox; - const char *name = dmxChannelToString(i + 9); - fb[i]->setObjectName(name); - fb[i]->setToolTip(name); - } - QVBoxLayout *master = new QVBoxLayout; - fb[0]->setRange(0, 500); - m_bypass = new QCheckBox; - master->addWidget(m_bypass); - m_bypass->setText("Bypass"); - m_bypass->setMinimumWidth(MIN_WIDTH / 4); - m_bypass->setStyleSheet("QCheckBox { border: 1px solid #CFB0C9;" - "margin: 0px;" - "background-color: #c82840;" - "font-size: 8px;}"); - connect(m_bypass, SIGNAL(stateChanged(int)), this, SLOT(bypassChanged(int))); - master->addWidget(fb[0]); - layout->addLayout(master); - for (int i = 1; i < 13;) { - QVBoxLayout *filterLayout= new QVBoxLayout; - for (int j = i; j < i + 3; j++) { - if ((j - 1) % 3 == 0) - fb[j]->setRange(0, 24000); - else if ((i - 1) % 3 == 1) { - fb[j]->setRange(0, 10); - } else { - fb[j]->setRange(-50, 50); - } - filterLayout->insertWidget(j, fb[j]); - } - filterLayout->setSpacing(0); - filterLayout->setAlignment(Qt::AlignHCenter); - filterLayout->setContentsMargins(0, 0, 0, 0); - layout->addLayout(filterLayout); - i += 3; - } - setLayout(layout); -} - -void FilterBankWidget::setValue(int filter, int value) -{ - double result = 0; - int channel = filter + 9; - - if (channel == HP_FREQ) { - result = double((value * 1.31) + 16.0f); // 16 - 350 - } else if (channel == LOW_FREQ) { - result = 30 + (value * 1.647); // 30 - 450 - } else if (channel == LOW_Q) { - result = (double)(value / 32.0f) + 0.1f; // 0.1 - 8 - } else if (channel == LOW_GAIN) { - result = (double)(value / 21.25f) - 6.023528412f; - } else if (channel == MIDLOW_FREQ) { - result = 200 + (value * 9.019607843); // 200 - 450 - } else if (channel == MIDLOW_Q) { - result = (double)( value / 64.0f) + 0.10; // 0.1 - 4 - } else if (channel == MIDLOW_GAIN) { - result = (double)(value / 7.0833333333333f) - 18.0f; - } else if (channel == MIDHIGH_FREQ) { - result = 600 + (value * 25.09803922); // 600 - 7000 - } else if (channel == MIDHIGH_Q) { - result = (double)( value / 64.0f) + 0.10; // 0.1 - 4 - } else if (channel == MIDHIGH_GAIN) { - result = (double)(value / 7.0833333333333f) - 18.0f; - } else if (channel == HIGH_FREQ) { - result = 1500 + (value * 56.8627451); // 1500 - 16000 - } else if (channel == HIGH_Q) { - result = (double)( value / 32.0f) + 0.1f; - } else if (channel == HIGH_GAIN) { - result = (double)(value / 21.25) - 6.023528412f; - } else - result = (double)value; - fb[filter]->setValue(result); -} - -void FilterBankWidget::bypassChanged(int value) -{ - if (value == 0) - emit setBypass(false); - else - emit setBypass(true); -} diff --git a/src/filterbankwidget.h b/src/filterbankwidget.h deleted file mode 100644 index bb36ef2..0000000 --- a/src/filterbankwidget.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef FILTERBANKWIDGET_H -#define FILTERBANKWIDGET_H - -#include -#include -#include -#include "clickabledoublespinbox.h" - - -class FilterBankWidget : public QWidget -{ - Q_OBJECT -public: - explicit FilterBankWidget(QWidget *parent = nullptr); - ClickableDoubleSpinBox *fb[13]; - QCheckBox *m_bypass; - void setValue(int filter, int value); - -private slots: - void bypassChanged(int value); - -signals: - void setBypass(bool value); -}; - -#endif // FILTERBANKWIDGET_H diff --git a/src/libremediaserver-audio-gui.cpp b/src/libremediaserver-audio-gui.cpp deleted file mode 100644 index 62b4544..0000000 --- a/src/libremediaserver-audio-gui.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - - Libre Media Server Audio - An Open source Media Server for arts and performing. - (c) Criptomart - Santiago Noreña 2012-2024 - https://git.criptomart.net/libremediaserver - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "libremediaserver-audio-gui.h" - - -libreMediaServerAudioUi::libreMediaServerAudioUi(QWidget *parent) - : QMainWindow(parent) -{ - ui.setupUi(this); - this->setWindowTitle(VERSION); - m_aw = new AudioWidget(this); - setCentralWidget(m_aw); - m_dmxWidget = new dmxWidget(this); - QDockWidget *topWidget = new QDockWidget(tr("Master"), this); - topWidget->setAllowedAreas(Qt::TopDockWidgetArea); - topWidget->setWidget(m_dmxWidget); - topWidget->setContentsMargins(0, 0, 0, 0); - addDockWidget(Qt::TopDockWidgetArea, topWidget); - connect(ui.actionLaunch_OLA_Setup, SIGNAL(triggered()), this, SLOT(olasetup())); - this->setContentsMargins(0, 0, 0, 0); - this->setStyleSheet( - "margin: 0px;" - "color: white;" - "background-color: #3f3038;" - "selection-color: blue;" - "selection-background-color: green" - ); -} - -libreMediaServerAudioUi::~libreMediaServerAudioUi() -{ -} - -void libreMediaServerAudioUi::olasetup() -{ - QWebView *view = new QWebView(); - view->load(QUrl("http://localhost:9090/ola.html")); - view->show(); -} diff --git a/src/libremediaserver-audio-gui.h b/src/libremediaserver-audio-gui.h deleted file mode 100644 index 50b4d8b..0000000 --- a/src/libremediaserver-audio-gui.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - Libre Media Server Audio - An Open source Media Server for arts and performing. - (c) Criptomart - Santiago Noreña 2012-2024 - https://git.criptomart.net/libremediaserver - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef LIBREMEDIASERVERAUDIOUI_H -#define LIBREMEDIASERVERAUDIOUI_H - -#include -#include - -#include "audiowidget.h" -#include "dmxwidget.h" -#include "defines.h" -#include "ui_libremediaserver-audio-gui.h" - -class libreMediaServerAudioUi : public QMainWindow -{ - Q_OBJECT - -public: - libreMediaServerAudioUi(QWidget *parent = 0); - virtual ~libreMediaServerAudioUi(); - AudioWidget *m_aw; - dmxWidget *m_dmxWidget; - -private: - Ui::LibreMediaServerAudio ui; - -private slots: - void olasetup(); -}; - -#endif // LIBREMEDIASERVERAUDIOUI_H diff --git a/src/libremediaserver-audio-gui.ui b/src/libremediaserver-audio-gui.ui deleted file mode 100644 index ad4c061..0000000 --- a/src/libremediaserver-audio-gui.ui +++ /dev/null @@ -1,55 +0,0 @@ - - - Santi Noreña lms@criptomart.net - LibreMediaServerAudio - - - - 0 - 0 - 400 - 400 - - - - - Unifont - 12 - 75 - true - - - - LibreMediaServer - - - - ../../../../criptomart/artwork/logo_v2_criptomart.net.png../../../../criptomart/artwork/logo_v2_criptomart.net.png - - - - - - 0 - 0 - 400 - 21 - - - - - File - - - - - - - - OLA Setup - - - - - - diff --git a/src/libremediaserver-audio.cpp b/src/libremediaserver-audio.cpp index c9d2dd3..d34abe9 100644 --- a/src/libremediaserver-audio.cpp +++ b/src/libremediaserver-audio.cpp @@ -1,8 +1,7 @@ /* + Libre Media Server - A Media Server Sotfware for stage and performing - Libre Media Server Audio - An Open source Media Server for arts and performing. - (c) Criptomart - Santiago Noreña 2012-2024 - https://git.criptomart.net/libremediaserver + Copyright (C) 2012-2024 Santi Noreña lms@criptomart.net This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,271 +19,192 @@ #include "libremediaserver-audio.h" +// QTextEdit * libreMediaServerAudio::textEdit = 0; -libreMediaServerAudio::libreMediaServerAudio() +libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent) + : QMainWindow(parent) { - m_settings = Settings::getInstance(); - m_settings->readFile(); - m_ui = m_settings->getShowUi(); - m_layersQty = m_settings->getLayersNumber(); - m_dmxSettings = m_settings->getDmxSettings(); - m_mediaLibrary = new MediaLibrary; - m_mediaLibrary->initMediaLibrary(); - for (uint i = 0; i < m_layersQty; i++) { - m_currentMedia[i] = ""; - m_currentStatus[i] = Status::Iddle; -#ifdef NOGUI - m_updateUi[i][0] = -1; - m_updateUi[i][1] = -1; - m_updateUi[i][2] = -1; - m_updateUi[i][3] = -1; -#endif - } - if (!m_mae.startEngine(m_layersQty, m_settings->getAudioDeviceId(), m_settings->getAudioDeviceQty())) { - cout << "Can not start Audio Engine!" << endl; - exit(-1); - } - m_ola = new olaThread(this, m_layersQty); - Q_CHECK_PTR(m_ola); - m_ola->blockSignals(true); - m_ola->registerUniverse(); -#ifdef NOGUI - m_ola->start(QThread::TimeCriticalPriority ); -#endif - m_ola->blockSignals(false); - cout << "Core init Complete." << endl; + Q_UNUSED(args); + ui.setupUi(this); + this->setWindowTitle(VERSION); + + // Lee la configuración por defecto + Settings::getInstance()->readFile(); + + // Inicia el objeto de conexión a ola + ola = new olaThread(); + Q_CHECK_PTR(ola); +/* + if (args.contains("-log")) { + // Inicia el widget Terminal + textEdit = new QTextEdit; + textEdit->setReadOnly(true); + QDockWidget *bottomWidget = new QDockWidget(tr("Terminal"), this); + bottomWidget->setAllowedAreas(Qt::BottomDockWidgetArea); + bottomWidget->setWidget(textEdit); + addDockWidget(Qt::BottomDockWidgetArea, bottomWidget); + connect(ola, SIGNAL(toTerminal(QString)), + textEdit, SLOT(append(QString)), Qt::QueuedConnection); + }*/ + + /* connect(MediaLibrary::getInstance(), SIGNAL(debug(QString)), + textEdit, SLOT(append(QString)), Qt::QueuedConnection); + + connect(MediaLibrary::getInstance(), SIGNAL(warning(QString)), + textEdit, SLOT(append(QString)), Qt::QueuedConnection); + */ + + this->setWindowTitle(VERSION); + +// qDebug() << QDate::currentDate().toString() << " "<< QTime::currentTime().toString(); + qDebug() << VERSION; + qDebug() << COPYRIGHT; + qDebug() << LICENSE; + + setCentralWidget(AudioWidget::getInstance()); + + // Inicia el widget Master. + amw = new AudioMasterWidget(this); + QDockWidget *topWidget = new QDockWidget(tr("Master"), this); + topWidget->setAllowedAreas(Qt::TopDockWidgetArea); + topWidget->setWidget(amw); + addDockWidget(Qt::TopDockWidgetArea, topWidget); + + // Conectamos los menus + 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())); + + connect(Settings::getInstance(), SIGNAL( registerUniverse(int) ), + ola, SLOT( registerUniverse(int) ) ); + ola->registerUniverse(); // register now all the universes + ola->blockSignals(true); + connect(ola, SIGNAL (layerReceived()), + amw, SLOT(updateWatchDMX())); + + // Inicia la media Library + MediaLibrary::getInstance()->initMediaLibrary(); + + // Inicia la lectura de datos DMX + ola->start(QThread::TimeCriticalPriority ); + ola->blockSignals(false); + connect(ola, SIGNAL( dmxOutput(int, int, int) ), + this, SLOT( dmxInput(int, int, int) ) ); + qDebug("Init Complete"); } +/////////////////////////////////////////////////////////////////// +// Destructor +/////////////////////////////////////////////////////////////////// + libreMediaServerAudio::~libreMediaServerAudio() { - m_ola->stop(); - m_mae.stopEngine(); - sleep(1); - cout << "bye!" << endl; - exit(0); + ola->stop(); +// qDebug() << QDate::currentDate() << QTime::currentTime(); +// qDebug() << "********************************************************************************"; } -void libreMediaServerAudio::loadMedia(int layer, int folder, int file) +/////////////////////////////////////////////////////////////////// +// Menu File +/////////////////////////////////////////////////////////////////// + +// Open a configuration File +void libreMediaServerAudio::openFile() { - QString mediaFile = m_mediaLibrary->requestNewFile(folder, file); - if (strcmp(mediaFile.toLatin1().constData(), m_currentMedia[layer].toLatin1().constData()) == 0) + QFileDialog dialog(this); + if (!dialog.exec()) return; - if (QFile::exists(mediaFile)){ - m_mae.loadMedia(layer, mediaFile.toLatin1().data()); - m_currentMedia[layer] = mediaFile; -#ifndef NOGUI - if (m_ui) - m_lmsUi->m_aw->mediaLoaded(layer, mediaFile, m_mae.getDuration(layer)); -#endif - m_mae.printFormatInfo(layer); - } - if (m_currentStatus[layer] == Status::PlayingFolder \ - || (m_currentStatus[layer] == Status::PlayingFolderLoop)\ - || (m_currentStatus[layer] == Status::PlayingFolderRandom)) { - m_played.append(file); - } else if (m_currentStatus[layer] == Status::PlayingOnce \ - || m_currentStatus[layer] == Status::PlayingLoop) { - m_played.clear(); - } + QStringList fileNames; + fileNames = dialog.selectedFiles(); + QFile file(fileNames.at(0)); +// open(&file); +} +// Save configuration 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(); +} + + +/////////////////////////////////////////////////////////////////// +// OLA Stuff +/////////////////////////////////////////////////////////////////// + +void libreMediaServerAudio::olasetup() +{ + QWebView *view = new QWebView(); + view->load(QUrl("http://localhost:9090/ola.html")); + view->show(); } void libreMediaServerAudio::dmxInput(int layer, int channel, int value) { - if (layer >= MAX_LAYERS || channel >= LAYER_CHANNELS) +// This qDebug slows all the program. Uncomment only for debugging purpouse and comment again in normal use +// qDebug() << tr("olaInterface|") << "newdmx layer" << layer << "channel" << channel << "value" << value; + if (layer > LAYER_CHANNELS) return; QString mediaFile = NULL; int aux; - if (channel == VOLUME_COARSE || channel == VOLUME_FINE) { - m_mae.volChanged(layer, value); - m_updateUi[layer][0] = value; - } else if (channel == PAN) { - m_mae.panChanged(layer, value); - m_updateUi[layer][1] = value; - } else if (channel == PITCH) { - m_mae.pitchChanged(layer, value); - m_updateUi[layer][2] = value; - } else if (channel == ENTRY_POINT_COARSE || channel == ENTRY_POINT_FINE) { - m_mae.setCursor(layer, value); - m_updateUi[layer][3] = value; - } else if (channel == PLAYBACK && value > 0) { + qreal f; + switch(channel){ + case DMX_FOLDER:// Folder + aux = ola->getValue(layer, DMX_FILE); + mediaFile = MediaLibrary::getInstance()->requestNewFile(value, aux); + if (QFile::exists(mediaFile)) + AudioWidget::getInstance()->mediaLoaded(layer, mediaFile); + break; + case DMX_FILE:// File + aux = ola->getValue(layer, DMX_FOLDER); + mediaFile = MediaLibrary::getInstance()->requestNewFile(aux, value); + if (QFile::exists(mediaFile)) + AudioWidget::getInstance()->mediaLoaded(layer, mediaFile); + break; + case VOLUME_COARSE: + f = ( value * 0x100 ) + ola->getValue(layer, VOLUME_FINE); + AudioWidget::getInstance()->volChanged(layer, f / 655.35); + break; + case VOLUME_FINE: + f = ( ola->getValue(layer, VOLUME_COARSE) * 0x100 ) + value; + AudioWidget::getInstance()->volChanged(layer, f / 655.35); + break; + case PAN: + AudioWidget::getInstance()->panChanged(layer, value); + break; + case PITCH: + AudioWidget::getInstance()->pitchChanged(layer, value); + break; + case PLAYBACK: + if (value == 0) + break; aux = value / 25; - Status s = m_currentStatus[layer]; - if (aux == 0) - s = Status::PlayingOnce; - else if (aux == 1) - s = Status::Stopped; - else if (aux == 2) - s = Status::Paused; - else if (aux == 3) - s = Status::PlayingLoop; - else if (aux == 4) - s = Status::PlayingFolder; - else if (aux == 5) - s = Status::PlayingFolderLoop; - else if (aux == 6) - s = Status::PlayingFolderRandom; - m_mae.playbackChanged(layer, s); - m_currentStatus[layer] = s; - qInfo() << "Layer" << layer << statusToString(s); -#ifndef NOGUI - if (m_ui) { - m_lmsUi->m_aw->playbackChanged(layer, s); - m_updateUi[layer][3] = 1; - m_played.clear(); - m_played.append(m_ola->getValue(layer, DMX_FILE)); + switch (aux) { + case 0 : + AudioWidget::getInstance()->playbackChanged(layer, PlayingOnce); + break; + case 1 : + AudioWidget::getInstance()->playbackChanged(layer, Stopped); + break; + case 2 : + AudioWidget::getInstance()->playbackChanged(layer, Paused); + break; + case 3 : + AudioWidget::getInstance()->playbackChanged(layer, PlayingLoop); + break; } -#endif - } else if (channel >= HP_FREQ) { - m_mae.filterParamChanged(layer, channel, value); -#ifndef NOGUI - if (m_ui) { - m_lmsUi->m_aw->filterParamChanged(layer, channel, value); - m_played.clear(); - m_played.append(m_ola->getValue(layer, DMX_FILE)); - } -#endif - } -} -#ifndef NOGUI -void libreMediaServerAudio::refreshUi() { - if (!m_ui) return; - for (int i= 0; i < m_settings->getLayersNumber(); i++ ) { - if (m_updateUi[i][0] >= 0) { - m_lmsUi->m_aw->volChanged(i, m_updateUi[i][0]); - m_updateUi[i][0] = -1; - } - if (m_updateUi[i][1] >= 0) { - m_lmsUi->m_aw->panChanged(i, m_updateUi[i][1]); - m_updateUi[i][1] = -1; - } - if (m_updateUi[i][2] >= 0) { - m_lmsUi->m_aw->pitchChanged(i, m_updateUi[i][2]); - m_updateUi[i][2] = -1; - } - if (m_updateUi[i][3] >= 0 \ - || m_currentStatus[i] == Status::PlayingOnce\ - || m_currentStatus[i] == Status::PlayingLoop\ - || m_currentStatus[i] == Status::PlayingFolder\ - || m_currentStatus[i] == Status::PlayingFolderLoop - || m_currentStatus[i] == Status::PlayingFolderRandom) { - m_lmsUi->m_aw->cursorChanged(i, m_mae.getCursor(i)); - m_updateUi[i][3] = -1; - } - m_lmsUi->m_aw->levelChanged(i, m_mae.getLevel(i)); - if (m_mae.getAtEnd(i)) { - if (m_currentStatus[i] == Status::PlayingOnce) { - m_currentStatus[i] = Status::Stopped; - m_lmsUi->m_aw->playbackChanged(i, Status::Stopped); - } - if (m_currentStatus[i] == Status::PlayingFolder) { - uint last = m_played.last(); - int folder = m_ola->getValue(i, DMX_FOLDER); - last++; - if (last < m_mediaLibrary->getMediaFolderCount(folder)) { - this->loadMedia(i, folder, last); - m_mae.playbackChanged(i, Status::PlayingFolder); - } - else { - m_currentStatus[i] = Status::Stopped; - m_lmsUi->m_aw->playbackChanged(i, Status::Stopped); - } - } - else if (m_currentStatus[i] == Status::PlayingFolderLoop) { - uint last = m_played.last(); - int folder = m_ola->getValue(i, DMX_FOLDER); - last++; - if (last >= m_mediaLibrary->getMediaFolderCount(folder)) { - this->loadMedia(i, folder, 0); - m_mae.playbackChanged(i, Status::PlayingFolderLoop); - } else { - this->loadMedia(i, folder, last); - m_mae.playbackChanged(i, Status::PlayingFolder); - } - } - else if (m_currentStatus[i] == Status::PlayingFolderRandom) { - int last = -1; - int folder = m_ola->getValue(i, DMX_FOLDER); - if (uint(abs(m_played.size())) >= m_mediaLibrary->getMediaFolderCount(folder)) - m_played.clear(); - while (last == -1) { - last = rand() % m_mediaLibrary->getMediaFolderCount(folder); - if (m_played.contains(last)) - last = -1; - } - this->loadMedia(i, folder, last); - m_mae.playbackChanged(i, Status::PlayingFolderRandom); - } - } - } -} - -void libreMediaServerAudio::setUi(libreMediaServerAudioUi *lmsUi) -{ - m_lmsUi = lmsUi; - m_ui = true; - connect(m_ola, SIGNAL(universeReceived(int)), m_lmsUi->m_dmxWidget, SLOT(updateWatchDMX(int))); - connect(m_lmsUi->m_aw, SIGNAL(uiSliderChanged(int, Slider, int)), this, SLOT(uiSliderChanged(int, Slider, int))); - connect(m_lmsUi->m_aw, SIGNAL(uiPlaybackChanged(int, Status)), this, SLOT(uiPlaybackChanged(int, Status))); - connect(m_lmsUi->m_aw, SIGNAL(uiLoadMedia(int, QString)), this, SLOT(uiLoadMedia(int, QString))); - m_refreshUi = new QTimer(this); - connect(m_refreshUi, SIGNAL(timeout()), this, SLOT(refreshUi())); - m_refreshUi->start(UI_REFRESH_TIME); - m_ola->start(QThread::TimeCriticalPriority ); - for (uint i = 0; i < m_settings->getAudioDeviceQty(); i++) { - char *name = m_mae.getDeviceName(i); - m_lmsUi->m_aw->busNameChanged(i, name); - } -}; - -// From Ui widgets -void libreMediaServerAudio::uiSliderChanged(int layer, Slider s, int value) -{ - switch (s){ - case Slider::Volume: - m_mae.volChanged(layer, value); - break; - case Slider::Pan: - m_mae.panChanged(layer, value); - break; - case Slider::Pitch: - m_mae.pitchChanged(layer, value); - break; - case Slider::Bypass: - m_mae.setBypass(m_dmxSettings.at(layer).audioDevice, layer, value); - break; - case Slider::Bus1: - m_mae.filterParamChanged(layer, SEND1, value / 255.0f); - break; - case Slider::Bus2: - m_mae.filterParamChanged(layer, SEND2, value / 255.0f); + default: break; } } - -void libreMediaServerAudio::uiPlaybackChanged(int layer, Status s) -{ - ma_result result; - - result = m_mae.playbackChanged(layer, s); - if (result == MA_SUCCESS) { - m_currentStatus[layer] = s; - } else { - qWarning() << "ui playback change error " << result << " status " << statusToString(s) << "layer" << layer; - } -} - -void libreMediaServerAudio::uiLoadMedia(int layer, QString mediaFile) -{ - ma_result result; - - if (strcmp(mediaFile.toLatin1().constData(), m_currentMedia[layer].toLatin1().constData()) == 0) - return; - result = m_mae.loadMedia(layer, mediaFile.toLatin1().data()); - if (result == MA_SUCCESS) { - m_currentMedia[layer] = mediaFile; - m_lmsUi->m_aw->mediaLoaded(layer, mediaFile, m_mae.getDuration(layer)); - } else { - qWarning() << "ui load media error" << result << "file" << mediaFile << "layer" << layer; - } -} -#endif diff --git a/src/libremediaserver-audio.h b/src/libremediaserver-audio.h index 898d408..babed0e 100644 --- a/src/libremediaserver-audio.h +++ b/src/libremediaserver-audio.h @@ -1,7 +1,6 @@ /* - Libre Media Server Audio - An Open source Media Server for arts and performing. - (c) Criptomart - Santiago Noreña 2012-2024 - https://git.criptomart.net/libremediaserver + Libre Media Server - A Media Server Sotfware for stage and performing + Copyright (C) 2012-2014 Santiago Noreña libremediaserver@gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,56 +19,87 @@ #ifndef LIBREMEDIASERVERAUDIO_H #define LIBREMEDIASERVERAUDIO_H +#include +#include +#include +#include +#include +#include +#include -#include -using namespace std; +#include +#include #include "medialibrary.h" -#include "miniaudioengine.h" -#include "olathread.h" +#include "audiowidget.h" #include "settings.h" +#include "olathread.h" +#include "audiomasterwidget.h" #include "defines.h" -#ifndef NOGUI -#include "libremediaserver-audio-gui.h" -#endif +#include "settingsdialog.h" -class libreMediaServerAudio : public QObject +#include "ui_libremediaserver-audio.h" + +class QMenu; + +class libreMediaServerAudio : public QMainWindow { Q_OBJECT public: - libreMediaServerAudio(); + + libreMediaServerAudio (QStringList args, QWidget *parent = 0); virtual ~libreMediaServerAudio(); - void dmxInput(int layer, int channel, int value); - void loadMedia(int layer, int folder, int file); -#ifndef NOGUI - void setUi(libreMediaServerAudioUi *lmsUi); - bool inline getShowUi() { return m_settings->getShowUi(); } -#endif + + Ui::LibreMediaServerAudio ui; + +// static QTextEdit *textEdit; // Terminal de feedback + +protected: private: - olaThread *m_ola; - MediaLibrary *m_mediaLibrary; - MiniAudioEngine m_mae; - Settings *m_settings; - QString m_currentMedia[MAX_LAYERS]; - Status m_currentStatus[MAX_LAYERS]; - QList m_dmxSettings; - bool m_ui; - QList m_played; - uint m_layersQty; -#ifndef NOGUI - QTimer *m_refreshUi; - libreMediaServerAudioUi *m_lmsUi; - float m_updateUi[MAX_LAYERS][4]; + +// void MessageHandler(QtMsgType type, const QMessageLogContext &logcontext, const QString &msg); + AudioMasterWidget *amw; + + olaThread *ola; + + void open_start(); + void save_finish(); + void open(QFile *file); + void save(QFile *file); + +public slots: +// inline void toTerminal(QString msg) { textEdit->append(msg); } private slots: - void refreshUi(); - void uiSliderChanged(int layer, Slider s, int value); - void uiPlaybackChanged(int layer, Status s); - void uiLoadMedia(int layer, QString s); -#endif + /** + * @brief Shows the OLA web setup page + */ + void olasetup(); + + /** + * @brief Parser for new dmx data arriving + * @param layer + * @param channel + * @param value + */ + void dmxInput(int layer, int channel, int value); + + // Menu File + /** + * @brief REad from dis a configuration file + */ + void openFile(); + /** + * @brief Write to disk a configuration file + */ + void saveFile(); + /** + * @brief OPen the settings dialog + */ + void settings(); }; #endif // LIBREMEDIASERVERAUDIO_H diff --git a/src/libremediaserver-audio.ui b/src/libremediaserver-audio.ui new file mode 100644 index 0000000..b4cec80 --- /dev/null +++ b/src/libremediaserver-audio.ui @@ -0,0 +1,84 @@ + + + Santi Noreña belfegor@gmail.com + LibreMediaServerAudio + + + + 0 + 0 + 126 + 89 + + + + LibreMediaServer + + + + + + 0 + 0 + 126 + 29 + + + + + File + + + + + + + + + + + Exit + + + + + Open Configuration... + + + + + Save Configuration... + + + + + Settings... + + + + + false + + + Init + + + + + IP Address + + + + + Make Thumbs + + + + + OLA Setup... + + + + + + diff --git a/src/ma_writer_node.c b/src/ma_writer_node.c deleted file mode 100644 index 5b20f66..0000000 --- a/src/ma_writer_node.c +++ /dev/null @@ -1,250 +0,0 @@ -#include "ma_writer_node.h" -#include "miniaudio.c" -MA_API ma_writer_node_config ma_writer_node_config_init(ma_uint32 channels, ma_uint32 bufferSizeInFrames, ma_pcm_rb *rb) -{ - ma_writer_node_config config; - - MA_ZERO_OBJECT(&config); - config.nodeConfig = ma_node_config_init(); - config.channels = channels; - config.bufferSizeInFrames = bufferSizeInFrames; - config.pBuffer = rb; - - return config; -} - -static void ma_writer_node_process_pcm_frames(ma_node* pNode, const float** ppFramesIn, ma_uint32* pFrameCountIn, float** ppFramesOut, ma_uint32* pFrameCountOut) -{ - ma_writer_node* pWriteNode = (ma_writer_node*)pNode; - - MA_ASSERT(pWriteNode != NULL); - MA_ASSERT(ma_node_get_input_bus_count(&pWriteNode->baseNode) == 2); - - if (*pFrameCountIn > 0) { - void *pWriteBuffer = NULL; - ma_pcm_rb_acquire_write(pWriteNode->pBuffer, pFrameCountIn, &pWriteBuffer); - if (pWriteBuffer != NULL) { - ma_copy_pcm_frames(pWriteBuffer, ppFramesIn[1], *pFrameCountIn, ma_format_f32, pWriteNode->channels); - ma_pcm_rb_commit_write(pWriteNode->pBuffer, *pFrameCountIn); - } - } - ma_copy_pcm_frames(ppFramesOut[0], ppFramesIn[0], *pFrameCountOut, ma_format_f32, pWriteNode->channels); -} - -static ma_node_vtable g_ma_writer_node_vtable = -{ - ma_writer_node_process_pcm_frames, - NULL, - 2, - 1, - 0 -}; - -MA_API ma_result ma_writer_node_init(ma_node_graph* pNodeGraph, const ma_writer_node_config* pConfig, const ma_allocation_callbacks* pAllocationCallbacks, ma_writer_node* pWriteNode) -{ - ma_result result; - ma_node_config baseConfig; - ma_uint32 inputChannels[2]; - ma_uint32 outputChannels[1]; - - if (pWriteNode == NULL || pConfig == NULL || pConfig->pBuffer == NULL \ - || (pConfig->channels > MA_MAX_NODE_BUS_COUNT) ) { - return MA_INVALID_ARGS; - } - - MA_ZERO_OBJECT(pWriteNode); - inputChannels[0] = pConfig->channels; - inputChannels[1] = pConfig->channels; - outputChannels[0] = pConfig->channels; - baseConfig = pConfig->nodeConfig; - baseConfig.vtable = &g_ma_writer_node_vtable; - baseConfig.pInputChannels = inputChannels; - baseConfig.pOutputChannels = outputChannels; - - result = ma_node_init(pNodeGraph, &baseConfig, pAllocationCallbacks, &pWriteNode->baseNode); - if (result != MA_SUCCESS) { - return result; - } - pWriteNode->bufferSizeInFrames = pConfig->bufferSizeInFrames; - pWriteNode->pBuffer = pConfig->pBuffer; - pWriteNode->channels = pConfig->channels; - return MA_SUCCESS; -} - -MA_API void ma_writer_node_uninit(ma_writer_node* pWriteNode, const ma_allocation_callbacks* pAllocationCallbacks) -{ - ma_node_uninit(&pWriteNode->baseNode, pAllocationCallbacks); -} - -/* - * Data Source Ring Buffer - */ - -ma_result ma_data_source_rb_read(ma_data_source* pDataSource, void* pFramesOut, ma_uint64 frameCount, ma_uint64* pFramesRead) -{ - ma_data_source_rb* ds = (ma_data_source_rb*)pDataSource; - - ma_uint32 pcmFramesAvailableInRB = 0; - ma_uint32 pcmFramesProcessed = 0; - while (pcmFramesProcessed < frameCount) { - pcmFramesAvailableInRB = ma_pcm_rb_available_read(ds->rb); - if (pcmFramesAvailableInRB == 0) { - break; - } - ma_uint32 framesToRead = frameCount - pcmFramesProcessed; - if (framesToRead > pcmFramesAvailableInRB) { - framesToRead = pcmFramesAvailableInRB; - } - void* pReadBuffer = NULL; - ma_pcm_rb_acquire_read(ds->rb, &framesToRead, &pReadBuffer); - if (pReadBuffer != NULL) { - ma_copy_pcm_frames(pFramesOut, pReadBuffer, framesToRead, ma_format_f32, 2); - ma_pcm_rb_commit_read(ds->rb, framesToRead); - pcmFramesProcessed += framesToRead; - } - else { - break; - } - } - *pFramesRead += pcmFramesProcessed; - return MA_SUCCESS; -} - -ma_result ma_data_source_rb_seek(ma_data_source* pDataSource, ma_uint64 frameIndex) -{ - (void)pDataSource; - (void)frameIndex; - return MA_NOT_IMPLEMENTED; -} - -ma_result ma_data_source_rb_get_data_format(ma_data_source* pDataSource, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap) -{ - (void)pDataSource; - *pFormat = ma_format_f32; - *pChannels = 2; - *pSampleRate = ma_standard_sample_rate_48000; - return MA_SUCCESS; -} - -ma_result ma_data_source_rb_get_cursor(ma_data_source* pDataSource, ma_uint64* pCursor) -{ - (void)pDataSource; - *pCursor = 0; - return MA_NOT_IMPLEMENTED; -} - -ma_result ma_data_source_rb_get_length(ma_data_source* pDataSource, ma_uint64* pLength) -{ - (void)pDataSource; - *pLength = 0; - return MA_NOT_IMPLEMENTED; -} - -ma_data_source_vtable g_ma_data_source_rb_vtable = -{ - ma_data_source_rb_read, - ma_data_source_rb_seek, - ma_data_source_rb_get_data_format, - ma_data_source_rb_get_cursor, - ma_data_source_rb_get_length -}; - -ma_result ma_data_source_rb_init(ma_data_source_rb* pMyDataSource, ma_pcm_rb *ringBuffer) -{ - ma_result result; - ma_data_source_config baseConfig; - - baseConfig = ma_data_source_config_init(); - baseConfig.vtable = &g_ma_data_source_rb_vtable; - - result = ma_data_source_init(&baseConfig, &pMyDataSource->base); - if (result != MA_SUCCESS) { - return result; - } - - pMyDataSource->rb = ringBuffer; - - return MA_SUCCESS; -} - -void ma_data_source_rb_uninit(ma_data_source_rb* pMyDataSource) -{ - ma_data_source_uninit(&pMyDataSource->base); -} - -/* - * vumeter - */ - -MA_API ma_vumeter_node_config ma_vumeter_node_config_init(ma_uint32 channels, ma_uint32 format, ma_uint32 sampleRate) -{ - ma_vumeter_node_config config; - - MA_ZERO_OBJECT(&config); - config.nodeConfig = ma_node_config_init(); - config.channels = channels; - config.sampleRate = sampleRate; - config.format = format; - - return config; -} - -static void ma_vumeter_node_process_pcm_frames(ma_node* pNode, const float** ppFramesIn, ma_uint32* pFrameCountIn, float** ppFramesOut, ma_uint32* pFrameCountOut) -{ - ma_vumeter_node* pVumeterNode = (ma_vumeter_node*)pNode; - - MA_ASSERT(pVumeterNode != NULL); - MA_ASSERT(ma_node_get_input_bus_count(&pVumeterNode->baseNode) == 1); - - for (uint i = 0; i < *pFrameCountIn; i++) { - float input = fabsf(ppFramesIn[0][i]); - pVumeterNode->level += pVumeterNode->alpha * (input - pVumeterNode->level); - } - ma_copy_pcm_frames(ppFramesOut[0], ppFramesIn[0], *pFrameCountOut, pVumeterNode->format, pVumeterNode->channels); -} - -static ma_node_vtable g_ma_vumeter_node_vtable = -{ - ma_vumeter_node_process_pcm_frames, - NULL, - 1, - 1, - 0 -}; - -MA_API ma_result ma_vumeter_node_init(ma_node_graph* pNodeGraph, const ma_vumeter_node_config* pConfig, const ma_allocation_callbacks* pAllocationCallbacks, ma_vumeter_node* pVumeterNode) -{ - ma_result result; - ma_node_config baseConfig; - ma_uint32 inputChannels[1]; - ma_uint32 outputChannels[1]; - - if (pVumeterNode == NULL || pConfig == NULL \ - || (pConfig->channels > MA_MAX_NODE_BUS_COUNT) ) { - return MA_INVALID_ARGS; - } - - MA_ZERO_OBJECT(pVumeterNode); - inputChannels[0] = pConfig->channels; - outputChannels[0] = pConfig->channels; - baseConfig = pConfig->nodeConfig; - baseConfig.vtable = &g_ma_vumeter_node_vtable; - baseConfig.pInputChannels = inputChannels; - baseConfig.pOutputChannels = outputChannels; - - result = ma_node_init(pNodeGraph, &baseConfig, pAllocationCallbacks, &pVumeterNode->baseNode); - if (result != MA_SUCCESS) { return result; - } - pVumeterNode->sampleRate = pConfig->sampleRate; - pVumeterNode->channels = pConfig->channels; - pVumeterNode->format = pConfig->format; - pVumeterNode->level = 0; - pVumeterNode->TC = 0.250f; - pVumeterNode->alpha = 1.0 - expf( (-2.0 * M_PI) / (pVumeterNode->TC * pConfig->sampleRate)); - return MA_SUCCESS; -} - -MA_API void ma_vumeter_node_uninit(ma_vumeter_node* pVumeterNode, const ma_allocation_callbacks* pAllocationCallbacks) -{ - ma_node_uninit(&pVumeterNode->baseNode, pAllocationCallbacks); -} diff --git a/src/ma_writer_node.h b/src/ma_writer_node.h deleted file mode 100644 index 3e03df5..0000000 --- a/src/ma_writer_node.h +++ /dev/null @@ -1,85 +0,0 @@ -/* Include ma_writer_node.h after miniaudio.h */ -#ifndef ma_writer_node_h -#define ma_writer_node_h - -#ifdef __cplusplus -extern "C" { -#endif - -#include "miniaudio.h" - -/* - * writer - */ - -typedef struct -{ - ma_node_config nodeConfig; - ma_uint32 channels; - ma_uint32 bufferSizeInFrames; - ma_pcm_rb *pBuffer; -} ma_writer_node_config; - -MA_API ma_writer_node_config ma_writer_node_config_init(ma_uint32 channels, ma_uint32 bufferSizeInFrames, ma_pcm_rb *rb); - -typedef struct -{ - ma_node_base baseNode; - ma_uint32 bufferSizeInFrames; - ma_pcm_rb *pBuffer; - ma_uint32 channels; -} ma_writer_node; - -MA_API ma_result ma_writer_node_init(ma_node_graph* pNodeGraph, const ma_writer_node_config* pConfig, const ma_allocation_callbacks* pAllocationCallbacks, ma_writer_node* pWriteNode); -MA_API void ma_writer_node_uninit(ma_writer_node* pWriteNode, const ma_allocation_callbacks* pAllocationCallbacks); -/** - * data source ring buffer - */ - -typedef struct -{ - ma_data_source_base base; - ma_pcm_rb *rb; -} ma_data_source_rb; - -ma_result ma_data_source_rb_read(ma_data_source* pDataSource, void* pFramesOut, ma_uint64 frameCount, ma_uint64* pFramesRead); -ma_result ma_data_source_rb_seek(ma_data_source* pDataSource, ma_uint64 frameIndex); -ma_result ma_data_source_rb_get_data_format(ma_data_source* pDataSource, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate, ma_channel* pChannelMap, size_t channelMapCap); -ma_result ma_data_source_rb_get_cursor(ma_data_source* pDataSource, ma_uint64* pCursor); -ma_result ma_data_source_rb_get_length(ma_data_source* pDataSource, ma_uint64* pLength); -ma_result ma_data_source_rb_init(ma_data_source_rb* pMyDataSource, ma_pcm_rb *ringBuffer); -void ma_data_source_rb_uninit(ma_data_source_rb* pMyDataSource); - - -/* - * VU meter - */ -typedef struct -{ - ma_node_config nodeConfig; - ma_uint32 channels; - ma_uint32 sampleRate; - ma_uint32 format; -} ma_vumeter_node_config; - -MA_API ma_vumeter_node_config ma_vumeter_node_config_init(ma_uint32 channels, ma_uint32 format, ma_uint32 sampleRate); - -typedef struct -{ - ma_node_base baseNode; - ma_uint32 channels; - ma_uint32 sampleRate; - ma_uint32 format; - float level; - float TC; - float alpha; -} ma_vumeter_node; - -MA_API ma_result ma_vumeter_node_init(ma_node_graph* pNodeGraph, const ma_vumeter_node_config* pConfig, const ma_allocation_callbacks* pAllocationCallbacks, ma_vumeter_node* pVumeterNode); -MA_API void ma_vumeter_node_uninit(ma_vumeter_node* pVumeterNode, const ma_allocation_callbacks* pAllocationCallbacks); -MA_API inline float ma_vumeter_node_get_level(ma_vumeter_node* pVumeterNode) { return 5 * pVumeterNode->level; }; - -#ifdef __cplusplus -} -#endif -#endif /* ma_writer_node_h */ diff --git a/src/main.cpp b/src/main.cpp index 79b7a91..4797866 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,8 @@ /* + Libre Media Server - A media server for audio playback in stage arts + controlled by lingting protocols (DMX, ArtNet, ACN,...) - Libre Media Server Audio - An Open source Media Server for arts and performing. - (c) Criptomart - Santiago Noreña 2012-2024 - https://git.criptomart.net/libremediaserver + Copyright (C) 2015-2024 Santi Noreña lms@criptomart.net This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,28 +18,162 @@ along with this program. If not, see . */ -#include "main.h" +#include +//#include +//#include +#include "libremediaserver-audio.h" -bool hasUi(int &argc, char *argv[]) +// Handler for pipe the stderr to a log file and texEdit +//bool initMessageHandler = false; +//QFile outFile; +//QMutex mutex; +//QMutexLocker mutexLocker(mutex); +/* +void MessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { - for (int i = 1; i < argc; ++i) { - if (!strcmp(argv[i], "--gui")) - return true; + Q_UNUSED(context); +// mutex.lock(); + // Create the log dir and log file + if (!initMessageHandler) { + QDir dir; + if (!dir.exists("log")) { + if (!dir.mkdir("log")) { + qDebug()<<"MessageHandler: Can not create log folder"; + return; + } + } + QString filename; + QDate date = QDate::currentDate(); + QTime time = QTime::currentTime(); + filename.append("./log/log_"); + filename.append(date.toString("ddMMyy-")); + filename.append(time.toString("hhmmss.txt")); + outFile.setFileName(filename); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Append)) { + qWarning("main/MessageHandler/Qfile::open: can not open log file"); + return; + } + initMessageHandler = true; } - return false; -} + QTextStream ts(&outFile);*/ +/* if (libreMediaServerAudio::textEdit == 0) + { + QByteArray localMsg = msg.toLocal8Bit(); + switch (type) { + case QtDebugMsg: + fprintf(stderr, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function); + break; + case QtWarningMsg: + fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function); + break; + case QtCriticalMsg: + fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function); + break; + case QtFatalMsg: + fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function); + abort(); + } + } + else + { + QString txt; + switch (type) { + case QtDebugMsg: + txt.append("Debug from File: "); + txt.append(context.file); + txt.append(" Line: "); + txt.append(QString::number(context.line)); +// txt.append(" Function: "); +// txt.append(context.function); + txt.append(" Message: "); + txt.append(msg); +// libreMediaServerAudio::textEdit->append(msg);, context.file, context.line, context.function); + libreMediaServerAudio::textEdit->append(txt); + break; + case QtWarningMsg: + txt.append("Warning from File: "); + txt.append(context.file); + txt.append(" Line: "); + txt.append(QString::number(context.line)); + txt.append(" Function: "); + txt.append(context.function); + txt.append(" Message: "); + txt.append(msg); +// libreMediaServerAudio::textEdit->append(msg);, context.file, context.line, context.function); + libreMediaServerAudio::textEdit->append(txt); + abort(); + break; + case QtCriticalMsg: +// txt.append("Critical from File: "); + txt.append(context.file); + txt.append(" Line: "); + txt.append(QString::number(context.line)); + txt.append(" Function: "); + txt.append(context.function); + txt.append(" Message "); + txt.append(msg); +// libreMediaServerAudio::textEdit->append(msg);, context.file, context.line, context.function); + libreMediaServerAudio::textEdit->append(txt); + abort(); + break; + case QtFatalMsg: +// txt.append("Fatal from File: "); + txt.append(context.file); + txt.append(" Line: "); + txt.append(QString::number(context.line)); + txt.append(" Function: "); + txt.append(context.function); + txt.append(" Message: "); + txt.append(msg); +// libreMediaServerAudio::textEdit->append(msg);, context.file, context.line, context.function); + libreMediaServerAudio::textEdit->append(txt);// ts << txt << endl; + abort(); + } +// outFile.write(txt.toLatin1().constData(), txt.size()); +// ts << txt << endl; +// libreMediaServerAudio::textEdit->append(txt); + } +// mutex.unlock(); +}*/ int main(int argc, char *argv[]) { + + // ToDo: discriminar niveles de log y log a fichero segúna argumentos + /* + if (args.contains("-log")) + { + qInstallMessageHandler(MessageHandler); + }*/ +// qInstallMessageHandler(MessageHandler); QApplication app(argc, argv); - libreMediaServerAudio lms; -#ifndef NOGUI - if (hasUi(argc, argv) || lms.getShowUi()) + + QStringList args = app.arguments(); + // parse the command line + if (args.size() > 1) { - libreMediaServerAudioUi *lmsUi = new libreMediaServerAudioUi(); - lms.setUi(lmsUi); - lmsUi->show(); + if (args.contains("-v")) + { + qDebug() << VERSION; + qDebug() << COPYRIGHT; + qDebug() << LICENSE; + return 0; + } + if (args.contains("-h")) + { + qDebug() << VERSION; + qDebug() << COPYRIGHT; + qDebug() << LICENSE; + qDebug() << "Help for command line options:"; + qDebug() << "-v show the version and exits"; + qDebug() << "-log write the debug information to a log file instead stderr"; + qDebug() << "-h this help"; + return 0; + } } -#endif + libreMediaServerAudio libreMediaServerAudio(args); + libreMediaServerAudio.show(); return app.exec(); } + + diff --git a/src/main.h b/src/main.h deleted file mode 100644 index 1a96ff6..0000000 --- a/src/main.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef MAIN_H -#define MAIN_H - -#include -#include - -#include "medialibrary.h" -#include "olathread.h" -#include "settings.h" -#include "libremediaserver-audio.h" -#include "libremediaserver-audio-gui.h" -#include "defines.h" - - olaThread *m_ola; - MediaLibrary *m_mediaLibrary; - - // slots - void dmxInput(int layer, int channel, int value); - -#endif // MAIN_H diff --git a/src/medialibrary.cpp b/src/medialibrary.cpp index 8617d0f..e196001 100644 --- a/src/medialibrary.cpp +++ b/src/medialibrary.cpp @@ -1,5 +1,17 @@ #include "medialibrary.h" +#include + +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) @@ -8,6 +20,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()); @@ -32,6 +45,9 @@ void MediaLibrary::initMediaLibrary() { } } +/** + * This set every media file included in one library/folder + */ QList MediaLibrary::getMediaInformation(QDir dir) { QList mediaList; @@ -41,26 +57,34 @@ QList MediaLibrary::getMediaInformation(QDir dir) QFileInfo fileInfo; for (int i = 0; i < filelist.size(); ++i) { fileInfo = filelist.at(i); + // Update the data base with the new file mediainf.Number = i; mediainf.MediaName = fileInfo.absoluteFilePath(); - mediainf.MediaLength = 1000; + mediainf.MediaLength = 1000; // ¿?¿?¿?¿? mediaList.append(mediainf); } return mediaList; } +/** Selects one media path from the library + * + */ + QString MediaLibrary::requestNewFile(int folder, int file){ + // Select one mediafile from the media library if (!m_media) { - qWarning("MediaLibrary is not init, set a correct path."); + qWarning("Media Library not init. Set a correct path to medias library"); return NULL; } QString newfile; if (folder < m_media->size()) { if (file < m_media->at(folder).m_MediaInformation.size()) { newfile = m_media->at(folder).m_MediaInformation.at(file).MediaName; - } else - qInfo("requestNewFile: Requested file %i is greater than files in library %i", file, m_media->at(folder).m_MediaInformation.size()); - } else - qInfo("requestNewFile: Requested folder %i is greater than media libraries %i", folder, m_media->size()); + } else { + qDebug("MediaLibrary::requestNewFile(): Requested file is greater than files in library"); + } + } else { + qDebug("MediaLibrary::requestNewFile(): Requested folder is greater than media libraries"); + } return newfile; } diff --git a/src/medialibrary.h b/src/medialibrary.h index ea92bca..2f69234 100644 --- a/src/medialibrary.h +++ b/src/medialibrary.h @@ -1,42 +1,68 @@ #ifndef MEDIALIBRARY_H #define MEDIALIBRARY_H +#include #include -#include "settings.h" #include "defines.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 m_MediaInformation; // Pointer to the Medias Information List of this Library -}; +#include "settings.h" 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 + * @param int layer - file required + * @return QString the file required with full path + */ QString requestNewFile(int folder, int layer); + + /** + * @brief Inicia la biblioteca de medios + */ void initMediaLibrary(); - inline uint getMediaFolderCount(int folder) { - return m_media->at(folder).m_ElementCount; - } + +protected: + + /** + * @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: - QList *m_media; - QList getMediaInformation(QDir dir); + explicit MediaLibrary(QObject *parent = 0); + static MediaLibrary *_instance; + +// Wich structure is more efficient for us? +// QList, QMap, QSet, QVector? + QList *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 The list with the medias in a folder + */ + QList getMediaInformation(QDir dir); // Get all the information of each media file in a dir + +signals: + +public slots: + }; #endif // MEDIALIBRARY_H diff --git a/src/miniaudioengine.cpp b/src/miniaudioengine.cpp deleted file mode 100644 index edc5f78..0000000 --- a/src/miniaudioengine.cpp +++ /dev/null @@ -1,728 +0,0 @@ -#include "miniaudioengine.h" -#include "dmxPersonality.h" - -#define BIAS 1.0f -#define FILTER_ORDER 3 - -MiniAudioEngine::MiniAudioEngine() {} - -void MiniAudioEngine::audioDataCallback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount) -{ - ma_result result; - - result = ma_engine_read_pcm_frames((ma_engine*)pDevice->pUserData, pOutput, frameCount, NULL); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": error audio callback."; - } - (void)pInput; -} - -void MiniAudioEngine::stopEngine() -{ - for (uint i = 0; i < m_mae.layersQty; i++) { - if (m_mae.mediaLoaded[i]) - ma_sound_uninit(&m_mae.sounds[i]); - } - for (uint i = 0; i < m_mae.layersQty; i++) { - ma_splitter_node_uninit(&m_mae.filters[i].input, NULL); - ma_hpf_node_uninit(&m_mae.filters[i].hpf, NULL); - ma_loshelf_node_uninit(&m_mae.filters[i].loshelf, NULL); - ma_peak_node_uninit(&m_mae.filters[i].mLow, NULL); - ma_peak_node_uninit(&m_mae.filters[i].mHigh, NULL); - ma_hishelf_node_uninit(&m_mae.filters[i].hishelf, NULL); - ma_splitter_node_uninit(&m_mae.filters[i].output, NULL); - } - for (uint i = 0; i < m_mae.audioDevicesQty; i++) { - if (i > 0) { - ma_writer_node_uninit(&m_mae.sendAuxNode[i], NULL); - ma_pcm_rb_uninit(&m_mae.auxBuffers[i]); - } - ma_engine_uninit(&m_mae.engines[i]); - ma_device_uninit(&m_mae.devices[i]); - } - ma_context_uninit(&m_mae.context); - ma_resource_manager_uninit(&m_mae.resourceManager); -} - -bool MiniAudioEngine::startEngine(uint layers, uint* audioDevicesId, uint audioDevicesQty) -{ - ma_result result; - - m_mae.layersQty = layers; - m_mae.audioDevicesId = audioDevicesId; - m_mae.audioDevicesQty = audioDevicesQty; - for (uint i =0; i < m_mae.layersQty; i++) { - m_mae.mediaLoaded[i] = MA_FALSE; - m_mae.currentStatus[i].status = Status::Iddle; - m_mae.currentStatus[i].pan = 128; - m_mae.currentStatus[i].pitch = 128; - m_mae.currentStatus[i].vol = 0.0f; - m_mae.currentStatus[i].cursor = 0; - m_mae.currentStatus[i].updated = false; - } - result = this->startContext(); - if (result != MA_SUCCESS) return false; - result = this->getAllAudioDevices(); - if (result != MA_SUCCESS) return false; - result = this->startDevices(); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed start audio devices." << endl; - return false; - } - result = this->setNodeGraph(); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to set node graph." << endl; - return false; - } - for (uint i = 0; i < m_mae.audioDevicesQty; i++) { - result = ma_engine_start(&m_mae.engines[i]); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to start audio device" << m_mae.audioDevicesId[i] << endl; - return false; - } - } - return true; -} - -ma_result MiniAudioEngine::createFilterBank(uint layer) -{ - ma_result result; - ma_node_graph *ng = ma_engine_get_node_graph(&m_mae.engines[0]); - ma_node *endpoint = ma_engine_get_endpoint(&m_mae.engines[0]); - filterBank *fb = &m_mae.filters[layer]; - - ma_splitter_node_config splitterConfig = ma_splitter_node_config_init(CHANNELS); - splitterConfig.outputBusCount= 3; - result = ma_splitter_node_init(ng, &splitterConfig, NULL, &fb->input); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init input node." << endl; - return result; - } - - fb->hpfConfig = ma_hpf_node_config_init(CHANNELS, SAMPLE_RATE, 16, FILTER_ORDER); - result = ma_hpf_node_init(ng, &fb->hpfConfig, NULL, &fb->hpf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init high pass filter node." << endl; - return result; - } - - fb->loshelfConfig = ma_loshelf_node_config_init(CHANNELS, SAMPLE_RATE, 0.0f, 1.0f, 30); - result = ma_loshelf_node_init(ng, &fb->loshelfConfig, NULL, &fb->loshelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init low pass filter node." << endl; - return result; - } - - fb->mLowConfig = ma_peak_node_config_init(CHANNELS, SAMPLE_RATE, 0.0, 4.0, 200); // double gainDB, double q, double frequency); - result = ma_peak_node_init(ng, &fb->mLowConfig, NULL, &fb->mLow); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init peak low filter node." << endl; - return result; - } - - fb->mHighConfig = ma_peak_node_config_init(CHANNELS, SAMPLE_RATE, 0.0, 0.0, 600); // double gainDB, double q, double frequency); - result = ma_peak_node_init(ng, &fb->mHighConfig, NULL, &fb->mHigh); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init peak high filter node." << endl; - return result; - } - - fb->hishelfConfig = ma_hishelf_node_config_init(CHANNELS, SAMPLE_RATE, 0.0f, 1.0f, 20000); - result = ma_hishelf_node_init(ng, &fb->hishelfConfig, NULL, &fb->hishelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init hi shelf filter node." << endl; - return result; - } - ma_vumeter_node_config vuc = ma_vumeter_node_config_init(CHANNELS, FORMAT, SAMPLE_RATE); - ma_vumeter_node_init(ng, &vuc, NULL, &fb->vumeter); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init vumeter node." << endl; - return result; - } - splitterConfig.outputBusCount = m_mae.audioDevicesQty; - result = ma_splitter_node_init(ng, &splitterConfig, NULL, &fb->output); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init output node." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->input, 0, &fb->hpf, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach input node." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->input, 1, &fb->vumeter, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach bypass connection." << endl; - return result; - } - ma_node_set_output_bus_volume(&fb->input, 1, 0.0f); - result = ma_node_attach_output_bus(&fb->hpf, 0, &fb->loshelf, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach high pass pass filter node." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->loshelf, 0, &fb->mLow, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach low shelf filter node." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->mLow, 0, &fb->mHigh, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach low peaks filter node." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->mHigh, 0, &fb->hishelf, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach high peaks filter node." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->hishelf, 0, &fb->vumeter, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach high shelf filter node." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->vumeter, 0, &fb->output, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach high shelf filter node." << endl; - return result; - } - if (m_mae.audioDevicesQty == 1) { - result = ma_node_attach_output_bus(&fb->output, 0, endpoint, 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach output to endpoint." << endl; - return result; - } - } else { - result = ma_node_attach_output_bus(&fb->output, 0, &m_mae.sendAuxNode[1], 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach output node to aux send 1." << endl; - return result; - } - result = ma_node_attach_output_bus(&fb->output, 1, &m_mae.sendAuxNode[1], 1); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach output node to aux send 1." << endl; - return result; - } - for (uint i = 2; i < m_mae.audioDevicesQty; i++) { - result = ma_node_attach_output_bus(&fb->output, i, &m_mae.sendAuxNode[i], 1); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach output node to aux send 1." << endl; - return result; - } - } - } - return result; -} - -ma_result MiniAudioEngine::setNodeGraph() { - ma_result result = MA_SUCCESS; - - ma_node_graph *ng = ma_engine_get_node_graph(&m_mae.engines[0]); - for (uint i = 1; i < m_mae.audioDevicesQty; i++) { - size_t sizeInFrames = SAMPLE_RATE; - result = ma_pcm_rb_init(FORMAT, CHANNELS, sizeInFrames, NULL, NULL, &m_mae.auxBuffers[i]); - if (result != MA_SUCCESS) { - printf("Failed to initialize ring buffer.\n"); - return result; - } - ma_silence_pcm_frames(m_mae.auxBuffers[i].rb.pBuffer, sizeInFrames, FORMAT, CHANNELS); - ma_writer_node_config writerConfig = ma_writer_node_config_init(CHANNELS, SAMPLE_RATE * 5, &m_mae.auxBuffers[i]); - result = ma_writer_node_init(ng, &writerConfig, NULL, &m_mae.sendAuxNode[i]); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to init writer node." << endl; - return result; - } - result = ma_node_attach_output_bus(&m_mae.sendAuxNode[i], 0, ma_engine_get_endpoint(&m_mae.engines[0]), 0); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to attach writer node." << endl; - return result; - } - result = ma_data_source_rb_init(&m_mae.dataSourceRB[i], &m_mae.auxBuffers[i]); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to init data source ring buffer" << endl; - return result; - } - ma_data_source_node_config dataSupplyNodeConfig = ma_data_source_node_config_init(&m_mae.dataSourceRB[i]); - result = ma_data_source_node_init(ma_engine_get_node_graph(&m_mae.engines[i]), &dataSupplyNodeConfig, NULL, &m_mae.dataSupplyNode[i]); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to init data source node" << endl; - return result; - } - result = ma_node_attach_output_bus(&m_mae.dataSupplyNode[i], 0, ma_engine_get_endpoint(&m_mae.engines[i]), 0); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to attach data source rb node" << endl; - return result; - } - } - for (uint i = 0; i < m_mae.layersQty; i++) { - result = this->createFilterBank(i); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed creating filter bank." << endl; - } - } - return (result); -} - -ma_result MiniAudioEngine::startDevices() -{ - ma_result result = MA_SUCCESS; - ma_device_config deviceConfig; - ma_engine_config engineConfig; - - deviceConfig = ma_device_config_init(ma_device_type_duplex); - deviceConfig.capture.format = m_mae.resourceManager.config.decodedFormat; - deviceConfig.capture.channels = CHANNELS; - deviceConfig.playback.channels = CHANNELS; - deviceConfig.capture.shareMode = ma_share_mode_shared; - deviceConfig.playback.format = m_mae.resourceManager.config.decodedFormat; - deviceConfig.sampleRate = m_mae.resourceManager.config.decodedSampleRate; - deviceConfig.dataCallback = audioDataCallback; - engineConfig = ma_engine_config_init(); - engineConfig.pResourceManager = &m_mae.resourceManager; - engineConfig.defaultVolumeSmoothTimeInPCMFrames = SAMPLE_RATE / 500; - engineConfig.noAutoStart = MA_TRUE; - - for (uint internalId = 0; internalId < m_mae.audioDevicesQty; internalId++) { - deviceConfig.capture.pDeviceID = &m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[internalId]].id; - deviceConfig.playback.pDeviceID = &m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[internalId]].id; - deviceConfig.pUserData = &m_mae.engines[internalId]; - result = ma_device_init(&m_mae.context, &deviceConfig, &m_mae.devices[internalId]); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to initialize audio device " << m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[internalId]].name << endl; - return result; - } - engineConfig.pDevice = &m_mae.devices[internalId]; - result = ma_engine_init(&engineConfig, &m_mae.engines[internalId]); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to initialize audio engine" << endl; - return result; - } - cout << "Initialized Audio Device. internalId: " << internalId << " systemId: " << m_mae.audioDevicesId[internalId] << " " << m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[internalId]].name << endl; - } - return result; -} - -ma_result MiniAudioEngine::startContext() -{ - ma_result result; - - ma_resource_manager_config resourceManagerConfig = ma_resource_manager_config_init(); - resourceManagerConfig.decodedFormat = FORMAT; - resourceManagerConfig.decodedChannels = CHANNELS; - resourceManagerConfig.decodedSampleRate = SAMPLE_RATE; - resourceManagerConfig.jobThreadCount = MAX_LAYERS; - result = ma_resource_manager_init(&resourceManagerConfig, &m_mae.resourceManager); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to initialize audio resource manager." << endl; - return result; - } - result = ma_context_init(NULL, 0, NULL, &m_mae.context); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to initialize audio context." << endl; - } - return result; -} - -// enum all audio devices in system -ma_result MiniAudioEngine::getAllAudioDevices() -{ - ma_result result; - - result = ma_context_get_devices(&m_mae.context, &m_mae.pPlaybackDeviceInfos, &m_mae.playbackDeviceCount, NULL, NULL); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to enumerate playback devices." << endl; - ma_context_uninit(&m_mae.context); - return result; - } - cout << "Audio devices available:" << endl; - for (ma_uint32 iAvailableDevice = 0; iAvailableDevice < m_mae.playbackDeviceCount; iAvailableDevice += 1) { - cout << iAvailableDevice << " : " << m_mae.pPlaybackDeviceInfos[iAvailableDevice].name << endl; - } - return result; -} - -char* MiniAudioEngine::getDeviceName(uint id) -{ - return m_mae.pPlaybackDeviceInfos[m_mae.audioDevicesId[id]].name; - -} - -ma_result MiniAudioEngine::loadMedia(int layer, char *file) -{ - ma_result result; - - if (m_mae.mediaLoaded[layer] == MA_TRUE) - { - m_mae.mediaLoaded[layer] = MA_FALSE; - ma_sound_set_volume(&m_mae.sounds[layer], 0.0f); - ma_sound_stop(&m_mae.sounds[layer]); - ma_sound_uninit(&m_mae.sounds[layer]); - } - ma_sound_config soundConfig = ma_sound_config_init(); - soundConfig = ma_sound_config_init(); - soundConfig.pFilePath = file; - soundConfig.pInitialAttachment = &m_mae.filters[layer].input; - soundConfig.initialAttachmentInputBusIndex = 0; - soundConfig.channelsIn = 0; - soundConfig.channelsOut = CHANNELS; - soundConfig.flags = MA_SOUND_FLAG_NO_SPATIALIZATION | MA_SOUND_FLAG_NO_DEFAULT_ATTACHMENT | MA_SOUND_FLAG_STREAM; //| MA_SOUND_FLAG_NO_PITCH - result = ma_sound_init_ex(&m_mae.engines[0], &soundConfig, &m_mae.sounds[layer]); - if (result != MA_SUCCESS) { - cout << "Error" << result << ": Failed to load file " << file << endl; - return result; - } - m_mae.currentStatus[layer].media = file; - m_mae.currentStatus[layer].updated = true; - m_mae.mediaLoaded[layer] = MA_TRUE; - this->refreshValues(layer); - return result; -} - -float MiniAudioEngine::getDuration(int layer) -{ - ma_result result; - float ret; - - if (m_mae.mediaLoaded[layer] == false) - return MA_DOES_NOT_EXIST; - result = ma_sound_get_length_in_seconds(&m_mae.sounds[layer], &ret); - if (result != MA_SUCCESS) { - return result; - } - return (ret * 1000); -} - -float MiniAudioEngine::getCursor(int layer) -{ - ma_result result; - float ret = 0; - - if (m_mae.mediaLoaded[layer] == false) - return MA_DOES_NOT_EXIST; - result = ma_sound_get_cursor_in_seconds(&m_mae.sounds[layer], &ret); - if (result != MA_SUCCESS) - { - cout << "Error" << result << ": Can not get cursor " << layer << endl; - ret = MA_ERROR; - } - return ret; -} - -ma_result MiniAudioEngine::printFormatInfo(int layer) -{ - ma_format format; - ma_uint32 channels; - ma_uint32 sampleRate; - - if (m_mae.mediaLoaded[layer] == false) - return MA_DOES_NOT_EXIST; - ma_result result = ma_sound_get_data_format(&m_mae.sounds[layer], \ - &format, &channels, &sampleRate, NULL, 0); - if (result != MA_SUCCESS) { - cout << "Error " << result << ": Failed to get data format " << layer; - cout << endl; - } else { - cout << "Layer:" << layer << " "; - cout << m_mae.currentStatus[layer].media.toLatin1().data(); - cout << " samples/sec:" << sampleRate << " format:" << format; - cout << " channels:" << channels << endl; - } - return result; -} - -// Expects between 0 and 65535 vol value -void MiniAudioEngine::volChanged(int layer, int vol) -{ - m_mae.currentStatus[layer].vol = vol; - if (m_mae.mediaLoaded[layer] == MA_FALSE && m_mae.currentStatus[layer].updated) - return; - float db = ((float)vol / 771.0f) - 85.0f; - if (db <= -85.0f) { - db = 0; - } else - db = ma_volume_db_to_linear(db); - ma_sound_set_fade_in_milliseconds(&m_mae.sounds[layer], -1, db, FADE_TIME); -} - -void MiniAudioEngine::panChanged(int layer, float value) -{ - float result; - - m_mae.currentStatus[layer].pan = value; - if (m_mae.mediaLoaded[layer] == false) - return; - result = (value / 128.0) - 1.0; - ma_sound_group_set_pan(&m_mae.sounds[layer], result); -} - -void MiniAudioEngine::pitchChanged(int layer, float value) -{ - float pitch; - - m_mae.currentStatus[layer].pitch = value; - if (m_mae.mediaLoaded[layer] == false) - return; - pitch = value / 128.0; - ma_sound_group_set_pitch(&m_mae.sounds[layer], pitch); -} - -ma_result MiniAudioEngine::playbackChanged(int layer, Status status) -{ - ma_result result = MA_SUCCESS; - float db = 0; - bool loop = false; - - m_mae.currentStatus[layer].status = status; - if (m_mae.mediaLoaded[layer] == MA_FALSE) - return MA_DOES_NOT_EXIST; - m_mae.currentStatus[layer].updated = false; - switch (status) { - case Status::Paused: - result = ma_sound_stop_with_fade_in_milliseconds(&m_mae.sounds[layer], FADE_TIME); - break; - case Status::Stopped: - ma_sound_stop_with_fade_in_milliseconds(&m_mae.sounds[layer], 0.0f); - result = this->seekToCursor(layer, m_mae.currentStatus[layer].cursor); - break; - case Status::PlayingLoop: - loop = true; - if (m_mae.currentStatus[layer].cursor > 0) { - result = this->seekToCursor(layer, m_mae.currentStatus[layer].cursor); - } - case Status::PlayingOnce: - case Status::PlayingFolder: - case Status::PlayingFolderLoop: - case Status::PlayingFolderRandom: - ma_sound_set_looping(&m_mae.sounds[layer], loop); - if (ma_sound_is_playing(&m_mae.sounds[layer])) break; - ma_sound_set_stop_time_in_milliseconds(&m_mae.sounds[layer], ~(ma_uint64)0); - db = (m_mae.currentStatus[layer].vol / 771.0f) - 85.0f; - if (db <= -85.0f) db = 0; - else db = ma_volume_db_to_linear(db); - result = ma_sound_start(&m_mae.sounds[layer]); - ma_sound_set_fade_in_milliseconds(&m_mae.sounds[layer], 0.000001f, 0.000000f, FADE_TIME); - if (m_mae.currentStatus[layer].cursor > 0) - usleep(FADE_TIME * 1500); // avoid glitch when load when seeking - ma_sound_set_fade_in_milliseconds(&m_mae.sounds[layer], 0, db, FADE_TIME * 2); - default: - break; - } - m_mae.currentStatus[layer].updated = true; - return result; -} - -ma_result MiniAudioEngine::setRangePoint(int layer, int cursor) -{ - ma_result result = MA_SUCCESS; - ma_uint64 end = 0, start; - - if (m_mae.mediaLoaded[layer] == false) - return MA_DOES_NOT_EXIST; - if (cursor == 0) - start = 0; - else { - result = ma_sound_get_length_in_pcm_frames(&m_mae.sounds[layer], &end); - if (result != MA_SUCCESS) { return result; } - start = (cursor * end) / 65535; - } - result = ma_data_source_set_range_in_pcm_frames(&m_mae.sounds[layer].pDataSource, start, end); - if (result != MA_SUCCESS) - cout << "ERROR " << result << " :set range point" << endl; - return (result); -} - -ma_result MiniAudioEngine::setLoopPoint(int layer, int cursor) -{ - ma_result result = MA_SUCCESS; - ma_uint64 end = 0, start; - - if (m_mae.mediaLoaded[layer] == false) - return MA_DOES_NOT_EXIST; - if (cursor == 0) - start = 0; - else { - result = ma_sound_get_length_in_pcm_frames(&m_mae.sounds[layer], &end); - if (result != MA_SUCCESS) { return result; } - start = (cursor * end) / 65535; - } - result = ma_data_source_set_loop_point_in_pcm_frames(&m_mae.sounds[layer].pDataSource, start + 1, end - 1); - if (result != MA_SUCCESS) - cout << "ERROR " << result << " :set loop point" << endl; - return (result); -} - -ma_result MiniAudioEngine::seekToCursor(int layer, int cursor) -{ - ma_result result = MA_SUCCESS; - ma_uint64 end = 0, start; - - if (m_mae.mediaLoaded[layer] == false) - return MA_DOES_NOT_EXIST; - if (cursor == 0) - start = 0; - else { - result = ma_sound_get_length_in_pcm_frames(&m_mae.sounds[layer], &end); - if (result != MA_SUCCESS) { return result; } - start = (cursor * end) / 65535; - } - result = ma_sound_seek_to_pcm_frame(&m_mae.sounds[layer], start); - return (result); -} - -ma_result MiniAudioEngine::setCursor(int layer, int cursor) -{ - ma_result result = MA_SUCCESS; - - m_mae.currentStatus[layer].cursor = cursor; - result = this->seekToCursor(layer, cursor); - return (result); -} - -Status MiniAudioEngine::getStatus(int layer) -{ - return m_mae.currentStatus[layer].status; -} - -void MiniAudioEngine::refreshValues(int layer) -{ - this->panChanged(layer, m_mae.currentStatus[layer].pan); - this->pitchChanged(layer, m_mae.currentStatus[layer].pitch); - this->playbackChanged(layer, m_mae.currentStatus[layer].status); -} - -ma_result MiniAudioEngine::filterParamChanged(int layer, int channel, int value) -{ - ma_result result = MA_SUCCESS; - filterBank *fb = &m_mae.filters[layer]; - - if (channel == HP_FREQ) { - fb->hpfConfig.hpf.cutoffFrequency = double((value * 1.31) + 16.0f); // 16 - 350 - result = ma_hpf_node_reinit(&fb->hpfConfig.hpf, &fb->hpf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set frecuency high pass filter node." << endl; - return result; - } - } else if (channel == LOW_FREQ) { - fb->loshelfConfig.loshelf.frequency = 30 + (value * 1.647); // 30 - 450 - result = ma_loshelf_node_reinit(&fb->loshelfConfig.loshelf, &fb->loshelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set frecuency low shelf filter node." << endl; - return result; - } - } else if (channel == LOW_Q) { - fb->loshelfConfig.loshelf.shelfSlope = (double)(value / 32.0f) + 0.1f; // 0.1 - 8 - result = ma_loshelf_node_reinit(&fb->loshelfConfig.loshelf, &fb->loshelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed set Q low shelf filter node." << endl; - return result; - } - } else if (channel == LOW_GAIN) { - fb->loshelfConfig.loshelf.gainDB = (double)(value / 21.25f) - 6.023528412f; - result = ma_loshelf_node_reinit(&fb->loshelfConfig.loshelf, &fb->loshelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed set gain low shelf filter node." << endl; - return result; - } - } else if (channel == MIDLOW_FREQ) { - fb->mLowConfig.peak.frequency = 200 + (value * 9.019607843); // 200 - 450 - result = ma_peak_node_reinit(&fb->mLowConfig.peak, &fb->mLow); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set frecuency Mid Low pass filter node." << endl; - return result; - } - } else if (channel == MIDLOW_Q) { - fb->mLowConfig.peak.q = (double)( value / 64.0f) + 0.10; // 0.1 - 4 - result = ma_peak_node_reinit(&fb->mLowConfig.peak, &fb->mLow); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set Q Mid Low filter node." << endl; - return result; - } - } else if (channel == MIDLOW_GAIN) { - fb->mLowConfig.peak.gainDB = (double)(value / 7.0833333333333f) - 18.0f; - result = ma_peak_node_reinit(&fb->mLowConfig.peak, &fb->mLow); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set gain Mid Low filter node." << endl; - return result; - } - } else if (channel == MIDHIGH_FREQ) { - fb->mHighConfig.peak.frequency = 600 + (value * 25.09803922); // 600 - 7000 - result = ma_peak_node_reinit(&fb->mHighConfig.peak, &fb->mHigh); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set frecuency Mid High filter node." << endl; - return result; - } - } else if (channel == MIDHIGH_Q) { - fb->mHighConfig.peak.q = (double)( value / 64.0f) + 0.10; // 0.1 - 4 - result = ma_peak_node_reinit(&fb->mHighConfig.peak, &fb->mHigh); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set Q Mid High filter node." << endl; - return result; - } - } else if (channel == MIDHIGH_GAIN) { - fb->mHighConfig.peak.gainDB = (double)(value / 7.0833333333333f) - 18.0f; - result = ma_peak_node_reinit(&fb->mHighConfig.peak, &fb->mHigh); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to set gain Mid High filter node." << endl; - return result; - } - } else if (channel == HIGH_FREQ) { - fb->hishelfConfig.hishelf.frequency = 1500 + (value * 56.8627451); // 1500 - 16000 - result = ma_hishelf_node_reinit(&fb->hishelfConfig.hishelf, &fb->hishelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed to frecuency high shelf filter node." << endl; - return result; - } - } else if (channel == HIGH_Q) { - fb->hishelfConfig.hishelf.shelfSlope = (double)( value / 32.0f) + 0.1f; - result = ma_hishelf_node_reinit(&fb->hishelfConfig.hishelf, &fb->hishelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed set Q high shelf filter node." << endl; - return result; - } - } else if (channel == HIGH_GAIN) { - fb->hishelfConfig.hishelf.gainDB = (double)(value / 21.25) - 6.023528412f; - result = ma_hishelf_node_reinit(&fb->hishelfConfig.hishelf, &fb->hishelf); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed set gain high shelf filter node." << endl; - return result; - } - } else if (channel == SEND1) { - float db = ((float)value / 3.0f) - 85.0f; - if (db <= -85.0f) { - db = 0; - } else - db = ma_volume_db_to_linear(db); - ma_node_set_output_bus_volume(&fb->output, 0, db); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed set Send 1 Volume." << endl; - return result; - } - } else if (channel == SEND2) { - float db = ((float)value / 3.0f) - 85.0f; - if (db <= -85.0f) { - db = 0; - } else - db = ma_volume_db_to_linear(db); - ma_node_set_output_bus_volume(&fb->output, 1, db); - if (result != MA_SUCCESS) { - cout << "ERROR " << result << ": Failed set Send 2 Volume." << endl; - } - return result; - } - return (result); -} - -bool MiniAudioEngine::setBypass(int audioDevice, int layer, bool bypass) -{ - (void)audioDevice; - filterBank *fb = &m_mae.filters[layer]; - - if (bypass) { - ma_node_set_output_bus_volume(&fb->input, 1, 1.0f); - ma_node_set_output_bus_volume(&fb->input, 0, 0.0f); - } else { - ma_node_set_output_bus_volume(&fb->input, 1, 0.0f); - ma_node_set_output_bus_volume(&fb->input, 0, 1.0f); - } - return true; -} diff --git a/src/miniaudioengine.h b/src/miniaudioengine.h deleted file mode 100644 index 21deff3..0000000 --- a/src/miniaudioengine.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef MINIAUDIOENGINE_H -#define MINIAUDIOENGINE_H - -#define MA_ENABLE_ONLY_SPECIFIC_BACKENDS -#define MA_ENABLE_JACK -#define MA_DISABLE_PULSE -#define MA_NO_GENERATION -#define MA_DEBUG_OUTPUT -#define MA_LOG_LEVEL_DEBUG DEBUG -#define MINIAUDIO_IMPLEMENTATION -#include "miniaudio.h" -#include "ma_writer_node.h" -#include -using namespace std; -#include "defines.h" - -typedef struct -{ - ma_splitter_node input; - ma_hpf_node hpf; - ma_hpf_node_config hpfConfig; - ma_loshelf_node loshelf; - ma_loshelf_node_config loshelfConfig; - ma_peak_node mLow; - ma_peak_node_config mLowConfig; - ma_peak_node mHigh; - ma_peak_node_config mHighConfig; - ma_hishelf_node hishelf; - ma_hishelf_node_config hishelfConfig; - ma_vumeter_node vumeter; - ma_splitter_node output; -} filterBank; - -typedef struct -{ - ma_engine engines[MAX_AUDIODEVICES]; - ma_device devices[MAX_AUDIODEVICES]; - filterBank filters[MAX_LAYERS]; - ma_writer_node sendAuxNode[MAX_AUDIODEVICES]; - ma_pcm_rb auxBuffers[MAX_AUDIODEVICES]; - ma_node_graph ng; - layerData currentStatus[MAX_LAYERS]; - ma_sound sounds[MAX_LAYERS]; - ma_resource_manager resourceManager; - ma_context context; - ma_device_info* pPlaybackDeviceInfos; - ma_device_info pSelectedPlaybackDeviceInfos[MAX_AUDIODEVICES]; - ma_uint32 playbackDeviceCount; - ma_uint32 devicesSelected; - ma_bool8 mediaLoaded[MAX_LAYERS]; - uint layersQty; - uint *audioDevicesId; - uint audioDevicesQty; - ma_data_source_node dataSupplyNode[MAX_AUDIODEVICES]; - ma_data_source_rb dataSourceRB[MAX_AUDIODEVICES]; -} MAE; - -class MiniAudioEngine -{ - friend class libreMediaServerAudio; - -public: - static void audioDataCallback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount); - -protected: - MiniAudioEngine(); - void stopEngine(); - bool startEngine(uint layersQty, uint* audioDevicesID, uint audioDevicesQty); - ma_result loadMedia(int layer, char *media); - void volChanged(int layer, int vol); - void panChanged(int layer, float pan); - void pitchChanged(int layer, float pitch); - ma_result playbackChanged(int layer, Status status); - ma_result setCursor(int layer, int cursor); - ma_result printFormatInfo(int layer); - float getDuration(int layer); - float getCursor(int layer); - Status getStatus(int layer); - inline float getVol(int layer) { - return ma_sound_get_volume(&m_mae.sounds[layer]); - }; - inline bool getAtEnd(int layer) { return m_mae.sounds[layer].atEnd; } - ma_result filterParamChanged(int layer, int channel, int value); - bool setBypass(int audioDevice, int layer, bool bypass); - inline float getLevel(int layer) { - float level = ma_vumeter_node_get_level(&m_mae.filters[layer].vumeter); - return ma_volume_linear_to_db(level) - 4.0f; - }; - char* getDeviceName(uint id); - -private: - MAE m_mae; - - ma_result startDevices(); - ma_result getAllAudioDevices(); - ma_result startContext(); - void refreshValues(int layer); - ma_result seekToCursor(int layer, int cursor); - ma_result setNodeGraph(); - ma_result createFilterBank(uint layer); - ma_result setLoopPoint(int layer, int cursor); - ma_result setRangePoint(int layer, int cursor); -}; - -#endif // MINIAUDIOENGINE_H diff --git a/src/olathread.cpp b/src/olathread.cpp index 6ca9325..900fc3b 100644 --- a/src/olathread.cpp +++ b/src/olathread.cpp @@ -1,21 +1,23 @@ -#include "libremediaserver-audio.h" +#include "olathread.h" -olaThread::olaThread(QObject *parent, int layers) : - m_counter(0) - , m_layers(layers) + +olaThread::olaThread(QObject *parent) { - this->setParent(parent); + Q_UNUSED(parent); + m_counter = 0; gettimeofday(&m_last_data, NULL); - for (int i=0; i < MAX_LAYERS; i++) + // Init the dmx buffer to 0 + for (int i=0; i < LAYERS_NUMBER; i++) { for (int j=0; j < LAYER_CHANNELS; j++) { m_dmx[i][j] = 0; } } - init(); + init(); // start the ola connection } + // --- DECONSTRUCTOR --- olaThread::~olaThread() { stop(); } @@ -37,11 +39,11 @@ void olaThread::init() m_client->SetDMXCallback(ola::NewCallback(this, &olaThread::NewDmx)); m_clientWrapper->GetSelectServer()->RegisterRepeatingTimeout(4000, ola::NewCallback(this, &olaThread::CheckDataLoss)); m_client->SetCloseHandler(ola::NewSingleCallback(this, &olaThread::socketClosed)); - m_dmxSettings = Settings::getInstance()->getDmxSettings(); } void olaThread::run() { + emit toTerminal("Start reading DMX"); m_clientWrapper->GetSelectServer()->Run(); } @@ -62,98 +64,67 @@ void olaThread::stop() void olaThread::NewDmx(const ola::client::DMXMetadata &data, const ola::DmxBuffer &buffer) { - foreach (const dmxSetting &i, m_dmxSettings) { - if(i.universe == data.universe && i.address > -1) { - bool volSent = false; - bool entrySent = false; - bool fileSent = false; - int aux; + m_counter++; + gettimeofday(&m_last_data, NULL); + uint universe = data.universe; + emit layerReceived(); + foreach (const dmxSetting &i, Settings::getInstance()->getDmxSettings()) { // loop for reading the channels by layer. + if(i.universe == universe && i.address > -1) { // Compare if the layer is from this universe AND if the DMX address is 0 or greater, process this layer. for (int j = 0; j < LAYER_CHANNELS; j++){ - int value = buffer.Get((i.address) + j); - if (m_dmx[i.layer][j] != value) { + int value = buffer.Get((i.address) + j); // Get the value for this channel. + 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; - switch (j) { - case DMX_FOLDER: - aux = buffer.Get(i.address + DMX_FILE); - qobject_cast(parent())->loadMedia(i.layer, value, aux); - m_dmx[i.layer][DMX_FILE] = aux; - fileSent = true; - break; - case DMX_FILE: - if (fileSent) - break; - aux = buffer.Get(i.address + DMX_FOLDER); - qobject_cast(parent())->loadMedia(i.layer, aux, value); - m_dmx[i.layer][DMX_FOLDER] = aux; - fileSent = true; - break; - case VOLUME_FINE: - aux = buffer.Get(i.address + VOLUME_COARSE); - value += (aux * 0x100); - qobject_cast(parent())->dmxInput(i.layer, j, value); - m_dmx[i.layer][VOLUME_COARSE] = aux; - volSent = true; - break; - case VOLUME_COARSE: - if (volSent) - break; - value = (value * 0x100) + buffer.Get(i.address + VOLUME_FINE); - qobject_cast(parent())->dmxInput(i.layer, j, value); - m_dmx[i.layer][VOLUME_FINE] = buffer.Get(i.address + VOLUME_FINE); - volSent = true; - break; - case PLAYBACK: - qobject_cast(parent())->dmxInput(i.layer, j, value); - break; - case ENTRY_POINT_FINE: - value = (buffer.Get(i.address + ENTRY_POINT_COARSE) * 0x100) + value; - qobject_cast(parent())->dmxInput(i.layer, j, value); - m_dmx[i.layer][ENTRY_POINT_COARSE] = buffer.Get(i.address + ENTRY_POINT_COARSE); - entrySent = true; - break; - case ENTRY_POINT_COARSE: - if (entrySent) - break; - value = (value * 0x100) + buffer.Get(i.address + ENTRY_POINT_FINE); - qobject_cast(parent())->dmxInput(i.layer, j, value); - m_dmx[i.layer][ENTRY_POINT_FINE] = buffer.Get(i.address + ENTRY_POINT_FINE); - entrySent = true; - break; - default: - qobject_cast(parent())->dmxInput(i.layer, j, value); - break; - } } } } } - m_counter++; - gettimeofday(&m_last_data, NULL); - emit universeReceived(data.universe); } /** * Check for data loss each 4 seconds. */ + bool olaThread::CheckDataLoss() { struct timeval now, diff; if (timerisset(&m_last_data)) { gettimeofday(&now, NULL); timersub(&now, &m_last_data, &diff); if (diff.tv_sec > 4 || (diff.tv_sec == 4 && diff.tv_usec > 4000000)) { - qInfo()<< "olaThread| Can not read one or several universes"; + // loss of data + qDebug()<< "olaThread| Can not read one or several universes"; + emit toTerminal("olaThread: Can not read one universe"); + // return false; // Retorna false para deshabilitar el callback } } return true; } +void olaThread::resendDmx() +{ +// qDebug() << "Resending DMX info"; + for (int i = 0; i < Settings::getInstance()->getLayersNumber(); i++) { // loop for reading the channels by layer. + for (int j = 0; j < LAYER_CHANNELS; j++){ + emit dmxOutput(i, j, m_dmx[i][j]); + } + } +} + void olaThread::socketClosed() { - qWarning("ola daemon closed connection, reopening it... "); + qWarning("ola close the connection. Trying reopening it... "); + emit toTerminal("OLA closed the connection. Tryin reopening it... "); + m_clientWrapper->GetSelectServer()->Terminate(); m_client = NULL; m_clientWrapper = NULL; + + // setup ola connection init(); + + // register universes registerUniverse(); + + // start thread run(); } diff --git a/src/olathread.h b/src/olathread.h index ed2735a..7e7a5a1 100644 --- a/src/olathread.h +++ b/src/olathread.h @@ -1,7 +1,11 @@ #ifndef OLATHREAD_H #define OLATHREAD_H +#include + +#include #include +#include #include #include @@ -11,26 +15,19 @@ #include #include +#include "defines.h" #include "dmxPersonality.h" #include "settings.h" -#include "defines.h" class olaThread : public QThread { Q_OBJECT public: - QList m_dmxSettings; - int m_dmx[MAX_LAYERS][LAYER_CHANNELS]; - ola::client::OlaClientWrapper *m_clientWrapper; - ola::client::OlaClient *m_client; - unsigned int m_counter; - struct timeval m_last_data; // Last DMX frame received - int m_layers; - olaThread(QObject *parent = 0, int layers = 0); + olaThread(QObject *parent = 0); virtual ~olaThread(); - void run (); + /** Retorna el valor de un canal *@param int layer the layer for we want the channel *@param int channel the channel for the value wanted @@ -39,49 +36,91 @@ public: inline int getValue(int layer, int channel) { return m_dmx[layer][channel]; } + + /** + * @brief resendDMX emite todo el buffer DMX + */ void resendDmx(); private: + + void run (); + ola::client::OlaClientWrapper *m_clientWrapper; + ola::client::OlaClient *m_client; + unsigned int m_counter; + struct timeval m_last_data; // Last DMX frame received + + int m_dmx[LAYERS_NUMBER][LAYER_CHANNELS]; // DMX Buffer. Habría que cambiarlo si queremos hacer las capas dinámicas + /** * @brief Callback from ola. Control de errores en el registro de Universos en OLA * typedef SingleUseCallback1 ola::client::SetCallback * @param ola::client::Result &error * @return void + * + * */ inline void RegisterComplete(const ola::client::Result &error) { if (error.Success()) { qDebug("Register Universe success"); + emit toTerminal("Register Universe success"); } else { - qCritical("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())); } } + /** * @brief Check if the dmx info is arriving each 4 seconds * @return bool */ bool CheckDataLoss(); + /** * @brief RepeteableDMXCallBack from ola called when arrives a new dmx frame * typedef Callback2 ola::client::RepeatableDMXCallback - * This is called one for second if there is not updated in the DMX frame. - * emit only the channels that has been changed. + * This is called one for second if there is not updated in the DMX frame. We need emit only the channels that + * has changed to save resources. + * + * */ - void NewDmx(const ola::client::DMXMetadata &dmx_meta, const ola::DmxBuffer &buffer); + void NewDmx(const ola::client::DMXMetadata &dmx_meta, const ola::DmxBuffer &buffer); // + /** * @brief Sometimes the ola server closes the connection. This is a callback to handle this event an reconect to ola + * + * */ void socketClosed(); - void init(); + + /** + * @brief Open the connection with olad and start processing data. + * + * + */ + void init(); public slots: - void stop(); + + void stop(); // Close the connection with olad. + + /** + * @brief register one Universe + * void ola::client::OlaClient::RegisterUniverse(unsigned int universe,RegisterAction register_action,SetCallback * callback + * @param universe + */ inline void registerUniverse(int universe) { - qInfo("Registering universe %d", universe); + qDebug("Registering universe %d", universe); m_client->RegisterUniverse(universe, ola::client::REGISTER, ola::NewSingleCallback (this, &olaThread::RegisterComplete)); } + + /** + * @brief Register all the universes again + * + */ inline void registerUniverse() { QSet unis = Settings::getInstance()->getUniverses(); foreach (const int &universe, unis) { @@ -89,9 +128,17 @@ public slots: } } +protected slots: + signals: - void dmxOutput(int layer, int channel, int value); - void universeReceived(int uni); + +// void finished(); // Signal for closing. Not used now. + void dmxOutput(int layer, int channel, int value); // Signal when a channel has changed + void toTerminal(QString message); + void universeReceived(uint universe); + void layerReceived(); }; +using namespace ola; + #endif // OLATHREAD_H diff --git a/src/settings.cpp b/src/settings.cpp index 6527bcb..c328237 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -15,7 +15,12 @@ Settings::Settings(QObject *parent) : QObject(parent) { m_layersNumber = 0; - m_ui = false; +} + +void Settings::setPathMedia(QString path) +{ + m_pathmedia = path; + MediaLibrary::getInstance()->rescanMediaLibrary(); } // Read the dmx settings for dmx.xml At the moment we need: @@ -23,8 +28,6 @@ Settings::Settings(QObject *parent) : // - The number of sources/layers controlled by DMX // - The first DMX channel of each source/layer // - The universe to bind in OLA -// - Audio device id -// - Show the Ui or not void Settings::readFromFile(QString file) { QFile* xmlFile = new QFile(file); if (!xmlFile->open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -36,56 +39,117 @@ void Settings::readFromFile(QString file) { exit(1); } QXmlStreamReader* xmlReader = new QXmlStreamReader(xmlFile); - while(!xmlReader->atEnd() && !xmlReader->hasError()) { + int counter = 0; + //Parse the XML until we reach end of it + while(!xmlReader->atEnd() && !xmlReader->hasError() && counter < LAYERS_NUMBER) { + // Read next element QXmlStreamReader::TokenType token = xmlReader->readNext(); + //If token is just StartDocument - go to next if(token == QXmlStreamReader::StartDocument) { continue; } + //If token is StartElement - read it if(token == QXmlStreamReader::StartElement) { - if(xmlReader->name() == "lmsAudio") { - m_ui = xmlReader->attributes().value("ui").toLocal8Bit().toInt(); - m_layersNumber = xmlReader->attributes().value("layersNumber").toLocal8Bit().toInt(); - m_pathmedia = xmlReader->attributes().value("path").toLocal8Bit(); - continue; + if(xmlReader->name() == "dmxSettings") { + int version = xmlReader->attributes().value("fileVersion").toLocal8Bit().toInt(); + if(version == 1) { + m_layersNumber = xmlReader->attributes().value("layersNumber").toLocal8Bit().toInt(); + m_pathmedia = xmlReader->attributes().value("path").toLocal8Bit(); + continue; + } } - if(xmlReader->name() == "audioDevice") { - m_audioDeviceQty = xmlReader->attributes().value("devicesNumber").toLocal8Bit().toInt(); - for (uint i = 0; i < m_audioDeviceQty; i++) - m_audioDeviceId[i] = xmlReader->attributes().value(QString("id%1").arg(i)).toLocal8Bit().toInt(); - } - if(xmlReader->name() == "layer") { + QString add = "layer"; + add.append(QString("%1").arg(counter)); + if((xmlReader->name() == add)) { dmxSetting temp; temp.address = xmlReader->attributes().value("dmx").toLocal8Bit().toInt() - 1; temp.universe = xmlReader->attributes().value("universe").toLocal8Bit().toInt(); - temp.layer = xmlReader->attributes().value("id").toLocal8Bit().toInt(); - temp.audioDevice = xmlReader->attributes().value("audioDevice").toLocal8Bit().toInt(); + temp.layer = counter; m_settings.append(temp); if (!m_universe.contains(temp.universe)) { m_universe.insert(temp.universe); +// emit registerUniverse(temp.universe); } } + counter++; } } + if(xmlReader->hasError()) { QMessageBox::critical(NULL,"File xml Parse Error ", xmlReader->errorString(), QMessageBox::Ok); qWarning("File xml Parse Error %s", xmlReader->errorString().toLatin1().constData()); - // ToDo: manage this, open a dialog to load a new file. + return; } + //close reader and flush file xmlReader->clear(); xmlFile->close(); + delete xmlReader; delete xmlFile; - this->printSettings(); } -void Settings::printSettings() { - qInfo() << "Settings readed:\nShow Ui:" << m_ui << "Layers:" << m_layersNumber << "Path:" << m_pathmedia <<"Audio Device qty:" << m_audioDeviceQty; - for (uint i = 0; i < m_audioDeviceQty; i++) - qInfo() << "Audio device internal id:" << i << "system id:" << m_audioDeviceId[i]; - for (int i = 0; i < m_layersNumber; i++) - qInfo() << "Layer:" << m_settings[i].layer << "Address:" << m_settings[i].address << "Universe:" << m_settings[i].universe; -} +/** Read the default 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); +// emit registerUniverse(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); +} +*/ diff --git a/src/settings.h b/src/settings.h index 6e51d14..990b3ca 100644 --- a/src/settings.h +++ b/src/settings.h @@ -1,43 +1,160 @@ #ifndef SETTINGS_H #define SETTINGS_H +#include #include #include #include #include -#include #include "medialibrary.h" -#include "audiowidget.h" #include "defines.h" +/** + * This class stores the settings on lms. + * Is a singleton with set and get methods to manage the settings + * Also writes and reads the settings files. + */ + class Settings : public QObject { Q_OBJECT public: - Settings(QObject *parent = 0); - static Settings *getInstance(); - inline QSet getUniverses() { return m_universe; } - inline QString getPathMedia() { return m_pathmedia; } - inline QList getDmxSettings() { return m_settings; } - inline int getLayersNumber() { return m_layersNumber; } - inline uint *getAudioDeviceId() { return m_audioDeviceId; } - inline uint getAudioDeviceQty() { return m_audioDeviceQty; } - inline bool getShowUi() { return m_ui; } - void readFile(); - void readFromFile(QString file); - void printSettings(); + static Settings *getInstance(); //Singleton + + /** + * @brief getUniverses + * @return + */ + inline QSet getUniverses() { return m_universe; } + + /** + * @brief getPathMedia + * @return + */ + inline QString getPathMedia() { return m_pathmedia; } + + /** + * @brief setPathMedia + * @param path + */ + void setPathMedia(QString path); + + /** + * @brief getDmxSettings + * @return + */ + inline QList getDmxSettings() { return m_settings; } + + /** + * @brief Get the number of layer currently used + * @return + */ + inline int getLayersNumber() { return m_layersNumber; } + + /** + * @brief Get the number of universes registered + * @return + */ + inline int getUniverseNumber() { return m_universe.size(); } + + /** + * @brief Read the default xml configuration file at startup + */ + void readFile(); + + /** + * @brief changeLayerSetup + * @param layer + * @param universe + * @param address + */ + void changeLayerSetup(int layer, int universe, int address); + + /** + * @brief removeLayer + * @param layer + */ + void removeLayer(int layer); + + /** + * @brief addLayer + */ + void addLayer(); + + /** + * @brief olaThread::setLayersNumber + * @param layersNumber + * + */ + inline void setLayersNumber(int layersNumber) + { + if (layersNumber <= LAYERS_NUMBER) + m_layersNumber = layersNumber; + else + m_layersNumber = LAYERS_NUMBER; + } private: + static Settings *_instance; + + // The list where we store the settings by layer QList m_settings; + + // The path to media library QString m_pathmedia; - uint m_audioDeviceId[MAX_AUDIODEVICES]; - uint m_audioDeviceQty; - QSet m_universe; - int m_layersNumber; - bool m_ui; + + /** Constructor + * + */ + explicit Settings(QObject *parent = 0); + + QSet m_universe; // Registered universes. + + int m_layersNumber; // Number of layers in wich divide the dmx frame. Each layer, one source. + + /** + * @brief readFromFile + * @param file + */ + void readFromFile(QString file); + + /** + * @brief writeFile + * @param filename + */ +// void writeFile(QString filename); // Not implemented yet + + /** + * @brief writeFile + * overload + */ +// void writeFile(); // Not implemented yet + +signals: + + /** + * @brief pathChanged + * @param path + */ + void pathChanged(QString path); + + /** + * @brief layersNumber + * @param number + */ + void layersNumber(int number); + + /** + * @brief DMXConf + * @param universe + */ + void registerUniverse(int universe); + +public slots: + }; #endif // SETTINGS_H diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index cbe19a5..98904d7 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -2,20 +2,18 @@ #include "ui_settingsdialog.h" SettingsDialog::SettingsDialog(QWidget *parent) : - QDialog(parent) - , ui(new Ui::SettingsDialog) - , m_deviceDialog(NULL) + QDialog(parent), + ui(new Ui::SettingsDialog) { ui->setupUi(this); this->setWindowTitle("Settings"); ui->layersNumber->setValue(Settings::getInstance()->getLayersNumber()); - //QString path("Path to root folder of the media tree: /n"); - //path.append(Settings::getInstance()->getPathMedia()); - //ui->mediaPath->setText(path); - connect(ui->mediaPathButton, SIGNAL(clicked()), + QString path("Path to root folder of the media tree: /n"); + path.append(Settings::getInstance()->getPathMedia()); + ui->mediaPath->setText(path); + + connect(ui->mediaPatchButton, SIGNAL(clicked()), this, SLOT(changeMediaPath())); - connect(ui->audioDeviceButton , SIGNAL(clicked()), - this, SLOT(changeAudioDevice())); connect(ui->layersNumber, SIGNAL(valueChanged(int)), this, SLOT(layersChanged(int))); int layer = 0; @@ -44,45 +42,7 @@ void SettingsDialog::changeMediaPath() QString file = fileNames.at(0); Settings::getInstance()->setPathMedia(file); QString desc = tr("Media Path Changed to: %1").arg(file); - qInfo("%s", desc.toLatin1().constData()); -} - -void SettingsDialog::changeAudioDevice() -{ - if (!m_deviceDialog) - { - m_deviceDialog = new QDialog( this ); - } -/* QLabel *msgLabel = new QLabel; - AudioWidget *aw = AudioWidget::getInstance(); - QString *msg = new QString; - for (uint iAvailableDevice = 0; iAvailableDevice < aw->playbackDeviceCount; iAvailableDevice += 1) { - msg->append(tr("%1 : %2\n").arg(iAvailableDevice).arg(aw->pPlaybackDeviceInfos[iAvailableDevice].name)); - } - msgLabel->setText(msg->toLatin1()); - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(msgLabel); - QSpinBox *res = new QSpinBox; - res->setRange(0, aw->playbackDeviceCount); - res->setValue(AudioWidget::getInstance()->iChosenDevice); - layout->addWidget(res); - QPushButton *closeButton = new QPushButton(tr("Close")); - connect(closeButton, SIGNAL(clicked()), this, SLOT(closeAudioDeviceDialog())); - closeButton->setDefault(true); - layout->addWidget(closeButton); - m_deviceDialog->setLayout(layout); - m_deviceDialog->setModal(true); - m_deviceDialog->show();*/ -} - -void SettingsDialog::closeAudioDeviceDialog() -{ - QLayoutItem * const item = m_deviceDialog->layout()->itemAt(1); - int value = dynamic_cast(item->widget())->value(); - Settings::getInstance()->setAudioDeviceId(value); - qInfo("device selected: %i", value); - m_deviceDialog->close(); - emit Settings::getInstance()->audioDeviceChanged(value); + qDebug("%s", desc.toLatin1().constData()); } void SettingsDialog::layersChanged(int val) diff --git a/src/settingsdialog.h b/src/settingsdialog.h index aaf099b..b4c7acc 100644 --- a/src/settingsdialog.h +++ b/src/settingsdialog.h @@ -4,8 +4,8 @@ #include #include #include - #include "settings.h" +#include "layersettingswidget.h" namespace Ui { class SettingsDialog; @@ -21,16 +21,11 @@ public: private slots: void changeMediaPath(); - void changeAudioDevice(); - void closeAudioDeviceDialog(); - private: Ui::SettingsDialog *ui; - QDialog *m_deviceDialog; private slots: void layersChanged(int val); - }; #endif // SETTINGSDIALOG_H diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui index 325e5b7..6b5aaa2 100644 --- a/src/settingsdialog.ui +++ b/src/settingsdialog.ui @@ -7,7 +7,7 @@ 0 0 400 - 563 + 429 @@ -16,9 +16,9 @@ - 10 - 530 - 381 + 290 + 390 + 101 32 @@ -26,14 +26,14 @@ Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Close 10 - 50 + 40 52 31 @@ -63,8 +63,8 @@ - 70 - 50 + 60 + 40 111 21 @@ -73,12 +73,25 @@ Layers Number - + 10 10 - 171 + 371 + 21 + + + + TextLabel + + + + + + 200 + 40 + 191 31 @@ -95,33 +108,14 @@ - 0 - 80 - 401 - 451 + 9 + 99 + 381 + 281 - - - - 210 - 10 - 181 - 31 - - - - Change Audio Device - - - false - - - false - - diff --git a/src/slidergroup.cpp b/src/slidergroup.cpp deleted file mode 100644 index 481d554..0000000 --- a/src/slidergroup.cpp +++ /dev/null @@ -1,113 +0,0 @@ -#include "slidergroup.h" -#include -#include -#include - -SliderGroup::SliderGroup(QString name, - int min, - int max, - int decimals, - QWidget *parent) - : QWidget(parent) -{ - QBoxLayout *layout; - if (decimals) { - layout = new QVBoxLayout; - slider.setOrientation(Qt::Vertical); - } - else { - layout = new QHBoxLayout; - slider.setOrientation(Qt::Horizontal); - slider.setMaximumHeight(15); - valueBox.setMaximumHeight(15); - } - layout->setAlignment(Qt::AlignHCenter); - layout->setContentsMargins(0, 0, 0, 0); - slider.setFocusPolicy(Qt::StrongFocus); - slider.setTickPosition(QSlider::TicksBothSides); - slider.setTickInterval((max - min) / 11); - slider.setMinimumHeight(0); - slider.setSingleStep(1); - slider.setRange(min, max); - slider.setValue(0); - slider.setMinimumWidth(50); - slider.setToolTip(name); - slider.setStyleSheet("QSlider {" - "border: 1px solid #aa8895;" - "background: #20182d;" - "margin: 0px;}" - "QSlider::groove:vertical {" - "border: 1px solid #999999;" - "width: 25px;" - "margin: -4px;}" - "QSlider::handle:vertical {" - "background: white;" - "border: 1px solid #5c5c5c;" - "width: 29px;" - "height: 7px;" - "margin: -2px;" - "border-radius: 2px;}" - "Qslider::tickmarks:vertical {background: white;" - "color: white;}" - "QSlider::add-page:vertical {background: blue;}" - "QSlider::sub-page:vertical {background: #20182d;}"); - slider.setContentsMargins(0, 0, 0, 0); - valueBox.setFocusPolicy(Qt::NoFocus); - valueBox.setButtonSymbols(QAbstractSpinBox::NoButtons); - valueBox.setMinimumWidth(50); - if (decimals) { - valueBox.setRange(-84.0f, 0.0f); - valueBox.setSpecialValueText("-inf"); - } else - valueBox.setRange(min, max); - valueBox.setValue(0); - valueBox.setDecimals(decimals); - valueBox.setObjectName(name); - valueBox.setToolTip(name); - valueBox.setAlignment(Qt::AlignHCenter); - valueBox.setContentsMargins(0, 0, 0, 0); - connect(&slider, SIGNAL(valueChanged(int)), this, SLOT(sliderValueChanged(int))); - connect(&valueBox, SIGNAL(click()), this, SLOT(enableSlider())); - layout->addWidget(&slider); - layout->addWidget(&valueBox); - this->setStyleSheet("border: 1px solid #aa8895;" - "background-color: black;" - "margin: 1px;" - ); - layout->setSpacing(0); - layout->setContentsMargins(0, 0, 0, 0); - this->setLayout(layout); -} - -void SliderGroup::sliderValueChanged(int value) -{ - valueBox.blockSignals(true); - if (valueBox.decimals()) { - float db = ((float)value / 771.0f) - 85.0f; - if (db <= -84.5f) { - valueBox.setSpecialValueText("-inf"); - } else - valueBox.setValue(db); - } else { - valueBox.setValue(value); - } - valueBox.blockSignals(false); - emit valueChanged(value); -}; - -void SliderGroup::setValue(float value) -{ - float db; - - slider.blockSignals(true); - valueBox.blockSignals(true); - if (int(value) != slider.value()) - slider.setValue(value); - if (valueBox.decimals()) { - db = (float)(value / 771.0f) - 85.0f; - valueBox.setValue(db); - } else - valueBox.setValue(value); - slider.blockSignals(false); - valueBox.blockSignals(false); -} diff --git a/src/slidergroup.h b/src/slidergroup.h deleted file mode 100644 index 39843bc..0000000 --- a/src/slidergroup.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef SLIDERGROUP_H -#define SLIDERGROUP_H - -#include -#include -#include - -#include "clickabledoublespinbox.h" -#include "clickableslider.h" - -class SliderGroup : public QWidget -{ - Q_OBJECT -public: - SliderGroup(QString name, - int min, - int max, - int decimals, - QWidget *parent = nullptr); - -signals: - void valueChanged(int value); - -public slots: - void setValue(float value); - void sliderValueChanged(int value); - -private: - ClickableSlider slider; - ClickableDoubleSpinBox valueBox; - -private slots: - void enableSlider() { slider.setEnabled(true); } - -}; - -#endif