funcionando ;-)
This commit is contained in:
parent
1013798788
commit
5d57eb705a
9 changed files with 54 additions and 79 deletions
|
@ -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
Add a link
Reference in a new issue