- added french install file. Revert sources du to Msex broken
This commit is contained in:
Santi Noreña
parent
e6e8c46c1d
commit
7fcb9ae204
36 changed files with 3590 additions and 3886 deletions
|
|
@ -22,18 +22,6 @@ You should have received a copy of the GNU General Public License along with thi
|
|||
Lbre Media Server ChangeLog
|
||||
|
||||
*******************************************************************************
|
||||
V 0.04-3-DebianWheezy
|
||||
|
||||
- Added flext binaries
|
||||
- Added some missing dependencies on install_wheezy.sh
|
||||
|
||||
V 0.04-3-UbuntuPrecise
|
||||
|
||||
- Added some missing dependecies and resolved some typo errors in install_precise.sh
|
||||
- Recompiled LibreMediaServer in Ubuntu Precise
|
||||
- Recompiled pix2image with libimagick++4
|
||||
- Added some white space in the GUI to avoid visualization problems
|
||||
- Added flext binaries to ./puredata/externals and avoid recompiling it
|
||||
|
||||
V 0.04-2
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ echo "export C_INCLUDE_PATH=$C_INCLUDE_PATH:/usr/local/include" >> ~/.bashrc
|
|||
|
||||
$ cd Gem
|
||||
$ ./autogen.sh
|
||||
$ ./configure --with-pd=/path/to/pd/source --prefix=$HOME/pd-externals
|
||||
$ ./configure --with-pd=/path/to/libremediaserver/src/pd-0.44-2/ --prefix=$HOME/pd-externals
|
||||
comment the line 65 in the Makefile in /plugins/ImageMagick. It fails compiling.
|
||||
$ make
|
||||
$ make install
|
||||
|
|
|
|||
83
install_fr.txt
Normal file
83
install_fr.txt
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
************************************************** *****************************
|
||||
|
||||
Libre Media Server – Un Média serveur open-source.
|
||||
(C) 2012-2013 James Noren
|
||||
|
||||
************************************************** *****************************
|
||||
|
||||
Développement et support: libremediaserver@gmail.com
|
||||
|
||||
Page du projet: http://code.google.com/p/libremediaserver
|
||||
|
||||
************************************************** *****************************
|
||||
|
||||
Ce programme est un logiciel libre. Vous pouvez le redistribuer et / ou le modifier selon les termes de la Licence Publique Générale GNU, telle que publiée par la Free Software Foundation, soit la version 3 de la Licence, ou (à votre choix) toute version ultérieure.
|
||||
|
||||
Ce programme est distribué avec l'espoir qu'il puisse être utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION À UN USAGE PARTICULIER. Voir la Licence Publique Générale GNU pour plus de détails.
|
||||
|
||||
Vous devriez avoir reçu une copie de la Licence Publique Générale GNU avec ce programme, sinon, écrivez à la Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
************************************************** *****************************
|
||||
|
||||
I. Conditions requises
|
||||
|
||||
LMS est développé et testé sur Debian Wheezy et dérivés.
|
||||
|
||||
Le logiciel nécessite une carte graphique OpenGL avec des pilotes Xorg et l'accélération matérielle correctement installés. Entrer "glxgears" dans un terminal devrait ouvrir une fenêtre avec trois roues d’engrenage qui doivent tourner. Si ce n’est pas le cas, consultez la documentation de votre distribution.
|
||||
|
||||
Pour résoudre les dépendances, vous devez avoir une connexion Internet sur l'ordinateur pendant le processus d'installation.
|
||||
|
||||
LMS communique avec Pure Data via le port TCP de 9195 à 9198. Open Lighting Architecture utilise le port 9090 de votre serveur web. Il est primordial que ces ports ne soient pas utilisés par d'autres applications.
|
||||
|
||||
Vous n'avez pas besoin de deux ordinateurs pour gérer LibreMediaServer, mais le CTIP / MSEX ne fonctionnera pas sur localhost.
|
||||
Au moment où le programme commence, vous devez disposer d'une interface réseau active, après avoir démarré. Si vous voulez contrôler le media serveur à partir d'un autre ordinateur, vous devez configurer la carte réseau du système d'exploitation selon le protocole que vous utilisez. Pour artnet utiliser une adresse IP de type 2.x.x.x avec un masque de sous réseau 255.0.0.0.
|
||||
|
||||
II. Installation d’OLA
|
||||
Ouvrez un terminal en tant que root et éditez le fichier source.list
|
||||
sudo gedit /etc/apt/sources.list
|
||||
|
||||
Ajoutez la ligne suivante :
|
||||
Sous debian > deb http://apt.openlighting.org/debian/ wheezy main
|
||||
Sous ubuntu > deb http://apt.openlighting.org/debian/ precise main
|
||||
|
||||
Enregistrez et fermez l’éditeur de texte.
|
||||
Exécutez la commande « apt-get update » pour mettre à jour la liste des dépôts.
|
||||
Installez le logiciel OLA avec la commande apt-get
|
||||
apt-get install ola
|
||||
Lancer OLA
|
||||
/etc/init.d/olad start
|
||||
|
||||
III. Installation de libremediaserver.
|
||||
|
||||
Ouvrez un terminal en tant que root et allez dans le répertoire des scripts avec la commande
|
||||
cd /répertoire racine/scripts
|
||||
Exécutez le fichier d’installation selon votre système d’exploitation.
|
||||
./Install_wheezy.sh
|
||||
|
||||
ou
|
||||
|
||||
./Install_precise.sh
|
||||
|
||||
Confirmez Oui lorsqu’il vous est demandé confirmation pour télécharger les fichiers et assurez-vous que vous êtes connecté à Internet. Ensuite, cliquez sur Non lorsque vous êtes invité à démarrer OLA daemon au démarrage du système.
|
||||
|
||||
Lancer libremediaserver
|
||||
cd/repertoire LMS
|
||||
puis
|
||||
./libremediaserver
|
||||
IV. Configuration
|
||||
|
||||
Cette étape n'est nécessaire qu’à la première exécution de LMS
|
||||
|
||||
a. Dans le menu fichier de l’application, cliquez sur « setup OLA »
|
||||
|
||||
b. Cliquez sur le bouton "Ajouter un univers"
|
||||
|
||||
c. Spécifiez le numéro de l’univers concerné (ID) et donnez-lui un nom. Cochez dans la liste le ou les protocoles que vous souhaitez utilisez en vous assurant de faire attention au sens (input ou output) des données.
|
||||
Si vous choisissez le protocole Artnet, entrez dans "Univers Id" le numéro de l'univers ArtNet pour lesquels vous souhaitez recevoir les signaux dmx. L’univers et le subnet peuvent être ultérieurement modifiés dans le fichier ~ /. Ola / wave-artnet.conf. L’univers par défaut est 0 et le subnet 0.
|
||||
|
||||
Vous pouvez vérifier que l'information dmx circule en cliquant sur l'univers dans le menu de gauche, puis sur l’onglet "DMX Monitor".
|
||||
Une fois la configuration terminée, fermez la fenêtre du logiciel OLA.
|
||||
d. Configurez la réception dmx du logiciel en cochant la case « Read DMX » et en spécifiant le numéro de l’univers dmx précédemment configuré dans OLA (OLA universe).
|
||||
e. Dans le logiciel LMS, cliquez sur le menu Fichier puis « Changer le répertoire de média » et sélectionnez le répertoire où sont vos médias. L’arborescence de ce dossier doit respecter un ordre particulier pour fonctionner. Référez-vous à la section correspondante dans le manuel d’utilisation. Définissez ensuite l'adresse DMX de chaque couche selon le patch de la table via les boites de dialogue sous chaque couche.
|
||||
|
||||
Si vous utilisez le CITP / MSEX afin de générer les vignettes de vos couches, allez dans le menu CITP / MSEX et cliquez sur « créer des vignettes ». Les vignettes sont générées automatiquement.
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#N canvas 730 202 611 318 10;
|
||||
#N canvas 411 100 952 599 dmx 0;
|
||||
#N canvas 740 152 611 318 10;
|
||||
#N canvas 315 169 952 599 dmx 0;
|
||||
#X obj -7 437 list split;
|
||||
#X obj 99 444 list split;
|
||||
#X obj 50 385 - 1;
|
||||
|
|
@ -55,8 +55,6 @@
|
|||
#X obj 703 527 s dmx7;
|
||||
#X obj 828 523 s dmx8;
|
||||
#X obj 410 243 ola2pd;
|
||||
#X obj 389 325 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
|
||||
-1 -1;
|
||||
#X connect 0 1 27 0;
|
||||
#X connect 1 1 28 0;
|
||||
#X connect 2 0 0 1;
|
||||
|
|
@ -120,7 +118,6 @@
|
|||
#X connect 54 0 24 0;
|
||||
#X connect 54 0 25 0;
|
||||
#X connect 54 0 26 0;
|
||||
#X connect 54 0 55 0;
|
||||
#X coords 0 -1 1 1 10 10 1 10 10;
|
||||
#X restore -354 -438 pd dmx;
|
||||
#N canvas 61 311 240 272 fondo 0;
|
||||
|
|
@ -139,7 +136,7 @@
|
|||
#X connect 5 0 7 0;
|
||||
#X connect 7 0 4 3;
|
||||
#X restore -309 -438 pd fondo;
|
||||
#N canvas 55 381 1134 358 receive 0;
|
||||
#N canvas 63 379 1134 358 receive 0;
|
||||
#X obj 22 -242 s winposx;
|
||||
#X obj 90 -242 s winposy;
|
||||
#X obj 158 -242 s winsizex;
|
||||
|
|
@ -180,9 +177,6 @@
|
|||
#X obj 1040 -263 float;
|
||||
#X obj 1040 -241 s fps;
|
||||
#X floatatom 1012 -184 5 0 0 0 - - -;
|
||||
#X floatatom 956 -389 5 0 0 0 - - -;
|
||||
#X obj 567 -455 print channel;
|
||||
#X obj 938 -331 print value;
|
||||
#X connect 4 0 0 0;
|
||||
#X connect 5 0 1 0;
|
||||
#X connect 6 0 2 0;
|
||||
|
|
@ -199,7 +193,6 @@
|
|||
#X connect 26 0 27 0;
|
||||
#X connect 29 0 32 0;
|
||||
#X connect 30 0 35 0;
|
||||
#X connect 30 0 40 0;
|
||||
#X connect 30 1 4 1;
|
||||
#X connect 30 1 5 1;
|
||||
#X connect 30 1 6 1;
|
||||
|
|
@ -218,9 +211,7 @@
|
|||
#X connect 30 1 33 1;
|
||||
#X connect 30 1 36 1;
|
||||
#X connect 30 2 28 0;
|
||||
#X connect 30 2 41 0;
|
||||
#X connect 31 0 30 0;
|
||||
#X connect 31 1 39 0;
|
||||
#X connect 33 0 34 0;
|
||||
#X connect 35 0 29 0;
|
||||
#X connect 35 1 4 0;
|
||||
|
|
|
|||
16
scripts/install_precise.sh
Executable file → Normal file
16
scripts/install_precise.sh
Executable file → Normal file
|
|
@ -1,12 +1,8 @@
|
|||
#!/bin/bash
|
||||
##############################################################################
|
||||
# Script for install LibreMediaServer dependencies on Ubuntu Precise 12.04 LTS
|
||||
# Needs Root for execute
|
||||
# The universe repository must be enabled.
|
||||
# Script de instalación de las dependencias de Libre Media Server
|
||||
# en Ubuntu Precise 12.04 LTS
|
||||
# en Ubuntu Precise 12.04.
|
||||
# Necesita root para ejecutar
|
||||
# El repositorio Universe debe estar habilitado
|
||||
# (c) 2012-2013 Santi Noreña
|
||||
# GPL License
|
||||
###############################################################################
|
||||
|
|
@ -19,16 +15,12 @@ cp /etc/apt/sources.list /etc/apt/sources.list.old
|
|||
output=`grep apt.openlighting.org /etc/apt/sources.list | wc -l`
|
||||
if [ "$output" -eq "0" ]; then
|
||||
#Añadimos el repositorio ola a sources.list
|
||||
echo "deb http://apt.openlighting.org/ubuntu/ precise main" >> /etc/apt/sources.list
|
||||
echo "deb http://apt.openlighting.org/debian/ precise main" >> /etc/apt/sources.list
|
||||
fi
|
||||
apt-get update
|
||||
|
||||
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libqt4-script libqt4-network libqt4-webkit libmagick++4 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1 libquicktime2
|
||||
|
||||
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libmacgick++4 libav-tools
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo "apt-get finish ok"
|
||||
else "apt-get return errors!"
|
||||
fi
|
||||
ln -s /usr/lib/libMagick++.so.4 /usr/lib/libMagick++.so.5
|
||||
ln -s /usr/lib/libMagickCore.so.4 /usr/lib/libMagickCore.so.5
|
||||
ln -s /usr/lib/libMagickWand.so.4 /usr/lib/libMagickWand.so.5
|
||||
|
||||
|
|
|
|||
|
|
@ -8,19 +8,11 @@
|
|||
###############################################################################
|
||||
# Comprobamos root
|
||||
(( EUID )) && echo ‘You need to be root.’ && exit 1
|
||||
# Instalamos OLA desde el repositorio del proyecto
|
||||
# copia de seguridad de sources.list
|
||||
cp /etc/apt/sources.list /etc/apt/sources.list.old
|
||||
# Comprobamos que el repositorio no está en soucers.list
|
||||
output=`grep apt.openlighting.org /etc/apt/sources.list | wc -l`
|
||||
if [ "$output" -eq "0" ]; then
|
||||
#Añadimos el repositorio ola a sources.list
|
||||
echo "deb http://apt.openlighting.org/debian/ wheezy main" >> /etc/apt/sources.list
|
||||
fi
|
||||
apt-get update
|
||||
#Instalamos el paquete suministrado con el release
|
||||
dpkg -i ola_0.8.26-1_i386.deb
|
||||
# Install Pure Data y OLA
|
||||
# libav para generar thumbs
|
||||
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libqtwebkit4 libqt4-script libqt4-network libmagick++5 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1 libquicktime2
|
||||
apt-get -y --force-yes install libav-tools libqtcore4 libqtgui4 libmagick++5
|
||||
if [ "$?" -eq "0" ]; then
|
||||
echo "apt-get finish ok"
|
||||
else "apt-get return errors!"
|
||||
|
|
|
|||
|
|
@ -4175,12 +4175,13 @@ ac_config_files="$ac_config_files plugins/videoVLC/Makefile"
|
|||
# some of them have their own build system
|
||||
#AC_CONFIG_FILES([extra/Makefile])
|
||||
# some do not
|
||||
#AC_CONFIG_FILES([extra/pix_drum/Makefile extra/pix_mano/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_hit/Makefile])
|
||||
ac_config_files="$ac_config_files extra/pix2jpg/Makefile"
|
||||
ac_config_files="$ac_config_files extra/pix_drum/Makefile extra/pix_mano/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/ola2pd/Makefile"
|
||||
ac_config_files="$ac_config_files extra/pix_fiducialtrack/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/pix_hit/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/pix2jpg/Makefile"
|
||||
|
||||
# other stuff
|
||||
ac_config_files="$ac_config_files build/Makefile Gem.pc Gem-meta.pd"
|
||||
|
|
@ -31596,8 +31597,11 @@ do
|
|||
"plugins/videoV4L2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoV4L2/Makefile" ;;
|
||||
"plugins/videoVFW/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVFW/Makefile" ;;
|
||||
"plugins/videoVLC/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVLC/Makefile" ;;
|
||||
"extra/pix_drum/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_drum/Makefile" ;;
|
||||
"extra/pix_mano/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_mano/Makefile" ;;
|
||||
"extra/pix_fiducialtrack/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_fiducialtrack/Makefile" ;;
|
||||
"extra/pix_hit/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_hit/Makefile" ;;
|
||||
"extra/pix2jpg/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix2jpg/Makefile" ;;
|
||||
"extra/ola2pd/Makefile") CONFIG_FILES="$CONFIG_FILES extra/ola2pd/Makefile" ;;
|
||||
"build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
|
||||
"Gem.pc") CONFIG_FILES="$CONFIG_FILES Gem.pc" ;;
|
||||
"Gem-meta.pd") CONFIG_FILES="$CONFIG_FILES Gem-meta.pd" ;;
|
||||
|
|
|
|||
|
|
@ -4175,12 +4175,13 @@ ac_config_files="$ac_config_files plugins/videoVLC/Makefile"
|
|||
# some of them have their own build system
|
||||
#AC_CONFIG_FILES([extra/Makefile])
|
||||
# some do not
|
||||
#AC_CONFIG_FILES([extra/pix_drum/Makefile extra/pix_mano/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_hit/Makefile])
|
||||
ac_config_files="$ac_config_files extra/pix2jpg/Makefile"
|
||||
ac_config_files="$ac_config_files extra/pix_drum/Makefile extra/pix_mano/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/ola2pd/Makefile"
|
||||
ac_config_files="$ac_config_files extra/pix_fiducialtrack/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/pix_hit/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/pix2jpg/Makefile"
|
||||
|
||||
# other stuff
|
||||
ac_config_files="$ac_config_files build/Makefile Gem.pc Gem-meta.pd"
|
||||
|
|
@ -31596,8 +31597,11 @@ do
|
|||
"plugins/videoV4L2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoV4L2/Makefile" ;;
|
||||
"plugins/videoVFW/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVFW/Makefile" ;;
|
||||
"plugins/videoVLC/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVLC/Makefile" ;;
|
||||
"extra/pix_drum/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_drum/Makefile" ;;
|
||||
"extra/pix_mano/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_mano/Makefile" ;;
|
||||
"extra/pix_fiducialtrack/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_fiducialtrack/Makefile" ;;
|
||||
"extra/pix_hit/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_hit/Makefile" ;;
|
||||
"extra/pix2jpg/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix2jpg/Makefile" ;;
|
||||
"extra/ola2pd/Makefile") CONFIG_FILES="$CONFIG_FILES extra/ola2pd/Makefile" ;;
|
||||
"build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
|
||||
"Gem.pc") CONFIG_FILES="$CONFIG_FILES Gem.pc" ;;
|
||||
"Gem-meta.pd") CONFIG_FILES="$CONFIG_FILES Gem-meta.pd" ;;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
16
src/Gem/configure
vendored
16
src/Gem/configure
vendored
|
|
@ -4175,12 +4175,13 @@ ac_config_files="$ac_config_files plugins/videoVLC/Makefile"
|
|||
# some of them have their own build system
|
||||
#AC_CONFIG_FILES([extra/Makefile])
|
||||
# some do not
|
||||
#AC_CONFIG_FILES([extra/pix_drum/Makefile extra/pix_mano/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_hit/Makefile])
|
||||
ac_config_files="$ac_config_files extra/pix2jpg/Makefile"
|
||||
ac_config_files="$ac_config_files extra/pix_drum/Makefile extra/pix_mano/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/ola2pd/Makefile"
|
||||
ac_config_files="$ac_config_files extra/pix_fiducialtrack/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/pix_hit/Makefile"
|
||||
|
||||
ac_config_files="$ac_config_files extra/pix2jpg/Makefile"
|
||||
|
||||
# other stuff
|
||||
ac_config_files="$ac_config_files build/Makefile Gem.pc Gem-meta.pd"
|
||||
|
|
@ -31596,8 +31597,11 @@ do
|
|||
"plugins/videoV4L2/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoV4L2/Makefile" ;;
|
||||
"plugins/videoVFW/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVFW/Makefile" ;;
|
||||
"plugins/videoVLC/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/videoVLC/Makefile" ;;
|
||||
"extra/pix_drum/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_drum/Makefile" ;;
|
||||
"extra/pix_mano/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_mano/Makefile" ;;
|
||||
"extra/pix_fiducialtrack/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_fiducialtrack/Makefile" ;;
|
||||
"extra/pix_hit/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix_hit/Makefile" ;;
|
||||
"extra/pix2jpg/Makefile") CONFIG_FILES="$CONFIG_FILES extra/pix2jpg/Makefile" ;;
|
||||
"extra/ola2pd/Makefile") CONFIG_FILES="$CONFIG_FILES extra/ola2pd/Makefile" ;;
|
||||
"build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
|
||||
"Gem.pc") CONFIG_FILES="$CONFIG_FILES Gem.pc" ;;
|
||||
"Gem-meta.pd") CONFIG_FILES="$CONFIG_FILES Gem-meta.pd" ;;
|
||||
|
|
|
|||
|
|
@ -60,11 +60,10 @@ AC_CONFIG_FILES([plugins/videoVLC/Makefile])
|
|||
# some of them have their own build system
|
||||
#AC_CONFIG_FILES([extra/Makefile])
|
||||
# some do not
|
||||
#AC_CONFIG_FILES([extra/pix_drum/Makefile extra/pix_mano/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile])
|
||||
#AC_CONFIG_FILES([extra/pix_hit/Makefile])
|
||||
AC_CONFIG_FILES([extra/pix_drum/Makefile extra/pix_mano/Makefile])
|
||||
AC_CONFIG_FILES([extra/pix_fiducialtrack/Makefile])
|
||||
AC_CONFIG_FILES([extra/pix_hit/Makefile])
|
||||
AC_CONFIG_FILES([extra/pix2jpg/Makefile])
|
||||
AC_CONFIG_FILES([extra/ola2pd/Makefile])
|
||||
# other stuff
|
||||
AC_CONFIG_FILES([build/Makefile Gem.pc Gem-meta.pd])
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,11 @@ ACLOCAL_AMFLAGS = -I ../m4
|
|||
|
||||
|
||||
SUBDIRS =
|
||||
#SUBDIRS += pix_mano pix_drum
|
||||
SUBDIRS += pix_mano pix_drum
|
||||
#SUBDIRS += pix_artoolkit
|
||||
#SUBDIRS += pix_fiducialtrack
|
||||
#SUBDIRS += pix_hit
|
||||
SUBDIRS += pix_fiducialtrack
|
||||
SUBDIRS += pix_hit
|
||||
SUBDIRS += pix2jpg
|
||||
SUBDIRS += ola2pd
|
||||
|
||||
EXTRA_DIST = \
|
||||
README-EXTRA.txt
|
||||
|
|
|
|||
|
|
@ -210,11 +210,8 @@ top_srcdir = @top_srcdir@
|
|||
AUTOMAKE_OPTIONS = foreign
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src
|
||||
ACLOCAL_AMFLAGS = -I ../m4
|
||||
#SUBDIRS += pix_mano pix_drum
|
||||
#SUBDIRS += pix_artoolkit
|
||||
#SUBDIRS += pix_fiducialtrack
|
||||
#SUBDIRS += pix_hit
|
||||
SUBDIRS = pix2jpg ola2pd
|
||||
SUBDIRS = pix_mano pix_drum pix_fiducialtrack pix_hit pix2jpg
|
||||
EXTRA_DIST = \
|
||||
README-EXTRA.txt
|
||||
|
||||
|
|
|
|||
|
|
@ -683,8 +683,7 @@ LDFLAGS
|
|||
LIBS
|
||||
CPPFLAGS
|
||||
CCC'
|
||||
ac_subdirs_all='pix2jpg
|
||||
ola2pd'
|
||||
ac_subdirs_all='pix_artoolkit'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
ac_init_help=
|
||||
|
|
@ -2994,9 +2993,12 @@ fi
|
|||
|
||||
|
||||
## pix_artoolkit
|
||||
#if test -d "$srcdir/pix_artoolkit"; then
|
||||
# AC_CONFIG_SUBDIRS([pix_artoolkit])
|
||||
#fi
|
||||
if test -d "$srcdir/pix_artoolkit"; then
|
||||
|
||||
|
||||
subdirs="$subdirs pix_artoolkit"
|
||||
|
||||
fi
|
||||
|
||||
## pix_drum (Jaime Oliver)
|
||||
#if test -d "$srcdir/pix_drum"; then
|
||||
|
|
@ -3018,13 +3020,6 @@ fi
|
|||
# AC_CONFIG_SUBDIRS([pix_opencv])
|
||||
#fi
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs pix2jpg"
|
||||
|
||||
subdirs="$subdirs ola2pd"
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
|
|
|
|||
|
|
@ -683,8 +683,7 @@ LDFLAGS
|
|||
LIBS
|
||||
CPPFLAGS
|
||||
CCC'
|
||||
ac_subdirs_all='pix2jpg
|
||||
ola2pd'
|
||||
ac_subdirs_all='pix_artoolkit'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
ac_init_help=
|
||||
|
|
@ -2994,9 +2993,12 @@ fi
|
|||
|
||||
|
||||
## pix_artoolkit
|
||||
#if test -d "$srcdir/pix_artoolkit"; then
|
||||
# AC_CONFIG_SUBDIRS([pix_artoolkit])
|
||||
#fi
|
||||
if test -d "$srcdir/pix_artoolkit"; then
|
||||
|
||||
|
||||
subdirs="$subdirs pix_artoolkit"
|
||||
|
||||
fi
|
||||
|
||||
## pix_drum (Jaime Oliver)
|
||||
#if test -d "$srcdir/pix_drum"; then
|
||||
|
|
@ -3018,13 +3020,6 @@ fi
|
|||
# AC_CONFIG_SUBDIRS([pix_opencv])
|
||||
#fi
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs pix2jpg"
|
||||
|
||||
subdirs="$subdirs ola2pd"
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
|
|
|
|||
|
|
@ -768,13 +768,12 @@ m4trace:configure.ac:14: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
|
|||
m4trace:configure.ac:14: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
|
||||
m4trace:configure.ac:14: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
|
||||
m4trace:configure.ac:15: -1- m4_pattern_allow([^CXX$])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^subdirs$])
|
||||
m4trace:configure.ac:43: -1- m4_pattern_allow([^subdirs$])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^LIB@&t@OBJS$])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^LTLIBOBJS$])
|
||||
m4trace:configure.ac:45: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
|
||||
m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:45: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
m4trace:configure.ac:19: -1- m4_pattern_allow([^subdirs$])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^LIB@&t@OBJS$])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^LTLIBOBJS$])
|
||||
m4trace:configure.ac:42: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
|
||||
m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:42: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
|
|
|
|||
|
|
@ -301,37 +301,33 @@ m4trace:configure.ac:14: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
|
|||
m4trace:configure.ac:15: -1- AC_SUBST([CXX])
|
||||
m4trace:configure.ac:15: -1- AC_SUBST_TRACE([CXX])
|
||||
m4trace:configure.ac:15: -1- m4_pattern_allow([^CXX$])
|
||||
m4trace:configure.ac:42: -1- AC_CONFIG_SUBDIRS([pix2jpg])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([pix2jpg])"])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([subdirs])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^subdirs$])
|
||||
m4trace:configure.ac:43: -1- AC_CONFIG_SUBDIRS([ola2pd])
|
||||
m4trace:configure.ac:43: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([ola2pd])"])
|
||||
m4trace:configure.ac:43: -1- AC_SUBST_TRACE([subdirs])
|
||||
m4trace:configure.ac:43: -1- m4_pattern_allow([^subdirs$])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^LIB@&t@OBJS$])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([LTLIBOBJS])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^LTLIBOBJS$])
|
||||
m4trace:configure.ac:45: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:45: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
|
||||
m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:45: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([top_builddir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([top_build_prefix])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([srcdir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([abs_srcdir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([top_srcdir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([abs_top_srcdir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([builddir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([abs_builddir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([abs_top_builddir])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([INSTALL])
|
||||
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([MKDIR_P])
|
||||
m4trace:configure.ac:19: -1- AC_CONFIG_SUBDIRS([pix_artoolkit])
|
||||
m4trace:configure.ac:19: -1- AC_SUBST([subdirs], ["$subdirs m4_normalize([pix_artoolkit])"])
|
||||
m4trace:configure.ac:19: -1- AC_SUBST_TRACE([subdirs])
|
||||
m4trace:configure.ac:19: -1- m4_pattern_allow([^subdirs$])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^LIB@&t@OBJS$])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([LTLIBOBJS])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^LTLIBOBJS$])
|
||||
m4trace:configure.ac:42: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:42: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
|
||||
m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
|
||||
m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([top_builddir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([top_build_prefix])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([srcdir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([abs_srcdir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([top_srcdir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([abs_top_srcdir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([builddir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([abs_builddir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([abs_top_builddir])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([INSTALL])
|
||||
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([MKDIR_P])
|
||||
|
|
|
|||
19
src/Gem/extra/configure
vendored
19
src/Gem/extra/configure
vendored
|
|
@ -683,8 +683,7 @@ LDFLAGS
|
|||
LIBS
|
||||
CPPFLAGS
|
||||
CCC'
|
||||
ac_subdirs_all='pix2jpg
|
||||
ola2pd'
|
||||
ac_subdirs_all='pix_artoolkit'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
ac_init_help=
|
||||
|
|
@ -2994,9 +2993,12 @@ fi
|
|||
|
||||
|
||||
## pix_artoolkit
|
||||
#if test -d "$srcdir/pix_artoolkit"; then
|
||||
# AC_CONFIG_SUBDIRS([pix_artoolkit])
|
||||
#fi
|
||||
if test -d "$srcdir/pix_artoolkit"; then
|
||||
|
||||
|
||||
subdirs="$subdirs pix_artoolkit"
|
||||
|
||||
fi
|
||||
|
||||
## pix_drum (Jaime Oliver)
|
||||
#if test -d "$srcdir/pix_drum"; then
|
||||
|
|
@ -3018,13 +3020,6 @@ fi
|
|||
# AC_CONFIG_SUBDIRS([pix_opencv])
|
||||
#fi
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs pix2jpg"
|
||||
|
||||
subdirs="$subdirs ola2pd"
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ AC_PROG_CXX
|
|||
AC_SUBST(CXX)
|
||||
|
||||
## pix_artoolkit
|
||||
#if test -d "$srcdir/pix_artoolkit"; then
|
||||
# AC_CONFIG_SUBDIRS([pix_artoolkit])
|
||||
#fi
|
||||
if test -d "$srcdir/pix_artoolkit"; then
|
||||
AC_CONFIG_SUBDIRS([pix_artoolkit])
|
||||
fi
|
||||
|
||||
## pix_drum (Jaime Oliver)
|
||||
#if test -d "$srcdir/pix_drum"; then
|
||||
|
|
@ -39,8 +39,5 @@ AC_SUBST(CXX)
|
|||
# AC_CONFIG_SUBDIRS([pix_opencv])
|
||||
#fi
|
||||
|
||||
AC_CONFIG_SUBDIRS([pix2jpg])
|
||||
AC_CONFIG_SUBDIRS([ola2pd])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
pix2jpg : Convert pix to jpg
|
||||
http://code.google.com/p/puremediaserver
|
||||
Copyright (c) 2012 Santi Noreña
|
||||
|
||||
based on:
|
||||
GEM - Graphics Environment for Multimedia
|
||||
Copyright (C) 1997-2000 Mark Danks, Günter Geiger,
|
||||
Copyright (c) 2001-2010 IOhannes m zmölnig
|
||||
Copyright (c) 2003-2007 James Tittle II,
|
||||
Copyright (c) 2003-2008 Chris Clepper et al.
|
||||
|
||||
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 2
|
||||
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.
|
||||
|
||||
In the official GEM distribution, the GNU General Public License is
|
||||
in the file GnuGPL.LICENSE
|
||||
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
AUTOMAKE_OPTIONS = foreign
|
||||
ACLOCAL_AMFLAGS = -I $(top_srcdir)/src/m4
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src -fopenmp
|
||||
EXTRA_DIST =
|
||||
|
||||
extradir=$(libdir)/ola2pd
|
||||
|
||||
extra_LTLIBRARIES = ola2pd.la
|
||||
|
||||
dist_extra_DATA = LICENSE.txt
|
||||
dist_extra_DATA += ola2pd-help.pd
|
||||
|
||||
## some default flags
|
||||
ola2pd_la_CXXFLAGS = -fopenmp
|
||||
ola2pd_la_LDFLAGS = -lola -module -avoid-version -shared -shrext .@GEM_RTE_EXTENSION@
|
||||
ola2pd_la_LIBADD = -lola
|
||||
|
||||
# RTE flags
|
||||
ola2pd_la_CXXFLAGS += @GEM_RTE_CFLAGS@ @GEM_ARCH_CXXFLAGS@
|
||||
ola2pd_la_LIBADD += @GEM_RTE_LIBS@
|
||||
|
||||
ola2pd_la_LDFLAGS += @GEM_ARCH_LDFLAGS@
|
||||
|
||||
# special flags for building externals
|
||||
ola2pd_la_CXXFLAGS += @GEM_EXTERNAL_CFLAGS@
|
||||
ola2pd_la_LIBADD += -L$(top_builddir) @GEM_EXTERNAL_LIBS@
|
||||
ola2pd_la_LIBADD += ola2pd.la
|
||||
# convenience symlinks
|
||||
## uha, this is ugly
|
||||
ola2pd.@GEM_RTE_EXTENSION@: ola2pd.la
|
||||
rm -f $@
|
||||
test -f .libs/$@ && $(LN_S) .libs/$@ $@ || true
|
||||
|
||||
.PHONY: clean-conviencesymlink
|
||||
|
||||
clean-conviencesymlink:
|
||||
rm -f ola2pd.@GEM_RTE_EXTENSION@
|
||||
|
||||
all-local:: ola2pd.@GEM_RTE_EXTENSION@
|
||||
|
||||
clean-local:: clean-conviencesymlink
|
||||
|
||||
|
||||
### SOURCES
|
||||
ola2pd_la_SOURCES = \
|
||||
ola2pd.cpp \
|
||||
ola2pd.h
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
#N canvas 690 208 450 300 10;
|
||||
#X obj 270 167 pix_image;
|
||||
#X msg 299 137 open img.jpg;
|
||||
#X obj 270 103 gemhead;
|
||||
#X obj 94 213 gemwin;
|
||||
#X msg 53 147 create;
|
||||
#X msg 270 64 1;
|
||||
#X msg 121 145 destroy;
|
||||
#X msg 308 63 0;
|
||||
#X obj 270 196 pix_texture;
|
||||
#X obj 270 222 rectangle 4 4;
|
||||
#N canvas 25 162 450 300 gemwin 0;
|
||||
#X restore 85 239 pd gemwin;
|
||||
#X msg 41 181 1;
|
||||
#X obj 191 203 pix2jpg;
|
||||
#X connect 0 0 8 0;
|
||||
#X connect 1 0 0 0;
|
||||
#X connect 2 0 0 0;
|
||||
#X connect 4 0 3 0;
|
||||
#X connect 5 0 2 0;
|
||||
#X connect 6 0 3 0;
|
||||
#X connect 7 0 2 0;
|
||||
#X connect 8 0 9 0;
|
||||
#X connect 11 0 3 0;
|
||||
|
|
@ -1,146 +0,0 @@
|
|||
/*
|
||||
* ola2pd - interface from Open Lighting Arquitecture to Pure Data
|
||||
* v 0.03
|
||||
*
|
||||
* Copyright (c) 2012-2013 Santiago Noreña <belfegor@gmail.com>
|
||||
*
|
||||
* ola2pd is an external for Pure Data and Max that reads one DMX512
|
||||
* universe from the Open Lighting Arquitecture and output it like a list
|
||||
* of 512 channels.
|
||||
*
|
||||
* Based on dmxmonitor Copyright (C) 2001 Dirk Jagdmann <doj@cubic.org>
|
||||
* and ola_dmxmonitor by Simon Newton (nomis52<AT>gmail.com)
|
||||
*
|
||||
* 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 2
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ola2pd.h"
|
||||
CPPEXTERN_NEW(ola2pd)
|
||||
|
||||
ola2pd::ola2pd():
|
||||
m_universe(0),
|
||||
m_clientpointer(NULL),
|
||||
m_client(NULL)
|
||||
{
|
||||
outlet1 = outlet_new(this->x_obj, gensym("list")); // Saca todos los canales mediante una lista
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
// Destructor
|
||||
//
|
||||
/////////////////////////////////////////////////////////
|
||||
ola2pd :: ~ola2pd()
|
||||
{
|
||||
// close();
|
||||
outlet_free(outlet1);
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------------------
|
||||
* IMPLEMENTATION
|
||||
*/
|
||||
|
||||
/*
|
||||
* Called when there is new DMX data
|
||||
*/
|
||||
|
||||
void ola2pd::NewDmx(unsigned int universe,const DmxBuffer &buffer,const string &error) {
|
||||
gettimeofday(&m_last_data, NULL);
|
||||
t_atom dmxlist[512];
|
||||
int z;
|
||||
for(z=0; z < 512; z++)
|
||||
{SETFLOAT(&dmxlist[z],(buffer.Get(z)));}
|
||||
outlet_list(outlet1, 0, 512, dmxlist);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check for data loss.
|
||||
*/
|
||||
|
||||
bool ola2pd::CheckDataLoss() {
|
||||
struct timeval now, diff;
|
||||
if (timerisset(&m_last_data)) {
|
||||
gettimeofday(&now, NULL);
|
||||
timersub(&now, &m_last_data, &diff);
|
||||
if (diff.tv_sec > 4 || (diff.tv_sec == 4 && diff.tv_usec > 4000000)) {
|
||||
// loss of data
|
||||
post("ola2pd: Can not read DMX!");
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Control de errores en el registro de Universos en OLA
|
||||
*/
|
||||
void ola2pd::RegisterComplete(const string &error) {
|
||||
if (!error.empty()) {
|
||||
post("ola2pd:Register command failed");
|
||||
m_client.GetSelectServer()->Terminate();
|
||||
}
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
// static member functions
|
||||
//
|
||||
/////////////////////////////////////////////////////////
|
||||
void ola2pd :: obj_setupCallback(t_class *classPtr)
|
||||
{
|
||||
// class_addbang(classPtr, reinterpret_cast<t_method>(&ola2pd::bangMessCallback));
|
||||
class_addmethod(classPtr, (t_method)&ola2pd::openMessCallback,gensym("open"), A_NULL);
|
||||
class_addmethod(classPtr, (t_method)&ola2pd::closeMessCallback,gensym("close"), A_NULL);
|
||||
class_addmethod(classPtr, (t_method)&ola2pd::universeMessCallback,gensym("universe"), A_FLOAT,A_NULL);
|
||||
}
|
||||
///////////////////////////////
|
||||
|
||||
void ola2pd :: openMessCallback(void *data)
|
||||
{
|
||||
if (m_clientpointer == NULL)
|
||||
{
|
||||
// set up ola connection
|
||||
if (!GetMyClass(data)->m_client.Setup()) {error("ola2pd: Can not setup ola client");}
|
||||
GetMyClass(data)->m_clientpointer = GetMyClass(data)->m_client.GetClient();
|
||||
GetMyClass(data)->m_clientpointer->SetDmxCallback(ola::NewCallback(this, &ola2pd::NewDmx));
|
||||
GetMyClass(data)->m_clientpointer->RegisterUniverse(GetMyClass(data)->m_universe,ola::REGISTER,ola::NewSingleCallback(this, &ola2pd::RegisterComplete));
|
||||
GetMyClass(data)->m_client.GetSelectServer()->RegisterRepeatingTimeout(5000,ola::NewCallback(this, &ola2pd::CheckDataLoss));
|
||||
post("ola2pd: Init complete. Start listening...");
|
||||
GetMyClass(data)->m_client.GetSelectServer()->Run();
|
||||
}
|
||||
}
|
||||
void ola2pd :: closeMessCallback(void *data)
|
||||
{
|
||||
if (GetMyClass(data)->m_clientpointer != NULL)
|
||||
{
|
||||
GetMyClass(data)->m_clientpointer->RegisterUniverse(GetMyClass(data)->m_universe,ola::UNREGISTER,ola::NewSingleCallback(this, &ola2pd::RegisterComplete));
|
||||
GetMyClass(data)->m_client.GetSelectServer()->Terminate();
|
||||
GetMyClass(data)->m_clientpointer = NULL;
|
||||
post("ola2pd: Close complete");
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
void ola2pd :: bangMessCallback(void *data)
|
||||
{
|
||||
if (GetMyClass(data)->m_clientpointer != NULL) {post("Listening on universe %d", GetMyClass(data)->m_universe);}
|
||||
else {post("Configured on universe %d. Send open to start listening", GetMyClass(data)->m_universe);}
|
||||
|
||||
}*/
|
||||
void ola2pd :: universeMessCallback (void *data, t_float f)
|
||||
{
|
||||
GetMyClass(data)->m_universe = f;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
/*-----------------------------------------------------------------
|
||||
ola2pd v0.03
|
||||
|
||||
(c) 2012-2013 Santi Noreña libremediaserver@gmail.com
|
||||
|
||||
GPL License.
|
||||
-----------------------------------------------------------------*/
|
||||
|
||||
#ifndef _INCLUDE__GEM_PIXES_ola2pd_H_
|
||||
#define _INCLUDE__GEM_PIXES_ola2pd_H_
|
||||
|
||||
#include <ola/OlaCallbackClient.h>
|
||||
#include <ola/OlaClientWrapper.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <m_pd.h>
|
||||
|
||||
using namespace ola;
|
||||
|
||||
/*-----------------------------------------------------------------
|
||||
-------------------------------------------------------------------
|
||||
CLASS
|
||||
ola2pd
|
||||
|
||||
|
||||
|
||||
KEYWORDS
|
||||
ola
|
||||
|
||||
DESCRIPTION
|
||||
|
||||
|
||||
|
||||
outlet : DMX list
|
||||
-----------------------------------------------------------------*/
|
||||
class GEM_EXPORT ola2pd : public GemPixObj
|
||||
{
|
||||
CPPEXTERN_HEADER(ola2pd, GemPixObj);
|
||||
|
||||
public:
|
||||
|
||||
//////////
|
||||
// Constructor
|
||||
ola2pd();
|
||||
|
||||
protected:
|
||||
|
||||
//////////
|
||||
// Destructor
|
||||
virtual ~ola2pd();
|
||||
|
||||
t_outlet *outlet1; // outlet pointer
|
||||
|
||||
unsigned int m_universe;
|
||||
|
||||
OlaCallbackClient *m_clientpointer;
|
||||
|
||||
struct timeval m_last_data;
|
||||
|
||||
OlaCallbackClientWrapper m_client;
|
||||
|
||||
private:
|
||||
|
||||
//////////
|
||||
// static member functions
|
||||
void openMessCallback(void *data);
|
||||
void closeMessCallback(void *data);
|
||||
// void bangMessCallback(void *data);
|
||||
void universeMessCallback(void *data, t_float f);
|
||||
|
||||
void NewDmx(unsigned int universe,const DmxBuffer &buffer,const string &error);
|
||||
bool CheckDataLoss();
|
||||
void RegisterComplete(const string &error);
|
||||
|
||||
};
|
||||
#endif // for header file
|
||||
|
|
@ -22,8 +22,8 @@ pix2jpg_la_LIBADD += @GEM_RTE_LIBS@
|
|||
pix2jpg_la_LDFLAGS += @GEM_ARCH_LDFLAGS@
|
||||
|
||||
# special flags for building externals
|
||||
#pix2jpg_la_CXXFLAGS += -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -pthread .@GEM_EXTERNAL_CFLAGS@
|
||||
#pix2jpg_la_LIBADD += -L$(top_builddir) @GEM_EXTERNAL_LIBS@
|
||||
pix2jpg_la_CXXFLAGS += -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -pthread .@GEM_EXTERNAL_CFLAGS@
|
||||
pix2jpg_la_LIBADD += -L$(top_builddir) @GEM_EXTERNAL_LIBS@
|
||||
|
||||
# convenience symlinks
|
||||
## uha, this is ugly
|
||||
|
|
|
|||
|
|
@ -419,11 +419,16 @@ extra_LTLIBRARIES = pix2jpg.la
|
|||
dist_extra_DATA = LICENSE.txt pix2jpg-help.pd
|
||||
|
||||
# RTE flags
|
||||
|
||||
# special flags for building externals
|
||||
pix2jpg_la_CXXFLAGS = -fopenmp -I/usr/include/ImageMagick \
|
||||
@GEM_RTE_CFLAGS@ @GEM_ARCH_CXXFLAGS@ $(am__empty)
|
||||
@GEM_RTE_CFLAGS@ @GEM_ARCH_CXXFLAGS@ -g -O2 -fstack-protector \
|
||||
--param=ssp-buffer-size=4 -Wformat -Wformat-security -pthread \
|
||||
.@GEM_EXTERNAL_CFLAGS@
|
||||
pix2jpg_la_LDFLAGS = -lMagick++ -lMagickCore -module -avoid-version \
|
||||
-shared -shrext .@GEM_RTE_EXTENSION@ @GEM_ARCH_LDFLAGS@
|
||||
pix2jpg_la_LIBADD = -lMagickCore @GEM_RTE_LIBS@
|
||||
pix2jpg_la_LIBADD = -lMagickCore @GEM_RTE_LIBS@ -L$(top_builddir) \
|
||||
@GEM_EXTERNAL_LIBS@ $(am__empty)
|
||||
|
||||
### SOURCES
|
||||
pix2jpg_la_SOURCES = \
|
||||
|
|
@ -771,10 +776,6 @@ uninstall-am: uninstall-dist_extraDATA uninstall-extraLTLIBRARIES
|
|||
uninstall-extraLTLIBRARIES
|
||||
|
||||
|
||||
# special flags for building externals
|
||||
#pix2jpg_la_CXXFLAGS += -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -pthread .@GEM_EXTERNAL_CFLAGS@
|
||||
#pix2jpg_la_LIBADD += -L$(top_builddir) @GEM_EXTERNAL_LIBS@
|
||||
|
||||
# convenience symlinks
|
||||
pix2jpg.@GEM_RTE_EXTENSION@: pix2jpg.la
|
||||
rm -f $@
|
||||
|
|
|
|||
|
|
@ -106,9 +106,9 @@
|
|||
'_AM_SET_OPTION' => 1,
|
||||
'AC_LTDL_PREOPEN' => 1,
|
||||
'_LT_LINKER_BOILERPLATE' => 1,
|
||||
'AC_LIBTOOL_PROG_CC_C_O' => 1,
|
||||
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
|
||||
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
|
||||
'AC_LIBTOOL_PROG_CC_C_O' => 1,
|
||||
'gl_PREREQ_ARGZ' => 1,
|
||||
'AC_LIB_PREFIX' => 1,
|
||||
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
|
||||
|
|
@ -425,9 +425,9 @@
|
|||
'_AM_SET_OPTION' => 1,
|
||||
'AC_LTDL_PREOPEN' => 1,
|
||||
'_LT_LINKER_BOILERPLATE' => 1,
|
||||
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
|
||||
'AC_LIBTOOL_PROG_CC_C_O' => 1,
|
||||
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
|
||||
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
|
||||
'gl_PREREQ_ARGZ' => 1,
|
||||
'AC_LIB_PREFIX' => 1,
|
||||
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
|
||||
|
|
|
|||
|
|
@ -107,9 +107,9 @@
|
|||
'_AM_SET_OPTION' => 1,
|
||||
'AC_LTDL_PREOPEN' => 1,
|
||||
'_LT_LINKER_BOILERPLATE' => 1,
|
||||
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
|
||||
'AC_LIBTOOL_PROG_CC_C_O' => 1,
|
||||
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
|
||||
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
|
||||
'gl_PREREQ_ARGZ' => 1,
|
||||
'AC_LIB_PREFIX' => 1,
|
||||
'LT_SUPPORTED_TAG' => 1,
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ libreMediaServer::libreMediaServer(QStringList args, QWidget *parent)
|
|||
m_startaudio(0),
|
||||
m_pd_video(NULL),
|
||||
m_pd_audio(NULL),
|
||||
m_pd_write_video(NULL),
|
||||
m_pd_write_audio(NULL),
|
||||
m_pd_read_audio(NULL),
|
||||
m_tcpsocket_audio(NULL),
|
||||
|
|
@ -142,10 +143,6 @@ libreMediaServer::libreMediaServer(QStringList args, QWidget *parent)
|
|||
qErrnoWarning("libremediaserver::constructor L132: Can not listen on unix local server");
|
||||
}
|
||||
connect(m_server_vid, SIGNAL(newConnection()),this, SLOT(newPeer()));
|
||||
// Creamos los sockets para mandar paquetes a PD
|
||||
m_pd_write_video = new QTcpSocket(this);
|
||||
Q_CHECK_PTR(m_pd_write_video);
|
||||
connect(m_pd_write_video, SIGNAL(connected()),this, SLOT(newconexion()));
|
||||
// Start preview Timer
|
||||
m_preview = new QTimer(this);
|
||||
Q_CHECK_PTR(m_preview);
|
||||
|
|
@ -885,11 +882,16 @@ void libreMediaServer::pdstart()
|
|||
{
|
||||
return;
|
||||
}
|
||||
// Creamos los sockets para la conexión a Pure Data
|
||||
m_pd_write_video = new QTcpSocket(this);
|
||||
Q_CHECK_PTR(m_pd_write_video);
|
||||
connect(m_pd_write_video, SIGNAL(connected()),this, SLOT(newconexion()));
|
||||
// Arrancamos el proceso Pure Data
|
||||
QString arguments;
|
||||
arguments.append("./puredata/pd -noaudio -lib Gem -stderr -nostdpath -path ./puredata/externals/ -open ./puredata/lms-video.pd ");
|
||||
if (!m_gui)
|
||||
arguments.append("-nogui");
|
||||
qDebug() << "PD Video starts with argument: " << arguments;
|
||||
m_pd_video->start(arguments);
|
||||
if (m_pd_video->waitForStarted(3000)){
|
||||
ui.textEdit->appendPlainText("Video Engine started.");
|
||||
|
|
@ -900,7 +902,7 @@ void libreMediaServer::pdstart()
|
|||
ui.textEdit->appendPlainText("Video Engine can not start!");
|
||||
return;
|
||||
}
|
||||
// Connect the output from PD Video to stdout slot to process it
|
||||
// Connect the output fropm PD Video to stdout slot to process it
|
||||
connect(m_pd_video, SIGNAL(readyReadStandardError()), this, SLOT(stdout()));
|
||||
// Restart PD Video if crash
|
||||
connect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart()));
|
||||
|
|
@ -917,8 +919,6 @@ void libreMediaServer::pdrestart()
|
|||
qDebug()<<"********************************************************************************";
|
||||
qDebug()<<"PD Video Restarts:" << ++m_startvideo;
|
||||
ui.textEdit->appendPlainText("PD Video Restarting.");
|
||||
m_pd_write_video->close();
|
||||
|
||||
disconnect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart()));
|
||||
pdstart();
|
||||
|
||||
|
|
@ -1014,7 +1014,7 @@ void libreMediaServer::newmessage()
|
|||
ui.layer8Preview->setPixmap(frame);
|
||||
break;
|
||||
default:
|
||||
qDebug()<<"newmessage: Message received but can not identify the cookie";
|
||||
qDebug()<<"newmessage: Message received but can not identify the cooki";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1022,6 +1022,13 @@ void libreMediaServer::newmessage()
|
|||
// Send the configuration to PD
|
||||
void libreMediaServer::newconexion()
|
||||
{
|
||||
// Iniciamos el socket
|
||||
m_pd_write_video->connectToHost(QHostAddress::LocalHost, PDPORTW);
|
||||
m_pd_write_video->waitForConnected(3000);
|
||||
if (!(m_pd_write_video->isOpen())){
|
||||
qErrnoWarning("newconexion:pd write socket not open!:");
|
||||
return;
|
||||
}
|
||||
//Mandamos el path
|
||||
QString desc = tr("0000 0000 %1;").arg(m_pathmedia);
|
||||
if (!sendPacket(desc.toAscii().constData(),desc.size()))
|
||||
|
|
@ -1406,6 +1413,7 @@ void libreMediaServer::pdstart_audio()
|
|||
arguments.append("./puredata/pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./puredata/externals/ -open ./puredata/lms-audio.pd ");
|
||||
if (!m_gui)
|
||||
arguments.append("-nogui");
|
||||
qDebug() << "PD Audio starts with argument: " << arguments;
|
||||
m_pd_audio->start(arguments);
|
||||
if (m_pd_audio->waitForStarted(3000)){
|
||||
ui.textEdit->appendPlainText("PD Audio started.");
|
||||
|
|
@ -1442,7 +1450,6 @@ void libreMediaServer::pdrestart_audio()
|
|||
delete m_pd_read_audio;
|
||||
}
|
||||
disconnect(m_pd_audio, SIGNAL(finished(int)), this, SLOT(pdrestart_audio()));
|
||||
m_pd_write_video->close();
|
||||
pdstart_audio();
|
||||
}
|
||||
|
||||
|
|
@ -1699,12 +1706,7 @@ void libreMediaServer::stdout() {
|
|||
case '0':
|
||||
qDebug()<<"Loadbang Video";
|
||||
ui.textEdit->appendPlainText("LoadBang Video received.");
|
||||
m_pd_write_video->connectToHost(QHostAddress::LocalHost, PDPORTW);
|
||||
if (!(m_pd_write_video->waitForConnected(3000))){
|
||||
qDebug()<<"Newconexion failed connect to Host "<< m_pd_write_video->error();
|
||||
} else {
|
||||
newconexion();
|
||||
}
|
||||
newconexion();
|
||||
break;
|
||||
case '1':
|
||||
out.remove(0, i);
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
#include "MSEXDefines.h"
|
||||
#include "ui_libremediaserver.h"
|
||||
|
||||
#define VERSION "LibreMediaServer Version 0.04-4-DebianWheezy"
|
||||
#define COPYRIGHT "(C) 2012-2013 Santi Nore libremediaserver@gmail.com"
|
||||
#define VERSION "LibreMediaServer Version 0.04-2"
|
||||
#define COPYRIGHT "(C) 2012-2013 Santi Norena libremediaserver@gmail.com"
|
||||
#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"
|
||||
|
||||
class msex;
|
||||
|
|
@ -61,7 +61,7 @@ public:
|
|||
protected:
|
||||
|
||||
QString m_pathmedia; // Path to Medias
|
||||
msex *m_msex; // CITP/MSEx
|
||||
msex *m_msex; // MSEx
|
||||
QProcess *m_ola; // OLA daemon process
|
||||
QProcess *m_pd_video; // Pure Data process for video
|
||||
QProcess *m_pd_audio; // Pure Data process for audio
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>777</width>
|
||||
<height>677</height>
|
||||
<width>745</width>
|
||||
<height>636</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -21,9 +21,9 @@
|
|||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>150</y>
|
||||
<width>711</width>
|
||||
<x>0</x>
|
||||
<y>120</y>
|
||||
<width>831</width>
|
||||
<height>441</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -395,9 +395,9 @@
|
|||
<widget class="QLabel" name="CITPaddress_label">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>470</x>
|
||||
<x>480</x>
|
||||
<y>200</y>
|
||||
<width>231</width>
|
||||
<width>241</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -1192,10 +1192,10 @@
|
|||
<widget class="QPlainTextEdit" name="textEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>20</y>
|
||||
<width>711</width>
|
||||
<height>111</height>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>721</width>
|
||||
<height>121</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="plainText">
|
||||
|
|
@ -1213,16 +1213,10 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>777</width>
|
||||
<height>25</height>
|
||||
<width>745</width>
|
||||
<height>29</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<widget class="QMenu" name="menuFile">
|
||||
<property name="title">
|
||||
<string>File</string>
|
||||
|
|
|
|||
0
src/ola2pd/LICENSE.txt
Normal file → Executable file
0
src/ola2pd/LICENSE.txt
Normal file → Executable file
|
|
@ -1,5 +1,5 @@
|
|||
*******************************************************************************
|
||||
ola2pd 0.03
|
||||
ola2pd 0.02 6/01/2013
|
||||
|
||||
(C) 2012-2013 Santi Noreña belfegor<AT>gmail.com
|
||||
|
||||
|
|
|
|||
|
|
@ -81,8 +81,8 @@ public:
|
|||
// --- define inlets and outlets ---
|
||||
AddInAnything(); // default inlet
|
||||
AddOutList(); // outlet for DMX list
|
||||
post("ola2pd v0.03 - an interface to Open Lighting Arquitecture");
|
||||
post("(C) 2012-2013 Santi Nore libremediaserver@gmail.com");
|
||||
post("ola2pd v0.02 - an interface to Open Lighting Arquitecture");
|
||||
post("(C) 2012-2013 Santi Noreña libremediaserver@gmail.com");
|
||||
}
|
||||
void NewDmx(unsigned int universe,
|
||||
const DmxBuffer &buffer,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
*******************************************************************************
|
||||
ola2pd 0.03
|
||||
ola2pd 0.02 6/1/2013
|
||||
|
||||
(C) 2012-2013 Santi Noreña belfegor<AT>gmail.com
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue