[SCM] gsequencer/upstream: fixed export to WAV
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sun Jun 14 16:07:00 UTC 2015
The following commit has been merged in the upstream branch:
commit 360107eb96bf5e37f29d44cab3ea2ee74ae5f22b
Author: Joël Krähemann <weedlight at gmail.com>
Date: Sat Apr 11 04:48:38 2015 +0000
fixed export to WAV
diff --git a/.deps/ags-ags_export_window_callbacks.Po b/.deps/ags-ags_export_window_callbacks.Po
index 29c5f74..a5f62d2 100644
--- a/.deps/ags-ags_export_window_callbacks.Po
+++ b/.deps/ags-ags_export_window_callbacks.Po
@@ -604,8 +604,8 @@ ags-ags_export_window_callbacks.o: \
src/ags/X/ags_navigation.h src/ags/X/ags_preferences.h \
src/ags/X/ags_generic_preferences.h src/ags/X/ags_audio_preferences.h \
src/ags/X/ags_performance_preferences.h \
- src/ags/X/ags_server_preferences.h src/ags/thread/ags_export_thread.h \
- src/ags/audio/file/ags_audio_file.h \
+ src/ags/X/ags_server_preferences.h src/ags/thread/ags_mutex_manager.h \
+ src/ags/thread/ags_export_thread.h src/ags/audio/file/ags_audio_file.h \
src/ags/audio/task/ags_export_output.h
/usr/include/stdc-predef.h:
@@ -2110,6 +2110,8 @@ src/ags/X/ags_performance_preferences.h:
src/ags/X/ags_server_preferences.h:
+src/ags/thread/ags_mutex_manager.h:
+
src/ags/thread/ags_export_thread.h:
src/ags/audio/file/ags_audio_file.h:
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index faa3fbe..98e647b 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -63,106 +63,106 @@
'configure.ac'
],
{
- 'AC_' => 1,
- 'AM_RUN_LOG' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'gl_THREADLIB_EARLY' => 1,
- 'gl_THREADLIB_EARLY_BODY' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AM_LANGINFO_CODESET' => 1,
- 'gl_THREADLIB' => 1,
- 'AM_SILENT_RULES' => 1,
- '_m4_warn' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'gl_SIZE_MAX' => 1,
- 'gl_LOCK' => 1,
- 'AC_TYPE_LONG_LONG_INT' => 1,
- 'm4_pattern_forbid' => 1,
- 'gl_AC_TYPE_UINTMAX_T' => 1,
- 'gl_GLIBC21' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'gt_TYPE_WINT_T' => 1,
- 'gt_INTDIV0' => 1,
- 'AM_ICONV_LINKFLAGS_BODY' => 1,
- 'gl_FCNTL_O_FLAGS' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
- 'gt_CHECK_DECL' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'gl_DISABLE_THREADS' => 1,
+ 'AM_ICONV' => 1,
+ 'gt_TYPE_INTMAX_T' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ 'AM_INTL_SUBDIR' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
'AC_LIB_FROMPACKAGE' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AM_PO_SUBDIRS' => 1,
'_AM_DEPENDENCIES' => 1,
- 'AU_DEFUN' => 1,
+ 'AC_LIB_WITH_FINAL_PREFIX' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AM_SANITY_CHECK' => 1,
'gt_INTTYPES_PRI' => 1,
- 'AC_LIB_PROG_LD_GNU' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_LIB_HAVE_LINKFLAGS' => 1,
- 'gt_TYPE_INTMAX_T' => 1,
+ 'gt_TYPE_WINT_T' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'AU_DEFUN' => 1,
+ 'gl_AC_HEADER_INTTYPES_H' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'm4_pattern_allow' => 1,
'AM_PROG_MKDIR_P' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'gt_CHECK_DECL' => 1,
+ 'AC_TYPE_LONG_LONG_INT' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'gl_AC_TYPE_UINTMAX_T' => 1,
+ 'gt_INTDIV0' => 1,
+ 'AM_ICONV_LINK' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'gl_DISABLE_THREADS' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ 'AM_SET_DEPDIR' => 1,
'AC_COMPUTE_INT' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'gl_VISIBILITY' => 1,
+ 'AC_LIB_RPATH' => 1,
+ 'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
'AM_NLS' => 1,
- 'AC_LIB_ARG_WITH' => 1,
+ '_AM_SET_OPTIONS' => 1,
'AM_SET_LEADING_DOT' => 1,
- 'gl_PREREQ_LOCK' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
+ 'AC_LIB_PREPARE_MULTILIB' => 1,
'gl_XSIZE' => 1,
- 'AC_LIB_APPENDTOVAR' => 1,
- 'AC_DEFUN' => 1,
- 'gl_VISIBILITY' => 1,
- 'AC_LIB_PREPARE_PREFIX' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'gl_THREADLIB_BODY' => 1,
- 'gt_INTL_MACOSX' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- '_AM_IF_OPTION' => 1,
- 'AC_LIB_PREFIX' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'gt_INTL_SUBDIR_CORE' => 1,
- '_AM_PROG_TAR' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+ 'gl_SIZE_MAX' => 1,
+ 'gl_LOCK' => 1,
+ 'gt_GLIBC2' => 1,
'gt_TYPE_WCHAR_T' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ 'm4_include' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_SUBST_NOTMAKE' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'gl_THREADLIB_EARLY' => 1,
+ 'AM_SILENT_RULES' => 1,
'AM_MAKE_INCLUDE' => 1,
- 'AC_LIB_LINKFLAGS_BODY' => 1,
- 'm4_include' => 1,
- 'AM_INTL_SUBDIR' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AM_ICONV_LINK' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'gl_FCNTL_O_FLAGS' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AC_LIB_PREPARE_PREFIX' => 1,
+ 'AC_' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
'AM_GNU_GETTEXT_NEED' => 1,
- '_AM_SET_OPTION' => 1,
- 'gt_GLIBC2' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AC_DEFUN' => 1,
+ 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ '_m4_warn' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
'include' => 1,
- 'AC_LIB_WITH_FINAL_PREFIX' => 1,
- 'gt_LC_MESSAGES' => 1,
+ 'gl_THREADLIB_EARLY_BODY' => 1,
+ 'gl_THREADLIB' => 1,
'gt_PRINTF_POSIX' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'gt_INTL_SUBDIR_CORE' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
'AC_LIB_LINKFLAGS' => 1,
- 'AM_SANITY_CHECK' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'AC_LIB_PROG_LD' => 1,
- 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AM_PO_SUBDIRS' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'gl_AC_HEADER_INTTYPES_H' => 1,
- 'AM_DEP_TRACK' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'm4_pattern_forbid' => 1,
'gl_AC_HEADER_STDINT_H' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'AC_LIB_PREPARE_MULTILIB' => 1,
- 'AM_ICONV' => 1,
- 'AC_LIB_RPATH' => 1,
- 'm4_pattern_allow' => 1,
- 'PKG_CHECK_MODULES' => 1
+ 'gl_GLIBC21' => 1,
+ 'AC_LIB_PREFIX' => 1,
+ 'gl_THREADLIB_BODY' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -177,65 +177,65 @@
'configure.ac'
],
{
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AM_NLS' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AM_CONDITIONAL' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AM_POT_TOOLS' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'AC_FC_FREEFORM' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
+ 'm4_sinclude' => 1,
+ '_m4_warn' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'include' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'm4_pattern_allow' => 1,
'_AM_COND_ENDIF' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'AM_PROG_CXX_C_O' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
'AC_SUBST' => 1,
- 'AM_PROG_MOC' => 1,
- 'AH_OUTPUT' => 1,
- 'AC_INIT' => 1,
- 'm4_pattern_allow' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_CONFIG_HEADERS' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
'AC_SUBST_TRACE' => 1,
- 'AC_CANONICAL_HOST' => 1,
- '_AM_COND_IF' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_POT_TOOLS' => 1,
- 'AM_PATH_GUILE' => 1,
- 'm4_sinclude' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
'_AM_COND_ELSE' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AM_PROG_FC_C_O' => 1,
+ 'AC_INIT' => 1,
+ 'AM_NLS' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'LT_INIT' => 1,
'AM_PROG_AR' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'AC_FC_SRCEXT' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'AC_CANONICAL_TARGET' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'LT_INIT' => 1,
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AM_PROG_FC_C_O' => 1,
+ 'AM_PROG_MOC' => 1,
'm4_include' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- '_m4_warn' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_SILENT_RULES' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AC_FC_PP_DEFINE' => 1,
- 'include' => 1,
- 'AC_LIBSOURCE' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ '_AM_COND_IF' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'AM_GNU_GETTEXT' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
'sinclude' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
- 'AM_PROG_F77_C_O' => 1
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_PATH_GUILE' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -301,114 +301,114 @@
'configure.ac'
],
{
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'AM_ICONV_LINK' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- 'AC_LIB_LINKFLAGS_BODY' => 1,
- 'm4_include' => 1,
- 'AM_INTL_SUBDIR' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'gt_TYPE_WCHAR_T' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- '_AM_PROG_TAR' => 1,
- 'gt_LC_MESSAGES' => 1,
+ 'AC_LIB_FROMPACKAGE' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'gt_GL_ATTRIBUTE' => 1,
+ '_AM_DEPENDENCIES' => 1,
'AC_LIB_WITH_FINAL_PREFIX' => 1,
- 'PKG_NOARCH_INSTALLDIR' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'include' => 1,
- 'PKG_INSTALLDIR' => 1,
- 'AM_GNU_GETTEXT_NEED' => 1,
- 'gt_GLIBC2' => 1,
- '_AM_SET_OPTION' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AM_CONDITIONAL' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'PKG_CHECK_VAR' => 1,
'AM_PO_SUBDIRS' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'AC_LIB_PROG_LD' => 1,
- 'gt_PRINTF_POSIX' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AM_SANITY_CHECK' => 1,
- 'AC_LIB_LINKFLAGS' => 1,
- 'AC_LIB_PREPARE_MULTILIB' => 1,
+ 'gt_INTTYPES_PRI' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'gt_TYPE_INTMAX_T' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'AM_ICONV' => 1,
- 'PKG_CHECK_VAR' => 1,
- 'AC_LIB_RPATH' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ 'AM_INTL_SUBDIR' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ '_AM_SET_OPTION' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
+ 'AC_TYPE_LONG_LONG_INT' => 1,
'm4_pattern_allow' => 1,
+ 'gl_AC_TYPE_UINTMAX_T' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'gl_DISABLE_THREADS' => 1,
+ 'gt_INTDIV0' => 1,
+ 'AM_ICONV_LINK' => 1,
'PKG_CHECK_MODULES' => 1,
- '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- 'gl_EXTERN_INLINE' => 1,
- 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'gl_AC_HEADER_STDINT_H' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
'AM_XGETTEXT_OPTION' => 1,
- 'gt_GL_ATTRIBUTE' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ 'AC_COMPUTE_INT' => 1,
+ 'gt_TYPE_WINT_T' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'AU_DEFUN' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'PKG_INSTALLDIR' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
'gl_AC_HEADER_INTTYPES_H' => 1,
- 'AM_DEP_TRACK' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'gl_GLIBC21' => 1,
- 'gl_AC_TYPE_UINTMAX_T' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'AM_GNU_GETTEXT' => 1,
'AM_SILENT_RULES' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- '_m4_warn' => 1,
- 'gl_SIZE_MAX' => 1,
- 'gl_LOCK' => 1,
- 'AC_TYPE_LONG_LONG_INT' => 1,
- 'gl_THREADLIB_EARLY_BODY' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'gl_THREADLIB' => 1,
- 'AM_LANGINFO_CODESET' => 1,
- 'AM_RUN_LOG' => 1,
- 'AC_' => 1,
- 'AC_DEFUN_ONCE' => 1,
'gl_THREADLIB_EARLY' => 1,
- 'AC_LIB_PROG_LD_GNU' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_LIB_HAVE_LINKFLAGS' => 1,
- 'AC_LIB_FROMPACKAGE' => 1,
- 'gl_DISABLE_THREADS' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'gt_INTTYPES_PRI' => 1,
- 'AU_DEFUN' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'gt_TYPE_WINT_T' => 1,
- 'gt_INTDIV0' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'PKG_NOARCH_INSTALLDIR' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_GNU_GETTEXT' => 1,
'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
'gl_FCNTL_O_FLAGS' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'gl_PREREQ_LOCK' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AM_NLS' => 1,
- 'AC_LIB_ARG_WITH' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'gt_TYPE_INTMAX_T' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
- 'AC_COMPUTE_INT' => 1,
- 'AC_LIB_PREFIX' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
'_AM_PROG_CC_C_O' => 1,
- 'gt_INTL_SUBDIR_CORE' => 1,
- 'gt_INTL_MACOSX' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- '_AM_IF_OPTION' => 1,
- 'AC_DEFUN' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
'gl_VISIBILITY' => 1,
- 'AC_LIB_PREPARE_PREFIX' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'gl_THREADLIB_BODY' => 1,
+ 'AC_LIB_RPATH' => 1,
+ 'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AC_LIB_PREPARE_MULTILIB' => 1,
'PKG_CHECK_EXISTS' => 1,
- 'AC_LIB_APPENDTOVAR' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_NLS' => 1,
+ 'gl_SIZE_MAX' => 1,
+ 'gl_LOCK' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
'gl_XSIZE' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1
+ 'gt_TYPE_WCHAR_T' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ 'm4_include' => 1,
+ 'gt_GLIBC2' => 1,
+ 'gt_PRINTF_POSIX' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'gl_THREADLIB' => 1,
+ 'gt_INTL_SUBDIR_CORE' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'gl_EXTERN_INLINE' => 1,
+ 'gl_THREADLIB_BODY' => 1,
+ 'gl_GLIBC21' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'gl_AC_HEADER_STDINT_H' => 1,
+ 'AC_LIB_PREFIX' => 1,
+ 'AM_CONDITIONAL' => 1,
+ '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ 'AC_' => 1,
+ 'AM_DEP_TRACK' => 1,
+ 'AC_LIB_PREPARE_PREFIX' => 1,
+ 'AC_DEFUN' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'AM_GNU_GETTEXT_NEED' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
+ 'include' => 1,
+ 'gl_THREADLIB_EARLY_BODY' => 1,
+ 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+ '_m4_warn' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1
}
], 'Autom4te::Request' )
);
diff --git a/config.log b/config.log
index e971184..b4939e9 100644
--- a/config.log
+++ b/config.log
@@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##
-hostname = localhost
+hostname = Device-03036C
uname -m = x86_64
uname -r = 3.14.25-rt22
uname -s = Linux
@@ -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/ccO4J43C.o: undefined reference to symbol 'pthread_mutexattr_init@@GLIBC_2.2.5'
+/usr/bin/ld: /tmp/ccUgk3Jb.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
@@ -2928,7 +2928,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
-on localhost
+on Device-03036C
config.status:1089: creating Makefile
config.status:1089: creating config.h
@@ -2949,7 +2949,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status config.h
-on localhost
+on Device-03036C
config.status:1089: creating config.h
config.status:1270: config.h is unchanged
diff --git a/src/ags/X/ags_export_window_callbacks.c b/src/ags/X/ags_export_window_callbacks.c
index 927b91b..fbc2c0a 100644
--- a/src/ags/X/ags_export_window_callbacks.c
+++ b/src/ags/X/ags_export_window_callbacks.c
@@ -20,6 +20,7 @@
#include <ags/main.h>
+#include <ags/thread/ags_mutex_manager.h>
#include <ags/thread/ags_audio_loop.h>
#include <ags/thread/ags_task_thread.h>
#include <ags/thread/ags_export_thread.h>
@@ -34,6 +35,8 @@
void ags_export_window_stop_callback(AgsThread *thread,
AgsExportWindow *export_window);
+extern pthread_mutex_t ags_application_mutex;
+
void
ags_export_window_file_chooser_button_callback(GtkWidget *file_chooser_button,
AgsExportWindow *export_window)
@@ -120,10 +123,25 @@ ags_export_window_export_callback(GtkWidget *toggle_button,
/* create start task */
if(success){
+ AgsMutexManager *mutex_manager;
+
guint tic;
gdouble delay;
- delay = (1.0 / window->devout->frequency / window->devout->buffer_size) * (60.0 / AGS_DEVOUT_DEFAULT_BPM);
+ pthread_mutex_t *devout_mutex;
+
+ pthread_mutex_lock(&(ags_application_mutex));
+
+ mutex_manager = ags_mutex_manager_get_instance();
+
+ devout_mutex = ags_mutex_manager_lookup(mutex_manager,
+ window->devout);
+
+ pthread_mutex_unlock(&(ags_application_mutex));
+
+ pthread_mutex_lock(devout_mutex);
+
+ delay = (window->devout->delay[window->devout->tic_counter]);
tic = (gtk_spin_button_get_value(export_window->tact) + 1) * delay;
@@ -135,6 +153,8 @@ ags_export_window_export_callback(GtkWidget *toggle_button,
g_signal_connect(export_thread, "stop\0",
G_CALLBACK(ags_export_window_stop_callback), export_window);
+ pthread_mutex_unlock(devout_mutex);
+
/* append AgsStartDevout */
ags_task_thread_append_task(AGS_TASK_THREAD(audio_loop->task_thread),
export_output);
diff --git a/src/ags/audio/task/ags_export_output.c b/src/ags/audio/task/ags_export_output.c
index 17717fd..9bec44c 100644
--- a/src/ags/audio/task/ags_export_output.c
+++ b/src/ags/audio/task/ags_export_output.c
@@ -177,7 +177,7 @@ ags_export_output_launch(AgsTask *task)
ags_audio_file_rw_open(audio_file,
TRUE);
- g_message("export output");
+ g_message("export output\0");
/* start export thread */
export_thread->tic = tic;
diff --git a/src/ags/thread/ags_export_thread.c b/src/ags/thread/ags_export_thread.c
index 9d2bd60..35ac6f6 100644
--- a/src/ags/thread/ags_export_thread.c
+++ b/src/ags/thread/ags_export_thread.c
@@ -242,9 +242,15 @@ ags_export_thread_finalize(GObject *gobject)
void
ags_export_thread_start(AgsThread *thread)
{
+ AgsExportThread *export_thread;
+
//TODO:JK: implement me
g_message("export start");
+ export_thread = thread;
+
+ export_thread->counter = 0;
+
AGS_THREAD_CLASS(ags_export_thread_parent_class)->start(thread);
}
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list