diff --git a/Makefile.am b/Makefile.am
index c91bdc8..b2870ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,13 +20,13 @@ librtbuf_la_LIBADD = -ldata
librtbuf_la_SOURCES = \
symbol.c \
rtbuf_type.c \
- rtbuf_fun.c \
+ rtbuf_proc.c \
rtbuf.c
include_HEADERS += \
symbol.h \
rtbuf_defs.h \
rtbuf_type.h \
- rtbuf_fun.h \
+ rtbuf_proc.h \
rtbuf.h
if ENABLE_RTBUF
diff --git a/Makefile.in b/Makefile.in
index 1181d28..889a90a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -161,7 +161,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
librtbuf_la_DEPENDENCIES =
-am_librtbuf_la_OBJECTS = symbol.lo rtbuf_type.lo rtbuf_fun.lo rtbuf.lo
+am_librtbuf_la_OBJECTS = symbol.lo rtbuf_type.lo rtbuf_proc.lo \
+ rtbuf.lo
librtbuf_la_OBJECTS = $(am_librtbuf_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -268,7 +269,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__include_HEADERS_DIST = symbol.h rtbuf_defs.h rtbuf_type.h \
- rtbuf_fun.h rtbuf.h rtbuf_lib.h rtbuf_music.h \
+ rtbuf_proc.h rtbuf.h rtbuf_lib.h rtbuf_music.h \
rtbuf_music_type.h rtbuf_signal.h rtbuf_signal_type.h \
rtbuf_dynamic.h rtbuf_synth.h rtbuf_synth_type.h rtbuf_sndio.h \
rtbuf_sndio_type.h rtbuf_glfw3.h
@@ -450,7 +451,7 @@ ACLOCAL_AMFLAGS = -I build-aux/m4
CLEANFILES = rtbuf_music_type rtbuf_music_type.h $(am__append_3) \
rtbuf_synth_type rtbuf_synth_type.h $(am__append_6) \
dependencies.mk.1 dependencies.mk.2
-include_HEADERS = symbol.h rtbuf_defs.h rtbuf_type.h rtbuf_fun.h \
+include_HEADERS = symbol.h rtbuf_defs.h rtbuf_type.h rtbuf_proc.h \
rtbuf.h $(am__append_2) rtbuf_music.h rtbuf_music_type.h \
$(am__append_5) rtbuf_dynamic.h rtbuf_synth.h \
rtbuf_synth_type.h $(am__append_8) $(am__append_10)
@@ -465,7 +466,7 @@ librtbuf_la_LIBADD = -ldata
librtbuf_la_SOURCES = \
symbol.c \
rtbuf_type.c \
- rtbuf_fun.c \
+ rtbuf_proc.c \
rtbuf.c
@ENABLE_RTBUF_TRUE@rtbuf_LDADD = ${RTBUF_LIBS} librtbuf.la
@@ -695,9 +696,9 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_cli.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_dynamic.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_dynamic_limiter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_fun.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_lib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_music.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_proc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_signal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_signal_sinus.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtbuf_signal_square.Plo@am__quote@
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index c39925b..5d5f617 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -44,186 +44,186 @@
'configure.ac'
],
{
- '_LT_PROG_CXX' => 1,
- '_LT_PROG_FC' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
- 'm4_pattern_allow' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_LTDL_DLLIB' => 1,
- 'AC_PROG_NM' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'LT_SYS_DLOPEN_SELF' => 1,
+ 'AM_PROG_NM' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ 'LT_LANG' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'LT_INIT' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'AC_LIBTOOL_FC' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
- '_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- 'LT_WITH_LTDL' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ '_LT_COMPILER_OPTION' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ '_LTDL_SETUP' => 1,
+ 'LTDL_INSTALLABLE' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
- 'gl_PREREQ_ARGZ' => 1,
+ '_LT_PROG_ECHO_BACKSLASH' => 1,
+ 'AC_PROG_LD' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'LT_PROG_RC' => 1,
+ '_LT_PROG_CXX' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'LT_PATH_NM' => 1,
- 'AC_LIBTOOL_RC' => 1,
- 'gl_FUNC_ARGZ' => 1,
- '_LT_LINKER_OPTION' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- 'AM_PROG_LIBTOOL' => 1,
- 'AC_DEFUN_ONCE' => 1,
- '_LT_AC_SYS_LIBPATH_AIX' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
- 'AC_LIB_LTDL' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AU_DEFUN' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
'AM_DEP_TRACK' => 1,
- '_LT_AC_LANG_GCJ' => 1,
- '_LT_AC_LOCK' => 1,
- 'AC_DISABLE_SHARED' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- '_AM_IF_OPTION' => 1,
- '_LT_AC_LANG_CXX' => 1,
- 'LTVERSION_VERSION' => 1,
- 'AC_PROG_LD' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AM_PROG_NM' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
+ 'LT_AC_PROG_RC' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
- '_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- 'LT_PATH_LD' => 1,
- '_m4_warn' => 1,
- 'LTDL_INIT' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
'_AM_SET_OPTION' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'AM_PROG_LD' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
- 'LT_PROG_RC' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- 'm4_include' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
'AM_INIT_AUTOMAKE' => 1,
- '_LT_PROG_ECHO_BACKSLASH' => 1,
- 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
- 'LT_PROG_GO' => 1,
+ 'AM_ENABLE_STATIC' => 1,
+ 'LT_PATH_LD' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'LTVERSION_VERSION' => 1,
+ 'AC_LIB_LTDL' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ 'm4_pattern_allow' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
'AC_ENABLE_SHARED' => 1,
- 'AC_LIBTOOL_OBJDIR' => 1,
+ 'gl_FUNC_ARGZ' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ 'include' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ '_LT_AC_PROG_CXXCPP' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'AC_LIBTOOL_RC' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AC_CHECK_LIBM' => 1,
- 'AC_ENABLE_STATIC' => 1,
- 'LT_AC_PROG_RC' => 1,
- '_AM_PROG_TAR' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1,
- 'LT_LIB_M' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+ 'LT_PROG_GCJ' => 1,
+ 'LT_PATH_NM' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ 'LT_OUTPUT' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_WITH_LTDL' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
'AC_LIBTOOL_F77' => 1,
+ '_LT_PROG_F77' => 1,
+ 'LT_AC_PROG_SED' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ 'AC_PROG_NM' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'gl_PREREQ_ARGZ' => 1,
+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ '_LT_AC_LOCK' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ 'AC_PATH_MAGIC' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
'AC_LTDL_SHLIBPATH' => 1,
- 'include' => 1,
- '_LTDL_SETUP' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AC_DISABLE_STATIC' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- '_LT_AC_TAGVAR' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'LTDL_INIT' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
'AM_PROG_AR' => 1,
- 'AM_MAKE_INCLUDE' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'm4_pattern_forbid' => 1,
'_LT_AC_CHECK_DLFCN' => 1,
- '_LT_AC_PROG_CXXCPP' => 1,
- 'AM_RUN_LOG' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_ENABLE_STATIC' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AM_PROG_LD' => 1,
+ 'LT_WITH_LTDL' => 1,
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_LTDL_DLLIB' => 1,
'AM_DISABLE_STATIC' => 1,
'AC_LTDL_SHLIBEXT' => 1,
- 'LTOBSOLETE_VERSION' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AC_LTDL_ENABLE_INSTALL' => 1,
- 'LT_INIT' => 1,
- 'AC_PATH_MAGIC' => 1,
- 'LTDL_INSTALLABLE' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'LT_AC_PROG_GCJ' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'LTOPTIONS_VERSION' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
- '_LT_AC_LANG_F77' => 1,
- '_LT_PATH_TOOL_PREFIX' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LTDL_PREOPEN' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- 'AC_WITH_LTDL' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'AC_LIBTOOL_CXX' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
- '_LT_LIBOBJ' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'LT_AC_PROG_EGREP' => 1,
- 'LT_AC_PROG_SED' => 1,
+ 'LT_LIB_M' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1,
- 'AM_SILENT_RULES' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'm4_pattern_forbid' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
- 'LTSUGAR_VERSION' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'AC_PROG_EGREP' => 1,
- '_LT_WITH_SYSROOT' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AU_DEFUN' => 1,
'AC_DEFUN' => 1,
- 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- 'AC_PROG_LD_GNU' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'LT_OUTPUT' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- 'AC_LIBTOOL_FC' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'LT_PROG_GCJ' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- '_LT_CC_BASENAME' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- '_LT_COMPILER_OPTION' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
- 'AM_DISABLE_SHARED' => 1,
- 'LT_LIB_DLLOAD' => 1,
- '_LT_PROG_F77' => 1,
- 'LT_LANG' => 1,
- 'AM_ENABLE_SHARED' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ '_LT_PROG_FC' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'LTOPTIONS_VERSION' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
'LT_FUNC_DLSYM_USCORE' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- '_LT_PROG_LTMAIN' => 1
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ '_AM_IF_OPTION' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ '_m4_warn' => 1,
+ 'LT_PROG_GO' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'm4_include' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ 'AC_PROG_EGREP' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -233,72 +233,72 @@
'/usr/local/share/autoconf-2.69'
],
[
- '/usr/local/share/autoconf-2.69/m4sugar/m4sugar.m4',
- '/usr/local/share/autoconf-2.69/m4sugar/m4sh.m4',
- '/usr/local/share/autoconf-2.69/autoconf/autoconf.m4',
- 'aclocal.m4',
- 'configure.ac'
- ],
- {
- 'AM_POT_TOOLS' => 1,
- 'AM_PROG_MOC' => 1,
- 'AC_CONFIG_LINKS' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
- 'AM_PATH_GUILE' => 1,
- 'AC_SUBST_TRACE' => 1,
- 'AM_PROG_CC_C_O' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_CONFIG_FILES' => 1,
+ '/usr/local/share/autoconf-2.69/m4sugar/m4sugar.m4',
+ '/usr/local/share/autoconf-2.69/m4sugar/m4sh.m4',
+ '/usr/local/share/autoconf-2.69/autoconf/autoconf.m4',
+ 'aclocal.m4',
+ 'configure.ac'
+ ],
+ {
'LT_INIT' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AM_PROG_F77_C_O' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AM_CONDITIONAL' => 1,
+ 'm4_sinclude' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
'AM_ENABLE_MULTILIB' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_FC_PP_DEFINE' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AC_SUBST' => 1,
- 'include' => 1,
'AH_OUTPUT' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- '_m4_warn' => 1,
- 'AM_PROG_CXX_C_O' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'm4_pattern_forbid' => 1,
- 'AM_PROG_F77_C_O' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
'AC_CANONICAL_HOST' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- '_AM_COND_ENDIF' => 1,
'AM_SILENT_RULES' => 1,
- 'AM_PROG_AR' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_NLS' => 1,
- 'm4_pattern_allow' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- '_AM_COND_IF' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'm4_include' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
'AM_INIT_AUTOMAKE' => 1,
- 'AM_PROG_FC_C_O' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
'AC_FC_SRCEXT' => 1,
- 'sinclude' => 1,
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- 'AC_INIT' => 1,
+ '_AM_COND_IF' => 1,
+ 'sinclude' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ '_m4_warn' => 1,
+ 'AM_CONDITIONAL' => 1,
'_AM_COND_ELSE' => 1,
- 'm4_sinclude' => 1,
+ 'm4_include' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'AM_NLS' => 1,
+ '_AM_COND_ENDIF' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
'AC_CANONICAL_TARGET' => 1,
- 'AC_CONFIG_HEADERS' => 1
+ 'AM_PROG_MKDIR_P' => 1,
+ 'AC_SUBST_TRACE' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_INIT' => 1,
+ 'AC_FC_FREEFORM' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
+ 'AC_SUBST' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AM_PROG_FC_C_O' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_PROG_AR' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AM_POT_TOOLS' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'include' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -342,186 +342,186 @@
'configure.ac'
],
{
- 'AM_PROG_LIBTOOL' => 1,
- 'AC_DEFUN_ONCE' => 1,
- '_LT_LINKER_OPTION' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- 'AC_LIB_LTDL' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AU_DEFUN' => 1,
- '_LT_AC_SYS_LIBPATH_AIX' => 1,
- '_LT_AC_LOCK' => 1,
- 'AC_DISABLE_SHARED' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
- 'AM_DEP_TRACK' => 1,
- '_LT_AC_LANG_GCJ' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- '_AM_IF_OPTION' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'm4_pattern_allow' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AC_LTDL_DLLIB' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- '_LT_PROG_FC' => 1,
- '_LT_PROG_CXX' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
- 'LT_SYS_DLOPEN_SELF' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ 'AC_LIBTOOL_FC' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- '_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_PROG_NM' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'LT_WITH_LTDL' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ 'LT_INIT' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'LT_LANG' => 1,
+ 'AM_PROG_NM' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'LT_PROG_RC' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_LT_PROG_CXX' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- 'LT_PATH_NM' => 1,
- 'AC_LIBTOOL_RC' => 1,
- 'gl_FUNC_ARGZ' => 1,
- 'gl_PREREQ_ARGZ' => 1,
- 'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AC_CHECK_LIBM' => 1,
- 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ '_LT_PROG_ECHO_BACKSLASH' => 1,
+ 'AC_PROG_LD' => 1,
+ '_LTDL_SETUP' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ '_LT_COMPILER_OPTION' => 1,
'AC_ENABLE_STATIC' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ 'AC_LIB_LTDL' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ 'm4_pattern_allow' => 1,
+ 'LT_PATH_LD' => 1,
+ 'AM_ENABLE_STATIC' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'LTVERSION_VERSION' => 1,
'LT_AC_PROG_RC' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- '_AM_PROG_TAR' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AC_DISABLE_STATIC' => 1,
+ 'AC_LTDL_SYMBOL_USCORE' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+ 'LT_PROG_GCJ' => 1,
+ '_LT_AC_PROG_CXXCPP' => 1,
+ 'AM_CONDITIONAL' => 1,
'AM_SUBST_NOTMAKE' => 1,
- 'AC_LIBTOOL_F77' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1,
- 'AC_LTDL_SHLIBPATH' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
'include' => 1,
- 'LT_LIB_M' => 1,
- '_LTDL_SETUP' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AC_LTDL_SYMBOL_USCORE' => 1,
- '_LT_AC_LANG_CXX' => 1,
- 'LTVERSION_VERSION' => 1,
- 'AC_PROG_LD' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AM_PROG_NM' => 1,
- '_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'LT_PATH_LD' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- '_m4_warn' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'LTDL_INIT' => 1,
- '_AM_SET_OPTION' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- '_LT_PROG_ECHO_BACKSLASH' => 1,
- 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
'AC_ENABLE_SHARED' => 1,
- 'LT_PROG_GO' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ 'gl_FUNC_ARGZ' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'AC_PROG_NM' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ '_LT_PROG_F77' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'LT_AC_PROG_SED' => 1,
+ 'AC_WITH_LTDL' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'LT_PATH_NM' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
+ 'LT_OUTPUT' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'LT_WITH_LTDL' => 1,
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'AC_LTDL_DLLIB' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'AM_PROG_LD' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
- 'LT_PROG_RC' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- 'm4_include' => 1,
- 'LTDL_INSTALLABLE' => 1,
+ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
'AC_PATH_MAGIC' => 1,
+ 'AM_PROG_AR' => 1,
+ 'LTDL_INIT' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'gl_PREREQ_ARGZ' => 1,
'AM_PROG_CC_C_O' => 1,
+ '_LT_AC_LOCK' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AC_LTDL_ENABLE_INSTALL' => 1,
- 'LT_INIT' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
- 'LT_AC_PROG_GCJ' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
'LTOPTIONS_VERSION' => 1,
- 'AC_LTDL_PREOPEN' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
- '_LT_AC_LANG_F77' => 1,
- '_LT_PATH_TOOL_PREFIX' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'AC_LIBTOOL_CXX' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'AC_WITH_LTDL' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- '_LT_AC_TAGVAR' => 1,
- 'AM_PROG_AR' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'AM_ENABLE_STATIC' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- '_LT_AC_PROG_CXXCPP' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
+ 'AC_DEFUN' => 1,
+ 'AU_DEFUN' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ '_LT_PROG_FC' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_RUN_LOG' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
+ 'LT_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ '_AM_SET_OPTIONS' => 1,
'AC_LTDL_SHLIBEXT' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
+ 'AM_SANITY_CHECK' => 1,
'AM_DISABLE_STATIC' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- 'LTOBSOLETE_VERSION' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
+ 'AC_LTDL_PREOPEN' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'LT_PROG_GCJ' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- 'LT_OUTPUT' => 1,
- 'AC_LIBTOOL_FC' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- '_LT_CC_BASENAME' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ 'LT_LIB_M' => 1,
'_AC_PROG_LIBTOOL' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
- 'AM_DISABLE_SHARED' => 1,
- '_LT_COMPILER_OPTION' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- '_LT_PROG_LTMAIN' => 1,
- 'LT_LIB_DLLOAD' => 1,
- '_LT_PROG_F77' => 1,
- 'LT_LANG' => 1,
- 'AM_ENABLE_SHARED' => 1,
- 'LT_FUNC_DLSYM_USCORE' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'LT_AC_PROG_SED' => 1,
- 'LT_AC_PROG_EGREP' => 1,
- '_LT_LIBOBJ' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- 'm4_pattern_forbid' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
- 'LTSUGAR_VERSION' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
'AC_PROG_EGREP' => 1,
- '_LT_WITH_SYSROOT' => 1,
- 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'AM_SILENT_RULES' => 1,
- 'LT_SYS_DLOPEN_DEPLIBS' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
- 'AC_DEFUN' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- 'AC_PROG_LD_GNU' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- 'AC_PROG_LIBTOOL' => 1
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ '_m4_warn' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'LT_PROG_GO' => 1,
+ 'm4_include' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'LT_FUNC_DLSYM_USCORE' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'LT_CMD_MAX_LEN' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -560,177 +560,177 @@
'configure.ac'
],
{
- 'AC_DISABLE_STATIC' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'LT_PROG_GCJ' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ 'AC_LTDL_SYSSEARCHPATH' => 1,
+ 'AM_CONDITIONAL' => 1,
+ '_LT_AC_PROG_CXXCPP' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
- '_LTDL_SETUP' => 1,
+ 'AM_ENABLE_SHARED' => 1,
'include' => 1,
- 'LT_LIB_M' => 1,
- 'AC_LTDL_SHLIBPATH' => 1,
- 'AC_LTDL_SYSSEARCHPATH' => 1,
- 'AC_LIBTOOL_F77' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AC_CHECK_LIBM' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- '_AM_PROG_TAR' => 1,
- 'AC_ENABLE_STATIC' => 1,
- 'LT_AC_PROG_RC' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'LTDL_INIT' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- '_AM_SET_OPTION' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'gl_FUNC_ARGZ' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
'AC_ENABLE_SHARED' => 1,
- 'AC_LIBTOOL_OBJDIR' => 1,
- 'LT_PROG_GO' => 1,
- '_LT_PROG_ECHO_BACKSLASH' => 1,
- 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
- 'LT_PROG_RC' => 1,
+ 'm4_pattern_allow' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ 'AC_LIB_LTDL' => 1,
+ 'LTVERSION_VERSION' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ 'AM_ENABLE_STATIC' => 1,
+ 'LT_PATH_LD' => 1,
'AM_INIT_AUTOMAKE' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- 'm4_include' => 1,
- 'AM_PROG_LD' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
- 'AM_PROG_NM' => 1,
- 'AM_MISSING_PROG' => 1,
- '_LT_AC_LANG_CXX' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'LT_AC_PROG_RC' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
+ 'AM_DEP_TRACK' => 1,
+ '_LT_PROG_CXX' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'LT_PROG_RC' => 1,
'AC_PROG_LD' => 1,
- 'LTVERSION_VERSION' => 1,
+ '_LT_PROG_ECHO_BACKSLASH' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ '_LTDL_SETUP' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ '_LT_COMPILER_OPTION' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+ 'AC_LIBTOOL_FC' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'LT_INIT' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'LT_LANG' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AM_PROG_NM' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ 'AC_PROG_EGREP' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ 'LT_PROG_GO' => 1,
+ 'm4_include' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ '_AM_IF_OPTION' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
'_m4_warn' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'LT_PATH_LD' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- '_LT_AC_LOCK' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ 'LT_FUNC_DLSYM_USCORE' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
+ 'AM_MISSING_PROG' => 1,
'AC_DISABLE_SHARED' => 1,
- 'AM_DEP_TRACK' => 1,
- '_LT_AC_LANG_GCJ' => 1,
+ '_LT_AC_LANG_CXX' => 1,
'_LT_AC_SYS_COMPILER' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- '_AM_IF_OPTION' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'AM_PROG_LIBTOOL' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- '_LT_LINKER_OPTION' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
- 'AU_DEFUN' => 1,
- 'AC_LIB_LTDL' => 1,
+ 'LTOPTIONS_VERSION' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
- 'LT_WITH_LTDL' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- 'AC_LIBTOOL_RC' => 1,
- 'gl_FUNC_ARGZ' => 1,
- 'LT_PATH_NM' => 1,
- 'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'gl_PREREQ_ARGZ' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_LTDL_DLLIB' => 1,
- 'm4_pattern_allow' => 1,
- '_LT_PROG_CXX' => 1,
'_LT_PROG_FC' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
- '_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'LT_SYS_DLOPEN_SELF' => 1,
- 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'AC_PROG_NM' => 1,
- 'AM_DISABLE_SHARED' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- '_LT_COMPILER_OPTION' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- '_LT_PROG_LTMAIN' => 1,
- 'AM_ENABLE_SHARED' => 1,
- 'LT_FUNC_DLSYM_USCORE' => 1,
- '_LT_PROG_F77' => 1,
- 'LT_LIB_DLLOAD' => 1,
- 'LT_LANG' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
- 'LT_PROG_GCJ' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIBTOOL_FC' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'LT_OUTPUT' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- '_LT_CC_BASENAME' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- 'AC_PROG_LD_GNU' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ 'AU_DEFUN' => 1,
'AC_DEFUN' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'LT_AC_PROG_SED' => 1,
- 'LT_AC_PROG_EGREP' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- '_LT_LIBOBJ' => 1,
- 'LTSUGAR_VERSION' => 1,
- 'AM_SET_DEPDIR' => 1,
- '_LT_WITH_SYSROOT' => 1,
- 'AC_PROG_EGREP' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ 'LT_LIB_M' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'AC_LTDL_PREOPEN' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- '_LT_PATH_TOOL_PREFIX' => 1,
- '_LT_AC_LANG_F77' => 1,
- 'AC_LIBTOOL_CXX' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'AC_WITH_LTDL' => 1,
- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'AM_CONDITIONAL' => 1,
- 'LTDL_INSTALLABLE' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ 'AC_LTDL_SHLIBEXT' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_LTDL_DLLIB' => 1,
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ 'LT_WITH_LTDL' => 1,
+ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AM_PROG_LD' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'LTDL_INIT' => 1,
'AC_PATH_MAGIC' => 1,
- 'LT_INIT' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ '_LT_AC_LOCK' => 1,
+ 'gl_PREREQ_ARGZ' => 1,
'AC_LTDL_ENABLE_INSTALL' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'LTOPTIONS_VERSION' => 1,
- 'LT_AC_PROG_GCJ' => 1,
- 'AC_LTDL_SHLIBEXT' => 1,
- 'AM_DISABLE_STATIC' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- 'LTOBSOLETE_VERSION' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ 'AC_PROG_NM' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'LT_AC_PROG_SED' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ '_LT_PROG_F77' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
'_LT_AC_TAGVAR' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- 'AM_ENABLE_STATIC' => 1,
- 'AM_RUN_LOG' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ 'AM_DISABLE_SHARED' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- '_LT_AC_PROG_CXXCPP' => 1,
- '_LT_AC_CHECK_DLFCN' => 1
+ '_LT_LIBOBJ' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_WITH_LTDL' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ 'LT_OUTPUT' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ 'LT_PATH_NM' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -775,192 +775,192 @@
'configure.ac'
],
{
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- '_LT_PROG_LTMAIN' => 1,
- 'LT_LIB_DLLOAD' => 1,
- '_LT_PROG_F77' => 1,
- 'LT_LANG' => 1,
- 'AM_ENABLE_SHARED' => 1,
- 'LT_FUNC_DLSYM_USCORE' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
- 'AM_DISABLE_SHARED' => 1,
- '_LT_COMPILER_OPTION' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- '_LT_CC_BASENAME' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
- 'LT_PROG_GCJ' => 1,
- 'LT_OUTPUT' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- 'AC_LIBTOOL_FC' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'LTOPTIONS_VERSION' => 1,
'AC_DEFUN' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+ 'AU_DEFUN' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ '_LT_PROG_FC' => 1,
+ 'LT_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ 'AC_LTDL_SHLIBEXT' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ 'AC_LTDL_PREOPEN' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ 'LT_LIB_M' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ 'AC_PROG_EGREP' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ '_m4_warn' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'm4_include' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'LT_PROG_GO' => 1,
+ 'LT_FUNC_DLSYM_USCORE' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
'AC_PROG_LD_GNU' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
- 'LTSUGAR_VERSION' => 1,
- 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- 'AM_SET_DEPDIR' => 1,
- '_LT_WITH_SYSROOT' => 1,
- 'AC_PROG_EGREP' => 1,
- 'AM_SILENT_RULES' => 1,
- 'LT_SYS_DLOPEN_DEPLIBS' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'LT_AC_PROG_SED' => 1,
- 'LT_AC_PROG_EGREP' => 1,
- '_LT_LIBOBJ' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- '_AM_DEPENDENCIES' => 1,
+ 'AC_PROG_NM' => 1,
'AC_LIBTOOL_GCJ' => 1,
- 'AC_LIBTOOL_CXX' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ '_LT_AC_TAGVAR' => 1,
'AC_LIBTOOL_COMPILER_OPTION' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ '_LT_PROG_F77' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'LT_AC_PROG_SED' => 1,
'AC_WITH_LTDL' => 1,
- 'AC_LTDL_PREOPEN' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'LT_PATH_NM' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
'_LT_AC_LANG_F77' => 1,
- '_LT_PATH_TOOL_PREFIX' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
- 'LT_AC_PROG_GCJ' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'LTOPTIONS_VERSION' => 1,
- 'LTDL_INSTALLABLE' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ 'LT_OUTPUT' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'LT_WITH_LTDL' => 1,
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'AC_LTDL_DLLIB' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AM_PROG_LD' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
'AC_PATH_MAGIC' => 1,
+ 'AM_PROG_AR' => 1,
+ 'LTDL_INIT' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'PKG_NOARCH_INSTALLDIR' => 1,
+ 'gl_PREREQ_ARGZ' => 1,
'AM_PROG_CC_C_O' => 1,
+ '_LT_AC_LOCK' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AC_LTDL_ENABLE_INSTALL' => 1,
- 'LT_INIT' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- 'LTOBSOLETE_VERSION' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- 'AC_LTDL_SHLIBEXT' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1,
- 'AM_DISABLE_STATIC' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ 'AC_LIB_LTDL' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ 'm4_pattern_allow' => 1,
+ 'LT_PATH_LD' => 1,
'AM_ENABLE_STATIC' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- '_LT_AC_PROG_CXXCPP' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'LTVERSION_VERSION' => 1,
'AM_RUN_LOG' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'AC_LTDL_SYMBOL_USCORE' => 1,
+ 'LT_AC_PROG_RC' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- '_LT_AC_TAGVAR' => 1,
- 'AM_PROG_AR' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'PKG_INSTALLDIR' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AC_DISABLE_STATIC' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+ 'LT_PROG_GCJ' => 1,
+ '_LT_AC_PROG_CXXCPP' => 1,
+ 'AM_CONDITIONAL' => 1,
'AM_SUBST_NOTMAKE' => 1,
- 'AC_LTDL_SHLIBPATH' => 1,
- 'LT_LIB_M' => 1,
- 'AC_LIBTOOL_F77' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1,
- 'include' => 1,
- '_LTDL_SETUP' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'AC_ENABLE_STATIC' => 1,
- 'LT_AC_PROG_RC' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- '_AM_PROG_TAR' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AC_CHECK_LIBM' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'AC_LIBTOOL_RC' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
- '_LT_PROG_ECHO_BACKSLASH' => 1,
- 'LT_PROG_GO' => 1,
- 'AC_ENABLE_SHARED' => 1,
- 'AC_LIBTOOL_OBJDIR' => 1,
- 'AM_PROG_LD' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
- 'LT_PROG_RC' => 1,
- 'm4_include' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'LTDL_INIT' => 1,
- '_AM_SET_OPTION' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- '_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- 'LT_PATH_LD' => 1,
- '_m4_warn' => 1,
- 'AC_LTDL_SYMBOL_USCORE' => 1,
- '_LT_AC_LANG_CXX' => 1,
- 'PKG_NOARCH_INSTALLDIR' => 1,
- 'AC_PROG_LD' => 1,
- 'LTVERSION_VERSION' => 1,
- 'AM_PROG_NM' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- '_AM_IF_OPTION' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- '_AM_SET_OPTIONS' => 1,
- '_LT_AC_LOCK' => 1,
- 'AC_DISABLE_SHARED' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
- 'AM_DEP_TRACK' => 1,
- '_LT_AC_LANG_GCJ' => 1,
- 'AC_LIB_LTDL' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AU_DEFUN' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
- '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ 'include' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
'AM_PROG_LIBTOOL' => 1,
- 'AC_DEFUN_ONCE' => 1,
'_LT_LINKER_OPTION' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- 'LT_PATH_NM' => 1,
- 'AC_LIBTOOL_RC' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ 'AC_ENABLE_SHARED' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
'gl_FUNC_ARGZ' => 1,
- 'gl_PREREQ_ARGZ' => 1,
- 'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'LT_WITH_LTDL' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- 'LT_SYS_DLOPEN_SELF' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ 'AC_LIBTOOL_FC' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- '_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_PROG_NM' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'm4_pattern_allow' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AC_LTDL_DLLIB' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- '_LT_PROG_FC' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'LT_INIT' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'LT_LANG' => 1,
+ 'AM_PROG_NM' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'PKG_INSTALLDIR' => 1,
+ 'LT_PROG_RC' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'AM_SET_DEPDIR' => 1,
'_LT_PROG_CXX' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ '_LT_PROG_ECHO_BACKSLASH' => 1,
+ 'AC_PROG_LD' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ '_LTDL_SETUP' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ '_LT_COMPILER_OPTION' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1
}
], 'Autom4te::Request' )
);
diff --git a/rtbuf.c b/rtbuf.c
index c34a27e..1ee0d8f 100644
--- a/rtbuf.c
+++ b/rtbuf.c
@@ -42,29 +42,29 @@ int librtbuf_init ()
data_alloc_init(&g_rtbuf_alloc, &g_rtbuf_type, RTBUF_MAX, 0, 0);
g_rtbuf = g_rtbuf_alloc.mem;
rtbuf_type_init();
- rtbuf_fun_init();
+ rtbuf_proc_init();
rtbuf_lib_init_();
return 0;
}
-int rtbuf_new (s_rtbuf_fun *rf)
+int rtbuf_new (s_rtbuf_proc *rp)
{
int i;
s_rtbuf *rtb;
void *data;
unsigned int j = 0;
- assert(rf);
- data = malloc(rf->out_bytes);
+ assert(rp);
+ data = malloc(rp->out_bytes);
if (!data)
return rtbuf_err("malloc failed");
- bzero(data, rf->out_bytes);
+ bzero(data, rp->out_bytes);
if ((i = data_new_i(&g_rtbuf_alloc)) < 0)
return -1;
rtb = &g_rtbuf[i];
rtb->data = data;
rtb->flags = 0;
- rtb->fun = rf;
- while (j < RTBUF_FUN_VAR_MAX) {
+ rtb->proc = rp;
+ while (j < RTBUF_PROC_IN_MAX) {
rtb->var[j].rtb = -1;
j++;
}
@@ -92,7 +92,7 @@ void rtbuf_unbind_all_out_rtbuf (s_rtbuf *rtb, unsigned int rtb_i,
unsigned int n;
assert(dest);
n = dest->var_n;
- while (i < dest->fun->var_n && n > 0 && rtb->refc) {
+ while (i < dest->proc->in_n && n > 0 && rtb->refc) {
s_rtbuf_binding *v = &dest->var[i];
if (v->rtb >= 0) {
if ((unsigned int) v->rtb == rtb_i)
@@ -125,8 +125,8 @@ void rtbuf_unbind_all (s_rtbuf *rtb)
{
unsigned int i = 0;
assert(rtb);
- assert(rtb->fun);
- while (i < rtb->fun->var_n && rtb->var_n > 0) {
+ assert(rtb->proc);
+ while (i < rtb->proc->in_n && rtb->var_n > 0) {
rtbuf_var_unbind(rtb, i);
i++;
}
@@ -137,7 +137,7 @@ void rtbuf_delete_ (s_rtbuf *rtb)
{
assert(rtb);
rtbuf_unbind_all(rtb);
- bzero(rtb->data, rtb->fun->out_bytes);
+ bzero(rtb->data, rtb->proc->out_bytes);
free(rtb->data);
bzero(rtb, sizeof(s_rtbuf));
data_delete(&g_rtbuf_alloc, rtb);
@@ -156,10 +156,10 @@ int rtbuf_clone (s_rtbuf *rtb)
s_rtbuf *new;
unsigned int j = 0;
assert(rtb);
- if ((new_i = rtbuf_new(rtb->fun)) < 0)
+ if ((new_i = rtbuf_new(rtb->proc)) < 0)
return -1;
new = &g_rtbuf[new_i];
- while (j < rtb->fun->var_n) {
+ while (j < rtb->proc->in_n) {
new->var[j] = rtb->var[j];
j++;
}
@@ -184,9 +184,9 @@ void rtbuf_bind (unsigned int src, unsigned int out,
int rtbuf_data_set (s_rtbuf *rtb, symbol name, void *value,
unsigned int size)
{
- int out_i = rtbuf_fun_out_find(rtb->fun, name);
+ int out_i = rtbuf_proc_out_find(rtb->proc, name);
if (out_i >= 0) {
- s_rtbuf_fun_out *out = &rtb->fun->out[out_i];
+ s_rtbuf_proc_out *out = &rtb->proc->out[out_i];
if (out->type->t.bits == size * 8) {
void *data = rtb->data + out->offset;
memcpy(data, value, size);
@@ -312,7 +312,7 @@ void rtbuf_sort ()
rtbuf_find_roots(&rvs);
g_rtbuf_sorted_n = 0;
while ((ptr = rtbuf_var_stack_top(&rvs))) {
- if (ptr->var == g_rtbuf[ptr->rtb].fun->var_n) {
+ if (ptr->var == g_rtbuf[ptr->rtb].proc->in_n) {
g_rtbuf_sorted[g_rtbuf_sorted_n++] = ptr->rtb;
rtbuf_var_stack_pop(&rvs);
} else
@@ -331,13 +331,13 @@ void rtbuf_start ()
while (i < g_rtbuf_sorted_n) {
s_rtbuf *rtb = &g_rtbuf[g_rtbuf_sorted[i]];
assert(rtb->data);
- if (rtb->fun->start) {
+ if (rtb->proc->start) {
//printf(" start ");
//rtbuf_print(g_rtbuf_sorted[i]);
//printf(" ");
- //rtbuf_fun_print(rtb->fun);
+ //rtbuf_proc_print(rtb->proc);
//printf("\n");
- rtb->fun->start(rtb);
+ rtb->proc->start(rtb);
}
i++;
}
@@ -355,8 +355,8 @@ void rtbuf_run ()
//rtbuf_print(g_rtbuf_sorted[i]);
//printf("\n");
assert(rtb->data);
- if (rtb->fun->f)
- rtb->fun->f(rtb);
+ if (rtb->proc->f)
+ rtb->proc->f(rtb);
i++;
}
//printf(" rtbuf_run => %u\n", i);
@@ -371,8 +371,8 @@ void rtbuf_stop ()
while (i < g_rtbuf_sorted_n) {
s_rtbuf *rtb = &g_rtbuf[g_rtbuf_sorted[i]];
assert(rtb->data);
- if (rtb->fun->stop)
- rtb->fun->stop(rtb);
+ if (rtb->proc->stop)
+ rtb->proc->stop(rtb);
i++;
}
}
@@ -381,26 +381,26 @@ int rtbuf_find (const char *x)
{
int i = atoi(x);
if (0 <= i && (unsigned int) i < g_rtbuf_alloc.n &&
- g_rtbuf[i].data && g_rtbuf[i].fun)
+ g_rtbuf[i].data && g_rtbuf[i].proc)
return i;
return -1;
}
int rtbuf_var_find (s_rtbuf *rtb, const char *x)
{
- s_rtbuf_fun *fun = rtb->fun;
+ s_rtbuf_proc *proc = rtb->proc;
symbol sym;
//printf("rtbuf_var_find %s\n", x);
if ('0' <= x[0] && x[0] <= '9') {
int i = atoi(x);
- if (0 <= i && (unsigned int) i < fun->var_n)
+ if (0 <= i && (unsigned int) i < proc->in_n)
return i;
}
if ((sym = symbol_find(x))) {
unsigned int i = 0;
//printf("rtbuf_var_find sym %s\n", sym);
- while (i < fun->var_n) {
- if (sym == fun->var[i].name)
+ while (i < proc->in_n) {
+ if (sym == proc->in[i].name)
return i;
i++;
}
@@ -410,19 +410,19 @@ int rtbuf_var_find (s_rtbuf *rtb, const char *x)
int rtbuf_out_find (s_rtbuf *rtb, const char *x)
{
- s_rtbuf_fun *fun = rtb->fun;
+ s_rtbuf_proc *proc = rtb->proc;
symbol sym;
//printf("rtbuf_out_find %s\n", x);
if ('0' <= x[0] && x[0] <= '9') {
int i = atoi(x);
- if (0 <= i && (unsigned int) i < fun->out_n)
+ if (0 <= i && (unsigned int) i < proc->out_n)
return i;
}
if ((sym = symbol_find(x))) {
unsigned int i = 0;
//printf("rtbuf_out_find sym %s\n", sym);
- while (i < fun->out_n) {
- if (sym == fun->out[i].name)
+ while (i < proc->out_n) {
+ if (sym == proc->out[i].name)
return i;
i++;
}
@@ -432,12 +432,12 @@ int rtbuf_out_find (s_rtbuf *rtb, const char *x)
int rtbuf_out_int (s_rtbuf *rtb, unsigned int out, int default_value)
{
- s_rtbuf_fun_out *o;
+ s_rtbuf_proc_out *o;
assert(rtb);
assert(rtb->data);
- assert(rtb->fun);
- assert(out < rtb->fun->out_n);
- o = &rtb->fun->out[out];
+ assert(rtb->proc);
+ assert(out < rtb->proc->out_n);
+ o = &rtb->proc->out[out];
assert(o->type);
if (o->type->t.bits >= sizeof(int) * 8) {
int *i = (int*)(rtb->data + o->offset);
@@ -456,42 +456,42 @@ void rtbuf_print (unsigned int i)
void rtbuf_print_long_var (s_rtbuf *rtb, unsigned int j)
{
assert(rtb);
- assert(rtb->fun);
- assert(j < rtb->fun->var_n);
- assert(rtb->fun->var[j].name);
- assert(rtb->fun->var[j].type);
- assert(rtb->fun->var[j].type->name);
- printf("\n var %i %s:%s", j, rtb->fun->var[j].name,
- rtb->fun->var[j].type->name);
+ assert(rtb->proc);
+ assert(j < rtb->proc->in_n);
+ assert(rtb->proc->in[j].name);
+ assert(rtb->proc->in[j].type);
+ assert(rtb->proc->in[j].type->name);
+ printf("\n in %i %s:%s", j, rtb->proc->in[j].name,
+ rtb->proc->in[j].type->name);
if (rtb->var[j].rtb >= 0) {
s_rtbuf *target = &g_rtbuf[rtb->var[j].rtb];
unsigned int target_out = rtb->var[j].out;
printf (" = ");
rtbuf_print(rtb->var[j].rtb);
printf(" out %u %s:%s", target_out,
- target->fun->out[target_out].name,
- target->fun->out[target_out].type->name);
+ target->proc->out[target_out].name,
+ target->proc->out[target_out].type->name);
}
}
void rtbuf_print_long (unsigned int i)
{
s_rtbuf *rtb;
- s_rtbuf_fun *fun;
+ s_rtbuf_proc *proc;
unsigned int j = 0;
assert(i < RTBUF_MAX);
rtb = &g_rtbuf[i];
- fun = rtb->fun;
+ proc = rtb->proc;
printf("#<rtbuf %i", i);
- printf(" %s %s", fun->lib->name, fun->name);
+ printf(" %s %s", proc->lib->name, proc->name);
if (rtb->data) {
printf(" %d", rtb->refc);
- while (j < fun->var_n)
+ while (j < proc->in_n)
rtbuf_print_long_var(rtb, j++);
j = 0;
- while (j < fun->out_n) {
- printf("\n out %i %s:%s", j, fun->out[j].name,
- fun->out[j].type->name);
+ while (j < proc->out_n) {
+ printf("\n out %i %s:%s", j, proc->out[j].name,
+ proc->out[j].type->name);
j++;
}
}
diff --git a/rtbuf.h b/rtbuf.h
index 1e08cd3..8e020af 100644
--- a/rtbuf.h
+++ b/rtbuf.h
@@ -19,7 +19,7 @@
#include <data.h>
#include "rtbuf_defs.h"
#include "rtbuf_type.h"
-#include "rtbuf_fun.h"
+#include "rtbuf_proc.h"
#define RTBUF_SORT 0x0001
#define RTBUF_DELETE 0x0002
@@ -34,9 +34,9 @@ struct rtbuf
{
void *data;
unsigned int flags;
- s_rtbuf_fun *fun;
+ s_rtbuf_proc *proc;
unsigned int refc;
- s_rtbuf_binding var[RTBUF_FUN_VAR_MAX];
+ s_rtbuf_binding var[RTBUF_PROC_IN_MAX];
unsigned int var_n;
};
@@ -49,7 +49,7 @@ int g_rtbuf_run;
int librtbuf_init ();
int rtbuf_err (const char *msg);
-int rtbuf_new (s_rtbuf_fun *rf);
+int rtbuf_new (s_rtbuf_proc *rp);
void rtbuf_var_unbind (s_rtbuf *rtb, unsigned int var);
void rtbuf_unbind_all (s_rtbuf *rtb);
void rtbuf_delete (s_rtbuf *rtb);
diff --git a/rtbuf_cli.c b/rtbuf_cli.c
index 465419a..830c01d 100644
--- a/rtbuf_cli.c
+++ b/rtbuf_cli.c
@@ -107,12 +107,12 @@ int rtbuf_cli_new (int argc, const char *argv[])
int rf;
int rtb;
if (argc != 2)
- return rtbuf_err("usage: new LIBRARY FUNCTION");
+ return rtbuf_err("usage: new LIBRARY PROCEDURE");
if ((rl = rtbuf_lib_find(argv[1])) < 0)
return rtbuf_err("library not found");
- if ((rf = rtbuf_lib_find_fun(&g_rtbuf_lib[rl], argv[2])) < 0)
- return rtbuf_err("function not found");
- if ((rtb = rtbuf_new(g_rtbuf_lib[rl].fun[rf])) < 0)
+ if ((rf = rtbuf_lib_find_proc(&g_rtbuf_lib[rl], argv[2])) < 0)
+ return rtbuf_err("procedure not found");
+ if ((rtb = rtbuf_new(g_rtbuf_lib[rl].proc[rf])) < 0)
return rtbuf_err("buffer not created");
rtbuf_print(rtb);
printf("\n");
@@ -163,7 +163,7 @@ int rtbuf_cli_unbind (int argc, const char *argv[])
return rtbuf_err("buffer not found");
if (argc == 2) {
int var = atoi(argv[2]);
- if (var < 0 || (unsigned int) var >= g_rtbuf[rtb].fun->var_n)
+ if (var < 0 || (unsigned int) var >= g_rtbuf[rtb].proc->in_n)
return rtbuf_err("variable not found");
rtbuf_var_unbind(&g_rtbuf[rtb], var);
}
@@ -173,7 +173,7 @@ int rtbuf_cli_unbind (int argc, const char *argv[])
return 0;
}
-void * rtbuf_cli_thread_fun (void *arg)
+void * rtbuf_cli_thread_proc (void *arg)
{
(void) arg;
rtbuf_start();
@@ -191,7 +191,7 @@ int rtbuf_cli_start (int argc, const char *argv[])
if (argc != 0)
return rtbuf_err("usage: start");
if (!g_rtbuf_cli_thread) {
- if (pthread_create(&g_rtbuf_cli_thread, 0, &rtbuf_cli_thread_fun,
+ if (pthread_create(&g_rtbuf_cli_thread, 0, &rtbuf_cli_thread_proc,
0))
return rtbuf_err("pthread_create failed");
}
@@ -220,7 +220,7 @@ int rtbuf_cli_help (int argc, const char *argv[])
" load PATH Load library at PATH.\n"
" buffers List buffers.\n"
" buffer N Show buffer N.\n"
- " new LIB FUN Instanciate library function.\n"
+ " new LIB PROC Instanciate library procedure.\n"
" delete BUFFER Unlink and delete RTBUF.\n"
" bind SOURCE OUT DEST VAR Bind SOURCE OUT to DEST VAR.\n"
" unbind BUFFER VAR Unbind BUFFER VAR.\n"
diff --git a/rtbuf_defs.h b/rtbuf_defs.h
index 0da094a..44455bf 100644
--- a/rtbuf_defs.h
+++ b/rtbuf_defs.h
@@ -16,18 +16,18 @@
#ifndef RTBUF_DEFS_H
#define RTBUF_DEFS_H
-typedef struct rtbuf s_rtbuf;
-typedef struct rtbuf_binding s_rtbuf_binding;
-typedef struct rtbuf_fun s_rtbuf_fun;
-typedef struct rtbuf_fun_out s_rtbuf_fun_out;
-typedef struct rtbuf_fun_var s_rtbuf_fun_var;
-typedef struct rtbuf_lib s_rtbuf_lib;
-typedef struct rtbuf_lib_fun s_rtbuf_lib_fun;
-typedef struct rtbuf_lib_fun_out s_rtbuf_lib_fun_out;
-typedef struct rtbuf_lib_fun_var s_rtbuf_lib_fun_var;
-typedef struct rtbuf_type s_rtbuf_type;
+typedef struct rtbuf s_rtbuf;
+typedef struct rtbuf_binding s_rtbuf_binding;
+typedef struct rtbuf_proc s_rtbuf_proc;
+typedef struct rtbuf_proc_in s_rtbuf_proc_in;
+typedef struct rtbuf_proc_out s_rtbuf_proc_out;
+typedef struct rtbuf_lib s_rtbuf_lib;
+typedef struct rtbuf_lib_proc s_rtbuf_lib_proc;
+typedef struct rtbuf_lib_proc_in s_rtbuf_lib_proc_in;
+typedef struct rtbuf_lib_proc_out s_rtbuf_lib_proc_out;
+typedef struct rtbuf_type s_rtbuf_type;
-typedef int f_rtbuf_fun (s_rtbuf *rtbuf);
+typedef int f_rtbuf_proc (s_rtbuf *rtbuf);
typedef int f_rtbuf_lib_init (s_rtbuf_lib *lib);
#endif
diff --git a/rtbuf_dynamic.c b/rtbuf_dynamic.c
index dabf81a..639ef69 100644
--- a/rtbuf_dynamic.c
+++ b/rtbuf_dynamic.c
@@ -20,7 +20,7 @@
#include "rtbuf_signal_type.h"
#include "rtbuf_dynamic.h"
-s_rtbuf_lib_fun_var g_rtbuf_dynamic_limiter_var[] = {
+s_rtbuf_lib_proc_in g_rtbuf_dynamic_limiter_in[] = {
{ "signal" , RTBUF_SIGNAL_TYPE },
{ "gain" , RTBUF_SIGNAL_TYPE },
{ "treshold", RTBUF_SIGNAL_TYPE },
@@ -29,14 +29,14 @@ s_rtbuf_lib_fun_var g_rtbuf_dynamic_limiter_var[] = {
{ "release" , RTBUF_SIGNAL_TYPE },
{ 0, 0 } };
-s_rtbuf_lib_fun_out g_rtbuf_dynamic_limiter_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_dynamic_limiter_out[] = {
{ "signal", RTBUF_SIGNAL_TYPE },
{ "gain" , RTBUF_SIGNAL_SAMPLE_TYPE },
{ 0, 0 } };
-const char *rtbuf_lib_name = "dynamic";
-unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
-s_rtbuf_lib_fun rtbuf_lib_fun[] = {
+const char *rtbuf_lib_name = "dynamic";
+unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
+s_rtbuf_lib_proc rtbuf_lib_proc[] = {
{ "limiter", rtbuf_dynamic_limiter, rtbuf_dynamic_limiter_start, 0,
- g_rtbuf_dynamic_limiter_var, g_rtbuf_dynamic_limiter_out },
+ g_rtbuf_dynamic_limiter_in, g_rtbuf_dynamic_limiter_out },
{ 0, 0, 0, 0, 0, 0 } };
diff --git a/rtbuf_dynamic.h b/rtbuf_dynamic.h
index be26310..2f82dab 100644
--- a/rtbuf_dynamic.h
+++ b/rtbuf_dynamic.h
@@ -19,13 +19,13 @@
#include "rtbuf_signal.h"
enum {
- RTBUF_DYNAMIC_LIMITER_VAR_SIGNAL = 0,
- RTBUF_DYNAMIC_LIMITER_VAR_GAIN,
- RTBUF_DYNAMIC_LIMITER_VAR_TRESHOLD,
- RTBUF_DYNAMIC_LIMITER_VAR_LIMIT,
- RTBUF_DYNAMIC_LIMITER_VAR_ATTACK,
- RTBUF_DYNAMIC_LIMITER_VAR_RELEASE,
- RTBUF_DYNAMIC_LIMITER_VAR_N
+ RTBUF_DYNAMIC_LIMITER_IN_SIGNAL = 0,
+ RTBUF_DYNAMIC_LIMITER_IN_GAIN,
+ RTBUF_DYNAMIC_LIMITER_IN_TRESHOLD,
+ RTBUF_DYNAMIC_LIMITER_IN_LIMIT,
+ RTBUF_DYNAMIC_LIMITER_IN_ATTACK,
+ RTBUF_DYNAMIC_LIMITER_IN_RELEASE,
+ RTBUF_DYNAMIC_LIMITER_IN_N
};
typedef struct rtbuf_dynamic_limiter_data {
diff --git a/rtbuf_dynamic_limiter.c b/rtbuf_dynamic_limiter.c
index b192b28..6987b0e 100644
--- a/rtbuf_dynamic_limiter.c
+++ b/rtbuf_dynamic_limiter.c
@@ -20,41 +20,41 @@
int rtbuf_dynamic_limiter (s_rtbuf *rtb)
{
- s_rtbuf_signal_fun in_;
- s_rtbuf_signal_fun g_;
- s_rtbuf_signal_fun t_;
- s_rtbuf_signal_fun l_;
- s_rtbuf_signal_fun a_;
- s_rtbuf_signal_fun r_;
+ s_rtbuf_signal_proc in_;
+ s_rtbuf_signal_proc g_;
+ s_rtbuf_signal_proc t_;
+ s_rtbuf_signal_proc l_;
+ s_rtbuf_signal_proc a_;
+ s_rtbuf_signal_proc r_;
s_rtbuf_dynamic_limiter_data *data;
unsigned int i = 0;
double *signal;
double s1;
assert(rtb);
- assert(rtb->fun);
+ assert(rtb->proc);
assert(rtb->data);
- rtbuf_signal_fun(rtb, RTBUF_DYNAMIC_LIMITER_VAR_SIGNAL , &in_,
+ rtbuf_signal_proc(rtb, RTBUF_DYNAMIC_LIMITER_IN_SIGNAL , &in_,
&g_rtbuf_signal_sample_zero);
- rtbuf_signal_fun(rtb, RTBUF_DYNAMIC_LIMITER_VAR_GAIN , &g_,
+ rtbuf_signal_proc(rtb, RTBUF_DYNAMIC_LIMITER_IN_GAIN , &g_,
&g_rtbuf_signal_sample_one);
- rtbuf_signal_fun(rtb, RTBUF_DYNAMIC_LIMITER_VAR_TRESHOLD, &t_,
+ rtbuf_signal_proc(rtb, RTBUF_DYNAMIC_LIMITER_IN_TRESHOLD, &t_,
&g_rtbuf_signal_sample_half);
- rtbuf_signal_fun(rtb, RTBUF_DYNAMIC_LIMITER_VAR_LIMIT , &l_,
+ rtbuf_signal_proc(rtb, RTBUF_DYNAMIC_LIMITER_IN_LIMIT , &l_,
&g_rtbuf_signal_sample_one);
- rtbuf_signal_fun(rtb, RTBUF_DYNAMIC_LIMITER_VAR_ATTACK , &a_,
+ rtbuf_signal_proc(rtb, RTBUF_DYNAMIC_LIMITER_IN_ATTACK , &a_,
&g_rtbuf_signal_sample_one);
- rtbuf_signal_fun(rtb, RTBUF_DYNAMIC_LIMITER_VAR_RELEASE , &r_,
+ rtbuf_signal_proc(rtb, RTBUF_DYNAMIC_LIMITER_IN_RELEASE , &r_,
&g_rtbuf_signal_sample_one);
data = (s_rtbuf_dynamic_limiter_data*) rtb->data;
signal = data->signal;
s1 = data->signal[RTBUF_SIGNAL_SAMPLES - 1];
while (i < RTBUF_SIGNAL_SAMPLES) {
- double in = in_.sample_fun(in_.signal, i);
- double g = max(0.0, g_.sample_fun(g_.signal, i));
- double t = max(0.0, t_.sample_fun(t_.signal, i));
- double l = max(0.0, l_.sample_fun(l_.signal, i));
- double a = max(0.0, a_.sample_fun(a_.signal, i));
- double r = max(0.0, r_.sample_fun(r_.signal, i));
+ double in = in_.sample_proc(in_.signal, i);
+ double g = max(0.0, g_.sample_proc(g_.signal, i));
+ double t = max(0.0, t_.sample_proc(t_.signal, i));
+ double l = max(0.0, l_.sample_proc(l_.signal, i));
+ double a = max(0.0, a_.sample_proc(a_.signal, i));
+ double r = max(0.0, r_.sample_proc(r_.signal, i));
double in_g = in * g;
double s = in_g * data->gain;
double ds = s - s1;
@@ -86,9 +86,9 @@ int rtbuf_dynamic_limiter_start (s_rtbuf *rtb)
{
s_rtbuf_dynamic_limiter_data *data;
assert(rtb);
- assert(rtb->fun);
+ assert(rtb->proc);
assert(rtb->data);
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_dynamic_limiter_data*) rtb->data;
data->signal[RTBUF_SIGNAL_SAMPLES - 1] = 0.0;
data->gain = 1.0;
diff --git a/rtbuf_fun.c b/rtbuf_fun.c
index 2f8b17b..2fb27ca 100644
--- a/rtbuf_fun.c
+++ b/rtbuf_fun.c
@@ -22,46 +22,46 @@
#include "rtbuf.h"
#include "symbol.h"
-s_data_type g_rtbuf_fun_type = {
- sizeof(s_rtbuf_fun) * 8,
+s_data_type g_rtbuf_proc_type = {
+ sizeof(s_rtbuf_proc) * 8,
DATA_TYPE_BITS
};
-s_data_alloc g_rtbuf_fun_alloc;
-s_rtbuf_fun *g_rtbuf_fun;
+s_data_alloc g_rtbuf_proc_alloc;
+s_rtbuf_proc *g_rtbuf_proc;
-void rtbuf_fun_init ()
+void rtbuf_proc_init ()
{
- data_alloc_init(&g_rtbuf_fun_alloc, &g_rtbuf_fun_type,
- RTBUF_FUN_MAX, 0, 0);
+ data_alloc_init(&g_rtbuf_proc_alloc, &g_rtbuf_proc_type,
+ RTBUF_PROC_MAX, 0, 0);
}
-int rtbuf_fun_p (s_rtbuf_fun *fun)
+int rtbuf_proc_p (s_rtbuf_proc *proc)
{
- return fun && fun->name;
+ return proc && proc->name;
}
-s_rtbuf_fun * rtbuf_fun_new ()
+s_rtbuf_proc * rtbuf_proc_new ()
{
- s_rtbuf_fun *rf = data_new(&g_rtbuf_fun_alloc);
+ s_rtbuf_proc *rf = data_new(&g_rtbuf_proc_alloc);
return rf;
}
-void rtbuf_fun_delete (s_rtbuf_fun *fun)
+void rtbuf_proc_delete (s_rtbuf_proc *proc)
{
- assert(fun);
- data_delete(&g_rtbuf_fun_alloc, fun);
+ assert(proc);
+ data_delete(&g_rtbuf_proc_alloc, proc);
}
-s_rtbuf_fun * rtbuf_fun_find (const char *x)
+s_rtbuf_proc * rtbuf_proc_find (const char *x)
{
const char *sym = symbol_find(x);
if (sym) {
unsigned int i = 0;
unsigned int n = g_rtbuf_alloc.n - g_rtbuf_alloc.free_n;
- while (i < g_rtbuf_fun_alloc.n && n > 0) {
- if (rtbuf_fun_p(&g_rtbuf_fun[i])) {
- if (sym == g_rtbuf_fun[i].name)
- return &g_rtbuf_fun[i];
+ while (i < g_rtbuf_proc_alloc.n && n > 0) {
+ if (rtbuf_proc_p(&g_rtbuf_proc[i])) {
+ if (sym == g_rtbuf_proc[i].name)
+ return &g_rtbuf_proc[i];
n--;
}
i++;
@@ -70,18 +70,18 @@ s_rtbuf_fun * rtbuf_fun_find (const char *x)
return 0;
}
-int rtbuf_fun_out_find (s_rtbuf_fun *fun, const char *x)
+int rtbuf_proc_out_find (s_rtbuf_proc *proc, const char *x)
{
symbol sym;
if (x && '0' <= x[0] && x[0] <= '9') {
int i = atoi(x);
- if (0 <= i && (unsigned int) i < fun->out_n)
+ if (0 <= i && (unsigned int) i < proc->out_n)
return i;
}
if ((sym = symbol_find(x))) {
unsigned int i = 0;
- while (i < fun->out_n) {
- if (sym == fun->out[i].name)
+ while (i < proc->out_n) {
+ if (sym == proc->out[i].name)
return i;
i++;
}
@@ -89,26 +89,26 @@ int rtbuf_fun_out_find (s_rtbuf_fun *fun, const char *x)
return -1;
}
-void rtbuf_fun_print (s_rtbuf_fun *fun)
+void rtbuf_proc_print (s_rtbuf_proc *proc)
{
unsigned int i = 0;
- printf("#<fun %i %s (", fun->lib_fun, fun->name);
- while (i < fun->var_n) {
+ printf("#<proc %i %s (", proc->lib_proc, proc->name);
+ while (i < proc->var_n) {
if (i > 0)
fputs(" ", stdout);
- fputs(fun->var[i].name, stdout);
+ fputs(proc->var[i].name, stdout);
fputs(":", stdout);
- fputs(fun->var[i].type->name, stdout);
+ fputs(proc->var[i].type->name, stdout);
i++;
}
printf(") -> (");
i = 0;
- while (i < fun->out_n) {
+ while (i < proc->out_n) {
if (i > 0)
fputs(" ", stdout);
- fputs(fun->out[i].name, stdout);
+ fputs(proc->out[i].name, stdout);
fputs(":", stdout);
- fputs(fun->out[i].type->name, stdout);
+ fputs(proc->out[i].type->name, stdout);
i++;
}
fputs(")>", stdout);
diff --git a/rtbuf_fun.h b/rtbuf_fun.h
deleted file mode 100644
index abaf1df..0000000
--- a/rtbuf_fun.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2018 Thomas de Grivel <thoxdg@gmail.com> +33614550127
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#ifndef RTBUF_FUN_H
-#define RTBUF_FUN_H
-
-#include <data.h>
-#include "rtbuf_defs.h"
-#include "symbol.h"
-
-struct rtbuf_fun_var {
- symbol name;
- s_rtbuf_type *type;
-};
-
-struct rtbuf_fun_out {
- symbol name;
- s_rtbuf_type *type;
- unsigned int offset;
-};
-
-#define RTBUF_FUN_VAR_MAX 1024
-#define RTBUF_FUN_OUT_MAX 1024
-
-struct rtbuf_fun {
- symbol name;
- f_rtbuf_fun *f;
- f_rtbuf_fun *start;
- f_rtbuf_fun *stop;
- s_rtbuf_fun_var var[RTBUF_FUN_VAR_MAX]; /* variables */
- unsigned int var_n; /* number of variables */
- s_rtbuf_fun_out out[RTBUF_FUN_OUT_MAX]; /* outputs */
- unsigned int out_n; /* number of outputs */
- unsigned int out_bytes; /* size of output data in bytes */
- s_rtbuf_lib *lib; /* the library this function comes from */
- unsigned int lib_fun; /* the function index in lib functions */
-};
-
-#define RTBUF_FUN_MAX 1024
-s_data_alloc g_rtbuf_fun_alloc;
-s_rtbuf_fun *g_rtbuf_fun;
-
-void rtbuf_fun_init ();
-int rtbuf_fun_p (s_rtbuf_fun *fun);
-s_rtbuf_fun * rtbuf_fun_new ();
-void rtbuf_fun_delete (s_rtbuf_fun *fun);
-s_rtbuf_fun * rtbuf_fun_find (const char *x);
-int rtbuf_fun_out_find (s_rtbuf_fun *fun,
- const char *name);
-void rtbuf_fun_print (s_rtbuf_fun *fun);
-
-#endif
diff --git a/rtbuf_glfw3.c b/rtbuf_glfw3.c
index 548960d..54f1216 100644
--- a/rtbuf_glfw3.c
+++ b/rtbuf_glfw3.c
@@ -22,30 +22,30 @@
#include "rtbuf_music_type.h"
#include "rtbuf_glfw3.h"
-s_rtbuf_lib_fun_out g_rtbuf_glfw3_keyboard_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_glfw3_keyboard_out[] = {
RTBUF_MUSIC_NOTES_OUT("note"),
{ "window", "void*" },
{ "octave", "unsigned int" },
{ 0, 0 } };
-s_rtbuf_lib_fun_var g_rtbuf_glfw3_oscilloscope_var[] = {
+s_rtbuf_lib_proc_in g_rtbuf_glfw3_oscilloscope_in[] = {
{ "black", RTBUF_SIGNAL_TYPE },
{ "red" , RTBUF_SIGNAL_TYPE },
{ "green", RTBUF_SIGNAL_TYPE },
{ "blue" , RTBUF_SIGNAL_TYPE },
{ 0, 0 } };
-s_rtbuf_lib_fun_out g_rtbuf_glfw3_oscilloscope_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_glfw3_oscilloscope_out[] = {
{ "window", "void*" },
{ 0, 0 } };
-const char *rtbuf_lib_name = "glfw3";
-unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
-s_rtbuf_lib_fun rtbuf_lib_fun[] = {
+const char *rtbuf_lib_name = "glfw3";
+unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
+s_rtbuf_lib_proc rtbuf_lib_proc[] = {
{ "keyboard", rtbuf_glfw3_keyboard, rtbuf_glfw3_keyboard_start,
rtbuf_glfw3_keyboard_stop, 0, g_rtbuf_glfw3_keyboard_out },
{ "oscilloscope", rtbuf_glfw3_oscilloscope,
- rtbuf_glfw3_oscilloscope_start, 0, g_rtbuf_glfw3_oscilloscope_var,
+ rtbuf_glfw3_oscilloscope_start, 0, g_rtbuf_glfw3_oscilloscope_in,
g_rtbuf_glfw3_oscilloscope_out },
{ 0, 0, 0, 0, 0, 0 } };
diff --git a/rtbuf_glfw3.h b/rtbuf_glfw3.h
index b5f5a35..809391a 100644
--- a/rtbuf_glfw3.h
+++ b/rtbuf_glfw3.h
@@ -31,11 +31,11 @@ int rtbuf_glfw3_keyboard_start (s_rtbuf *rtb);
int rtbuf_glfw3_keyboard_stop (s_rtbuf *rtb);
enum {
- RTBUF_GLFW3_OSCILLOSCOPE_VAR_BLACK,
- RTBUF_GLFW3_OSCILLOSCOPE_VAR_RED,
- RTBUF_GLFW3_OSCILLOSCOPE_VAR_GREEN,
- RTBUF_GLFW3_OSCILLOSCOPE_VAR_BLUE,
- RTBUF_GLFW3_SCIILLOSCOPE_VAR_N
+ RTBUF_GLFW3_OSCILLOSCOPE_IN_BLACK,
+ RTBUF_GLFW3_OSCILLOSCOPE_IN_RED,
+ RTBUF_GLFW3_OSCILLOSCOPE_IN_GREEN,
+ RTBUF_GLFW3_OSCILLOSCOPE_IN_BLUE,
+ RTBUF_GLFW3_OSCILLOSCOPE_INS
};
typedef struct rtbuf_glfw3_oscilloscope_data {
diff --git a/rtbuf_glfw3_keyboard.c b/rtbuf_glfw3_keyboard.c
index e301e5c..55ab6cb 100644
--- a/rtbuf_glfw3_keyboard.c
+++ b/rtbuf_glfw3_keyboard.c
@@ -214,7 +214,7 @@ GLFWwindow * rtbuf_glfw3_keyboard_window (s_rtbuf *rtb)
int rtbuf_glfw3_keyboard_start (s_rtbuf *rtb)
{
s_rtbuf_glfw3_keyboard_data *data;
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_glfw3_keyboard_data*) rtb->data;
if (!data->window &&
!(data->window = rtbuf_glfw3_keyboard_window(rtb)))
diff --git a/rtbuf_glfw3_oscilloscope.c b/rtbuf_glfw3_oscilloscope.c
index f362757..2156f8f 100644
--- a/rtbuf_glfw3_oscilloscope.c
+++ b/rtbuf_glfw3_oscilloscope.c
@@ -33,7 +33,7 @@ void rtbuf_glfw3_oscilloscope_size (GLFWwindow *w, int width,
void rtbuf_glfw3_oscilloscope_draw (GLFWwindow *window)
{
s_rtbuf *rtb = (s_rtbuf*) glfwGetWindowUserPointer(window);
- s_rtbuf_signal_fun in[4];
+ s_rtbuf_signal_proc in[4];
const float color[4][3] = { { 0.0f, 0.0f, 0.0f },
{ 1.0f, 0.0f, 0.0f },
{ 0.0f, 1.0f, 0.0f },
@@ -42,7 +42,7 @@ void rtbuf_glfw3_oscilloscope_draw (GLFWwindow *window)
unsigned int j;
assert(rtb);
for (j = 0; j < 4; j++)
- rtbuf_signal_fun(rtb, j, &in[j], &g_rtbuf_signal_sample_zero);
+ rtbuf_signal_proc(rtb, j, &in[j], &g_rtbuf_signal_sample_zero);
glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
for (j = 0; j < 4; j++) {
@@ -50,7 +50,7 @@ void rtbuf_glfw3_oscilloscope_draw (GLFWwindow *window)
glBegin(GL_LINE_STRIP);
for (i = 0; i < RTBUF_SIGNAL_SAMPLES; i++) {
float x = (double) i / RTBUF_SIGNAL_SAMPLES;
- float s = in[j].sample_fun(in[j].signal, i);
+ float s = in[j].sample_proc(in[j].signal, i);
glVertex2f(x, s / 4.0f + 0.5f);
}
glEnd();
@@ -78,7 +78,7 @@ GLFWwindow * rtbuf_glfw3_oscilloscope_window (s_rtbuf *rtb)
int rtbuf_glfw3_oscilloscope_start (s_rtbuf *rtb)
{
s_rtbuf_glfw3_oscilloscope_data *data;
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_glfw3_oscilloscope_data*) rtb->data;
if (!data->window &&
!(data->window = rtbuf_glfw3_oscilloscope_window(rtb)))
@@ -91,7 +91,7 @@ int rtbuf_glfw3_oscilloscope (s_rtbuf *rtb)
s_rtbuf_glfw3_oscilloscope_data *data;
assert(rtb);
assert(rtb->data);
- assert(rtb->fun);
+ assert(rtb->proc);
data = (s_rtbuf_glfw3_oscilloscope_data*) rtb->data;
rtbuf_glfw3_oscilloscope_draw(data->window);
glfwPollEvents();
diff --git a/rtbuf_lib.c b/rtbuf_lib.c
index 278857d..45ec18f 100644
--- a/rtbuf_lib.c
+++ b/rtbuf_lib.c
@@ -85,18 +85,18 @@ int rtbuf_lib_find (const char *str)
return -1;
}
-int rtbuf_lib_find_fun (s_rtbuf_lib *rl, const char *str)
+int rtbuf_lib_find_proc (s_rtbuf_lib *rl, const char *str)
{
const char *sym;
if ('0' <= str[0] && str[0] <= '9') {
int i = atoi(str);
- if (0 <= i && (unsigned) i < rl->fun_n)
+ if (0 <= i && (unsigned) i < rl->proc_n)
return i;
}
if ((sym = symbol_find(str))) {
unsigned int i = 0;
- while (i < rl->fun_n) {
- if (sym == rl->fun[i]->name)
+ while (i < rl->proc_n) {
+ if (sym == rl->proc[i]->name)
return i;
i++;
}
@@ -114,13 +114,13 @@ void rtbuf_lib_delete (s_rtbuf_lib *rl)
{
unsigned int i = 0;
assert(rl);
- assert(rl->fun);
- while (i < rl->fun_n) {
- rtbuf_fun_delete(rl->fun[i]);
- rl->fun[i] = 0;
+ assert(rl->proc);
+ while (i < rl->proc_n) {
+ rtbuf_proc_delete(rl->proc[i]);
+ rl->proc[i] = 0;
i++;
}
- free(rl->fun);
+ free(rl->proc);
data_delete(&g_rtbuf_lib_alloc, rl);
}
@@ -148,15 +148,15 @@ void rtbuf_lib_load_path (s_rtbuf_lib *lib, const char *name)
}
}
-int rtbuf_lib_fun_p (s_rtbuf_lib_fun *fun)
+int rtbuf_lib_proc_p (s_rtbuf_lib_proc *proc)
{
- return fun->name || fun->f || fun->start || fun->stop;
+ return proc->name || proc->f || proc->start || proc->stop;
}
s_rtbuf_lib * rtbuf_lib_load (const char *name)
{
s_rtbuf_lib *lib = rtbuf_lib_new();
- s_rtbuf_lib_fun *fun;
+ s_rtbuf_lib_proc *proc;
unsigned long *ver;
unsigned int i = 0;
f_rtbuf_lib_init *init;
@@ -177,51 +177,51 @@ s_rtbuf_lib * rtbuf_lib_load (const char *name)
rtbuf_lib_delete(lib);
return 0;
}
- fun = dlsym(lib->lib, "rtbuf_lib_fun");
- lib->fun_n = 0;
- while (lib->fun_n < RTBUF_FUN_MAX &&
- rtbuf_lib_fun_p(&fun[lib->fun_n]))
- lib->fun_n++;
- lib->fun = malloc(sizeof(s_rtbuf_fun*) * lib->fun_n);
- while (i < lib->fun_n) {
- lib->fun[i] = rtbuf_fun_new();
- assert(lib->fun[i]);
- rtbuf_lib_fun_init_fun(lib->fun[i], &fun[i]);
- lib->fun[i]->lib = lib;
- lib->fun[i]->lib_fun = i;
+ proc = dlsym(lib->lib, "rtbuf_lib_proc");
+ lib->proc_n = 0;
+ while (lib->proc_n < RTBUF_PROC_MAX &&
+ rtbuf_lib_proc_p(&proc[lib->proc_n]))
+ lib->proc_n++;
+ lib->proc = malloc(sizeof(s_rtbuf_proc*) * lib->proc_n);
+ while (i < lib->proc_n) {
+ lib->proc[i] = rtbuf_proc_new();
+ assert(lib->proc[i]);
+ rtbuf_lib_proc_init_proc(lib->proc[i], &proc[i]);
+ lib->proc[i]->lib = lib;
+ lib->proc[i]->lib_proc = i;
i++;
}
- lib->fun[i] = 0;
+ lib->proc[i] = 0;
return lib;
}
-void rtbuf_lib_fun_var_init_fun (s_rtbuf_fun *fun,
- s_rtbuf_lib_fun_var *var)
+void rtbuf_lib_proc_in_init_proc (s_rtbuf_proc *proc,
+ s_rtbuf_lib_proc_in *in)
{
unsigned int i = 0;
- bzero(fun->var, sizeof(fun->var));
- if (var) {
- while (var->name && i < RTBUF_FUN_VAR_MAX) {
- s_rtbuf_fun_var *v = &fun->var[i];
- v->name = symbol_intern(var->name);
- v->type = rtbuf_type(var->type);
- var++;
+ bzero(proc->in, sizeof(proc->in));
+ if (in) {
+ while (in->name && i < RTBUF_PROC_IN_MAX) {
+ s_rtbuf_proc_in *v = &proc->in[i];
+ v->name = symbol_intern(in->name);
+ v->type = rtbuf_type(in->type);
+ in++;
i++;
}
- assert(i < RTBUF_FUN_VAR_MAX);
+ assert(i < RTBUF_PROC_IN_MAX);
}
- fun->var_n = i;
+ proc->in_n = i;
}
-void rtbuf_lib_fun_out_init_fun (s_rtbuf_fun *fun,
- s_rtbuf_lib_fun_out *out)
+void rtbuf_lib_proc_out_init_proc (s_rtbuf_proc *proc,
+ s_rtbuf_lib_proc_out *out)
{
unsigned int i = 0;
- bzero(fun->out, sizeof(fun->out));
+ bzero(proc->out, sizeof(proc->out));
if (out) {
unsigned int offset = 0;
- while (out->name && i < RTBUF_FUN_OUT_MAX) {
- s_rtbuf_fun_out *o = &fun->out[i];
+ while (out->name && i < RTBUF_PROC_OUT_MAX) {
+ s_rtbuf_proc_out *o = &proc->out[i];
o->name = symbol_intern(out->name);
o->type = rtbuf_type(out->type);
assert(o->type);
@@ -230,20 +230,20 @@ void rtbuf_lib_fun_out_init_fun (s_rtbuf_fun *fun,
out++;
i++;
}
- assert(i < RTBUF_FUN_OUT_MAX);
- fun->out_bytes = offset;
+ assert(i < RTBUF_PROC_OUT_MAX);
+ proc->out_bytes = offset;
}
- fun->out_n = i;
+ proc->out_n = i;
}
-void rtbuf_lib_fun_init_fun (s_rtbuf_fun *fun, s_rtbuf_lib_fun *x)
+void rtbuf_lib_proc_init_proc (s_rtbuf_proc *proc, s_rtbuf_lib_proc *x)
{
- fun->name = symbol_intern(x->name);
- fun->f = x->f;
- fun->start = x->start;
- fun->stop = x->stop;
- rtbuf_lib_fun_var_init_fun(fun, x->var);
- rtbuf_lib_fun_out_init_fun(fun, x->out);
+ proc->name = symbol_intern(x->name);
+ proc->f = x->f;
+ proc->start = x->start;
+ proc->stop = x->stop;
+ rtbuf_lib_proc_in_init_proc(proc, x->in);
+ rtbuf_lib_proc_out_init_proc(proc, x->out);
}
void rtbuf_lib_print (unsigned int i)
@@ -260,9 +260,9 @@ void rtbuf_lib_print_long (unsigned int i)
lib = &g_rtbuf_lib[i];
printf("#<lib %i %s", i, lib->name);
printf("\n %s", lib->path);
- while (j < lib->fun_n) {
+ while (j < lib->proc_n) {
printf("\n ");
- rtbuf_fun_print(lib->fun[j]);
+ rtbuf_proc_print(lib->proc[j]);
j++;
}
printf(">\n");
diff --git a/rtbuf_lib.h b/rtbuf_lib.h
index 0025cee..00d3802 100644
--- a/rtbuf_lib.h
+++ b/rtbuf_lib.h
@@ -21,29 +21,29 @@
#define RTBUF_LIB_MAX 1000
#define RTBUF_LIB_VER 0x00010001
-struct rtbuf_lib_fun_var {
+struct rtbuf_lib_proc_in {
const char *name;
const char *type;
};
-struct rtbuf_lib_fun_out {
+struct rtbuf_lib_proc_out {
const char *name;
const char *type;
};
-struct rtbuf_lib_fun {
+struct rtbuf_lib_proc {
const char *name;
- f_rtbuf_fun *f;
- f_rtbuf_fun *start;
- f_rtbuf_fun *stop;
- s_rtbuf_lib_fun_var *var; /* variables, end with NULL */
- s_rtbuf_lib_fun_out *out; /* outputs, end with NULL */
+ f_rtbuf_proc *f;
+ f_rtbuf_proc *start;
+ f_rtbuf_proc *stop;
+ s_rtbuf_lib_proc_in *in; /* inputs, end with NULL */
+ s_rtbuf_lib_proc_out *out; /* outputs, end with NULL */
};
struct rtbuf_lib {
const char *name;
- s_rtbuf_fun **fun;
- unsigned int fun_n;
+ s_rtbuf_proc **proc;
+ unsigned int proc_n;
void *lib;
const char *path;
};
@@ -53,17 +53,17 @@ s_rtbuf_lib *g_rtbuf_lib;
void rtbuf_lib_delete (s_rtbuf_lib *rl);
int rtbuf_lib_find (const char *str);
-int rtbuf_lib_find_fun (s_rtbuf_lib *rl, const char *str);
+int rtbuf_lib_find_proc (s_rtbuf_lib *rl, const char *str);
void rtbuf_lib_init_ ();
s_rtbuf_lib * rtbuf_lib_load (const char *path);
s_rtbuf_lib * rtbuf_lib_new ();
void rtbuf_lib_print (unsigned int i);
void rtbuf_lib_print_long (unsigned int i);
-void rtbuf_lib_fun_var_init_fun (s_rtbuf_fun *fun,
- s_rtbuf_lib_fun_var *var);
-void rtbuf_lib_fun_out_init_fun (s_rtbuf_fun *fun,
- s_rtbuf_lib_fun_out *out);
-void rtbuf_lib_fun_init_fun (s_rtbuf_fun *fun, s_rtbuf_lib_fun *x);
+void rtbuf_lib_proc_var_init_proc (s_rtbuf_proc *proc,
+ s_rtbuf_lib_proc_in *in);
+void rtbuf_lib_proc_out_init_proc (s_rtbuf_proc *proc,
+ s_rtbuf_lib_proc_out *out);
+void rtbuf_lib_proc_init_proc (s_rtbuf_proc *proc, s_rtbuf_lib_proc *x);
#endif
diff --git a/rtbuf_music.c b/rtbuf_music.c
index 2e71944..f5ecf81 100644
--- a/rtbuf_music.c
+++ b/rtbuf_music.c
@@ -129,9 +129,9 @@ s_rtbuf_music_notes * rtbuf_music_notes (s_rtbuf *rtb,
return 0;
assert(v->rtb < RTBUF_MAX);
target = &g_rtbuf[v->rtb];
- assert(target->fun);
- assert(v->out < target->fun->out_n);
- offset = target->fun->out[v->out].offset;
+ assert(target->proc);
+ assert(v->out < target->proc->out_n);
+ offset = target->proc->out[v->out].offset;
return (s_rtbuf_music_notes*) (target->data + offset);
}
diff --git a/rtbuf_music.h b/rtbuf_music.h
index 9a52ed3..7f2c0b9 100644
--- a/rtbuf_music.h
+++ b/rtbuf_music.h
@@ -33,36 +33,36 @@ typedef struct rtbuf_music_note {
t_rtbuf_signal_sample stop; /* time since stop, or -1.0 */
} s_rtbuf_music_note;
-#define RTBUF_MUSIC_NOTE_VAR(note) \
+#define RTBUF_MUSIC_NOTE_IN(note) \
{ note "velocity", RTBUF_SIGNAL_SAMPLE_TYPE }, \
{ note "frequency", RTBUF_SIGNAL_SAMPLE_TYPE }, \
{ note "start", RTBUF_SIGNAL_SAMPLE_TYPE }, \
{ note "stop", RTBUF_SIGNAL_SAMPLE_TYPE }
-#define RTBUF_MUSIC_NOTE_VAR_ENUM(note) \
+#define RTBUF_MUSIC_NOTE_IN_ENUM(note) \
note ## _VELOCITY , \
note ## _FREQUENCY, \
note ## _START , \
note ## _STOP
enum {
- RTBUF_MUSIC_NOTE_VAR_VELOCITY = 0,
- RTBUF_MUSIC_NOTE_VAR_FREQUENCY,
- RTBUF_MUSIC_NOTE_VAR_START,
- RTBUF_MUSIC_NOTE_VAR_STOP,
- RTBUF_MUSIC_NOTE_VARS
+ RTBUF_MUSIC_NOTE_IN_VELOCITY = 0,
+ RTBUF_MUSIC_NOTE_IN_FREQUENCY,
+ RTBUF_MUSIC_NOTE_IN_START,
+ RTBUF_MUSIC_NOTE_IN_STOP,
+ RTBUF_MUSIC_NOTE_INS
};
-#define RTBUF_MUSIC_NOTE_VAR_VELOCITY(notes, i) \
- (notes + 1 + RTBUF_MUSIC_NOTE_VARS * i + \
- RTBUF_MUSIC_NOTE_VAR_VELOCITY)
-#define RTBUF_MUSIC_NOTE_VAR_FREQUENCY(notes, i) \
- (notes + 1 + RTBUF_MUSIC_NOTE_VARS * i + \
- RTBUF_MUSIC_NOTE_VAR_FREQUENCY)
-#define RTBUF_MUSIC_NOTE_VAR_START(notes, i) \
- (notes + 1 + RTBUF_MUSIC_NOTE_VARS * i + RTBUF_MUSIC_NOTE_VAR_START)
-#define RTBUF_MUSIC_NOTE_VAR_STOP(notes, i) \
- (notes + 1 + RTBUF_MUSIC_NOTE_VARS * i + RTBUF_MUSIC_NOTE_VAR_STOP)
+#define RTBUF_MUSIC_NOTE_IN_VELOCITY(notes, i) \
+ (notes + 1 + RTBUF_MUSIC_NOTE_INS * i + \
+ RTBUF_MUSIC_NOTE_IN_VELOCITY)
+#define RTBUF_MUSIC_NOTE_IN_FREQUENCY(notes, i) \
+ (notes + 1 + RTBUF_MUSIC_NOTE_INS * i + \
+ RTBUF_MUSIC_NOTE_IN_FREQUENCY)
+#define RTBUF_MUSIC_NOTE_IN_START(notes, i) \
+ (notes + 1 + RTBUF_MUSIC_NOTE_INS * i + RTBUF_MUSIC_NOTE_IN_START)
+#define RTBUF_MUSIC_NOTE_IN_STOP(notes, i) \
+ (notes + 1 + RTBUF_MUSIC_NOTE_INS * i + RTBUF_MUSIC_NOTE_IN_STOP)
#define RTBUF_MUSIC_NOTE_MAX 128
@@ -85,7 +85,7 @@ int rtbuf_music_note_p (s_rtbuf_music_note *note);
void rtbuf_music_note_dt (s_rtbuf_music_note *note, double dt);
s_rtbuf_music_notes * rtbuf_music_notes (s_rtbuf *rtb,
- unsigned int var);
+ unsigned int in);
t_rtbuf_signal_sample rtbuf_music_note_frequency (unsigned int octave,
unsigned int note);
diff --git a/rtbuf_music_type.c b/rtbuf_music_type.c
index 0e50085..38d5165 100644
--- a/rtbuf_music_type.c
+++ b/rtbuf_music_type.c
@@ -3,12 +3,12 @@
#include "rtbuf.h"
#include "rtbuf_music.h"
-void notes_var ()
+void notes_in ()
{
unsigned int i = 0;
const char *st = "RTBUF_SIGNAL_SAMPLE_TYPE";
printf("\n"
- "#define RTBUF_MUSIC_NOTES_VAR(note) \\\n"
+ "#define RTBUF_MUSIC_NOTES_IN(note) \\\n"
" { note \"s\" , RTBUF_MUSIC_NOTES_TYPE }"
", \\\n");
while (i < RTBUF_MUSIC_NOTE_MAX) {
@@ -23,7 +23,7 @@ void notes_var ()
}
i = 0;
printf("\n"
- "#define RTBUF_MUSIC_NOTES_VAR_ENUM(note) \\\n"
+ "#define RTBUF_MUSIC_NOTES_IN_ENUM(note) \\\n"
" note ## S , \\\n");
while (i < RTBUF_MUSIC_NOTE_MAX) {
printf(" note ## _%u_VELOCITY , \\\n", i);
@@ -62,7 +62,7 @@ int main ()
printf("/* file generated by rtbuf_music_type */\n");
printf("#ifndef RTBUF_MUSIC_TYPE_H\n"
"#define RTBUF_MUSIC_TYPE_H\n");
- notes_var();
+ notes_in();
notes_out();
printf("\n"
"#endif\n");
diff --git a/rtbuf_proc.c b/rtbuf_proc.c
new file mode 100644
index 0000000..59832af
--- /dev/null
+++ b/rtbuf_proc.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2018 Thomas de Grivel <thoxdg@gmail.com> +33614550127
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <assert.h>
+#include <data.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include "rtbuf.h"
+#include "symbol.h"
+
+s_data_type g_rtbuf_proc_type = {
+ sizeof(s_rtbuf_proc) * 8,
+ DATA_TYPE_BITS
+};
+s_data_alloc g_rtbuf_proc_alloc;
+s_rtbuf_proc *g_rtbuf_proc;
+
+void rtbuf_proc_init ()
+{
+ data_alloc_init(&g_rtbuf_proc_alloc, &g_rtbuf_proc_type,
+ RTBUF_PROC_MAX, 0, 0);
+}
+
+int rtbuf_proc_p (s_rtbuf_proc *proc)
+{
+ return proc && proc->name;
+}
+
+s_rtbuf_proc * rtbuf_proc_new ()
+{
+ s_rtbuf_proc *rf = data_new(&g_rtbuf_proc_alloc);
+ return rf;
+}
+
+void rtbuf_proc_delete (s_rtbuf_proc *proc)
+{
+ assert(proc);
+ data_delete(&g_rtbuf_proc_alloc, proc);
+}
+
+s_rtbuf_proc * rtbuf_proc_find (const char *x)
+{
+ const char *sym = symbol_find(x);
+ if (sym) {
+ unsigned int i = 0;
+ unsigned int n = g_rtbuf_alloc.n - g_rtbuf_alloc.free_n;
+ while (i < g_rtbuf_proc_alloc.n && n > 0) {
+ if (rtbuf_proc_p(&g_rtbuf_proc[i])) {
+ if (sym == g_rtbuf_proc[i].name)
+ return &g_rtbuf_proc[i];
+ n--;
+ }
+ i++;
+ }
+ }
+ return 0;
+}
+
+int rtbuf_proc_out_find (s_rtbuf_proc *proc, const char *x)
+{
+ symbol sym;
+ if (x && '0' <= x[0] && x[0] <= '9') {
+ int i = atoi(x);
+ if (0 <= i && (unsigned int) i < proc->out_n)
+ return i;
+ }
+ if ((sym = symbol_find(x))) {
+ unsigned int i = 0;
+ while (i < proc->out_n) {
+ if (sym == proc->out[i].name)
+ return i;
+ i++;
+ }
+ }
+ return -1;
+}
+
+void rtbuf_proc_print (s_rtbuf_proc *proc)
+{
+ unsigned int i = 0;
+ printf("#<proc %i %s (", proc->lib_proc, proc->name);
+ while (i < proc->in_n) {
+ if (i > 0)
+ fputs(" ", stdout);
+ fputs(proc->in[i].name, stdout);
+ fputs(":", stdout);
+ fputs(proc->in[i].type->name, stdout);
+ i++;
+ }
+ printf(") -> (");
+ i = 0;
+ while (i < proc->out_n) {
+ if (i > 0)
+ fputs(" ", stdout);
+ fputs(proc->out[i].name, stdout);
+ fputs(":", stdout);
+ fputs(proc->out[i].type->name, stdout);
+ i++;
+ }
+ fputs(")>", stdout);
+}
diff --git a/rtbuf_proc.h b/rtbuf_proc.h
new file mode 100644
index 0000000..d450cc9
--- /dev/null
+++ b/rtbuf_proc.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2018 Thomas de Grivel <thoxdg@gmail.com> +33614550127
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef RTBUF_PROC_H
+#define RTBUF_PROC_H
+
+#include <data.h>
+#include "rtbuf_defs.h"
+#include "symbol.h"
+
+struct rtbuf_proc_in {
+ symbol name;
+ s_rtbuf_type *type;
+};
+
+struct rtbuf_proc_out {
+ symbol name;
+ s_rtbuf_type *type;
+ unsigned int offset;
+};
+
+#define RTBUF_PROC_IN_MAX 1024
+#define RTBUF_PROC_OUT_MAX 1024
+
+struct rtbuf_proc {
+ symbol name;
+ f_rtbuf_proc *f;
+ f_rtbuf_proc *start;
+ f_rtbuf_proc *stop;
+ s_rtbuf_proc_in in[RTBUF_PROC_IN_MAX]; /* inputs */
+ unsigned int in_n; /* number of inputs */
+ s_rtbuf_proc_out out[RTBUF_PROC_OUT_MAX]; /* outputs */
+ unsigned int out_n; /* number of outputs */
+ unsigned int out_bytes; /* size of output data in bytes */
+ s_rtbuf_lib *lib; /* the library this procedure comes from */
+ unsigned int lib_proc; /* the procedure index in library */
+};
+
+#define RTBUF_PROC_MAX 1024
+s_data_alloc g_rtbuf_proc_alloc;
+s_rtbuf_proc *g_rtbuf_proc;
+
+void rtbuf_proc_init ();
+int rtbuf_proc_p (s_rtbuf_proc *proc);
+s_rtbuf_proc * rtbuf_proc_new ();
+void rtbuf_proc_delete (s_rtbuf_proc *proc);
+s_rtbuf_proc * rtbuf_proc_find (const char *x);
+int rtbuf_proc_out_find (s_rtbuf_proc *proc,
+ const char *name);
+void rtbuf_proc_print (s_rtbuf_proc *proc);
+
+#endif
diff --git a/rtbuf_signal.c b/rtbuf_signal.c
index 9b8a687..677a078 100644
--- a/rtbuf_signal.c
+++ b/rtbuf_signal.c
@@ -27,34 +27,34 @@ const double g_rtbuf_signal_sample_half = 0.5;
const double g_rtbuf_signal_sample_one = 1.0;
const double g_rtbuf_signal_default_frequency = 220.0;
-s_rtbuf_lib_fun_var g_rtbuf_signal_sinus_var[] = {
+s_rtbuf_lib_proc_in g_rtbuf_signal_sinus_in[] = {
{ "frequency", RTBUF_SIGNAL_TYPE },
{ "amplitude", RTBUF_SIGNAL_TYPE },
{ 0, 0 } };
-s_rtbuf_lib_fun_out g_rtbuf_signal_sinus_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_signal_sinus_out[] = {
{ "signal", RTBUF_SIGNAL_TYPE },
{ "phase", "double" },
{ 0, 0 } };
-s_rtbuf_lib_fun_var g_rtbuf_signal_square_var[] = {
+s_rtbuf_lib_proc_in g_rtbuf_signal_square_in[] = {
{ "frequency", RTBUF_SIGNAL_TYPE },
{ "amplitude", RTBUF_SIGNAL_TYPE },
{ "pulse", RTBUF_SIGNAL_TYPE },
{ 0, 0 } };
-s_rtbuf_lib_fun_out g_rtbuf_signal_square_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_signal_square_out[] = {
{ "signal", RTBUF_SIGNAL_TYPE },
{ "phase", "double" },
{ 0, 0 } };
const char *rtbuf_lib_name = "signal";
unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
-s_rtbuf_lib_fun rtbuf_lib_fun[] = {
+s_rtbuf_lib_proc rtbuf_lib_proc[] = {
{ "sinus", rtbuf_signal_sinus, rtbuf_signal_sinus_start, 0,
- g_rtbuf_signal_sinus_var, g_rtbuf_signal_sinus_out },
+ g_rtbuf_signal_sinus_in, g_rtbuf_signal_sinus_out },
{ "square", rtbuf_signal_square, rtbuf_signal_square_start, 0,
- g_rtbuf_signal_square_var, g_rtbuf_signal_square_out },
+ g_rtbuf_signal_square_in, g_rtbuf_signal_square_out },
{ 0, 0, 0, 0, 0, 0 } };
void rtbuf_signal_zero (t_rtbuf_signal_sample *signal)
@@ -65,23 +65,23 @@ void rtbuf_signal_zero (t_rtbuf_signal_sample *signal)
t_rtbuf_signal_sample
rtbuf_signal_sample (s_rtbuf *rtb,
- unsigned int var,
+ unsigned int in,
t_rtbuf_signal_sample default_value)
{
s_rtbuf_binding *v;
assert(rtb);
- assert(rtb->fun);
- assert(var < rtb->fun->var_n);
- v = &rtb->var[var];
+ assert(rtb->proc);
+ assert(in < rtb->proc->in_n);
+ v = &rtb->var[in];
if (v->rtb >= 0) {
s_rtbuf *src;
- s_rtbuf_fun_out *out;
+ s_rtbuf_proc_out *out;
assert(v->rtb < RTBUF_MAX);
src = &g_rtbuf[v->rtb];
assert(src->data);
- assert(src->fun);
- assert(v->out < src->fun->out_n);
- out = &src->fun->out[v->out];
+ assert(src->proc);
+ assert(v->out < src->proc->out_n);
+ out = &src->proc->out[v->out];
assert(out->type);
if (out->type->t.bits >= sizeof(t_rtbuf_signal_sample) * 8) {
t_rtbuf_signal_sample *sample = (t_rtbuf_signal_sample*)
@@ -108,33 +108,33 @@ double rtbuf_signal_sample_from_signal (const double *signal,
return signal[i];
}
-void rtbuf_signal_fun (s_rtbuf *rtb,
- unsigned int var,
- s_rtbuf_signal_fun *rsf,
- const double *default_value)
+void rtbuf_signal_proc (s_rtbuf *rtb,
+ unsigned int in,
+ s_rtbuf_signal_proc *rsp,
+ const double *default_value)
{
s_rtbuf_binding *v;
assert(rtb);
- assert(rtb->fun);
- assert(var < rtb->fun->var_n);
- assert(rsf);
+ assert(rtb->proc);
+ assert(in < rtb->proc->in_n);
+ assert(rsp);
assert(default_value);
- rsf->signal = default_value;
- rsf->sample_fun = rtbuf_signal_sample_from_sample;
- v = &rtb->var[var];
+ rsp->signal = default_value;
+ rsp->sample_proc = rtbuf_signal_sample_from_sample;
+ v = &rtb->var[in];
if (v->rtb >= 0) {
s_rtbuf *dest;
- s_rtbuf_fun_out *out;
+ s_rtbuf_proc_out *out;
assert(v->rtb < RTBUF_MAX);
dest = &g_rtbuf[v->rtb];
assert(dest->data);
- assert(dest->fun);
- assert(v->out < dest->fun->out_n);
- out = &dest->fun->out[v->out];
+ assert(dest->proc);
+ assert(v->out < dest->proc->out_n);
+ out = &dest->proc->out[v->out];
assert(out->type);
if (out->type->t.bits >= sizeof(t_rtbuf_signal_sample) * 8)
- rsf->signal = (double*)(dest->data + out->offset);
+ rsp->signal = (double*)(dest->data + out->offset);
if (out->type->t.bits >= sizeof(t_rtbuf_signal) * 8)
- rsf->sample_fun = rtbuf_signal_sample_from_signal;
+ rsp->sample_proc = rtbuf_signal_sample_from_signal;
}
}
diff --git a/rtbuf_signal.h b/rtbuf_signal.h
index c708696..526de6e 100644
--- a/rtbuf_signal.h
+++ b/rtbuf_signal.h
@@ -36,20 +36,20 @@ typedef t_rtbuf_signal_sample
f_rtbuf_signal (const t_rtbuf_signal_sample *signal,
unsigned int sample);
-typedef struct rtbuf_signal_fun {
- f_rtbuf_signal *sample_fun;
+typedef struct rtbuf_signal_proc {
+ f_rtbuf_signal *sample_proc;
const t_rtbuf_signal_sample *signal;
-} s_rtbuf_signal_fun;
+} s_rtbuf_signal_proc;
void rtbuf_signal_zero (t_rtbuf_signal_sample *signal);
t_rtbuf_signal_sample
rtbuf_signal_sample (s_rtbuf *rtb,
- unsigned int var,
+ unsigned int in,
t_rtbuf_signal_sample default_value);
-void rtbuf_signal_fun (s_rtbuf *rtb,
- unsigned int var,
- s_rtbuf_signal_fun *data,
- const t_rtbuf_signal_sample *default_value);
+void rtbuf_signal_proc (s_rtbuf *rtb,
+ unsigned int in,
+ s_rtbuf_signal_proc *data,
+ const t_rtbuf_signal_sample *default_value);
f_rtbuf_signal rtbuf_signal_sample_from_sample;
f_rtbuf_signal rtbuf_signal_sample_from_signal;
@@ -68,9 +68,9 @@ typedef struct rtbuf_signal_sinus_data {
} s_rtbuf_signal_sinus_data;
enum {
- RTBUF_SIGNAL_SINUS_VAR_FREQUENCY = 0,
- RTBUF_SIGNAL_SINUS_VAR_AMPLITUDE,
- RTBUF_SIGNAL_SINUS_VAR_N
+ RTBUF_SIGNAL_SINUS_IN_FREQUENCY = 0,
+ RTBUF_SIGNAL_SINUS_IN_AMPLITUDE,
+ RTBUF_SIGNAL_SINUS_IN_N
};
int rtbuf_signal_sinus (s_rtbuf *rtb);
@@ -79,10 +79,10 @@ int rtbuf_signal_sinus_start (s_rtbuf *rtb);
/* square */
enum {
- RTBUF_SIGNAL_SQUARE_VAR_FREQUENCY = 0,
- RTBUF_SIGNAL_SQUARE_VAR_AMPLITUDE,
- RTBUF_SIGNAL_SQUARE_VAR_PULSE,
- RTBUF_SIGNAL_SQUARE_VAR_N
+ RTBUF_SIGNAL_SQUARE_IN_FREQUENCY = 0,
+ RTBUF_SIGNAL_SQUARE_IN_AMPLITUDE,
+ RTBUF_SIGNAL_SQUARE_IN_PULSE,
+ RTBUF_SIGNAL_SQUARE_IN_N
};
typedef struct rtbuf_signal_square_data {
diff --git a/rtbuf_signal_sinus.c b/rtbuf_signal_sinus.c
index 9a7ff7b..9d4a77c 100644
--- a/rtbuf_signal_sinus.c
+++ b/rtbuf_signal_sinus.c
@@ -22,18 +22,18 @@
int rtbuf_signal_sinus (s_rtbuf *rtb)
{
- s_rtbuf_signal_fun freq;
- s_rtbuf_signal_fun amp;
+ s_rtbuf_signal_proc freq;
+ s_rtbuf_signal_proc amp;
s_rtbuf_signal_sinus_data *data;
unsigned int i = 0;
- rtbuf_signal_fun(rtb, RTBUF_SIGNAL_SINUS_VAR_FREQUENCY, &freq,
- &g_rtbuf_signal_default_frequency);
- rtbuf_signal_fun(rtb, RTBUF_SIGNAL_SINUS_VAR_AMPLITUDE, &,
- &g_rtbuf_signal_sample_one);
+ rtbuf_signal_proc(rtb, RTBUF_SIGNAL_SINUS_IN_FREQUENCY, &freq,
+ &g_rtbuf_signal_default_frequency);
+ rtbuf_signal_proc(rtb, RTBUF_SIGNAL_SINUS_IN_AMPLITUDE, &,
+ &g_rtbuf_signal_sample_one);
data = (s_rtbuf_signal_sinus_data*) rtb->data;
while (i < RTBUF_SIGNAL_SAMPLES) {
- double f = freq.sample_fun(freq.signal, i);
- double a = amp.sample_fun(amp.signal, i);
+ double f = freq.sample_proc(freq.signal, i);
+ double a = amp.sample_proc(amp.signal, i);
f = max(0.0, f);
a = max(0.0, a);
f /= (double) RTBUF_SIGNAL_SAMPLERATE;
@@ -48,7 +48,7 @@ int rtbuf_signal_sinus (s_rtbuf *rtb)
int rtbuf_signal_sinus_start (s_rtbuf *rtb)
{
s_rtbuf_signal_sinus_data *data;
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_signal_sinus_data*) rtb->data;
data->phase = 0;
return 0;
diff --git a/rtbuf_signal_square.c b/rtbuf_signal_square.c
index d7a47fb..226247c 100644
--- a/rtbuf_signal_square.c
+++ b/rtbuf_signal_square.c
@@ -27,22 +27,22 @@ double square (double amp, double phase, double pulse)
int rtbuf_signal_square (s_rtbuf *rtb)
{
- s_rtbuf_signal_fun freq;
- s_rtbuf_signal_fun amp;
- s_rtbuf_signal_fun pulse;
+ s_rtbuf_signal_proc freq;
+ s_rtbuf_signal_proc amp;
+ s_rtbuf_signal_proc pulse;
s_rtbuf_signal_square_data *data;
unsigned int i = 0;
- rtbuf_signal_fun(rtb, RTBUF_SIGNAL_SQUARE_VAR_FREQUENCY, &freq,
- &g_rtbuf_signal_default_frequency);
- rtbuf_signal_fun(rtb, RTBUF_SIGNAL_SQUARE_VAR_AMPLITUDE, &,
- &g_rtbuf_signal_sample_one);
- rtbuf_signal_fun(rtb, RTBUF_SIGNAL_SQUARE_VAR_PULSE, &pulse,
- &g_rtbuf_signal_sample_half);
+ rtbuf_signal_proc(rtb, RTBUF_SIGNAL_SQUARE_IN_FREQUENCY, &freq,
+ &g_rtbuf_signal_default_frequency);
+ rtbuf_signal_proc(rtb, RTBUF_SIGNAL_SQUARE_IN_AMPLITUDE, &,
+ &g_rtbuf_signal_sample_one);
+ rtbuf_signal_proc(rtb, RTBUF_SIGNAL_SQUARE_IN_PULSE, &pulse,
+ &g_rtbuf_signal_sample_half);
data = (s_rtbuf_signal_square_data*) rtb->data;
while (i < RTBUF_SIGNAL_SAMPLES) {
- double f = freq.sample_fun(freq.signal, i);
- double a = amp.sample_fun(amp.signal, i);
- double p = pulse.sample_fun(pulse.signal, i);
+ double f = freq.sample_proc(freq.signal, i);
+ double a = amp.sample_proc(amp.signal, i);
+ double p = pulse.sample_proc(pulse.signal, i);
f = max(0.0, f);
a = max(0.0, a);
p = clamp(0.0, p, 1.0);
@@ -59,7 +59,7 @@ int rtbuf_signal_square (s_rtbuf *rtb)
int rtbuf_signal_square_start (s_rtbuf *rtb)
{
s_rtbuf_signal_square_data *data;
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_signal_square_data*) rtb->data;
data->phase = 0;
return 0;
diff --git a/rtbuf_sndio.c b/rtbuf_sndio.c
index 9e6b753..2666a85 100644
--- a/rtbuf_sndio.c
+++ b/rtbuf_sndio.c
@@ -24,29 +24,29 @@
#include "rtbuf_sndio.h"
#include "rtbuf_sndio_type.h"
-s_rtbuf_lib_fun_out g_rtbuf_sndio_input_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_sndio_input_out[] = {
{ "left", RTBUF_SIGNAL_TYPE },
{ "right", RTBUF_SIGNAL_TYPE },
{ "samples", RTBUF_SNDIO_SAMPLES_TYPE },
{ 0, 0 } };
-s_rtbuf_lib_fun_var g_rtbuf_sndio_output_var[] = {
+s_rtbuf_lib_proc_in g_rtbuf_sndio_output_in[] = {
{ "left", RTBUF_SIGNAL_TYPE },
{ "right", RTBUF_SIGNAL_TYPE },
{ 0, 0 } };
-s_rtbuf_lib_fun_out g_rtbuf_sndio_output_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_sndio_output_out[] = {
{ "samples", RTBUF_SNDIO_SAMPLES_TYPE },
{ "reserved", RTBUF_SNDIO_OUTPUT_RESERVED_TYPE },
{ 0, 0 } };
const char *rtbuf_lib_name = "sndio";
unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
-s_rtbuf_lib_fun rtbuf_lib_fun[] = {
+s_rtbuf_lib_proc rtbuf_lib_proc[] = {
{ "input", rtbuf_sndio_input, rtbuf_sndio_input_start,
rtbuf_sndio_input_stop, 0, g_rtbuf_sndio_input_out },
{ "output", rtbuf_sndio_output, rtbuf_sndio_output_start,
- rtbuf_sndio_output_stop, g_rtbuf_sndio_output_var,
+ rtbuf_sndio_output_stop, g_rtbuf_sndio_output_in,
g_rtbuf_sndio_output_out },
{ 0, 0, 0, 0, 0, 0 } };
diff --git a/rtbuf_sndio_input.c b/rtbuf_sndio_input.c
index 1dc833f..86a9598 100644
--- a/rtbuf_sndio_input.c
+++ b/rtbuf_sndio_input.c
@@ -33,7 +33,7 @@ int rtbuf_sndio_input (s_rtbuf *rtb)
int rtbuf_sndio_input_start (s_rtbuf *rtb)
{
s_rtbuf_sndio_input_data *data;
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_sndio_input_data*) rtb->data;
return 0;
}
diff --git a/rtbuf_sndio_output.c b/rtbuf_sndio_output.c
index 8c159c3..7dae0c7 100644
--- a/rtbuf_sndio_output.c
+++ b/rtbuf_sndio_output.c
@@ -51,7 +51,7 @@ int rtbuf_sndio_output_start (s_rtbuf *rtb)
s_rtbuf_sndio_output_data *data;
s_rtbuf_sndio_output_reserved *res;
int err = 0;
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_sndio_output_data*) rtb->data;
res = &data->reserved;
if (!res->sio_hdl) {
@@ -88,16 +88,16 @@ int rtbuf_sndio_output_stop (s_rtbuf *rtb)
int rtbuf_sndio_output (s_rtbuf *rtb)
{
- s_rtbuf_signal_fun in[RTBUF_SNDIO_CHANNELS];
+ s_rtbuf_signal_proc in[RTBUF_SNDIO_CHANNELS];
s_rtbuf_sndio_output_data *data;
short *sample;
unsigned int i = 0;
unsigned int j = 0;
assert(rtb);
assert(rtb->data);
- assert(rtb->fun);
+ assert(rtb->proc);
while (j < RTBUF_SNDIO_CHANNELS) {
- rtbuf_signal_fun(rtb, j, &in[j], &g_rtbuf_signal_sample_zero);
+ rtbuf_signal_proc(rtb, j, &in[j], &g_rtbuf_signal_sample_zero);
j++;
}
data = (s_rtbuf_sndio_output_data*) rtb->data;
@@ -106,7 +106,7 @@ int rtbuf_sndio_output (s_rtbuf *rtb)
while (i < RTBUF_SIGNAL_SAMPLES) {
j = 0;
while (j < RTBUF_SNDIO_CHANNELS) {
- double in_ = in[j].sample_fun(in[j].signal, i);
+ double in_ = in[j].sample_proc(in[j].signal, i);
in_ = clamp(-1.0, in_, 1.0);
if (in_ < 0.0)
in_ *= -SHRT_MIN;
diff --git a/rtbuf_synth.c b/rtbuf_synth.c
index 5961a3c..4fee439 100644
--- a/rtbuf_synth.c
+++ b/rtbuf_synth.c
@@ -23,37 +23,37 @@
#include "rtbuf_music_type.h"
#include "rtbuf_synth.h"
-s_rtbuf_lib_fun_var g_rtbuf_synth_adsr_var[] = {
- RTBUF_MUSIC_NOTE_VAR(),
+s_rtbuf_lib_proc_in g_rtbuf_synth_adsr_in[] = {
+ RTBUF_MUSIC_NOTE_IN(),
{ "attack", RTBUF_SIGNAL_TYPE },
{ "decay", RTBUF_SIGNAL_TYPE },
{ "sustain", RTBUF_SIGNAL_TYPE },
{ "release", RTBUF_SIGNAL_TYPE },
{ 0, 0 } };
-s_rtbuf_lib_fun_out g_rtbuf_synth_adsr_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_synth_adsr_out[] = {
{ "signal", RTBUF_SIGNAL_TYPE },
{ "state", "int" },
{ 0, 0 } };
-s_rtbuf_lib_fun_var g_rtbuf_synth_synth_var[] = {
+s_rtbuf_lib_proc_in g_rtbuf_synth_synth_in[] = {
{ "envelope", RTBUF_SIGNAL_TYPE },
{ "oscillator", RTBUF_SIGNAL_TYPE },
- RTBUF_MUSIC_NOTES_VAR("note"),
+ RTBUF_MUSIC_NOTES_IN("note"),
{ 0, 0 } };
-s_rtbuf_lib_fun_out g_rtbuf_synth_synth_out[] = {
+s_rtbuf_lib_proc_out g_rtbuf_synth_synth_out[] = {
{ "signal", RTBUF_SIGNAL_TYPE },
{ "note_n", "unsigned int" },
{ 0, 0 } };
-const char *rtbuf_lib_name = "synth";
-unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
-s_rtbuf_lib_fun rtbuf_lib_fun[] = {
+const char *rtbuf_lib_name = "synth";
+unsigned long rtbuf_lib_ver = RTBUF_LIB_VER;
+s_rtbuf_lib_proc rtbuf_lib_proc[] = {
{ "adsr", rtbuf_synth_adsr, rtbuf_synth_adsr_start, 0,
- g_rtbuf_synth_adsr_var, g_rtbuf_synth_adsr_out },
+ g_rtbuf_synth_adsr_in, g_rtbuf_synth_adsr_out },
{ "synth", rtbuf_synth_synth, rtbuf_synth_synth_start, 0,
- g_rtbuf_synth_synth_var, g_rtbuf_synth_synth_out },
+ g_rtbuf_synth_synth_in, g_rtbuf_synth_synth_out },
{ 0, 0, 0, 0, 0, 0 } };
int rtbuf_lib_init (s_rtbuf_lib *lib)
diff --git a/rtbuf_synth.h b/rtbuf_synth.h
index b78416d..610b2af 100644
--- a/rtbuf_synth.h
+++ b/rtbuf_synth.h
@@ -25,12 +25,12 @@
/* adsr */
enum {
- RTBUF_MUSIC_NOTE_VAR_ENUM(RTBUF_SYNTH_ADSR_VAR),
- RTBUF_SYNTH_ADSR_VAR_ATTACK,
- RTBUF_SYNTH_ADSR_VAR_DECAY,
- RTBUF_SYNTH_ADSR_VAR_SUSTAIN,
- RTBUF_SYNTH_ADSR_VAR_RELEASE,
- RTBUF_SYNTH_ADSR_VAR_N,
+ RTBUF_MUSIC_NOTE_IN_ENUM(RTBUF_SYNTH_ADSR_IN),
+ RTBUF_SYNTH_ADSR_IN_ATTACK,
+ RTBUF_SYNTH_ADSR_IN_DECAY,
+ RTBUF_SYNTH_ADSR_IN_SUSTAIN,
+ RTBUF_SYNTH_ADSR_IN_RELEASE,
+ RTBUF_SYNTH_ADSR_IN_N,
};
enum {
@@ -50,18 +50,18 @@ int rtbuf_synth_adsr_start (s_rtbuf *rtb);
/* synth */
enum {
- RTBUF_SYNTH_SYNTH_VAR_ENVELOPE = 0,
- RTBUF_SYNTH_SYNTH_VAR_OSCILLATOR,
- RTBUF_SYNTH_SYNTH_VAR_NOTES,
- RTBUF_SYNTH_NOTES_VAR_ENUM(RTBUF_SYNTH_SYNTH_VAR_NOTE),
- RTBUF_SYNTH_SYNTH_VAR_N
+ RTBUF_SYNTH_SYNTH_IN_ENVELOPE = 0,
+ RTBUF_SYNTH_SYNTH_IN_OSCILLATOR,
+ RTBUF_SYNTH_SYNTH_IN_NOTES,
+ RTBUF_SYNTH_NOTES_IN_ENUM(RTBUF_SYNTH_SYNTH_IN_NOTE),
+ RTBUF_SYNTH_SYNTH_IN_N
};
-#define RTBUF_SYNTH_SYNTH_VAR_NOTE_ENVELOPE(i) \
- (RTBUF_SYNTH_SYNTH_VAR_NOTE_0_ENVELOPE + 2 * i)
+#define RTBUF_SYNTH_SYNTH_IN_NOTE_ENVELOPE(i) \
+ (RTBUF_SYNTH_SYNTH_IN_NOTE_0_ENVELOPE + 2 * i)
-#define RTBUF_SYNTH_SYNTH_VAR_NOTE_OSCILLATOR(i) \
- (RTBUF_SYNTH_SYNTH_VAR_NOTE_0_OSCILLATOR + 2 * i)
+#define RTBUF_SYNTH_SYNTH_IN_NOTE_OSCILLATOR(i) \
+ (RTBUF_SYNTH_SYNTH_IN_NOTE_0_OSCILLATOR + 2 * i)
typedef struct rtbuf_synth_synth_data
{
diff --git a/rtbuf_synth_adsr.c b/rtbuf_synth_adsr.c
index 69f84b1..110675a 100644
--- a/rtbuf_synth_adsr.c
+++ b/rtbuf_synth_adsr.c
@@ -46,11 +46,11 @@ void rtbuf_synth_adsr_signal (s_rtbuf *rtb, double *signal,
double stop, double r)
{
double a =
- rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_VAR_ATTACK, 0.02);
+ rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_IN_ATTACK, 0.02);
double d =
- rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_VAR_DECAY, 0.01);
+ rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_IN_DECAY, 0.01);
double s =
- rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_VAR_SUSTAIN, 0.4);
+ rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_IN_SUSTAIN, 0.4);
unsigned int i = 0;
(void) velocity;
(void) start;
@@ -76,8 +76,8 @@ int rtbuf_synth_adsr (s_rtbuf *rtb)
s_rtbuf_synth_adsr_data *data;
assert(rtb);
assert(rtb->data);
- vel = rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_VAR_VELOCITY, 0.0);
- start = rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_VAR_START, -1.0);
+ vel = rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_IN_VELOCITY, 0.0);
+ start = rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_IN_START, -1.0);
data = (s_rtbuf_synth_adsr_data*) rtb->data;
if (data->state == RTBUF_SYNTH_ENVELOPE_STATE_NOT_STARTED) {
if (vel > 0.0 && start >= 0.0)
@@ -89,9 +89,9 @@ int rtbuf_synth_adsr (s_rtbuf *rtb)
return 0;
if (data->state == RTBUF_SYNTH_ENVELOPE_STATE_STARTED) {
double stop =
- rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_VAR_STOP, -1.0);
+ rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_IN_STOP, -1.0);
double rel =
- rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_VAR_RELEASE, 0.3);
+ rtbuf_signal_sample(rtb, RTBUF_SYNTH_ADSR_IN_RELEASE, 0.3);
if (stop > rel) {
rtbuf_signal_zero(data->signal);
data->state = RTBUF_SYNTH_ENVELOPE_STATE_ENDED;
@@ -108,8 +108,8 @@ int rtbuf_synth_adsr_start (s_rtbuf *rtb)
{
s_rtbuf_synth_adsr_data *data;
assert(rtb->data);
- assert(rtb->fun);
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc);
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_synth_adsr_data*) rtb->data;
data->state = RTBUF_SYNTH_ENVELOPE_STATE_NOT_STARTED;
bzero(data->signal, sizeof(t_rtbuf_signal));
diff --git a/rtbuf_synth_synth.c b/rtbuf_synth_synth.c
index c82a36d..a3e1ecb 100644
--- a/rtbuf_synth_synth.c
+++ b/rtbuf_synth_synth.c
@@ -24,7 +24,7 @@
s_rtbuf * rtbuf_var_rtbuf (s_rtbuf *rtb, unsigned int var)
{
int i;
- assert(var < rtb->fun->var_n);
+ assert(var < rtb->proc->in_n);
if ((i = rtb->var[var].rtb) < 0)
return 0;
return &g_rtbuf[i];
@@ -34,7 +34,7 @@ s_rtbuf * rtbuf_synth_synth_note_envelope (s_rtbuf *rtb, unsigned int i)
{
unsigned int j;
assert(i < RTBUF_MUSIC_NOTE_MAX);
- j = RTBUF_SYNTH_SYNTH_VAR_NOTE_ENVELOPE(i);
+ j = RTBUF_SYNTH_SYNTH_IN_NOTE_ENVELOPE(i);
return rtbuf_var_rtbuf(rtb, j);
}
@@ -43,7 +43,7 @@ s_rtbuf * rtbuf_synth_synth_note_oscillator (s_rtbuf *rtb,
{
unsigned int j;
assert(i < RTBUF_MUSIC_NOTE_MAX);
- j = RTBUF_SYNTH_SYNTH_VAR_NOTE_OSCILLATOR(i);
+ j = RTBUF_SYNTH_SYNTH_IN_NOTE_OSCILLATOR(i);
return rtbuf_var_rtbuf(rtb, j);
}
@@ -78,20 +78,20 @@ void rtbuf_synth_synth_delete_notes (s_rtbuf *rtb)
s_rtbuf * rtbuf_synth_synth_new_envelope (s_rtbuf *rtb,
unsigned int i)
{
- s_rtbuf *ref = rtbuf_var_rtbuf(rtb, RTBUF_SYNTH_SYNTH_VAR_ENVELOPE);
+ s_rtbuf *ref = rtbuf_var_rtbuf(rtb, RTBUF_SYNTH_SYNTH_IN_ENVELOPE);
int env_i;
s_rtbuf *env;
unsigned int env_vel;
unsigned int env_freq;
unsigned int env_start;
unsigned int env_stop;
- s_rtbuf_binding *v = &rtb->var[RTBUF_SYNTH_SYNTH_VAR_NOTES];
+ s_rtbuf_binding *v = &rtb->var[RTBUF_SYNTH_SYNTH_IN_NOTES];
unsigned int kbd_i = v->rtb;
unsigned int kbd_notes = v->out;
- unsigned int note_vel = RTBUF_MUSIC_NOTE_VAR_VELOCITY(kbd_notes, i);
- unsigned int note_freq = RTBUF_MUSIC_NOTE_VAR_FREQUENCY(kbd_notes, i);
- unsigned int note_start = RTBUF_MUSIC_NOTE_VAR_START(kbd_notes, i);
- unsigned int note_stop = RTBUF_MUSIC_NOTE_VAR_STOP(kbd_notes, i);
+ unsigned int note_vel = RTBUF_MUSIC_NOTE_IN_VELOCITY(kbd_notes, i);
+ unsigned int note_freq = RTBUF_MUSIC_NOTE_IN_FREQUENCY(kbd_notes, i);
+ unsigned int note_start = RTBUF_MUSIC_NOTE_IN_START(kbd_notes, i);
+ unsigned int note_stop = RTBUF_MUSIC_NOTE_IN_STOP(kbd_notes, i);
assert(rtb > g_rtbuf);
if (!ref)
return 0;
@@ -106,11 +106,11 @@ s_rtbuf * rtbuf_synth_synth_new_envelope (s_rtbuf *rtb,
rtbuf_bind(kbd_i, note_freq , env, env_freq);
rtbuf_bind(kbd_i, note_start, env, env_start);
rtbuf_bind(kbd_i, note_stop , env, env_stop);
- rtbuf_bind(env_i, 0, rtb, RTBUF_SYNTH_SYNTH_VAR_NOTE_ENVELOPE(i));
- if (env->fun->start)
- env->fun->start(env);
- if (env->fun->f)
- env->fun->f(env);
+ rtbuf_bind(env_i, 0, rtb, RTBUF_SYNTH_SYNTH_IN_NOTE_ENVELOPE(i));
+ if (env->proc->start)
+ env->proc->start(env);
+ if (env->proc->f)
+ env->proc->f(env);
//rtbuf_print_long(env_i);
printf("synth_synth_new_envelope %u\n", i);
return env;
@@ -120,14 +120,14 @@ s_rtbuf * rtbuf_synth_synth_new_oscillator (s_rtbuf *rtb,
unsigned int i)
{
s_rtbuf *ref =
- rtbuf_var_rtbuf(rtb, RTBUF_SYNTH_SYNTH_VAR_OSCILLATOR);
+ rtbuf_var_rtbuf(rtb, RTBUF_SYNTH_SYNTH_IN_OSCILLATOR);
int osc_i;
s_rtbuf *osc;
unsigned int osc_freq;
- s_rtbuf_binding *v = &rtb->var[RTBUF_SYNTH_SYNTH_VAR_NOTES];
+ s_rtbuf_binding *v = &rtb->var[RTBUF_SYNTH_SYNTH_IN_NOTES];
unsigned int kbd_i = v->rtb;
unsigned int kbd_notes = v->out;
- unsigned int note_freq = RTBUF_MUSIC_NOTE_VAR_FREQUENCY(kbd_notes, i);
+ unsigned int note_freq = RTBUF_MUSIC_NOTE_IN_FREQUENCY(kbd_notes, i);
assert(rtb > g_rtbuf);
if (!ref)
return 0;
@@ -136,11 +136,11 @@ s_rtbuf * rtbuf_synth_synth_new_oscillator (s_rtbuf *rtb,
osc = &g_rtbuf[osc_i];
osc_freq = rtbuf_var_find(osc, "frequency");
rtbuf_bind(kbd_i, note_freq, osc, osc_freq);
- rtbuf_bind(osc_i, 0, rtb, RTBUF_SYNTH_SYNTH_VAR_NOTE_OSCILLATOR(i));
- if (osc->fun->start)
- osc->fun->start(osc);
- if (osc->fun->f)
- osc->fun->f(osc);
+ rtbuf_bind(osc_i, 0, rtb, RTBUF_SYNTH_SYNTH_IN_NOTE_OSCILLATOR(i));
+ if (osc->proc->start)
+ osc->proc->start(osc);
+ if (osc->proc->f)
+ osc->proc->f(osc);
//rtbuf_print_long(osc_i);
return osc;
}
@@ -149,22 +149,22 @@ void rtbuf_synth_synth_update_note_signal (s_rtbuf *rtb,
unsigned int i)
{
s_rtbuf_synth_synth_data *data;
- s_rtbuf_signal_fun env;
- s_rtbuf_signal_fun osc;
+ s_rtbuf_signal_proc env;
+ s_rtbuf_signal_proc osc;
unsigned int j = 0;
double *signal;
assert(rtb);
assert(rtb->data);
assert(i < RTBUF_MUSIC_NOTE_MAX);
- rtbuf_signal_fun(rtb, RTBUF_SYNTH_SYNTH_VAR_NOTE_ENVELOPE(i), &env,
- &g_rtbuf_signal_sample_zero);
- rtbuf_signal_fun(rtb, RTBUF_SYNTH_SYNTH_VAR_NOTE_OSCILLATOR(i), &osc,
- &g_rtbuf_signal_sample_zero);
+ rtbuf_signal_proc(rtb, RTBUF_SYNTH_SYNTH_IN_NOTE_ENVELOPE(i), &env,
+ &g_rtbuf_signal_sample_zero);
+ rtbuf_signal_proc(rtb, RTBUF_SYNTH_SYNTH_IN_NOTE_OSCILLATOR(i), &osc,
+ &g_rtbuf_signal_sample_zero);
data = (s_rtbuf_synth_synth_data *) rtb->data;
signal = data->signal;
while (j < RTBUF_SIGNAL_SAMPLES) {
- double e = env.sample_fun(env.signal, j);
- double o = osc.sample_fun(osc.signal, j);
+ double e = env.sample_proc(env.signal, j);
+ double o = osc.sample_proc(osc.signal, j);
e = max(0.0, e);
*signal += e * o;
//printf(" e=%f o=%f s=%f", e, o, *signal);
@@ -178,7 +178,7 @@ void rtbuf_synth_synth_update_note (s_rtbuf *rtb,
{
s_rtbuf_synth_synth_data *data;
s_rtbuf_music_notes *notes =
- rtbuf_music_notes(rtb, RTBUF_SYNTH_SYNTH_VAR_NOTES);
+ rtbuf_music_notes(rtb, RTBUF_SYNTH_SYNTH_IN_NOTES);
s_rtbuf_music_note *note;
assert(notes);
assert(i < RTBUF_MUSIC_NOTE_MAX);
@@ -196,7 +196,7 @@ void rtbuf_synth_synth_update_note (s_rtbuf *rtb,
data->note_n++;
}
if (env && osc) {
- unsigned int env_state_out = rtbuf_fun_out_find(env->fun,
+ unsigned int env_state_out = rtbuf_proc_out_find(env->proc,
"state");
int env_state = rtbuf_out_int(env, env_state_out,
RTBUF_SYNTH_ENVELOPE_STATE_STARTED);
@@ -211,7 +211,7 @@ void rtbuf_synth_synth_update_note (s_rtbuf *rtb,
int rtbuf_synth_synth (s_rtbuf *rtb)
{
s_rtbuf_music_notes *notes =
- rtbuf_music_notes(rtb, RTBUF_SYNTH_SYNTH_VAR_NOTES);
+ rtbuf_music_notes(rtb, RTBUF_SYNTH_SYNTH_IN_NOTES);
s_rtbuf_synth_synth_data *data;
unsigned int i = 0;
unsigned int notes_n = notes ? notes->note_n : 0;
@@ -234,7 +234,7 @@ int rtbuf_synth_synth (s_rtbuf *rtb)
int rtbuf_synth_synth_start (s_rtbuf *rtb)
{
s_rtbuf_synth_synth_data *data;
- assert(rtb->fun->out_bytes == sizeof(*data));
+ assert(rtb->proc->out_bytes == sizeof(*data));
data = (s_rtbuf_synth_synth_data*) rtb->data;
return 0;
}
diff --git a/rtbuf_synth_type.c b/rtbuf_synth_type.c
index 4dc0f40..c127198 100644
--- a/rtbuf_synth_type.c
+++ b/rtbuf_synth_type.c
@@ -4,12 +4,12 @@
#include "rtbuf_music.h"
#include "rtbuf_music_type.h"
-void notes_var ()
+void notes_in ()
{
unsigned int i = 0;
const char *st = "RTBUF_SIGNAL_TYPE";
printf("\n"
- "#define RTBUF_SYNTH_NOTES_VAR(note) \\\n");
+ "#define RTBUF_SYNTH_NOTES_IN(note) \\\n");
while (i < RTBUF_MUSIC_NOTE_MAX) {
printf(" { note \"[%u].envelope\" , %s }, \\\n", i, st);
printf(" { note \"[%u].oscillator\", %s }", i, st);
@@ -20,7 +20,7 @@ void notes_var ()
}
i = 0;
printf("\n"
- "#define RTBUF_SYNTH_NOTES_VAR_ENUM(note) \\\n");
+ "#define RTBUF_SYNTH_NOTES_IN_ENUM(note) \\\n");
while (i < RTBUF_MUSIC_NOTE_MAX) {
printf(" note ## _%u_ENVELOPE , \\\n", i);
printf(" note ## _%u_OSCILLATOR", i);
@@ -38,7 +38,7 @@ int main ()
"#define RTBUF_SYNTH_TYPE_H\n"
"\n"
"#include \"rtbuf_signal_type.h\"\n");
- notes_var();
+ notes_in();
printf("\n"
"#endif\n");
return 0;