diff --git a/scripts/install_precise.sh b/scripts/install_precise.sh old mode 100644 new mode 100755 index f6fa3ba..608cee8 --- a/scripts/install_precise.sh +++ b/scripts/install_precise.sh @@ -2,11 +2,11 @@ ############################################################################## # 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 # Necesita root para ejecutar -# +# El repositorio Universe debe estar habilitado # (c) 2012-2013 Santi Noreña # GPL License ############################################################################### @@ -22,9 +22,13 @@ if [ "$output" -eq "0" ]; then echo "deb http://apt.openlighting.org/ubuntu/ precise main" >> /etc/apt/sources.list fi apt-get update -apt-get -y --force-yes install ola libqtcore4 libqtgui4 libqtwebkit4 libqt4script libqt4network libmagick++4 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1 libquicktime2 + +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 + 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 diff --git a/src/Gem/extra/ola2pd/LICENSE.txt b/src/Gem/extra/ola2pd/LICENSE.txt new file mode 100644 index 0000000..307bd19 --- /dev/null +++ b/src/Gem/extra/ola2pd/LICENSE.txt @@ -0,0 +1,28 @@ +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 + diff --git a/src/Gem/extra/ola2pd/Makefile.am b/src/Gem/extra/ola2pd/Makefile.am new file mode 100644 index 0000000..383033b --- /dev/null +++ b/src/Gem/extra/ola2pd/Makefile.am @@ -0,0 +1,48 @@ +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 + diff --git a/src/Gem/extra/ola2pd/ola2pd-help.pd b/src/Gem/extra/ola2pd/ola2pd-help.pd new file mode 100644 index 0000000..018fe89 --- /dev/null +++ b/src/Gem/extra/ola2pd/ola2pd-help.pd @@ -0,0 +1,24 @@ +#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; diff --git a/src/Gem/extra/ola2pd/ola2pd.cpp b/src/Gem/extra/ola2pd/ola2pd.cpp new file mode 100644 index 0000000..2720419 --- /dev/null +++ b/src/Gem/extra/ola2pd/ola2pd.cpp @@ -0,0 +1,146 @@ +/* + * ola2pd - interface from Open Lighting Arquitecture to Pure Data + * v 0.03 + * + * Copyright (c) 2012-2013 Santiago Noreña + * + * 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 + * and ola_dmxmonitor by Simon Newton (nomis52gmail.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(&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; +} + + + diff --git a/src/Gem/extra/ola2pd/ola2pd.h b/src/Gem/extra/ola2pd/ola2pd.h new file mode 100644 index 0000000..e96bad0 --- /dev/null +++ b/src/Gem/extra/ola2pd/ola2pd.h @@ -0,0 +1,79 @@ +/*----------------------------------------------------------------- + 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 +#include + +#include +#include +#include + +#include + +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 diff --git a/src/Gem/plugins/videoAVT/autom4te.cache/requests b/src/Gem/plugins/videoAVT/autom4te.cache/requests index a6db945..41f4643 100644 --- a/src/Gem/plugins/videoAVT/autom4te.cache/requests +++ b/src/Gem/plugins/videoAVT/autom4te.cache/requests @@ -62,8 +62,8 @@ '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'LTOBSOLETE_VERSION' => 1, 'AM_SANITY_CHECK' => 1, + 'LTOBSOLETE_VERSION' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -75,22 +75,22 @@ '_AM_PROG_TAR' => 1, 'AC_LIBTOOL_GCJ' => 1, '_LT_WITH_SYSROOT' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, 'LT_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LIB_ARG_WITH' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, '_LT_AC_LANG_F77' => 1, - 'AC_LTDL_DLLIB' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LIB_ARG_WITH' => 1, '_AM_SUBST_NOTMAKE' => 1, + 'AC_LTDL_DLLIB' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, '_LTDL_SETUP' => 1, - 'AM_PROG_LIBTOOL' => 1, '_LT_AC_LANG_CXX' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LIBTOOL' => 1, 'AC_LIB_LTDL' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LD' => 1, 'GEM_TARGET_DISABLED' => 1, 'GEM_CHECK_RTE' => 1, 'AU_DEFUN' => 1, @@ -111,24 +111,24 @@ 'AC_LIBTOOL_PROG_CC_C_O' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, - 'LT_SUPPORTED_TAG' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_PROG_RC' => 1, + 'LT_SUPPORTED_TAG' => 1, 'LT_SYS_MODULE_EXT' => 1, + 'LT_PROG_RC' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, - 'AC_' => 1, 'GEM_ARG_DISABLE' => 1, + 'AC_' => 1, 'AC_LTDL_OBJDIR' => 1, - 'GEM_ARG_WITH' => 1, '_LT_PATH_TOOL_PREFIX' => 1, + 'GEM_ARG_WITH' => 1, 'AC_LIBTOOL_RC' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, 'AM_SILENT_RULES' => 1, - 'include' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_AC_SYS_LIBPATH_AIX' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'include' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, 'AC_LIB_APPENDTOVAR' => 1, @@ -136,22 +136,22 @@ '_LT_AC_LANG_GCJ_CONFIG' => 1, 'AC_ENABLE_SHARED' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, 'AC_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, - 'LTVERSION_VERSION' => 1, - '_LT_PROG_CXX' => 1, - '_LT_PROG_F77' => 1, 'LTDL_INIT' => 1, - 'm4_include' => 1, + '_LT_PROG_F77' => 1, + '_LT_PROG_CXX' => 1, + 'LTVERSION_VERSION' => 1, 'AM_PROG_INSTALL_SH' => 1, + 'm4_include' => 1, 'AC_PROG_EGREP' => 1, - 'AC_PATH_MAGIC' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_PATH_MAGIC' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, @@ -171,81 +171,81 @@ 'LT_LANG' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, 'LT_OUTPUT' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, 'GEM_CHECK_LDFLAGS' => 1, 'AC_LIB_PROG_LD_GNU' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_WITH_LTDL' => 1, 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'LT_AC_PROG_RC' => 1, + 'AC_WITH_LTDL' => 1, 'AC_LIBTOOL_CXX' => 1, + 'LT_AC_PROG_RC' => 1, 'LT_INIT' => 1, - 'LT_AC_PROG_GCJ' => 1, 'LT_SYS_DLOPEN_SELF' => 1, - 'AM_DEP_TRACK' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_AC_PROG_GCJ' => 1, '_LT_AC_PROG_CXXCPP' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AM_DEP_TRACK' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'm4_pattern_allow' => 1, 'AC_LIBTOOL_F77' => 1, + 'm4_pattern_allow' => 1, 'AM_SET_LEADING_DOT' => 1, 'GEM_CHECK_FRAMEWORK' => 1, - '_LT_PROG_FC' => 1, 'LT_AC_PROG_EGREP' => 1, + '_LT_PROG_FC' => 1, '_AM_DEPENDENCIES' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'LTOPTIONS_VERSION' => 1, - 'AC_LIB_LINKFLAGS' => 1, '_LT_AC_SYS_COMPILER' => 1, + 'AC_LIB_LINKFLAGS' => 1, 'AM_PROG_NM' => 1, - 'PKG_CHECK_MODULES' => 1, 'GEM_CHECK_LIB' => 1, + 'PKG_CHECK_MODULES' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'LT_PROG_GCJ' => 1, 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'LT_PROG_GCJ' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, 'LT_PATH_NM' => 1, 'AC_LTDL_SHLIBEXT' => 1, '_LT_AC_LOCK' => 1, - 'GEM_ARG_ENABLE' => 1, '_LT_AC_LANG_RC_CONFIG' => 1, + 'GEM_ARG_ENABLE' => 1, 'LT_PROG_GO' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'LT_WITH_LTDL' => 1, 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'LT_WITH_LTDL' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, 'GEM_TARGET' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, '_AM_SET_OPTIONS' => 1, - 'IEM_OPERATING_SYSTEM' => 1, - 'AM_RUN_LOG' => 1, + '_LT_COMPILER_OPTION' => 1, '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, + 'IEM_OPERATING_SYSTEM' => 1, 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_PICMODE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'ACX_PTHREAD' => 1, - 'AX_PTHREAD' => 1, - 'AC_CHECK_LIBM' => 1, 'LT_PATH_LD' => 1, + 'AC_CHECK_LIBM' => 1, + 'AX_PTHREAD' => 1, + 'ACX_PTHREAD' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AM_SET_DEPDIR' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, '_LT_CC_BASENAME' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, 'GEM_CHECK_THREADS' => 1, '_LT_LIBOBJ' => 1, 'AC_LIB_PROG_LD' => 1 @@ -263,57 +263,57 @@ 'configure.ac' ], { - 'AM_PROG_F77_C_O' => 1, '_LT_AC_TAGCONFIG' => 1, - 'AC_INIT' => 1, + 'AM_PROG_F77_C_O' => 1, 'm4_pattern_forbid' => 1, - 'AC_CANONICAL_TARGET' => 1, + 'AC_INIT' => 1, '_AM_COND_IF' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CANONICAL_TARGET' => 1, 'AC_SUBST' => 1, - 'AC_CANONICAL_HOST' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_FC_SRCEXT' => 1, + 'AC_CANONICAL_HOST' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_SUBDIRS' => 1, 'AM_PATH_GUILE' => 1, + 'AC_CONFIG_SUBDIRS' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_LINKS' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'LT_SUPPORTED_TAG' => 1, + 'AC_CONFIG_LINKS' => 1, 'm4_sinclude' => 1, + 'LT_SUPPORTED_TAG' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_NLS' => 1, 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - '_m4_warn' => 1, 'AM_MAKEFILE_INCLUDE' => 1, + '_m4_warn' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, '_AM_COND_ENDIF' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, 'AM_PROG_MOC' => 1, 'AC_CONFIG_FILES' => 1, - 'include' => 1, 'LT_INIT' => 1, - 'AM_GNU_GETTEXT' => 1, + 'include' => 1, 'AM_PROG_AR' => 1, + 'AM_GNU_GETTEXT' => 1, 'AC_LIBSOURCE' => 1, - 'AC_CANONICAL_BUILD' => 1, 'AM_PROG_FC_C_O' => 1, + 'AC_CANONICAL_BUILD' => 1, 'AC_FC_FREEFORM' => 1, - 'AC_FC_PP_SRCEXT' => 1, 'AH_OUTPUT' => 1, - 'AC_CONFIG_AUX_DIR' => 1, + 'AC_FC_PP_SRCEXT' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'm4_pattern_allow' => 1, - 'AM_PROG_CC_C_O' => 1, + 'AC_CONFIG_AUX_DIR' => 1, 'sinclude' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'm4_pattern_allow' => 1, 'AM_XGETTEXT_OPTION' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_POT_TOOLS' => 1, @@ -381,8 +381,8 @@ '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'LTOBSOLETE_VERSION' => 1, 'AM_SANITY_CHECK' => 1, + 'LTOBSOLETE_VERSION' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -394,22 +394,22 @@ '_AM_PROG_TAR' => 1, 'AC_LIBTOOL_GCJ' => 1, '_LT_WITH_SYSROOT' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, 'LT_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LIB_ARG_WITH' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, '_LT_AC_LANG_F77' => 1, - 'AC_LTDL_DLLIB' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LIB_ARG_WITH' => 1, '_AM_SUBST_NOTMAKE' => 1, + 'AC_LTDL_DLLIB' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, '_LTDL_SETUP' => 1, - 'AM_PROG_LIBTOOL' => 1, '_LT_AC_LANG_CXX' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LIBTOOL' => 1, 'AC_LIB_LTDL' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LD' => 1, 'GEM_TARGET_DISABLED' => 1, 'GEM_CHECK_RTE' => 1, 'AU_DEFUN' => 1, @@ -430,24 +430,24 @@ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, - 'LT_SUPPORTED_TAG' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_PROG_RC' => 1, + 'LT_SUPPORTED_TAG' => 1, 'LT_SYS_MODULE_EXT' => 1, + 'LT_PROG_RC' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, - 'AC_' => 1, 'GEM_ARG_DISABLE' => 1, + 'AC_' => 1, 'AC_LTDL_OBJDIR' => 1, - 'GEM_ARG_WITH' => 1, '_LT_PATH_TOOL_PREFIX' => 1, + 'GEM_ARG_WITH' => 1, 'AC_LIBTOOL_RC' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, 'AM_SILENT_RULES' => 1, - 'include' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_AC_SYS_LIBPATH_AIX' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'include' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, 'AC_LIB_APPENDTOVAR' => 1, @@ -455,22 +455,22 @@ '_LT_AC_LANG_GCJ_CONFIG' => 1, 'AC_ENABLE_SHARED' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, 'AC_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, - 'LTVERSION_VERSION' => 1, - '_LT_PROG_CXX' => 1, - '_LT_PROG_F77' => 1, 'LTDL_INIT' => 1, - 'm4_include' => 1, + '_LT_PROG_F77' => 1, + '_LT_PROG_CXX' => 1, + 'LTVERSION_VERSION' => 1, 'AM_PROG_INSTALL_SH' => 1, + 'm4_include' => 1, 'AC_PROG_EGREP' => 1, - 'AC_PATH_MAGIC' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_PATH_MAGIC' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, @@ -490,81 +490,81 @@ 'LT_LANG' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, 'LT_OUTPUT' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, 'GEM_CHECK_LDFLAGS' => 1, 'AC_LIB_PROG_LD_GNU' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_WITH_LTDL' => 1, 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'LT_AC_PROG_RC' => 1, + 'AC_WITH_LTDL' => 1, 'AC_LIBTOOL_CXX' => 1, + 'LT_AC_PROG_RC' => 1, 'LT_INIT' => 1, - 'LT_AC_PROG_GCJ' => 1, 'LT_SYS_DLOPEN_SELF' => 1, - 'AM_DEP_TRACK' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_AC_PROG_GCJ' => 1, '_LT_AC_PROG_CXXCPP' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AM_DEP_TRACK' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'm4_pattern_allow' => 1, 'AC_LIBTOOL_F77' => 1, + 'm4_pattern_allow' => 1, 'AM_SET_LEADING_DOT' => 1, 'GEM_CHECK_FRAMEWORK' => 1, - '_LT_PROG_FC' => 1, 'LT_AC_PROG_EGREP' => 1, + '_LT_PROG_FC' => 1, '_AM_DEPENDENCIES' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'LTOPTIONS_VERSION' => 1, - 'AC_LIB_LINKFLAGS' => 1, '_LT_AC_SYS_COMPILER' => 1, + 'AC_LIB_LINKFLAGS' => 1, 'AM_PROG_NM' => 1, - 'PKG_CHECK_MODULES' => 1, 'GEM_CHECK_LIB' => 1, + 'PKG_CHECK_MODULES' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'LT_PROG_GCJ' => 1, 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'LT_PROG_GCJ' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, 'LT_PATH_NM' => 1, 'AC_LTDL_SHLIBEXT' => 1, '_LT_AC_LOCK' => 1, - 'GEM_ARG_ENABLE' => 1, '_LT_AC_LANG_RC_CONFIG' => 1, + 'GEM_ARG_ENABLE' => 1, 'LT_PROG_GO' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'LT_WITH_LTDL' => 1, 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'LT_WITH_LTDL' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, 'GEM_TARGET' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, '_AM_SET_OPTIONS' => 1, - 'IEM_OPERATING_SYSTEM' => 1, - 'AM_RUN_LOG' => 1, + '_LT_COMPILER_OPTION' => 1, '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, + 'IEM_OPERATING_SYSTEM' => 1, 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_PICMODE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'ACX_PTHREAD' => 1, - 'AX_PTHREAD' => 1, - 'AC_CHECK_LIBM' => 1, 'LT_PATH_LD' => 1, + 'AC_CHECK_LIBM' => 1, + 'AX_PTHREAD' => 1, + 'ACX_PTHREAD' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AM_SET_DEPDIR' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, '_LT_CC_BASENAME' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, 'GEM_CHECK_THREADS' => 1, '_LT_LIBOBJ' => 1, 'AC_LIB_PROG_LD' => 1 diff --git a/src/Gem/plugins/videoHALCON/autom4te.cache/requests b/src/Gem/plugins/videoHALCON/autom4te.cache/requests index 4308fd0..caf3c65 100644 --- a/src/Gem/plugins/videoHALCON/autom4te.cache/requests +++ b/src/Gem/plugins/videoHALCON/autom4te.cache/requests @@ -63,8 +63,8 @@ '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'AM_SANITY_CHECK' => 1, 'LTOBSOLETE_VERSION' => 1, + 'AM_SANITY_CHECK' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -76,22 +76,22 @@ '_AM_PROG_TAR' => 1, 'AC_LIBTOOL_GCJ' => 1, '_LT_WITH_SYSROOT' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_FUNC_DLSYM_USCORE' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'AC_LIB_ARG_WITH' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + '_LT_AC_LANG_F77' => 1, 'AC_LTDL_DLLIB' => 1, + '_AM_SUBST_NOTMAKE' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, '_LTDL_SETUP' => 1, - '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LIBTOOL' => 1, - 'AC_LIB_LTDL' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LD' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIB_LTDL' => 1, 'GEM_TARGET_DISABLED' => 1, 'GEM_CHECK_RTE' => 1, 'AU_DEFUN' => 1, @@ -112,24 +112,24 @@ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_SUPPORTED_TAG' => 1, - 'LT_SYS_MODULE_EXT' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_PROG_RC' => 1, + 'LT_SYS_MODULE_EXT' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, - 'GEM_ARG_DISABLE' => 1, 'AC_' => 1, + 'GEM_ARG_DISABLE' => 1, 'AC_LTDL_OBJDIR' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, 'GEM_ARG_WITH' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, 'AC_LIBTOOL_RC' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_SILENT_RULES' => 1, 'include' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, 'AC_LIB_APPENDTOVAR' => 1, @@ -137,22 +137,22 @@ '_LT_AC_LANG_GCJ_CONFIG' => 1, 'AC_ENABLE_SHARED' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_ENABLE_STATIC' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, - 'LTDL_INIT' => 1, - '_LT_PROG_F77' => 1, - '_LT_PROG_CXX' => 1, 'LTVERSION_VERSION' => 1, - 'AM_PROG_INSTALL_SH' => 1, + '_LT_PROG_CXX' => 1, + '_LT_PROG_F77' => 1, + 'LTDL_INIT' => 1, 'm4_include' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'AC_PROG_EGREP' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_PATH_MAGIC' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, @@ -172,82 +172,82 @@ 'LT_LANG' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'LT_OUTPUT' => 1, 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'LT_OUTPUT' => 1, 'GEM_CHECK_LDFLAGS' => 1, 'AC_LIB_PROG_LD_GNU' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, 'AC_WITH_LTDL' => 1, - 'AC_LIBTOOL_CXX' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, 'LT_AC_PROG_RC' => 1, + 'AC_LIBTOOL_CXX' => 1, 'LT_INIT' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, 'LT_AC_PROG_GCJ' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, 'AM_DEP_TRACK' => 1, + 'AM_DISABLE_STATIC' => 1, + '_LT_AC_PROG_CXXCPP' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, 'GEM_CHECK_HALCON' => 1, - 'AC_LIBTOOL_F77' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, 'm4_pattern_allow' => 1, + 'AC_LIBTOOL_F77' => 1, 'AM_SET_LEADING_DOT' => 1, 'GEM_CHECK_FRAMEWORK' => 1, - 'LT_AC_PROG_EGREP' => 1, '_LT_PROG_FC' => 1, + 'LT_AC_PROG_EGREP' => 1, '_AM_DEPENDENCIES' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'LTOPTIONS_VERSION' => 1, - '_LT_AC_SYS_COMPILER' => 1, 'AC_LIB_LINKFLAGS' => 1, + '_LT_AC_SYS_COMPILER' => 1, 'AM_PROG_NM' => 1, - 'GEM_CHECK_LIB' => 1, 'PKG_CHECK_MODULES' => 1, + 'GEM_CHECK_LIB' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'LT_PROG_GCJ' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, 'LT_PATH_NM' => 1, 'AC_LTDL_SHLIBEXT' => 1, '_LT_AC_LOCK' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, 'GEM_ARG_ENABLE' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, 'LT_PROG_GO' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'LT_WITH_LTDL' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, 'GEM_TARGET' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_AM_SET_OPTIONS' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, '_LT_COMPILER_OPTION' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_RUN_LOG' => 1, + '_AM_SET_OPTIONS' => 1, 'IEM_OPERATING_SYSTEM' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'LT_PATH_LD' => 1, - 'AC_CHECK_LIBM' => 1, - 'AX_PTHREAD' => 1, 'ACX_PTHREAD' => 1, + 'AX_PTHREAD' => 1, + 'AC_CHECK_LIBM' => 1, + 'LT_PATH_LD' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, 'AM_SET_DEPDIR' => 1, - '_LT_CC_BASENAME' => 1, 'PKG_PROG_PKG_CONFIG' => 1, + '_LT_CC_BASENAME' => 1, 'GEM_CHECK_THREADS' => 1, '_LT_LIBOBJ' => 1, 'AC_LIB_PROG_LD' => 1 @@ -265,57 +265,57 @@ 'configure.ac' ], { - '_LT_AC_TAGCONFIG' => 1, 'AM_PROG_F77_C_O' => 1, - 'm4_pattern_forbid' => 1, + '_LT_AC_TAGCONFIG' => 1, 'AC_INIT' => 1, - '_AM_COND_IF' => 1, + 'm4_pattern_forbid' => 1, 'AC_CANONICAL_TARGET' => 1, - 'AC_SUBST' => 1, + '_AM_COND_IF' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_FC_SRCEXT' => 1, + 'AC_SUBST' => 1, 'AC_CANONICAL_HOST' => 1, + 'AC_FC_SRCEXT' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AM_PATH_GUILE' => 1, 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PATH_GUILE' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, 'AC_CONFIG_LINKS' => 1, - 'm4_sinclude' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, 'LT_SUPPORTED_TAG' => 1, + 'm4_sinclude' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_NLS' => 1, 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, '_m4_warn' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_COND_ENDIF' => 1, '_AM_MAKEFILE_INCLUDE' => 1, + '_AM_COND_ENDIF' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, 'AM_PROG_MOC' => 1, 'AC_CONFIG_FILES' => 1, - 'LT_INIT' => 1, 'include' => 1, - 'AM_PROG_AR' => 1, + 'LT_INIT' => 1, 'AM_GNU_GETTEXT' => 1, + 'AM_PROG_AR' => 1, 'AC_LIBSOURCE' => 1, - 'AM_PROG_FC_C_O' => 1, 'AC_CANONICAL_BUILD' => 1, + 'AM_PROG_FC_C_O' => 1, 'AC_FC_FREEFORM' => 1, - 'AH_OUTPUT' => 1, 'AC_FC_PP_SRCEXT' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AH_OUTPUT' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'sinclude' => 1, - 'AM_PROG_CC_C_O' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'm4_pattern_allow' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'sinclude' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_XGETTEXT_OPTION' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_POT_TOOLS' => 1, diff --git a/src/Gem/plugins/videoPYLON/autom4te.cache/requests b/src/Gem/plugins/videoPYLON/autom4te.cache/requests index 2e2f6c2..c136500 100644 --- a/src/Gem/plugins/videoPYLON/autom4te.cache/requests +++ b/src/Gem/plugins/videoPYLON/autom4te.cache/requests @@ -63,8 +63,8 @@ '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'AM_SANITY_CHECK' => 1, 'LTOBSOLETE_VERSION' => 1, + 'AM_SANITY_CHECK' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -76,23 +76,23 @@ '_AM_PROG_TAR' => 1, 'AC_LIBTOOL_GCJ' => 1, '_LT_WITH_SYSROOT' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_FUNC_DLSYM_USCORE' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'AC_LIB_ARG_WITH' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + '_LT_AC_LANG_F77' => 1, 'GEM_CHECK_PYLON' => 1, - '_AM_SUBST_NOTMAKE' => 1, 'AC_LTDL_DLLIB' => 1, + '_AM_SUBST_NOTMAKE' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, '_LTDL_SETUP' => 1, - '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LIBTOOL' => 1, - 'AC_LIB_LTDL' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_AC_LANG_CXX' => 1, 'AM_PROG_LD' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIB_LTDL' => 1, 'GEM_TARGET_DISABLED' => 1, 'GEM_CHECK_RTE' => 1, 'AU_DEFUN' => 1, @@ -108,29 +108,29 @@ '_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_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_SUPPORTED_TAG' => 1, - 'LT_SYS_MODULE_EXT' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'LT_PROG_RC' => 1, + 'LT_SYS_MODULE_EXT' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, - 'GEM_ARG_DISABLE' => 1, 'AC_' => 1, + 'GEM_ARG_DISABLE' => 1, 'AC_LTDL_OBJDIR' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, 'GEM_ARG_WITH' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, 'AC_LIBTOOL_RC' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_SILENT_RULES' => 1, 'include' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, 'AC_LIB_APPENDTOVAR' => 1, @@ -138,22 +138,22 @@ '_LT_AC_LANG_GCJ_CONFIG' => 1, 'AC_ENABLE_SHARED' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_ENABLE_STATIC' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, - 'LTDL_INIT' => 1, - '_LT_PROG_F77' => 1, - '_LT_PROG_CXX' => 1, 'LTVERSION_VERSION' => 1, - 'AM_PROG_INSTALL_SH' => 1, + '_LT_PROG_CXX' => 1, + '_LT_PROG_F77' => 1, + 'LTDL_INIT' => 1, 'm4_include' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'AC_PROG_EGREP' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_PATH_MAGIC' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, @@ -173,81 +173,81 @@ 'LT_LANG' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'LT_OUTPUT' => 1, 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'LT_OUTPUT' => 1, 'GEM_CHECK_LDFLAGS' => 1, 'AC_LIB_PROG_LD_GNU' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, 'AC_WITH_LTDL' => 1, - 'AC_LIBTOOL_CXX' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, 'LT_AC_PROG_RC' => 1, + 'AC_LIBTOOL_CXX' => 1, 'LT_INIT' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, 'LT_AC_PROG_GCJ' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, 'AM_DEP_TRACK' => 1, + 'AM_DISABLE_STATIC' => 1, + '_LT_AC_PROG_CXXCPP' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_F77' => 1, 'm4_pattern_allow' => 1, + 'AC_LIBTOOL_F77' => 1, 'AM_SET_LEADING_DOT' => 1, 'GEM_CHECK_FRAMEWORK' => 1, - 'LT_AC_PROG_EGREP' => 1, '_LT_PROG_FC' => 1, + 'LT_AC_PROG_EGREP' => 1, '_AM_DEPENDENCIES' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'LTOPTIONS_VERSION' => 1, - '_LT_AC_SYS_COMPILER' => 1, 'AC_LIB_LINKFLAGS' => 1, + '_LT_AC_SYS_COMPILER' => 1, 'AM_PROG_NM' => 1, - 'GEM_CHECK_LIB' => 1, 'PKG_CHECK_MODULES' => 1, + 'GEM_CHECK_LIB' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'LT_PROG_GCJ' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, 'LT_PATH_NM' => 1, 'AC_LTDL_SHLIBEXT' => 1, '_LT_AC_LOCK' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, 'GEM_ARG_ENABLE' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, 'LT_PROG_GO' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'LT_WITH_LTDL' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, 'GEM_TARGET' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_AM_SET_OPTIONS' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, '_LT_COMPILER_OPTION' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_RUN_LOG' => 1, + '_AM_SET_OPTIONS' => 1, 'IEM_OPERATING_SYSTEM' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'LT_PATH_LD' => 1, - 'AC_CHECK_LIBM' => 1, - 'AX_PTHREAD' => 1, 'ACX_PTHREAD' => 1, + 'AX_PTHREAD' => 1, + 'AC_CHECK_LIBM' => 1, + 'LT_PATH_LD' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, 'AM_SET_DEPDIR' => 1, - '_LT_CC_BASENAME' => 1, 'PKG_PROG_PKG_CONFIG' => 1, + '_LT_CC_BASENAME' => 1, 'GEM_CHECK_THREADS' => 1, '_LT_LIBOBJ' => 1, 'AC_LIB_PROG_LD' => 1 @@ -265,57 +265,57 @@ 'configure.ac' ], { - '_LT_AC_TAGCONFIG' => 1, 'AM_PROG_F77_C_O' => 1, - 'm4_pattern_forbid' => 1, + '_LT_AC_TAGCONFIG' => 1, 'AC_INIT' => 1, - '_AM_COND_IF' => 1, + 'm4_pattern_forbid' => 1, 'AC_CANONICAL_TARGET' => 1, - 'AC_SUBST' => 1, + '_AM_COND_IF' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_FC_SRCEXT' => 1, + 'AC_SUBST' => 1, 'AC_CANONICAL_HOST' => 1, + 'AC_FC_SRCEXT' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AM_PATH_GUILE' => 1, 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PATH_GUILE' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, 'AC_CONFIG_LINKS' => 1, - 'm4_sinclude' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, 'LT_SUPPORTED_TAG' => 1, + 'm4_sinclude' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_NLS' => 1, 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, '_m4_warn' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_COND_ENDIF' => 1, '_AM_MAKEFILE_INCLUDE' => 1, + '_AM_COND_ENDIF' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, 'AM_PROG_MOC' => 1, 'AC_CONFIG_FILES' => 1, - 'LT_INIT' => 1, 'include' => 1, - 'AM_PROG_AR' => 1, + 'LT_INIT' => 1, 'AM_GNU_GETTEXT' => 1, + 'AM_PROG_AR' => 1, 'AC_LIBSOURCE' => 1, - 'AM_PROG_FC_C_O' => 1, 'AC_CANONICAL_BUILD' => 1, + 'AM_PROG_FC_C_O' => 1, 'AC_FC_FREEFORM' => 1, - 'AH_OUTPUT' => 1, 'AC_FC_PP_SRCEXT' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AH_OUTPUT' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'sinclude' => 1, - 'AM_PROG_CC_C_O' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'm4_pattern_allow' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'sinclude' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_XGETTEXT_OPTION' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_POT_TOOLS' => 1, diff --git a/src/libremediaserver.h b/src/libremediaserver.h index 2817059..d3b1692 100644 --- a/src/libremediaserver.h +++ b/src/libremediaserver.h @@ -61,7 +61,7 @@ public: protected: QString m_pathmedia; // Path to Medias - msex *m_msex; // MSEx + msex *m_msex; // CITP/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 diff --git a/src/ola2pd/LICENSE.txt b/src/ola2pd/LICENSE.txt old mode 100755 new mode 100644 diff --git a/src/ola2pd/leeme.txt b/src/ola2pd/leeme.txt index ac1c73d..ca6eaf6 100644 --- a/src/ola2pd/leeme.txt +++ b/src/ola2pd/leeme.txt @@ -1,5 +1,5 @@ ******************************************************************************* -ola2pd 0.02 6/01/2013 +ola2pd 0.03 (C) 2012-2013 Santi Noreña belfegorgmail.com diff --git a/src/ola2pd/main.cpp b/src/ola2pd/main.cpp index 183e23b..5c7afb1 100644 --- a/src/ola2pd/main.cpp +++ b/src/ola2pd/main.cpp @@ -81,8 +81,8 @@ public: // --- define inlets and outlets --- AddInAnything(); // default inlet AddOutList(); // outlet for DMX list - post("ola2pd v0.02 - an interface to Open Lighting Arquitecture"); - post("(C) 2012-2013 Santi Noreña libremediaserver@gmail.com"); + post("ola2pd v0.03 - an interface to Open Lighting Arquitecture"); + post("(C) 2012-2013 Santi Nore libremediaserver@gmail.com"); } void NewDmx(unsigned int universe, const DmxBuffer &buffer, diff --git a/src/ola2pd/ola2pd.c b/src/ola2pd/ola2pd.c deleted file mode 100644 index 86c8ebb..0000000 --- a/src/ola2pd/ola2pd.c +++ /dev/null @@ -1,170 +0,0 @@ -/* - * ola2pd - interface from Open Lighting Arquitecture to Pure Data - * v 0.03 - * - * Copyright (c) 2012-2013 Santiago Noreña - * - * 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 - * and ola_dmxmonitor by Simon Newton (nomis52gmail.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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//static char *version = "$Revision: 0.01 $"; - -//#define DEBUG(x) - - -/*------------------------------------------------------------------------------ - * CLASS DEF - */ -static t_class *ola2pd_class; - -typedef struct _ola2pd { - t_object x_obj; - t_outlet *x_out; - unsigned int x_universe; - unsigned int x_counter; - OlaCallbackClient *x_clientpointer; -} t_ola2pd; - -struct timeval m_last_data; -OlaCallbackClientWrapper m_client; - - - -/*------------------------------------------------------------------------------ - * IMPLEMENTATION - */ - -static void ola2pd_open(t_ola2pd* x) -{ - if (x->x_clientpointer == NULL) - { - // set up ola connection - if (!m_client.Setup()) {post("%s: %s",thisName(), strerror(errno));} - x->x_clientpointer = m_client.GetClient(); - x->x_clientpointer->SetDmxCallback(ola::NewCallback(this, &ola2pd::NewDmx)); - x->xclientpointer->RegisterUniverse(m_universe,ola::REGISTER,ola::NewSingleCallback(this, &ola2pd::RegisterComplete)); - x->xclient.GetSelectServer()->RegisterRepeatingTimeout(5000,ola::NewCallback(this, &ola2pd::CheckDataLoss)); - post("ola2pd: Init complete. Start listening..."); - x->x_client.GetSelectServer()->Run(); - } -} - -static void ola2pd_close(t_ola2pd* x) -{ - if (x->x_clientpointer != NULL) - { - x->x_clientpointer->RegisterUniverse(x->x_universe,ola::UNREGISTER,ola::NewSingleCallback(this, &ola2pd::RegisterComplete)); - m_client.GetSelectServer()->Terminate(); - m_clientpointer = NULL; - post("ola2pd: Close complete"); - } -} - -static void ola2pd_universe(t_ola2pd* x, t_floatarg f) -{ - x->x_universe = f; -} - -static void ola2pd_bang(t_ola2pd* x) -{ - if (x->x_clientpointer != NULL) {post("%s listening on universe %d",thisName(),x->x_universe);} - else {post("%s configured on universe %d. Send open to start listening",thisName(),x->x_universe);} -} - -/* - * Called when there is new DMX data - */ - -void NewDmx(unsigned int universe,const DmxBuffer &buffer,const string &error) { - m_counter++; - gettimeofday(&m_last_data, NULL); - int z; - AtomList dmxlist; - dmxlist(512); - for(z=0; z < 512; z++){SetFloat(dmxlist[z],(buffer.Get(z)));} - ToOutList(0, dmxlist); -} - -/* - * Check for data loss. - */ - -bool 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 void *ola2pd_new() -{ - t_ola2pd *x = (t_ola2pd *)pd_new(ola2pd_class); - x->x_out = outlet_new((t_object *)x, &s_symbol); - x->x_pattern = gensym("empty"); - x->x_universe = 0; - x->x_counter = 0; - return (x); -} - -void ola2pd_setup(void) -{ - ola2pd_class = class_new(gensym("ola2pd"),(t_newmethod)ola2pd_new,0,sizeof(t_ola2pd),0,A_DEFFLOAT, 0); - /* add inlet datatype methods */ - class_addbang(ola2pd_class,(t_method) ola2pd_output); - class_addmethod(ola2pd_class,(t_method)ola2pd_file,gensym("open"),0); - class_addmethod(ola2pd_class,(t_method)ola2pd_type,gensym("close"),0); - class_addmethod(ola2pd_class,(t_method)ola2pd_type,gensym("universe"),A_FLOAT, 0); -} - - - - - diff --git a/src/ola2pd/ola2pd.pd_linux b/src/ola2pd/ola2pd.pd_linux deleted file mode 100755 index 0c95a32..0000000 Binary files a/src/ola2pd/ola2pd.pd_linux and /dev/null differ diff --git a/src/ola2pd/readme.txt b/src/ola2pd/readme.txt index 9ed7030..6544e52 100644 --- a/src/ola2pd/readme.txt +++ b/src/ola2pd/readme.txt @@ -1,5 +1,5 @@ ******************************************************************************* -ola2pd 0.02 6/1/2013 +ola2pd 0.03 (C) 2012-2013 Santi Noreña belfegorgmail.com