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

WIP miniaudio working, some sigsev while playing...

Browse source
This commit is contained in:
snt 2024-04-20 20:19:16 +02:00
parent 78695b7976
commit 7aea8f6cf1
23 changed files with 469 additions and 299 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
docs/changelog.txt
View file

@ -1,18 +1,14 @@
*******************************************************************************
Libre Media Server Audio - An Open source Media Server for arts and performing.
(c) Santiago Noreña 2012-2024 <lms@criptomart.net>
Code: https://git.criptomart.net/libremediaserver
(c) Criptomart - Santiago Noreña 2012-2024 <lms@criptomart.net>
https://git.criptomart.net/libremediaserver
*******************************************************************************
Lbre Media Server ChangeLog
v 0.1.3 (28/05/2024)
+ Ubuntu 22.04 jammy.
+ Use SFML as audio engine.
+ Qt 5.15.3.
+ pitch.
+ loop.
v 1.4
- change engine to miniaudio.
- Select sound device output.
- pan.
- Show faders values.
--> Hacer UI por fader: mute/centrado, valor, visualizador:
@ -20,6 +16,14 @@ v 0.1.3 (28/05/2024)
- SettingsDialog.
- Load/save conf file.
v 0.1.3 (19/04/2024)
+ Ubuntu 22.04 jammy.
+ Use SFML as audio engine.
+ Qt 5.15.3.
+ pitch.
+ loop.
v 0.1.2 (12/08/2015)
- GUI config

4
docs/compiling.txt
View file

@ -1,6 +1,6 @@
*******************************************************************************
Libre Media Server Audio - An Open source Media Server.
(c) Santiago Noreña 2014-2024 <libremediaserver@criptomart.net>
Libre Media Server Audio - An Open source Media Server for arts and performing.
(c) Criptomart - Santiago Noreña 2012-2024 <lms@criptomart.net>
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.

3
docs/lms-audio.xlm
View file

@ -1,5 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<dmxSettings fileVersion="1" layersNumber="4" path="/path/to/medias" universeNumber="1">
<dmxSettings fileVersion="1" layersNumber="4" path="/home/snt/Documentos/lab/lms/media/sound" universeNumber="1">
<audioDevice id="3" />
<layer0 dmx="1" universe="1" />
<layer1 dmx="17" universe="1" />
<layer2 dmx="33" universe="1" />

42
docs/roadmap.txt
View file

@ -1,15 +1,18 @@
*******************************************************************************
Libre Media Server Audio - An Open source Media Server for arts and performing.
(c) Santiago Noreña 2012-2024 <lms@criptomart.net>
Code: https://git.criptomart.net/libremediaserver
(c) Criptomart - Santiago Noreña 2012-2024 <lms@criptomart.net>
https://git.criptomart.net/libremediaserver
*******************************************************************************
Libre Media Server Roadmap
(or a whislist...)
(en continuo crecimiento...)
v 0.2.1
v 0.2.x
- skin, UI/UX
- live input.
- insertar/bypass/eliminar audio procesadores sin reiniciar por capa y master. (compresor, equs).
- FX en capas master para que se puedan usar como envíos de auxiliar.
- Enroutado de masters en otros masters (retorno de efectos).
v 0.2.0
- Use sACN directly.
@ -17,15 +20,13 @@ v 0.2.0
+ hay que empaquetar OLA, incluirlo en el binario, o implementar sACN y linkarlo estáticamente.
+ https://github.com/ETCLabs/sACN
- Qt6.
- audio processing (eq, rev, compresor, ...).
- audio processing (eq, rev, compresor, ...) por master y capa.
- CIPT/MSex, send icons play-pause-stop.
- Rasp build.
- Octopus Sound Card support (6 outputs - 8 inputs).
v 1.5
- Select sound device output.
- Multi device output, router layers to devices and audio outputs.
- Jack/pipewire integration?
- Multi devices output.
- Rose noise and sine generator in menu to test system.
- Play Mode:
- Play all medias found in folder consecutevily or random, with loop.
@ -34,18 +35,19 @@ v 1.5
- 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.
- Master Bus Layer:
- each layer will have one "Gain" prefader that acts in source, "Vol" in v 1.3.
- each layer will have one volume dmx channel for each bus layer. One aux "Send" prefader.
- mute/panic.
- fader + value
- pan.
- magicq .hed
- audio device linked, outputs will be redirected there.
- dmx address + universe settings.
- Keyboards strokes, select files from ui.
- Dar la opción clickeando en el widget de tiempo de poner una cuenta atrás en vez de hacia delante.
- 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.
- Refactor AudioMasterWidget to AudioDMXReceptionWidget. Master functions will be in AudioWidget.
- New control mode without pitch control, it saves resources. MA_SOUND_FLAG_NO_PITCH
- Vumeter or indicator about audio output in layer and master.

13
libremediaserver-audio.pro
View file

@ -2,6 +2,7 @@ TEMPLATE = app
TARGET = libremediaserver-audio
QT += webkitwidgets widgets
HEADERS += src/libremediaserver-audio.h \
src/miniaudio.h \
src/medialibrary.h \
src/olathread.h \
src/audiolayerwidget.h \
@ -13,6 +14,7 @@ HEADERS += src/libremediaserver-audio.h \
src/settingsdialog.h \
src/layersettingswidget.h
SOURCES += src/main.cpp \
src/miniaudio.c \
src/libremediaserver-audio.cpp \
src/medialibrary.cpp \
src/olathread.cpp \
@ -25,12 +27,13 @@ SOURCES += src/main.cpp \
FORMS += src/libremediaserver-audio.ui \
src/settingsdialog.ui \
src/layersettingswidget.ui
LIBS += -lola -lolacommon
CCFLAG += -msse2 -mavx2 #-fsanitize=address -g -O0
QMAKE_CXXFLAGS += $$(CXXFLAG)
#QMAKE_CXXFLAGS += -fsanitize=address -g -O0
QMAKE_CFLAGS += $$(CCFLAG)
QMAKE_LFLAGS += $$(LDFLAG)
LIBS += -lola -lolacommon -ldl -lpthread -lm
# -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 \

179
src/audiolayerwidget.cpp
View file

@ -1,31 +1,20 @@
#include "audiolayerwidget.h"
#include<iostream>
#include <QDebug>
#include <QVBoxLayout>
#include <QFile>
#include <QTime>
AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
QGroupBox(parent)
, m_suspendResumeButton(0)
, m_watchDMX(new QTimer(this))
, m_currentMedia(" ")
, m_running(false)
, m_refreshGUI(new QTimer(this))
, m_currentMedia("")
, m_mediaLoaded(false)
{
this->setTitle(name);
QVBoxLayout *layout = new QVBoxLayout;
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();
@ -58,8 +47,8 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
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->setMinimum(-100);
m_volumeSlider->setMaximum(100);
m_volumeSlider->setSingleStep(1);
m_volumeIndicator = new QLabel;
volumeBox->addWidget(m_volumeLabel, 0, 0);
@ -111,13 +100,8 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
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);
layout->addWidget(m_progressSlider);
m_suspendResumeButton = new QPushButton(this);
m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
@ -125,12 +109,8 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
layout->addWidget(m_suspendResumeButton);
this->setLayout(layout);
connect(m_watchDMX, SIGNAL(timeout()),
this, SLOT(refreshGUI()));
m_watchDMX->start(100);
m_music.setAttenuation(0);
connect(m_refreshGUI, SIGNAL(timeout()), this, SLOT(refreshGUI()));
m_refreshGUI->start(100);
}
AudioLayerWidget::~AudioLayerWidget()
@ -140,36 +120,42 @@ AudioLayerWidget::~AudioLayerWidget()
void AudioLayerWidget::volumeChanged(int value)
{
m_music.setVolume(value);
float result;
if (m_mediaLoaded == false)
return;
result = ma_volume_linear_to_db(value);
ma_sound_group_set_volume(&currentSound, result);
}
void AudioLayerWidget::panChanged(int 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());
float result;
if (m_mediaLoaded == false)
return;
result = (value / 128.0) - 128;
ma_sound_group_set_pan(&currentSound, result);
}
void AudioLayerWidget::pitchChanged(int value)
{
m_music.setPitch(qreal(value / 128.0 ));
float result;
if (m_mediaLoaded == false)
return;
result = (value / 128.0) - 128;
ma_sound_group_set_pitch(&currentSound, result);
}
void AudioLayerWidget::loopChanged(int value)
{
m_music.setLoop(value);
if (m_mediaLoaded == false)
return;
ma_sound_set_looping(&currentSound, value);
}
void AudioLayerWidget::setVol(qreal vol)
{
m_music.setVolume(vol);
this->volumeChanged(vol);
m_volumeSlider->blockSignals(true);
m_volumeSlider->setValue(vol);
m_volumeIndicator->setText(QString::number(vol));
@ -186,7 +172,7 @@ void AudioLayerWidget::setPan(qreal pan)
void AudioLayerWidget::setPitch(qreal pitch)
{
m_music.setPitch(float(pitch / 128 ));
this->pitchChanged(pitch);
m_pitchSlider->blockSignals(true);
m_pitchSlider->setValue(pitch);
m_pitchSlider->blockSignals(false);
@ -194,6 +180,12 @@ void AudioLayerWidget::setPitch(qreal pitch)
void AudioLayerWidget::loadMedia(QString file)
{
ma_result result;
ma_format *format = 0;
ma_uint32 *channels = 0;
ma_uint32 *sampleRate = 0;
if (m_currentMedia.compare(file) == 0 ) {
return;
}
@ -201,21 +193,46 @@ void AudioLayerWidget::loadMedia(QString 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());
ma_engine engine = AudioWidget::getInstance()->getEngine();
if (currentSound.ownsDataSource == true)
{
ma_sound_uninit(&currentSound);
}
result = ma_sound_init_from_file(&engine, file.toLatin1(), MA_SOUND_FLAG_NO_SPATIALIZATION | MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_DECODE | MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_ASYNC | MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_STREAM, NULL, NULL, &currentSound);
if (result != MA_SUCCESS) {
qWarning("WARNING: Failed to load sound %s", file.toLatin1().constData());
return;
}
m_currentMedia = file;
durationChanged(m_music.getDuration().asMilliseconds());
float pLength = this->getDuration();
result = ma_sound_get_data_format(&currentSound, format, channels, sampleRate, NULL, 0);
if (result != MA_SUCCESS) {
qWarning("WARNING: Failed to get data format %s", file.toLatin1().constData());
return;
}
m_mediaLoaded = true;
durationChanged(pLength * 1000);
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;
std::cout << " " << pLength << " seconds";
std::cout << " -- " << sampleRate << " samples/sec";
std::cout << " -- " << format << " format";
std::cout << " -- " << channels << " channels" << std::endl;
}
float AudioLayerWidget::getDuration()
{
float pLength;
if (m_mediaLoaded == false)
return 0;
ma_result result = ma_sound_get_length_in_seconds(&currentSound, &pLength);
if (result != MA_SUCCESS) {
qWarning("WARNING: Failed to get total duration %s", m_currentMedia.toLatin1().constData());
return 0;
}
return pLength;
}
void AudioLayerWidget::fileLoaded(QString file)
@ -236,56 +253,66 @@ void AudioLayerWidget::durationChanged(qint64 dur)
void AudioLayerWidget::play(bool loop)
{
m_music.play();
m_music.setLoop(loop);
if (m_mediaLoaded == false)
return;
ma_sound_set_looping(&currentSound, loop);
ma_sound_start(&currentSound);
m_loopCheck->blockSignals(true);
m_loopCheck->setChecked(m_music.getLoop());
m_loopCheck->setChecked(loop);
m_loopCheck->blockSignals(false);
}
void AudioLayerWidget::pause()
{
m_music.pause();
if (m_mediaLoaded == false)
return;
ma_sound_stop(&currentSound);
}
void AudioLayerWidget::stop()
{
m_music.stop();
if (m_mediaLoaded == false)
return;
ma_sound_stop(&currentSound);
ma_sound_seek_to_pcm_frame(&currentSound, 0);
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(0));
m_statusValue->setText(STOP_LABEL);
m_suspendResumeButton->setText(tr(STOP_LABEL));
m_progressSlider->setValue(0);
}
void AudioLayerWidget::refreshGUI() {
// m_receiveDMX->setChecked(false);
int progress;
switch (m_music.getStatus()) {
case sf::SoundSource::Playing:
progress = m_music.getPlayingOffset().asMilliseconds();
float progress;
if (m_mediaLoaded == false)
return;
if (currentSound.ownsDataSource == 0)
return;
switch (ma_sound_is_playing(&currentSound)) {
case true:
ma_sound_get_cursor_in_seconds(&currentSound, &progress);
progress *= 1000;
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:
case false:
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();
if (m_mediaLoaded == false)
return;
if (ma_sound_is_playing(&currentSound)) {
this->pause();
} else {
m_music.play();
if (ma_sound_at_end(&currentSound))
ma_sound_seek_to_pcm_frame(&currentSound, 0);
ma_sound_start(&currentSound);
}
}

44
src/audiolayerwidget.h
View file

@ -1,22 +1,25 @@
#ifndef AUDIOLAYERWIDGET_H
#define AUDIOLAYERWIDGET_H
#include <cmath>
#include <iostream>
#include <QDebug>
#include <QFile>
#include <QTime>
#include <QByteArray>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include <QSlider>
#include <QTimer>
#include <QTime>
#include <QTimeEdit>
#include <QGroupBox>
#include <QCheckBox>
#include <SFML/Audio.hpp>
#include <SFML/System.hpp>
#include "defines.h"
#include "audiowidget.h"
#include "miniaudio.h"
class AudioLayerWidget : public QGroupBox
{
@ -32,20 +35,8 @@ public:
* @param file name with full path
*/
void loadMedia(QString file);
/**
* @brief play
*/
void play(bool loop);
/**
* @brief stop
*/
void stop();
/**
* @brief pause
*/
void pause();
/**
@ -53,20 +44,11 @@ public:
* @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:
@ -120,14 +102,12 @@ private:
QLabel * m_folderLabel;
QLabel * m_folderValue;
//QCheckBox *m_receiveDMX;
QTimer *m_watchDMX;
QTimer *m_refreshGUI;
QString m_currentMedia;
ma_sound currentSound;
ma_bool8 m_mediaLoaded;
bool m_running;
sf::Music m_music;
float getDuration();
private slots:

12
src/audiomasterwidget.cpp
View file

@ -1,22 +1,12 @@
#include "audiomasterwidget.h"
#include <QVBoxLayout>
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");
m_receiveDMX->setText("DMX signal");
vbox->addWidget(m_receiveDMX);
this->setLayout(vbox);
connect(m_watchDMX, SIGNAL(timeout()),

2
src/audiomasterwidget.h
View file

@ -6,7 +6,7 @@
#include <QSlider>
#include <QCheckBox>
#include <QGroupBox>
#include <QVBoxLayout>
//#include "ui_audiomasterwidget.h"

126
src/audiowidget.cpp
View file

@ -1,4 +1,5 @@
#include "audiowidget.h"
#include "miniaudio.c"
AudioWidget *AudioWidget::_instance = 0;
@ -11,30 +12,117 @@ AudioWidget *AudioWidget::getInstance() {
return _instance;
}
AudioWidget::AudioWidget()
AudioWidget::AudioWidget() :
engineCount(0)
{
this->startEngine();
layout = new QHBoxLayout();
for (int i= 0; i < Settings::getInstance()->getLayersNumber(); i++ ) {
layout->insertWidget(i, new AudioLayerWidget(this, tr("Layer %1").arg(i)));
layout->insertWidget(i, new AudioLayerWidget(this, tr("Layer %1").arg(i + 1)));
}
setLayout(layout);
// qDebug( "Init AudioWidget");
}
void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount)
{
(void)pInput;
//Do master audio processing before sending to device.
ma_engine_read_pcm_frames((ma_engine*)pDevice->pUserData, pOutput, frameCount, NULL);
}
void AudioWidget::startEngine(int n)
{
this->startContext();
this->startDevice(n);
}
void AudioWidget::startDevice(int id)
{
ma_result result;
ma_device_config deviceConfig;
ma_engine_config engineConfig;
deviceConfig = ma_device_config_init(ma_device_type_playback);
deviceConfig.playback.pDeviceID = &pPlaybackDeviceInfos[id].id;
deviceConfig.playback.format = resourceManager.config.decodedFormat;
deviceConfig.playback.channels = 0;
deviceConfig.sampleRate = resourceManager.config.decodedSampleRate;
deviceConfig.dataCallback = data_callback;
deviceConfig.pUserData = &engines[engineCount];
result = ma_device_init(&context, &deviceConfig, &devices[engineCount]);
if (result != MA_SUCCESS) {
qCritical("Failed to initialize audio device %s.", pPlaybackDeviceInfos[id].name);
return;
}
engineConfig = ma_engine_config_init();
engineConfig.pDevice = &devices[engineCount];
engineConfig.pResourceManager = &resourceManager;
engineConfig.noAutoStart = MA_TRUE;
result = ma_engine_init(NULL, &engines[engineCount]);
if (result != MA_SUCCESS) {
qCritical("Failed to initialize audio engine.");
return;
}
result = ma_engine_start(&engines[engineCount]);
if (result != MA_SUCCESS) {
qCritical("Failed to start audio engine %d.", engineCount);
}
//engineCount +=1;
iChosenDevice = id;
qInfo("Initialized audio device %d: %s", id, pPlaybackDeviceInfos[id].name);
}
void AudioWidget::startContext()
{
ma_result result;
resourceManagerConfig = ma_resource_manager_config_init();
resourceManagerConfig.decodedFormat = ma_format_f32; /* ma_format_f32 should almost always be used as that's what the engine (and most everything else) uses for mixing. */
resourceManagerConfig.decodedChannels = 0;
resourceManagerConfig.decodedSampleRate = 0;
resourceManagerConfig.jobThreadCount = 0;
result = ma_resource_manager_init(&resourceManagerConfig, &resourceManager);
if (result != MA_SUCCESS) {
qCritical("Failed to initialize audio resource manager.");
return;
}
result = ma_context_init(NULL, 0, NULL, &context);
if (result != MA_SUCCESS) {
qCritical("Failed to initialize audio context.");
return;
}
}
void AudioWidget::startEngine()
{
this->startContext();
this->getAllAudioDevices();
iChosenDevice = Settings::getInstance()->getAudioDeviceId();
this->startDevice(iChosenDevice);
}
ma_engine AudioWidget::getEngine()
{
return(engines[engineCount]);
}
void AudioWidget::stopEngine()
{
ma_engine_uninit(&engines[engineCount]);
ma_device_uninit(&devices[engineCount]);
ma_context_uninit(&context);
ma_resource_manager_uninit(&resourceManager);
}
void AudioWidget::mediaLoaded(int layer, QString media)
{
QLayoutItem * const item = layout->itemAt(layer);
dynamic_cast<AudioLayerWidget *>(item->widget())->loadMedia(media);
// qDebug() << "AudioWidget::mediaLoaded Received layer: " << layer
// << "Media: " << media;
}
void AudioWidget::volChanged(int layer, qreal vol) {
QLayoutItem * const item = layout->itemAt(layer);
dynamic_cast<AudioLayerWidget *>(item->widget())->setVol(vol);
// qDebug() << "AudioWidget::volChanged Received layer: " << layer
// << "Vol : " << vol;
}
void AudioWidget::panChanged(int layer, qreal vol) {
@ -65,10 +153,20 @@ void AudioWidget::playbackChanged(int layer, Status status)
break;
}
}
/*
void AudioWidget::layerReceived(int layer)
{
QLayoutItem * const item = layout->itemAt(layer);
dynamic_cast<AudioLayerWidget *>(item->widget())->updateWatchDMX(true);
}*/
// enum all audio devices in system
void AudioWidget::getAllAudioDevices()
{
ma_result result;
result = ma_context_get_devices(&context, &pPlaybackDeviceInfos, &playbackDeviceCount, NULL, NULL);
if (result != MA_SUCCESS) {
qCritical("Failed to enumerate playback devices.");
ma_context_uninit(&context);
return;
}
for (ma_uint32 iAvailableDevice = 0; iAvailableDevice < playbackDeviceCount; iAvailableDevice += 1) {
qInfo("%d: : %s", iAvailableDevice, pPlaybackDeviceInfos[iAvailableDevice].name);
}
return ;
}

25
src/audiowidget.h
View file

@ -4,12 +4,14 @@
#include <QObject>
#include <QWidget>
#include <QVBoxLayout>
#include <QDialog>
#include "audiomasterwidget.h"
#include "audiolayerwidget.h"
#include "defines.h"
#include "settings.h"
#include "miniaudio.h"
#include "defines.h"
#include "SFML/Audio/SoundSource.hpp"
class AudioWidget : public QWidget
{
@ -19,20 +21,37 @@ class AudioWidget : public QWidget
public:
static AudioWidget *getInstance();
ma_engine getEngine();
void stopEngine();
void startEngine(int id);
ma_device_info* pPlaybackDeviceInfos;
ma_uint32 playbackDeviceCount;
ma_uint32 iChosenDevice;
protected:
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);
void startEngine();
private:
static AudioWidget *_instance;
AudioWidget();
QHBoxLayout *layout;
ma_engine engines[MAX_DEVICES];
ma_uint32 engineCount;
ma_device devices[MAX_DEVICES];
ma_context context;
ma_resource_manager_config resourceManagerConfig;
ma_resource_manager resourceManager;
void getAllAudioDevices();
void startDevice(int id);
void startContext();
signals:

9
src/defines.h
View file

@ -1,7 +1,7 @@
#ifndef DEFINES_H
#define DEFINES_H
#define VERSION "LibreMediaServer-Audio 0.1.3"
#define VERSION "LibreMediaServer-Audio 0.1.4"
#define COPYRIGHT "(C) 2014-2024 Santi Norena lms@criptomart.net"
#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"
@ -9,11 +9,6 @@
#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"
@ -33,6 +28,8 @@ const int BufferSize = 262144;
#define NOTIFY_INTERVAL 150
#define PULL_TIMER_INTERVAL 10
#define MAX_DEVICES 16
#define MAX_SOUNDS 4096
// struct where save the DMX settings for each layer
struct dmxSetting {

91
src/libremediaserver-audio.cpp
View file

@ -1,7 +1,8 @@
/*
Libre Media Server - A Media Server Sotfware for stage and performing
Copyright (C) 2012-2024 Santi Noreña lms@criptomart.net
Libre Media Server Audio - An Open source Media Server for arts and performing.
(c) Criptomart - Santiago Noreña 2012-2024 <lms@criptomart.net>
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
@ -19,21 +20,16 @@
#include "libremediaserver-audio.h"
// QTextEdit * libreMediaServerAudio::textEdit = 0;
libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
: QMainWindow(parent)
{
Q_UNUSED(args);
ui.setupUi(this);
this->setWindowTitle(VERSION);
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);
Settings *set = Settings::getInstance();
set->readFile();
/*
if (args.contains("-log")) {
// Inicia el widget Terminal
@ -54,43 +50,35 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
textEdit, SLOT(append(QString)), Qt::QueuedConnection);
*/
this->setWindowTitle(VERSION);
this->setWindowTitle(VERSION);
qDebug() << VERSION;
qDebug() << COPYRIGHT;
qDebug() << LICENSE;
// 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
// start audio engine
MediaLibrary::getInstance()->initMediaLibrary();
setCentralWidget(AudioWidget::getInstance());
amw = new AudioMasterWidget(this);
QDockWidget *topWidget = new QDockWidget(tr("Master"), this);
topWidget->setAllowedAreas(Qt::TopDockWidgetArea);
topWidget->setWidget(amw);
addDockWidget(Qt::TopDockWidgetArea, topWidget);
// ola setup
ola = new olaThread();
Q_CHECK_PTR(ola);
connect(set, SIGNAL(registerUniverse(int)), ola, SLOT(registerUniverse(int)));
ola->registerUniverse(); // register now all the universes
ola->blockSignals(true);
connect(ola, SIGNAL (layerReceived()), amw, SLOT(updateWatchDMX()));
connect(ola, SIGNAL(dmxOutput(int, int, int)), this, SLOT(dmxInput(int, int, int)));
connect(ui.actionLaunch_OLA_Setup, SIGNAL(triggered()), this, SLOT(olasetup()));
ola->start(QThread::TimeCriticalPriority );
ola->blockSignals(false);
// 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) ) );
connect(set, SIGNAL(audioDeviceChanged(int)), this, SLOT(audioDeviceChanged(int)));
qDebug("Init Complete");
}
@ -101,8 +89,7 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
libreMediaServerAudio::~libreMediaServerAudio()
{
ola->stop();
// qDebug() << QDate::currentDate() << QTime::currentTime();
// qDebug() << "********************************************************************************";
AudioWidget::getInstance()->stopEngine();
}
///////////////////////////////////////////////////////////////////
@ -174,11 +161,11 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
break;
case VOLUME_COARSE:
f = ( value * 0x100 ) + ola->getValue(layer, VOLUME_FINE);
AudioWidget::getInstance()->volChanged(layer, f / 655.35);
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);
AudioWidget::getInstance()->volChanged(layer, (f / 655.35));
break;
case PAN:
AudioWidget::getInstance()->panChanged(layer, value);
@ -208,3 +195,9 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
break;
}
}
void libreMediaServerAudio::audioDeviceChanged(int id)
{
AudioWidget::getInstance()->stopEngine();
AudioWidget::getInstance()->startEngine(id);
}

15
src/libremediaserver-audio.h
View file

@ -1,6 +1,7 @@
/*
Libre Media Server - A Media Server Sotfware for stage and performing
Copyright (C) 2012-2014 Santiago Noreña libremediaserver@gmail.com
Libre Media Server Audio - An Open source Media Server for arts and performing.
(c) Criptomart - Santiago Noreña 2012-2024 <lms@criptomart.net>
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
@ -26,17 +27,17 @@
#include <QFileDialog>
#include <QTextStream>
#include <QWebView>
#include <QApplication>
#include <QVBoxLayout>
#include <QTextEdit>
#include "medialibrary.h"
#include "audiowidget.h"
#include "settings.h"
#include "medialibrary.h"
#include "olathread.h"
#include "settings.h"
#include "audiomasterwidget.h"
#include "defines.h"
#include "settingsdialog.h"
#include "defines.h"
#include "ui_libremediaserver-audio.h"
@ -70,7 +71,7 @@ private:
void save(QFile *file);
public slots:
// inline void toTerminal(QString msg) { textEdit->append(msg); }
void audioDeviceChanged(int id);
private slots:

8
src/libremediaserver-audio.ui
View file

@ -7,8 +7,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>126</width>
<height>89</height>
<width>199</width>
<height>218</height>
</rect>
</property>
<property name="windowTitle">
@ -20,8 +20,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>126</width>
<height>29</height>
<width>199</width>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">

9
src/main.cpp
View file

@ -1,8 +1,8 @@
/*
Libre Media Server - A media server for audio playback in stage arts
controlled by lingting protocols (DMX, ArtNet, ACN,...)
Copyright (C) 2015-2024 Santi Noreña lms@criptomart.net
Libre Media Server Audio - An Open source Media Server for arts and performing.
(c) Criptomart - Santiago Noreña 2012-2024 <lms@criptomart.net>
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
@ -18,9 +18,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QApplication>
//#include <QMutex>
//#include <QMutexLocker>
#include "libremediaserver-audio.h"
// Handler for pipe the stderr to a log file and texEdit

25
src/medialibrary.cpp
View file

@ -1,7 +1,5 @@
#include "medialibrary.h"
#include <QDebug>
MediaLibrary *MediaLibrary::_instance = 0;
MediaLibrary *MediaLibrary::getInstance() {
@ -20,7 +18,6 @@ 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());
@ -46,7 +43,7 @@ void MediaLibrary::initMediaLibrary() {
}
/**
* This set every media file included in one library/folder
* fill the struct with all files in one library/folder
*/
QList<MediaFile> MediaLibrary::getMediaInformation(QDir dir)
{
@ -60,31 +57,27 @@ QList<MediaFile> MediaLibrary::getMediaInformation(QDir dir)
// 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
*
/**
* returns the path to a media file from the library.
*/
QString MediaLibrary::requestNewFile(int folder, int file){
// Select one mediafile from the media library
if (!m_media) {
qWarning("Media Library not init. Set a correct path to medias library");
qWarning("MediaLibrary is not init. Set a correct path to media 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 {
qDebug("MediaLibrary::requestNewFile(): Requested file is greater than files in library");
}
} else {
qDebug("MediaLibrary::requestNewFile(): Requested folder is greater than media libraries");
}
} 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());
return newfile;
}

1
src/medialibrary.h
View file

@ -3,6 +3,7 @@
#include <QObject>
#include <QDir>
#include <QDebug>
#include "defines.h"
#include "settings.h"

5
src/settings.cpp
View file

@ -28,6 +28,7 @@ void Settings::setPathMedia(QString path)
// - 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
void Settings::readFromFile(QString file) {
QFile* xmlFile = new QFile(file);
if (!xmlFile->open(QIODevice::ReadOnly | QIODevice::Text)) {
@ -58,6 +59,10 @@ void Settings::readFromFile(QString file) {
continue;
}
}
if(xmlReader->name() == "audioDevice") {
m_audioDeviceId = xmlReader->attributes().value("id").toLocal8Bit().toInt();
continue;
}
QString add = "layer";
add.append(QString("%1").arg(counter));
if((xmlReader->name() == add)) {

12
src/settings.h
View file

@ -8,6 +8,7 @@
#include <QSet>
#include "medialibrary.h"
#include "audiowidget.h"
#include "defines.h"
/**
@ -96,6 +97,11 @@ public:
else
m_layersNumber = LAYERS_NUMBER;
}
inline int getAudioDeviceId() { return m_audioDeviceId; }
inline void setAudioDeviceId(int id) { m_audioDeviceId = id; }
private:
static Settings *_instance;
@ -106,6 +112,9 @@ private:
// The path to media library
QString m_pathmedia;
// The SO audio device id used
uint m_audioDeviceId;
/** Constructor
*
*/
@ -153,8 +162,7 @@ signals:
*/
void registerUniverse(int universe);
public slots:
void audioDeviceChanged(int id);
};
#endif // SETTINGS_H

56
src/settingsdialog.cpp
View file

@ -2,18 +2,20 @@
#include "ui_settingsdialog.h"
SettingsDialog::SettingsDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::SettingsDialog)
QDialog(parent)
, ui(new Ui::SettingsDialog)
, m_deviceDialog(NULL)
{
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->mediaPatchButton, SIGNAL(clicked()),
//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()),
this, SLOT(changeMediaPath()));
connect(ui->audioDeviceButton , SIGNAL(clicked()),
this, SLOT(changeAudioDevice()));
connect(ui->layersNumber, SIGNAL(valueChanged(int)),
this, SLOT(layersChanged(int)));
int layer = 0;
@ -42,7 +44,45 @@ void SettingsDialog::changeMediaPath()
QString file = fileNames.at(0);
Settings::getInstance()->setPathMedia(file);
QString desc = tr("Media Path Changed to: %1").arg(file);
qDebug("%s", desc.toLatin1().constData());
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<QSpinBox *>(item->widget())->value();
Settings::getInstance()->setAudioDeviceId(value);
qInfo("device selected: %i", value);
m_deviceDialog->close();
emit Settings::getInstance()->audioDeviceChanged(value);
}
void SettingsDialog::layersChanged(int val)

5
src/settingsdialog.h
View file

@ -21,11 +21,16 @@ 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

60
src/settingsdialog.ui
View file

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>429</height>
<height>563</height>
</rect>
</property>
<property name="windowTitle">
@ -16,9 +16,9 @@
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
<rect>
<x>290</x>
<y>390</y>
<width>101</width>
<x>10</x>
<y>530</y>
<width>381</width>
<height>32</height>
</rect>
</property>
@ -26,14 +26,14 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QSpinBox" name="layersNumber">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<y>50</y>
<width>52</width>
<height>31</height>
</rect>
@ -63,8 +63,8 @@
<widget class="QLabel" name="layersNumber_label">
<property name="geometry">
<rect>
<x>60</x>
<y>40</y>
<x>70</x>
<y>50</y>
<width>111</width>
<height>21</height>
</rect>
@ -73,25 +73,12 @@
<string>Layers Number</string>
</property>
</widget>
<widget class="QLabel" name="mediaPath">
<widget class="QPushButton" name="mediaPathButton">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>371</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
<widget class="QPushButton" name="mediaPatchButton">
<property name="geometry">
<rect>
<x>200</x>
<y>40</y>
<width>191</width>
<width>171</width>
<height>31</height>
</rect>
</property>
@ -108,14 +95,33 @@
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>9</x>
<y>99</y>
<width>381</width>
<height>281</height>
<x>0</x>
<y>80</y>
<width>401</width>
<height>451</height>
</rect>
</property>
<layout class="QVBoxLayout" name="layersLayout"/>
</widget>
<widget class="QPushButton" name="audioDeviceButton">
<property name="geometry">
<rect>
<x>210</x>
<y>10</y>
<width>181</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Change Audio Device</string>
</property>
<property name="default">
<bool>false</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</widget>
<resources/>
<connections>