funcionando ;-)
This commit is contained in:
parent
1013798788
commit
5d57eb705a
9 changed files with 54 additions and 79 deletions
|
@ -1,22 +1,7 @@
|
|||
*******************************************************************************
|
||||
|
||||
Libre Media Server Audio - An Open source Media Server.
|
||||
(c) Santiago Noreña 2012-2024
|
||||
|
||||
*******************************************************************************
|
||||
|
||||
Developing and support: libremediaserver@criptomart.net
|
||||
|
||||
(c) Santiago Noreña 2012-2024 <libremediaserver@criptomart.net>
|
||||
Code: https://github.com/criptomart/lms
|
||||
|
||||
*******************************************************************************
|
||||
|
||||
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, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*******************************************************************************
|
||||
|
||||
Lbre Media Server ChangeLog
|
||||
|
@ -26,7 +11,7 @@ Lbre Media Server ChangeLog
|
|||
v 0.1.3 (1/05/2024)
|
||||
|
||||
- Ubuntu 22.04 jammy
|
||||
- Use SFML from system
|
||||
- Use SFML as audio engine
|
||||
- Qt 5.15.3
|
||||
|
||||
v 0.1.2 (12/08/2015)
|
||||
|
|
|
@ -1,21 +1,18 @@
|
|||
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, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*******************************************************************************
|
||||
Libre Media Server Audio - An Open source Media Server.
|
||||
(c) Santiago Noreña 2014-2024
|
||||
Developing and support: libremediaserver@criptomart.net
|
||||
Code: http://github.com/criptomart/libremediaserver
|
||||
(c) Santiago Noreña 2014-2024 <libremediaserver@criptomart.net>
|
||||
http://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, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*******************************************************************************
|
||||
|
||||
0. Requisites
|
||||
- sudo apt-get install build-essential qmake-qt5 gcc g++ libtool libsfml-dev qtbase5-dev libqt5webkit5-dev qtwebengine5-dev
|
||||
- OLA https://www.openlighting.org/ola/linuxinstall/#Git
|
||||
-- ToDo: la instalación de OLA es un infierno, hay que empaquetarlo
|
||||
|
||||
1. Compiles
|
||||
$ cd src
|
||||
$ qmake -spec linux-g++ -o Makefile libremediaserver-audio.pro
|
||||
$ make -w
|
||||
|
|
|
@ -1,11 +1,7 @@
|
|||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<dmxSettings fileVersion="1" layersNumber="3" path="/home/snt/lab/lms/sound" universeNumber="1">
|
||||
<dmxSettings fileVersion="1" layersNumber="4" path="/path/to/medias" universeNumber="1">
|
||||
<layer0 dmx="1" universe="1" />
|
||||
<layer1 dmx="21" universe="1" />
|
||||
<layer2 dmx="41" universe="1" />
|
||||
<layer3 dmx="61" universe="1" />
|
||||
<layer4 dmx="257" universe="1" />
|
||||
<layer5 dmx="321" universe="1" />
|
||||
<layer6 dmx="385" universe="1" />
|
||||
<layer7 dmx="449" universe="1" />
|
||||
<layer1 dmx="17" universe="1" />
|
||||
<layer2 dmx="33" universe="1" />
|
||||
<layer2 dmx="49" universe="1" />
|
||||
</dmxSettings>
|
||||
|
|
37
libremediaserver-audio.pro
Normal file
37
libremediaserver-audio.pro
Normal file
|
@ -0,0 +1,37 @@
|
|||
TEMPLATE = app
|
||||
TARGET = libremediaserver-audio
|
||||
QT += webkitwidgets widgets
|
||||
CONFIG += debug
|
||||
DESTDIR =
|
||||
HEADERS += src/libremediaserver-audio.h \
|
||||
src/medialibrary.h \
|
||||
src/olathread.h \
|
||||
src/audiolayerwidget.h \
|
||||
src/dmxPersonality.h \
|
||||
src/audiowidget.h \
|
||||
src/audiomasterwidget.h \
|
||||
src/defines.h \
|
||||
src/settings.h \
|
||||
src/settingsdialog.h \
|
||||
src/layersettingswidget.h
|
||||
SOURCES += src/main.cpp \
|
||||
src/libremediaserver-audio.cpp \
|
||||
src/medialibrary.cpp \
|
||||
src/olathread.cpp \
|
||||
src/audiolayerwidget.cpp \
|
||||
src/audiowidget.cpp \
|
||||
src/audiomasterwidget.cpp \
|
||||
src/settings.cpp \
|
||||
src/settingsdialog.cpp \
|
||||
src/layersettingswidget.cpp
|
||||
FORMS += src/libremediaserver-audio.ui \
|
||||
src/settingsdialog.ui \
|
||||
src/layersettingswidget.ui
|
||||
LIBS += -lola -lolacommon -lsfml-audio -lsfml-system
|
||||
# -lcitp
|
||||
RESOURCES =
|
||||
OTHER_FILES += \
|
||||
LICENSE.txt \
|
||||
docs/compiling.txt \
|
||||
docs/changelog.txt \
|
||||
docs/lms-audio.xlm
|
|
@ -2,7 +2,7 @@
|
|||
#define DEFINES_H
|
||||
|
||||
#define VERSION "LibreMediaServer-Audio 0.1.3"
|
||||
#define COPYRIGHT "(C) 2014 Santi Norena libremediaserver@gmail.com"
|
||||
#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 3
|
||||
|
|
|
@ -31,6 +31,6 @@
|
|||
#define ENTRY_POINT_COARSE 7
|
||||
#define ENTRY_POINT_FINE 8
|
||||
|
||||
#define LAYER_CHANNELS 5
|
||||
#define LAYER_CHANNELS 4 // ToDo: esto tiene que desaparecer
|
||||
|
||||
#endif // DMXPERSONALITY_H
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
TEMPLATE = app
|
||||
TARGET = libremediaserver-audio
|
||||
QT += webkitwidgets widgets
|
||||
CONFIG += debug
|
||||
DESTDIR = ./debug
|
||||
HEADERS += libremediaserver-audio.h \
|
||||
medialibrary.h \
|
||||
olathread.h \
|
||||
audiolayerwidget.h \
|
||||
dmxPersonality.h \
|
||||
audiowidget.h \
|
||||
audiomasterwidget.h \
|
||||
defines.h \
|
||||
settings.h \
|
||||
settingsdialog.h \
|
||||
layersettingswidget.h
|
||||
SOURCES += main.cpp \
|
||||
libremediaserver-audio.cpp \
|
||||
medialibrary.cpp \
|
||||
olathread.cpp \
|
||||
audiolayerwidget.cpp \
|
||||
audiowidget.cpp \
|
||||
audiomasterwidget.cpp \
|
||||
settings.cpp \
|
||||
settingsdialog.cpp \
|
||||
layersettingswidget.cpp
|
||||
FORMS += libremediaserver-audio.ui \
|
||||
settingsdialog.ui \
|
||||
layersettingswidget.ui
|
||||
LIBS += -lola -lolacommon -lsfml-audio -lsfml-system
|
||||
# -lcitp
|
||||
RESOURCES =
|
||||
OTHER_FILES += \
|
||||
../LICENSE.txt \
|
||||
../credits.txt \
|
||||
../compiling.txt \
|
||||
../changelog.txt \
|
||||
../lms-audio.xlm
|
|
@ -2,7 +2,7 @@
|
|||
Libre Media Server - A media server for audio playback in stage arts
|
||||
controlled by lingting protocols (DMX, ArtNet, ACN,...)
|
||||
|
||||
Copyright (C) 2015 Santiago Noreña libremediaserver@gmail.com
|
||||
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
|
||||
|
|
|
@ -15,10 +15,8 @@ MediaLibrary *MediaLibrary::getInstance() {
|
|||
|
||||
MediaLibrary::MediaLibrary(QObject *parent) :
|
||||
QObject(parent)
|
||||
// ,m_media(new QList<MediaFolder>)
|
||||
{
|
||||
// initMediaLibrary();
|
||||
// qDebug("Init MediaLibrary");
|
||||
m_media = NULL;
|
||||
}
|
||||
|
||||
void MediaLibrary::initMediaLibrary() {
|
||||
|
|
Loading…
Add table
Reference in a new issue