From 5d57eb705a2db7bdbab89c04fbf3d8286973a0bd Mon Sep 17 00:00:00 2001 From: snt Date: Wed, 17 Apr 2024 22:00:11 +0200 Subject: [PATCH] funcionando ;-) --- docs/changelog.txt | 19 ++--------------- docs/compiling.txt | 17 +++++++-------- docs/lms-audio.xlm | 12 ++++------- libremediaserver-audio.pro | 37 +++++++++++++++++++++++++++++++++ src/defines.h | 2 +- src/dmxPersonality.h | 2 +- src/libremediaserver-audio.pro | 38 ---------------------------------- src/main.cpp | 2 +- src/medialibrary.cpp | 4 +--- 9 files changed, 54 insertions(+), 79 deletions(-) create mode 100644 libremediaserver-audio.pro delete mode 100644 src/libremediaserver-audio.pro diff --git a/docs/changelog.txt b/docs/changelog.txt index 90c64b7..a795e69 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -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 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) diff --git a/docs/compiling.txt b/docs/compiling.txt index edbdece..c9d01c7 100644 --- a/docs/compiling.txt +++ b/docs/compiling.txt @@ -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 +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 diff --git a/docs/lms-audio.xlm b/docs/lms-audio.xlm index 226f6df..37e53c9 100644 --- a/docs/lms-audio.xlm +++ b/docs/lms-audio.xlm @@ -1,11 +1,7 @@ - + - - - - - - - + + + diff --git a/libremediaserver-audio.pro b/libremediaserver-audio.pro new file mode 100644 index 0000000..faf4507 --- /dev/null +++ b/libremediaserver-audio.pro @@ -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 diff --git a/src/defines.h b/src/defines.h index 62ae99f..9f6316a 100644 --- a/src/defines.h +++ b/src/defines.h @@ -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 diff --git a/src/dmxPersonality.h b/src/dmxPersonality.h index 893538b..1728938 100644 --- a/src/dmxPersonality.h +++ b/src/dmxPersonality.h @@ -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 diff --git a/src/libremediaserver-audio.pro b/src/libremediaserver-audio.pro deleted file mode 100644 index ba5e1d1..0000000 --- a/src/libremediaserver-audio.pro +++ /dev/null @@ -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 diff --git a/src/main.cpp b/src/main.cpp index cccd2d7..4797866 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 diff --git a/src/medialibrary.cpp b/src/medialibrary.cpp index bef5c9d..e196001 100644 --- a/src/medialibrary.cpp +++ b/src/medialibrary.cpp @@ -15,10 +15,8 @@ MediaLibrary *MediaLibrary::getInstance() { MediaLibrary::MediaLibrary(QObject *parent) : QObject(parent) -// ,m_media(new QList) { -// initMediaLibrary(); -// qDebug("Init MediaLibrary"); + m_media = NULL; } void MediaLibrary::initMediaLibrary() {