moved auxiliary files to docs folder

compiling.txt

@@ -1,60 +0,0 @@
-*******************************************************************************
-
-Libre Media Server Audio - An Open source Media Server.
-(c) Santiago Noreña 2014
-
-*******************************************************************************
-
-Developing and support: libremediaserver@gmail.com
-
-Code: http://code.google.com/p/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.
-
-*******************************************************************************
-
-If you have troubles, or you are in another distro, you can try compiling from the source code.
-
-0. Requisites
-	tcl tk --> To compile Pure Data, not necesary to execute it without GUI (-gui option in command line)
-	build-essential	
-	make
-	qmake	
-	gcc
-	g++
-	libtool
-	ola-dev
-	
-1. Building pd
-	$./configure
-	$make
-
-2. LibreMediaserver Audio
-
-	Open the file libremediaserver-audio.pro with QtCreator and compile it.
-
-	or
-	
-	$ cd src
-	$ qmake-qt4 libremediaserver-audio.pro -r -spec linux-g++
-	$ make -w
-
-3. Putting all together.
-
-  Make a directory. Copy in it:
-    - libremediaserver binary
-    - Folder scripts
-    - Folder puredata
-    - the tcl folder in the pd sources. This is only necessary to show the Pure Data GUI's. You don't need if you don't want the GUI's. Only it's good for debugging purpouses and developing, for normal use you can skip this step.    
-
-  In the folder puredata copy:
-    - the pd executable
-    - Make a folder named externals and copy all the externals to it. All the externals compiled must be in ~HOME/pd-external. 
-
-

credits.txt

@@ -1,4 +0,0 @@
-Pure Data: Copyright © Miller Miller Puckette and others - BSD License.
-
-pdogg~/oggread~: Copyright © 2002-2004 by Olaf Matthes - GPL License.
-

docs/LibreMediaServer_Audio.hed

@@ -0,0 +1,55 @@
+＾皾湏毄讍悊€潫憙嚈曀寑剛扰臓崙櫗泛疮鷼岸沪瓲驖か<EFBFBD><EFBFBD><EFBFBD><EFBFBD>堪彪Й，称蛽咴斕与栧蚜赁尬履匾娤了脜绿衼祧<EFBFBD><EFBFBD><EFBFBD><EFBFBD>雠疰鬻惆<EFBFBD>＜<EFBFBD>
+堀阜刀ā相槜灜鬯勖
+и拍媚菀<EFBFBD>彏帶寣巼秮憯剴€煥覆蝶趱毤丁窚但К煯缚<EFBFBD>溟驷钽伿谠訖<EFBFBD>
+増唵檮儌劀煘潨嚉櫂棅晹搾崘<EFBFBD><EFBFBD><EFBFBD>┅沪イ⒕　榭〖缓垢范胆
+≡顡嫄欃稚惹婆拿禽肋掭苒谫<EFBFBD>
+哦剨廖研镱盱腓蹊珂邃汊帱
+韴<EFBFBD><EFBFBD>魂膂豸篁耩崚崒媻増噺<EFBFBD>
+桋圯諐倽湜殭槜攭敁拺惎<EFBFBD><EFBFBD>
+故貔铘赭<EFBFBD>綘烤郊缓护范荡巢睘<EFBFBD>
+呖敂崐槡棕寐晾咿蒉勤儇字赵佄
+枚安ū菌勘钩鼬汊徉<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>鲺趔<EFBFBD>
+銋咽吓浭盅俾棙儌亐煘潥嚉櫂棖晹悗
+冨耜镥皇鲴<EFBFBD>狄<EFBFBD>臣烤郊缓归<EFBFBD>荡巢毕脱
+拶稚惹婆拿垒肋掭苒谯<EFBFBD>
+拍稍右研镱镳腙殍珂彐<EFBFBD>
+痼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>鲺趔蝰饙<EFBFBD>
+煘棅増噯厔仦亐煘潨洏<EFBFBD>
+妳姇敁拺惎<EFBFBD><EFBFBD><EFBFBD>ěΗ<EFBFBD>
+卑綘烤郊缓护范荡巢蓖<EFBFBD>
+咿资扇瞧拍赁晾咿蒈圬<EFBFBD>
+刈中扔已畜铐潆鲩桤琦溷赆<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>牾趔黜饛帊悑妷帥唴寖<EFBFBD>
+亐煔亷<EFBFBD>妊厞晹搾崘<EFBFBD>グ<EFBFBD>┅沪イ＂<EFBFBD>竣
+郊痪オ则牯‘毕夏兴适邵婆穆蘖肋掭苒谂
+刈盅攘皠摢掣<EFBFBD>觊脲<EFBFBD>溏除<EFBFBD><EFBFBD><EFBFBD>帑<EFBFBD><EFBFBD>鲺麸
+蝰饖挓筝軟攪唴劅倎仐倽湜泤槜枙敁拺<EFBFBD>
+<EFBFBD><EFBFBD>犯婶鲲黪瘗臣烤嫉Ш够丢荡吵<EFBFBD>瓮趟噬熔
+婆拿铝肋<EFBFBD>
+蒈圳儇字稍右研镱眇腙殍珂邃<EFBFBD>忉<EFBFBD><EFBFBD><EFBFBD><EFBFBD>纟<EFBFBD>鲺趔蝽饛帊寢妷攪唴剝倎€優潨洑櫂棅晹搾憪<EFBFBD>爆<EFBFBD>┄Еジ＂<EFBFBD>烤郊Ш垢范荡钞毕瓮趟噬郧婆拿铝烂掭苒谫刈收杂已酗铖
+<EFBFBD>鲩桤驽溷恺<EFBFBD><EFBFBD><EFBFBD>帑<EFBFBD><EFBFBD>鲺趔铖饛帒寢妷<EFBFBD>
+噯厔儌亣優湝泦櫃枱墧捛悓
+<EFBFBD><EFBFBD><EFBFBD>┊沪が＞<EFBFBD>烤〖翰工
+范荡巢馍彝趟收惹婆孛铝烂
+掭苒谫嬓收杂彝酗铐痣觊棼
+驽溷忉锄恺<EFBFBD><EFBFBD><EFBFBD>鲺梵篑驌
+帊寢妷蹆殔厓倽€煘潃洓櫂<EFBFBD>
+枙敁拺惃箔<EFBFBD><EFBFBD>ěΕ福）牐
+窘蓟汗攵<EFBFBD>闯箔衔吞资扇勤
+拍寐晾屵淋圳倌字赵弦研矧
+盱腙殍存<EFBFBD>汊狳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+豸篁耩軒憣媻墧噯厔焸亐焸
+潨洑櫂臇墧搾憣<EFBFBD><EFBFBD>藩┄Ш
+イ＂<EFBFBD>炀〖缓工范荡<EFBFBD>毕窝
+趟噬惹暸孛铝烂掭苒瀑刈稚
+杂已酗巾痣觊棼驽溷<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>ヵ梵蝰饟帊寢枆垏啓
+柵偀€湆<EFBFBD>
+湜殭剠剦唩巸偝<EFBFBD><EFBFBD>订ěЧぃⅰ伎窘姬汗缚<EFBFBD>闯脖衔托
+耸扇瞧牌<EFBFBD>
+杏芡塘紊<EFBFBD>
+倨字赵右托耦盱腙轸瑛邃汊徉泾泓<EFBFBD><EFBFBD>麝蹶篁耩弾憣晩増噯厴
+憪潃煘潃
+泦檮棅晥搸憣<EFBFBD><EFBFBD><EFBFBD>┄Еイ<EFBFBD>
+⒔牐尽姬亥斧订疮箔弦托
+酥稍勤
+咆<EFBFBD>

docs/changelog.txt

@@ -1,13 +1,13 @@
 *******************************************************************************
 
 Libre Media Server Audio - An Open source Media Server.
-(c) Santiago Noreña 2014
+(c) Santiago Noreña 2012-2024
 
 *******************************************************************************
 
-Developing and support: libremediaserver@gmail.com
+Developing and support: libremediaserver@criptomart.net
 
-Code: http://code.google.com/p/libremediaserver
+Code: https://github.com/criptomart/lms
 
 *******************************************************************************
 
@@ -23,7 +23,20 @@ Lbre Media Server ChangeLog
 
 *******************************************************************************
 
-v 0.1-1
+v 0.1.3 (1/05/2024)
+
+- Ubuntu 22.04 jammy
+- Use SFML from system
+- Qt 5.15.3
+
+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

docs/compiling.txt

@@ -0,0 +1,21 @@
+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
+*******************************************************************************
+
+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
+
+1. Compiles
+	$ cd src
+        $ qmake -spec linux-g++ -o Makefile libremediaserver-audio.pro
+	$ make -w

docs/lms-audio.xlm

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<dmxSettings fileVersion="1" layersNumber="3" path="/home/santi/lo_que_vio_el_mayordomo/sound" universeNumber="1">
+<dmxSettings fileVersion="1" layersNumber="3" path="/home/snt/lab/lms/sound" universeNumber="1">
 <layer0 dmx="1" universe="1" />
 <layer1 dmx="21" universe="1" />
 <layer2 dmx="41" universe="1" />

docs/todo.txt

@@ -0,0 +1,11 @@
+To Do:
+
+1. Acabar SettingsDialog --> Hay que hacer una Qlist de layerSettingWidget (tiene un spinbox para universo y otro spinbox para los address. Si queremos interactuar directamente con los universos en vez de a través del patch de OLA habrá que cambiar el spinbox del universo por un ComboList con los distintos protocolos/dispositivos y luego un SpinBox para la configuración (NetId,...). De momento es más sencillo seguir como hasta ahora, pero hay que refactorizar la clase layerSettingWidget para permitir la ampliación en el futuro de forma sencilla. Esta clase será la que iteraccione directamente con Settings.
+2. LOGs y entrada de comandos. Depurar esto y dejarlo definitivo. 
+3. Entry Point / Exit Point
+4. Dar la opción clickeando en el widget de tiempo de poner una cuenta atrás en vez de hacia delante.
+5. Mover el dmx receiving checkbox a las capas.
+6. Mute global y por capas.
+7. Pan global y por capas. 
+8. Pitch
+9. Dos modos de reproducción: Loop y One Shot.

instalacion.txt

@@ -1,66 +0,0 @@
-*******************************************************************************
-
-Libre Media Server Audio - An Open source Media Server.
-(c) Santiago Noreña 2014
-
-*******************************************************************************
-
-Desarrollo y soporte: libremediaserver@gmail.com
-
-Página del proyecto: http://code.google.com/p/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. Requerimientos
-
-LMS Audio está desarrollado y probado en Debian Wheezy y derivados.
- 
-Para resolver dependencias es necesario tener conexión a internet en el ordenador durante el proceso de instalación.
-
-LMS se comunica con Pure Data mediante puertos TCP, del 9195 al 9198.  Open Lighting Arquitecure utiliza el puerto 9090 para su servidor web. Es necesario que estos puertos no estén siendo utilizados por otras aplicaciones.
-
-1. Instala Open Lignting Arquitecture 
-
-Añadimos el repositorio de Open Lighting al archivo /etc/apt/sources.list:
-
-$ echo "deb http://apt.openlighting.org/debian/ wheezy main" >> /etc/apt/sources.list
-
-Actualizamos las fuentes:
-
-$ apt-get update
-
-Instalamos los paquetes necesarios:
-
-$ apt-get -y --force-yes install ola libqtcore4 libqtgui4
-
-2. Configuración 
-
-Este proceso sólo es necesario la primera vez que se ejecuta LMS Audio.
-
-a. Inicia LMS Audio ejecutando el archivo "libremediaserver-audio"
-
-b. Pincha en la opción "OLA setup" en el menu File.
-
-c. Pincha en el botón "add universe"
-
-d. Marca en la casilla del protocolo de red o dispositivo por el que quieras introducir datos. Asegúrate de que en "Direction" sea "input".
-
-Si el protocolo elegido es ArtNet en "Universe Id" introduce el número del universo ArtNet por el que quieres recibir. La Net y la Subnet de Artnet se pueden cambiar en el archivo ~/.ola/ola-artnet.conf, por defecto es la Net 0 y la SubNet 0. 
-
-Puedes confirmar que está llegando información pinchando en el universo en el menú de la izquierda y luego en la pestaña "DMX Monitor". Puedes cerrar la ventana.
-
-Si quieres usar el mismo ordenador como mesa y media server edit el archivo ~/.ola/ola-artnet.conf y define la opción use_loopback a true. 
-
-e. Pincha en el menu File -> Change Media Path y elige el directorio donde estén tus medias. 
-
-f. La configuración de los universos de ola a los que LMS Audio escucha y las direcciones DMX de las capas se configuran en el fichero lms.xlm. En el campo Universe tienes que poner el universo de ola que has definido anteriormente. Edita este fichero con un editor de texto plano y reinicia el programa. De momento no se puede configurar mediante GUI.
-
-

src/libremediaserver-audio.pro

@@ -1,11 +1,8 @@
 TEMPLATE = app
 TARGET = libremediaserver-audio
-
 QT += webkitwidgets widgets
-
 CONFIG += debug
 DESTDIR = ./debug
-
 HEADERS += libremediaserver-audio.h \
     medialibrary.h \
     olathread.h \
@@ -17,7 +14,6 @@ HEADERS += libremediaserver-audio.h \
     settings.h \
     settingsdialog.h \
     layersettingswidget.h
-
 SOURCES += main.cpp \
     libremediaserver-audio.cpp \
     medialibrary.cpp \
@@ -28,40 +24,15 @@ SOURCES += main.cpp \
     settings.cpp \
     settingsdialog.cpp \
     layersettingswidget.cpp
-
+FORMS += libremediaserver-audio.ui \
-FORMS += \
-    libremediaserver-audio.ui \
     settingsdialog.ui \
     layersettingswidget.ui
-
+LIBS += -lola -lolacommon -lsfml-audio -lsfml-system 
-#INCLUDEPATH += ./
+# -lcitp
-
-LIBS += -lola -lolacommon
-
-#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../debug/release/ -lcitp
-#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../debug/debug/ -lcitp
-#else:symbian: LIBS += -lcitp
-#else:unix: LIBS += -L$$PWD/../debug/ -lcitp
-#INCLUDEPATH += $$PWD/../debug
-#DEPENDPATH += $$PWD/../debug
-
-LIBS += -lola -lolacommon
-
 RESOURCES =
-
 OTHER_FILES += \
     ../LICENSE.txt \
-    ../instalacion.txt \
     ../credits.txt \
     ../compiling.txt \
     ../changelog.txt \
     ../lms-audio.xlm
-
-#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/SFML/lib/release/ -lsfml-audio
-#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/SFML/lib/debug/ -lsfml-audio
-#else:symbian: LIBS += -lsfml-audio
-
-LIBS += -L$$PWD/SFML/lib/ -lsfml-audio -lsfml-system
-
-INCLUDEPATH += $$PWD/SFML/include
-DEPENDPATH += $$PWD/SFML/include