[SCM] gsequencer/upstream: final fixes
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sun Jun 14 16:07:04 UTC 2015
The following commit has been merged in the upstream branch:
commit 997b04b9377789f03be8cf2bc558eda6c8d163e3
Author: Joël Krähemann <weedlight at gmail.com>
Date: Thu Apr 23 21:39:02 2015 +0000
final fixes
diff --git a/.deps/ags-ags_drum_callbacks.Po b/.deps/ags-ags_drum_callbacks.Po
index e874760..884a2ad 100644
--- a/.deps/ags-ags_drum_callbacks.Po
+++ b/.deps/ags-ags_drum_callbacks.Po
@@ -604,10 +604,10 @@ ags-ags_drum_callbacks.o: src/ags/X/machine/ags_drum_callbacks.c \
src/ags/X/ags_audio_preferences.h \
src/ags/X/ags_performance_preferences.h \
src/ags/X/ags_server_preferences.h src/ags/widget/ags_led.h \
- src/ags/audio/ags_input.h /usr/include/glib-2.0/glib/gstdio.h \
- /usr/include/glib-2.0/glib/gprintf.h /usr/include/sys/stat.h \
- src/ags/audio/ags_output.h src/ags/audio/ags_pattern.h \
- src/ags/audio/task/ags_toggle_pattern_bit.h \
+ src/ags/thread/ags_mutex_manager.h src/ags/audio/ags_input.h \
+ /usr/include/glib-2.0/glib/gstdio.h /usr/include/glib-2.0/glib/gprintf.h \
+ /usr/include/sys/stat.h src/ags/audio/ags_output.h \
+ src/ags/audio/ags_pattern.h src/ags/audio/task/ags_toggle_pattern_bit.h \
src/ags/audio/task/ags_toggle_led.h \
src/ags/audio/task/recall/ags_apply_bpm.h \
src/ags/audio/task/recall/ags_apply_sequencer_length.h \
@@ -2124,6 +2124,8 @@ src/ags/X/ags_server_preferences.h:
src/ags/widget/ags_led.h:
+src/ags/thread/ags_mutex_manager.h:
+
src/ags/audio/ags_input.h:
/usr/include/glib-2.0/glib/gstdio.h:
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index df5eb39..7034c41 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -63,106 +63,106 @@
'configure.ac'
],
{
- 'm4_pattern_forbid' => 1,
+ 'gt_INTDIV0' => 1,
+ 'gt_TYPE_INTMAX_T' => 1,
+ 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'gl_XSIZE' => 1,
+ '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+ 'AC_DEFUN' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AM_MISSING_PROG' => 1,
'm4_pattern_allow' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
'_AM_MANGLE_OPTION' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AC_LIB_HAVE_LINKFLAGS' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_NLS' => 1,
+ 'gl_THREADLIB_EARLY' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'gt_GLIBC2' => 1,
+ 'AM_PO_SUBDIRS' => 1,
'PKG_PROG_PKG_CONFIG' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- '_AM_SET_OPTION' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AM_MAKE_INCLUDE' => 1,
+ 'AC_LIB_PREPARE_MULTILIB' => 1,
+ 'AM_ICONV_LINK' => 1,
+ 'gl_AC_TYPE_UINTMAX_T' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'include' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_' => 1,
- 'gl_THREADLIB_EARLY' => 1,
+ 'AC_LIB_PREPARE_PREFIX' => 1,
+ 'gl_DISABLE_THREADS' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'gl_SIZE_MAX' => 1,
'AM_CONDITIONAL' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
'AC_LIB_RPATH' => 1,
- 'AU_DEFUN' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AC_LIB_LINKFLAGS_BODY' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'gt_TYPE_WINT_T' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'm4_include' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AM_GNU_GETTEXT_NEED' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'gl_THREADLIB' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'AC_LIB_PROG_LD' => 1,
- 'AC_DEFUN_ONCE' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ '_m4_warn' => 1,
'PKG_CHECK_EXISTS' => 1,
- 'AM_ICONV_LINKFLAGS_BODY' => 1,
'AC_LIB_FROMPACKAGE' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'gl_GLIBC21' => 1,
'_AM_PROG_TAR' => 1,
- 'm4_include' => 1,
- 'gt_GLIBC2' => 1,
- 'AC_LIB_WITH_FINAL_PREFIX' => 1,
- '_m4_warn' => 1,
- 'gt_TYPE_INTMAX_T' => 1,
- 'include' => 1,
- 'gl_DISABLE_THREADS' => 1,
- 'AM_INTL_SUBDIR' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_LIB_APPENDTOVAR' => 1,
- 'AM_RUN_LOG' => 1,
- 'gt_INTL_MACOSX' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'AC_COMPUTE_INT' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'gl_FCNTL_O_FLAGS' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'gt_PRINTF_POSIX' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AM_PROG_MKDIR_P' => 1,
- 'gl_LOCK' => 1,
+ 'AU_DEFUN' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ 'gl_VISIBILITY' => 1,
+ 'gl_THREADLIB_EARLY_BODY' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'gt_INTTYPES_PRI' => 1,
'gl_AC_HEADER_STDINT_H' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'AC_COMPUTE_INT' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
'_AM_SUBST_NOTMAKE' => 1,
- 'gt_TYPE_WCHAR_T' => 1,
- 'AM_DEP_TRACK' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'AC_' => 1,
'gt_CHECK_DECL' => 1,
+ 'gl_THREADLIB_BODY' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'gt_TYPE_WCHAR_T' => 1,
+ 'AC_LIB_PREFIX' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_PO_SUBDIRS' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
'AM_ICONV' => 1,
- 'AC_LIB_ARG_WITH' => 1,
- 'gl_AC_TYPE_UINTMAX_T' => 1,
- 'gl_THREADLIB' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
+ 'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'gl_LOCK' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'AC_LIB_WITH_FINAL_PREFIX' => 1,
'AM_SET_DEPDIR' => 1,
- 'gt_TYPE_WINT_T' => 1,
- 'AM_NLS' => 1,
- 'AC_LIB_PREFIX' => 1,
- 'gt_INTTYPES_PRI' => 1,
- 'AM_SILENT_RULES' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_LIB_PREPARE_PREFIX' => 1,
- '_AM_SET_OPTIONS' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'gt_INTL_SUBDIR_CORE' => 1,
+ 'gt_INTL_MACOSX' => 1,
'AC_TYPE_LONG_LONG_INT' => 1,
- '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- 'AC_DEFUN' => 1,
- 'gt_PRINTF_POSIX' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
- 'AM_GNU_GETTEXT_NEED' => 1,
- 'AC_LIB_PROG_LD_GNU' => 1,
- 'gl_SIZE_MAX' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
- 'AM_ICONV_LINK' => 1,
- 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'gl_VISIBILITY' => 1,
- 'AC_LIB_PREPARE_MULTILIB' => 1,
- 'gl_THREADLIB_BODY' => 1,
- 'AC_LIB_LINKFLAGS' => 1,
- 'gl_PREREQ_LOCK' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'gl_FCNTL_O_FLAGS' => 1,
+ 'AM_INTL_SUBDIR' => 1,
'_AM_IF_OPTION' => 1,
- 'gt_INTDIV0' => 1,
- 'AM_LANGINFO_CODESET' => 1,
- 'gt_LC_MESSAGES' => 1,
- 'gl_GLIBC21' => 1,
- 'gl_THREADLIB_EARLY_BODY' => 1,
- 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'gl_AC_HEADER_INTTYPES_H' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'gl_XSIZE' => 1
+ 'gt_INTL_SUBDIR_CORE' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -177,65 +177,65 @@
'configure.ac'
],
{
- '_m4_warn' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AM_POT_TOOLS' => 1,
+ '_AM_COND_ELSE' => 1,
+ 'AH_OUTPUT' => 1,
'include' => 1,
- 'm4_include' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'm4_sinclude' => 1,
- 'sinclude' => 1,
+ 'AM_SILENT_RULES' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AM_GNU_GETTEXT' => 1,
'AM_PROG_AR' => 1,
- 'AM_POT_TOOLS' => 1,
- 'AC_CANONICAL_BUILD' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AM_PROG_FC_C_O' => 1,
+ 'AC_FC_FREEFORM' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_SUBST' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'm4_sinclude' => 1,
+ 'm4_pattern_forbid' => 1,
'LT_INIT' => 1,
- 'AM_PROG_F77_C_O' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AM_NLS' => 1,
'AM_INIT_AUTOMAKE' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_PROG_MKDIR_P' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'm4_include' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ '_m4_warn' => 1,
'AC_INIT' => 1,
- 'AC_SUBST' => 1,
- 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
'AC_SUBST_TRACE' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
'AC_FC_PP_SRCEXT' => 1,
- 'AM_SILENT_RULES' => 1,
- '_AM_COND_IF' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'AM_NLS' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'_AM_COND_ENDIF' => 1,
- 'AH_OUTPUT' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AM_PATH_GUILE' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- '_AM_COND_ELSE' => 1,
- 'm4_pattern_allow' => 1,
- 'm4_pattern_forbid' => 1,
'AC_CONFIG_LINKS' => 1,
+ 'AC_CONFIG_FILES' => 1,
'AM_PROG_CXX_C_O' => 1,
'AM_CONDITIONAL' => 1,
- 'AC_FC_SRCEXT' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- 'AM_PROG_FC_C_O' => 1,
- 'AC_FC_PP_DEFINE' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AM_PROG_MOC' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'AC_CONFIG_AUX_DIR' => 1
+ 'AC_PROG_LIBTOOL' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ '_AM_COND_IF' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'sinclude' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -301,114 +301,114 @@
'configure.ac'
],
{
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'AC_LIB_PROG_LD' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'AC_DEFUN_ONCE' => 1,
- '_AM_PROG_TAR' => 1,
- 'm4_include' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AM_NLS' => 1,
+ 'gl_THREADLIB_EARLY' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'PKG_INSTALLDIR' => 1,
'AM_ICONV_LINKFLAGS_BODY' => 1,
- 'AC_LIB_FROMPACKAGE' => 1,
- 'gl_DISABLE_THREADS' => 1,
- 'include' => 1,
- 'gt_GLIBC2' => 1,
- 'AC_LIB_WITH_FINAL_PREFIX' => 1,
- '_m4_warn' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'gt_INTDIV0' => 1,
'gt_TYPE_INTMAX_T' => 1,
+ '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+ 'AC_DEFUN' => 1,
+ 'gl_XSIZE' => 1,
+ 'include' => 1,
'AM_PROG_INSTALL_SH' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'AM_INTL_SUBDIR' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- 'AC_LIB_APPENDTOVAR' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'AM_RUN_LOG' => 1,
- 'gt_INTL_MACOSX' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AC_LIB_PREPARE_PREFIX' => 1,
+ 'gl_DISABLE_THREADS' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+ 'AM_PO_SUBDIRS' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'AC_LIB_PREPARE_MULTILIB' => 1,
+ 'AM_ICONV_LINK' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'gt_GLIBC2' => 1,
+ 'gl_AC_TYPE_UINTMAX_T' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
'AM_MISSING_HAS_RUN' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'PKG_CHECK_VAR' => 1,
- 'AC_COMPUTE_INT' => 1,
- 'gl_FCNTL_O_FLAGS' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'gl_LOCK' => 1,
- 'gl_AC_HEADER_STDINT_H' => 1,
- 'gt_TYPE_WCHAR_T' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'AM_DEP_TRACK' => 1,
- 'm4_pattern_allow' => 1,
- 'gl_EXTERN_INLINE' => 1,
- 'm4_pattern_forbid' => 1,
- '_AM_MANGLE_OPTION' => 1,
+ 'AC_LIB_RPATH' => 1,
+ 'gt_TYPE_WINT_T' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'gl_SIZE_MAX' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'AM_CONDITIONAL' => 1,
'PKG_NOARCH_INSTALLDIR' => 1,
- 'AM_MISSING_PROG' => 1,
+ 'AC_LIB_FROMPACKAGE' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ 'm4_include' => 1,
+ 'AM_GNU_GETTEXT_NEED' => 1,
+ 'AM_DEP_TRACK' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIB_HAVE_LINKFLAGS' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ '_m4_warn' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'gl_THREADLIB' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- '_AM_SET_OPTION' => 1,
+ 'gt_PRINTF_POSIX' => 1,
'AM_MAKE_INCLUDE' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AC_' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'gl_THREADLIB_EARLY' => 1,
- 'AC_LIB_RPATH' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'AM_CONDITIONAL' => 1,
+ 'gl_VISIBILITY' => 1,
+ 'gl_THREADLIB_EARLY_BODY' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AU_DEFUN' => 1,
'AM_SANITY_CHECK' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'gl_GLIBC21' => 1,
+ 'gt_GL_ATTRIBUTE' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ '_AM_SET_OPTION' => 1,
+ '_AM_PROG_TAR' => 1,
'AC_LIB_LINKFLAGS_BODY' => 1,
- 'AU_DEFUN' => 1,
- 'AM_GNU_GETTEXT_NEED' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
- 'gt_PRINTF_POSIX' => 1,
- 'AC_LIB_PROG_LD_GNU' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
- 'AM_ICONV_LINK' => 1,
- 'gl_SIZE_MAX' => 1,
- 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'PKG_CHECK_VAR' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_' => 1,
'gl_THREADLIB_BODY' => 1,
- 'AC_LIB_LINKFLAGS' => 1,
- 'PKG_INSTALLDIR' => 1,
- 'gl_VISIBILITY' => 1,
- 'AC_LIB_PREPARE_MULTILIB' => 1,
- '_AM_IF_OPTION' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ 'AC_COMPUTE_INT' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'gt_INTTYPES_PRI' => 1,
+ 'gl_AC_HEADER_STDINT_H' => 1,
+ '_AM_SET_OPTIONS' => 1,
'gl_PREREQ_LOCK' => 1,
- 'gt_INTDIV0' => 1,
- 'AM_LANGINFO_CODESET' => 1,
'gt_LC_MESSAGES' => 1,
- 'gl_THREADLIB_EARLY_BODY' => 1,
'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'gl_GLIBC21' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
'gl_AC_HEADER_INTTYPES_H' => 1,
- 'gt_GL_ATTRIBUTE' => 1,
- 'gl_XSIZE' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_ICONV' => 1,
- 'AM_PO_SUBDIRS' => 1,
- 'AC_LIB_ARG_WITH' => 1,
- 'gl_THREADLIB' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- 'gl_AC_TYPE_UINTMAX_T' => 1,
+ 'gl_LOCK' => 1,
'AM_SET_DEPDIR' => 1,
- 'AM_NLS' => 1,
- 'gt_TYPE_WINT_T' => 1,
- 'gt_INTTYPES_PRI' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ 'AC_LIB_WITH_FINAL_PREFIX' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'gt_TYPE_WCHAR_T' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LIB_PREFIX' => 1,
- 'AM_SILENT_RULES' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_LIB_PREPARE_PREFIX' => 1,
- '_AM_SET_OPTIONS' => 1,
+ '_AM_IF_OPTION' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AM_INTL_SUBDIR' => 1,
+ 'gl_EXTERN_INLINE' => 1,
'gt_INTL_SUBDIR_CORE' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ 'AC_TYPE_LONG_LONG_INT' => 1,
'AM_PROG_CC_C_O' => 1,
- '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- 'AC_DEFUN' => 1,
- 'AC_TYPE_LONG_LONG_INT' => 1
+ 'AC_DEFUN_ONCE' => 1,
+ 'gl_FCNTL_O_FLAGS' => 1
}
], 'Autom4te::Request' )
);
diff --git a/config.log b/config.log
index ea6cdb1..ea9c8fb 100644
--- a/config.log
+++ b/config.log
@@ -1205,7 +1205,7 @@ configure:8169: result: yes
configure:8169: checking for pthread.h
configure:8169: result: yes
configure:8207: gcc -o conftest -g -O2 conftest.c -lrt -lm -ldl >&5
-/usr/bin/ld: /tmp/ccleTYWh.o: undefined reference to symbol 'pthread_mutexattr_init@@GLIBC_2.2.5'
+/usr/bin/ld: /tmp/cckPtg4n.o: undefined reference to symbol 'pthread_mutexattr_init@@GLIBC_2.2.5'
/lib64/libpthread.so.0: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
configure:8207: $? = 1
diff --git a/src/ags/X/machine/ags_drum_callbacks.c b/src/ags/X/machine/ags_drum_callbacks.c
index 9081bad..f38be11 100644
--- a/src/ags/X/machine/ags_drum_callbacks.c
+++ b/src/ags/X/machine/ags_drum_callbacks.c
@@ -25,6 +25,7 @@
#include <ags/widget/ags_led.h>
+#include <ags/thread/ags_mutex_manager.h>
#include <ags/thread/ags_audio_loop.h>
#include <ags/thread/ags_task_thread.h>
@@ -67,6 +68,7 @@
#define AGS_DRUM_PLAY_RECALL "AgsDrumPlayRecall\0"
extern const char *AGS_DRUM_INDEX;
+extern pthread_mutex_t ags_application_mutex;
void
ags_drum_parent_set_callback(GtkWidget *widget, GtkObject *old_parent, AgsDrum *drum)
@@ -118,9 +120,25 @@ void
ags_drum_loop_button_callback(GtkWidget *button, AgsDrum *drum)
{
AgsCountBeatsAudio *count_beats_audio;
+
+ AgsMutexManager *mutex_manager;
+
GList *list;
gboolean loop;
+ pthread_mutex_t *audio_mutex;
+
+ pthread_mutex_lock(&(ags_application_mutex));
+
+ mutex_manager = ags_mutex_manager_get_instance();
+
+ audio_mutex = ags_mutex_manager_lookup(mutex_manager,
+ (GObject *) AGS_MACHINE(drum)->audio);
+
+ pthread_mutex_unlock(&(ags_application_mutex));
+
+ pthread_mutex_lock(audio_mutex);
+
loop = (GTK_TOGGLE_BUTTON(button)->active) ? TRUE: FALSE;
/* AgsCopyPatternAudio */
@@ -146,15 +164,33 @@ ags_drum_loop_button_callback(GtkWidget *button, AgsDrum *drum)
list = list->next;
}
+ pthread_mutex_unlock(audio_mutex);
}
void
ags_drum_length_spin_callback(GtkWidget *spin_button, AgsDrum *drum)
{
AgsWindow *window;
+
AgsApplySequencerLength *apply_sequencer_length;
+
+ AgsMutexManager *mutex_manager;
+
gdouble length;
+ pthread_mutex_t *audio_mutex;
+
+ pthread_mutex_lock(&(ags_application_mutex));
+
+ mutex_manager = ags_mutex_manager_get_instance();
+
+ audio_mutex = ags_mutex_manager_lookup(mutex_manager,
+ (GObject *) AGS_MACHINE(drum)->audio);
+
+ pthread_mutex_unlock(&(ags_application_mutex));
+
+ pthread_mutex_lock(audio_mutex);
+
window = (AgsWindow *) gtk_widget_get_toplevel(GTK_WIDGET(drum));
length = GTK_SPIN_BUTTON(spin_button)->adjustment->value;
@@ -164,11 +200,28 @@ ags_drum_length_spin_callback(GtkWidget *spin_button, AgsDrum *drum)
ags_task_thread_append_task(AGS_TASK_THREAD(AGS_AUDIO_LOOP(AGS_MAIN(window->ags_main)->main_loop)->task_thread),
AGS_TASK(apply_sequencer_length));
+
+ pthread_mutex_unlock(audio_mutex);
}
void
ags_drum_index0_callback(GtkWidget *widget, AgsDrum *drum)
{
+ AgsMutexManager *mutex_manager;
+
+ pthread_mutex_t *audio_mutex;
+
+ pthread_mutex_lock(&(ags_application_mutex));
+
+ mutex_manager = ags_mutex_manager_get_instance();
+
+ audio_mutex = ags_mutex_manager_lookup(mutex_manager,
+ (GObject *) AGS_MACHINE(drum)->audio);
+
+ pthread_mutex_unlock(&(ags_application_mutex));
+
+ pthread_mutex_lock(audio_mutex);
+
if(drum->selected0 != NULL){
GtkToggleButton *toggle_button;
@@ -223,11 +276,28 @@ ags_drum_index0_callback(GtkWidget *widget, AgsDrum *drum)
ags_drum_set_pattern(drum);
}
+
+ pthread_mutex_unlock(audio_mutex);
}
void
ags_drum_index1_callback(GtkWidget *widget, AgsDrum *drum)
{
+ AgsMutexManager *mutex_manager;
+
+ pthread_mutex_t *audio_mutex;
+
+ pthread_mutex_lock(&(ags_application_mutex));
+
+ mutex_manager = ags_mutex_manager_get_instance();
+
+ audio_mutex = ags_mutex_manager_lookup(mutex_manager,
+ (GObject *) AGS_MACHINE(drum)->audio);
+
+ pthread_mutex_unlock(&(ags_application_mutex));
+
+ pthread_mutex_lock(audio_mutex);
+
if(drum->selected1 != NULL){
GtkToggleButton *toggle_button;
@@ -282,19 +352,28 @@ ags_drum_index1_callback(GtkWidget *widget, AgsDrum *drum)
ags_drum_set_pattern(drum);
}
+
+ pthread_mutex_unlock(audio_mutex);
}
void
ags_drum_pad_callback(GtkWidget *toggle_button, AgsDrum *drum)
{
AgsLine *selected_line;
+
AgsPattern *pattern;
+
AgsTogglePatternBit *toggle_pattern_bit;
+
+ AgsMutexManager *mutex_manager;
+
GList *list, *list_start;
GList *line, *line_start;
GList *tasks;
guint i, index0, index1, offset;
+ pthread_mutex_t *audio_mutex;
+
if(drum->selected_pad == NULL){
return;
}
@@ -306,6 +385,17 @@ ags_drum_pad_callback(GtkWidget *toggle_button, AgsDrum *drum)
return;
}
+
+ pthread_mutex_lock(&(ags_application_mutex));
+
+ mutex_manager = ags_mutex_manager_get_instance();
+
+ audio_mutex = ags_mutex_manager_lookup(mutex_manager,
+ (GObject *) AGS_MACHINE(drum)->audio);
+
+ pthread_mutex_unlock(&(ags_application_mutex));
+
+ pthread_mutex_lock(audio_mutex);
/* calculate offset */
list_start =
@@ -346,7 +436,6 @@ ags_drum_pad_callback(GtkWidget *toggle_button, AgsDrum *drum)
selected_line->channel->line,
index0, index1,
offset);
- g_message("found %d %x\0", selected_line->channel, selected_line->channel->pattern->data);
tasks = g_list_prepend(tasks,
toggle_pattern_bit);
@@ -359,6 +448,8 @@ ags_drum_pad_callback(GtkWidget *toggle_button, AgsDrum *drum)
/* append AgsTogglePatternBit */
ags_task_thread_append_tasks(AGS_TASK_THREAD(AGS_AUDIO_LOOP(AGS_MAIN(AGS_DEVOUT(AGS_MACHINE(drum)->audio->devout)->ags_main)->main_loop)->task_thread),
tasks);
+
+ pthread_mutex_unlock(audio_mutex);
}
void
@@ -373,13 +464,32 @@ ags_drum_tact_callback(AgsAudio *audio,
AgsDrum *drum)
{
AgsWindow *window;
+
AgsCountBeatsAudio *play_count_beats_audio;
AgsCountBeatsAudioRun *play_count_beats_audio_run;
AgsToggleLed *toggle_led;
+
+ AgsMutexManager *mutex_manager;
+
GList *list, *tmp;
guint counter, active_led;
gdouble active_led_old, active_led_new;
+
GValue value = {0,};
+
+ pthread_mutex_t *audio_mutex;
+
+ pthread_mutex_lock(&(ags_application_mutex));
+
+ mutex_manager = ags_mutex_manager_get_instance();
+
+ audio_mutex = ags_mutex_manager_lookup(mutex_manager,
+ (GObject *) AGS_MACHINE(drum)->audio);
+
+ pthread_mutex_unlock(&(ags_application_mutex));
+
+ pthread_mutex_lock(audio_mutex);
+
window = AGS_WINDOW(gtk_widget_get_ancestor((GtkWidget *) drum, AGS_TYPE_WINDOW));
@@ -420,6 +530,8 @@ ags_drum_tact_callback(AgsAudio *audio,
ags_task_thread_append_task(AGS_TASK_THREAD(AGS_AUDIO_LOOP(AGS_MAIN(window->ags_main)->main_loop)->task_thread),
AGS_TASK(toggle_led));
+
+ pthread_mutex_unlock(audio_mutex);
}
void
diff --git a/src/ags/audio/recall/ags_buffer_audio_signal.c b/src/ags/audio/recall/ags_buffer_audio_signal.c
index 2308633..123a237 100644
--- a/src/ags/audio/recall/ags_buffer_audio_signal.c
+++ b/src/ags/audio/recall/ags_buffer_audio_signal.c
@@ -337,14 +337,16 @@ ags_buffer_audio_signal_run_inter(AgsRecall *recall)
stream_destination = destination->stream_current;
- if(stream_destination->next == NULL){
- ags_audio_signal_add_stream(destination);
- }
+ if(stream_destination != NULL){
+ if(stream_destination->next == NULL){
+ ags_audio_signal_add_stream(destination);
+ }
- //TODO:JK: in future release buffer size may differ
- ags_audio_signal_copy_buffer_to_buffer((signed short *) stream_destination->data, 1,
- (signed short *) stream_source->data, 1,
- source->buffer_size);
+ //TODO:JK: in future release buffer size may differ
+ ags_audio_signal_copy_buffer_to_buffer((signed short *) stream_destination->data, 1,
+ (signed short *) stream_source->data, 1,
+ source->buffer_size);
+ }
}
AgsRecall*
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list