[SCM] gsequencer/upstream: fixed pead
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Sun Jun 14 16:07:03 UTC 2015
The following commit has been merged in the upstream branch:
commit 11c40de9f417f10df30cdb2402f0dbc4bcb174a5
Author: Joël Krähemann <weedlight at gmail.com>
Date: Wed Apr 22 19:38:52 2015 +0000
fixed pead
diff --git a/.deps/ags-ags_peak_channel.Po b/.deps/ags-ags_peak_channel.Po
index 42b1a6c..3454839 100644
--- a/.deps/ags-ags_peak_channel.Po
+++ b/.deps/ags-ags_peak_channel.Po
@@ -598,7 +598,7 @@ ags-ags_peak_channel.o: src/ags/audio/recall/ags_peak_channel.c \
src/ags/X/ags_audio_preferences.h \
src/ags/X/ags_performance_preferences.h \
src/ags/X/ags_server_preferences.h src/ags/object/ags_mutable.h \
- src/ags/object/ags_plugin.h
+ src/ags/object/ags_plugin.h src/ags/audio/ags_output.h
/usr/include/stdc-predef.h:
@@ -2077,3 +2077,5 @@ src/ags/X/ags_server_preferences.h:
src/ags/object/ags_mutable.h:
src/ags/object/ags_plugin.h:
+
+src/ags/audio/ags_output.h:
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 8447504..2f94ca4 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -63,106 +63,106 @@
'configure.ac'
],
{
- 'gl_PREREQ_LOCK' => 1,
+ 'AM_GNU_GETTEXT_NEED' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'AM_ICONV_LINK' => 1,
+ 'AC_DEFUN' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AM_INTL_SUBDIR' => 1,
+ 'AM_NLS' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'gl_THREADLIB_EARLY_BODY' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_ICONV' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'gl_SIZE_MAX' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
'AC_' => 1,
- 'AC_LIB_FROMPACKAGE' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'gt_GLIBC2' => 1,
- '_AM_SET_OPTION' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'gl_VISIBILITY' => 1,
+ 'gl_GLIBC21' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ '_m4_warn' => 1,
+ 'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'gl_LOCK' => 1,
+ 'AC_LIB_WITH_FINAL_PREFIX' => 1,
'AC_COMPUTE_INT' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_DEFUN' => 1,
- 'gl_AC_HEADER_INTTYPES_H' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'gt_INTDIV0' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'gl_FCNTL_O_FLAGS' => 1,
- 'gt_PRINTF_POSIX' => 1,
- 'gt_INTL_MACOSX' => 1,
- 'gt_LC_MESSAGES' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AM_PO_SUBDIRS' => 1,
- 'm4_include' => 1,
- 'AM_SANITY_CHECK' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
'AU_DEFUN' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'm4_pattern_allow' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'gt_TYPE_INTMAX_T' => 1,
'gt_INTL_SUBDIR_CORE' => 1,
- 'gl_THREADLIB' => 1,
- 'AM_SET_LEADING_DOT' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
+ 'gl_XSIZE' => 1,
'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'gl_GLIBC21' => 1,
- 'gl_VISIBILITY' => 1,
- 'AC_LIB_RPATH' => 1,
- 'AC_LIB_LINKFLAGS' => 1,
- 'gl_AC_HEADER_STDINT_H' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AM_SILENT_RULES' => 1,
+ 'AM_RUN_LOG' => 1,
'AC_LIB_PREPARE_PREFIX' => 1,
- 'AM_LANGINFO_CODESET' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'AC_LIB_HAVE_LINKFLAGS' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
'AM_GNU_GETTEXT' => 1,
+ '_AM_SET_OPTIONS' => 1,
'AC_LIB_PREPARE_MULTILIB' => 1,
- 'gt_TYPE_INTMAX_T' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- '_AM_IF_OPTION' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- 'AC_LIB_PROG_LD_GNU' => 1,
- 'AC_LIB_ARG_WITH' => 1,
- 'AM_INTL_SUBDIR' => 1,
- 'm4_pattern_allow' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
'AM_MISSING_HAS_RUN' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
- 'm4_pattern_forbid' => 1,
- 'AM_RUN_LOG' => 1,
- 'AM_NLS' => 1,
- 'AM_ICONV_LINK' => 1,
- '_m4_warn' => 1,
- 'gl_SIZE_MAX' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'AC_LIB_APPENDTOVAR' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
'_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- 'AC_LIB_WITH_FINAL_PREFIX' => 1,
- 'gl_THREADLIB_BODY' => 1,
- 'gl_XSIZE' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'include' => 1,
+ 'gt_PRINTF_POSIX' => 1,
+ '_AM_SET_OPTION' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'gt_INTDIV0' => 1,
'gt_TYPE_WCHAR_T' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'AC_LIB_PREFIX' => 1,
- 'AC_LIB_PROG_LD' => 1,
- 'gl_THREADLIB_EARLY_BODY' => 1,
- 'AC_TYPE_LONG_LONG_INT' => 1,
- '_AM_DEPENDENCIES' => 1,
'AM_DEP_TRACK' => 1,
- 'PKG_CHECK_EXISTS' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ 'AC_LIB_FROMPACKAGE' => 1,
+ 'gt_CHECK_DECL' => 1,
+ 'gt_TYPE_WINT_T' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'gl_THREADLIB' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ 'm4_include' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
'gl_AC_TYPE_UINTMAX_T' => 1,
- 'gl_LOCK' => 1,
- 'AM_ICONV' => 1,
+ 'gl_AC_HEADER_STDINT_H' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'AM_PO_SUBDIRS' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ 'gl_AC_HEADER_INTTYPES_H' => 1,
'gt_INTTYPES_PRI' => 1,
- 'AC_LIB_LINKFLAGS_BODY' => 1,
- 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'gl_THREADLIB_EARLY' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AC_LIB_RPATH' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ 'AM_SILENT_RULES' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'gt_TYPE_WINT_T' => 1,
+ 'AC_LIB_PREFIX' => 1,
+ 'gl_FCNTL_O_FLAGS' => 1,
+ 'AC_TYPE_LONG_LONG_INT' => 1,
+ 'gl_THREADLIB_BODY' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'gt_GLIBC2' => 1,
'gl_DISABLE_THREADS' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- 'AM_GNU_GETTEXT_NEED' => 1,
- '_AM_MANGLE_OPTION' => 1,
- '_AM_PROG_TAR' => 1,
- 'gt_CHECK_DECL' => 1,
- 'gl_THREADLIB_EARLY' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'include' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1
+ 'PKG_CHECK_EXISTS' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -177,65 +177,65 @@
'configure.ac'
],
{
- 'AM_ENABLE_MULTILIB' => 1,
- 'AM_SILENT_RULES' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'LT_INIT' => 1,
+ '_m4_warn' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'm4_include' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_SUBST' => 1,
'AM_POT_TOOLS' => 1,
- 'AC_FC_SRCEXT' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'sinclude' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ '_AM_COND_ENDIF' => 1,
+ 'AC_FC_FREEFORM' => 1,
'_AM_COND_IF' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
+ 'AC_SUBST_TRACE' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
'_LT_AC_TAGCONFIG' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'm4_sinclude' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AM_GNU_GETTEXT' => 1,
'AH_OUTPUT' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_PROG_CXX_C_O' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- 'sinclude' => 1,
'include' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_FC_FREEFORM' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
'AC_INIT' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_AM_COND_ELSE' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- '_m4_warn' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AC_FC_SRCEXT' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
- 'AM_PROG_FC_C_O' => 1,
- 'AC_SUBST' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- 'm4_pattern_allow' => 1,
- 'AM_PROG_AR' => 1,
- 'AM_PATH_GUILE' => 1,
+ 'AM_PROG_MOC' => 1,
'AM_NLS' => 1,
- '_AM_COND_ENDIF' => 1,
- 'm4_pattern_forbid' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+ 'AM_PATH_GUILE' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_PROG_AR' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AM_PROG_FC_C_O' => 1,
'AM_XGETTEXT_OPTION' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AM_PROG_MKDIR_P' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
'AC_CANONICAL_HOST' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AM_PROG_F77_C_O' => 1,
- 'm4_sinclude' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'AC_SUBST_TRACE' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
- 'AM_PROG_MOC' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- 'm4_include' => 1,
- 'AC_FC_PP_DEFINE' => 1
+ 'AC_CONFIG_LINKS' => 1,
+ 'AM_CONDITIONAL' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -301,114 +301,114 @@
'configure.ac'
],
{
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'gt_INTTYPES_PRI' => 1,
+ 'gl_THREADLIB_EARLY' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ 'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
'PKG_INSTALLDIR' => 1,
+ 'AC_LIB_RPATH' => 1,
+ 'gl_FCNTL_O_FLAGS' => 1,
+ 'AC_LIB_PREFIX' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ 'gl_DISABLE_THREADS' => 1,
+ 'gt_GLIBC2' => 1,
'AC_TYPE_LONG_LONG_INT' => 1,
- 'gl_THREADLIB_EARLY_BODY' => 1,
- 'AC_LIB_PROG_LD' => 1,
+ 'gl_THREADLIB_BODY' => 1,
'_AM_DEPENDENCIES' => 1,
+ 'PKG_NOARCH_INSTALLDIR' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'm4_include' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'gl_AC_TYPE_UINTMAX_T' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ 'AM_XGETTEXT_OPTION_INIT' => 1,
+ 'AM_PO_SUBDIRS' => 1,
+ 'gl_AC_HEADER_STDINT_H' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
'AM_DEP_TRACK' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'gl_XSIZE' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'gt_TYPE_WCHAR_T' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AC_LIB_PREFIX' => 1,
'AC_LIB_APPENDTOVAR' => 1,
'AM_SET_DEPDIR' => 1,
- '_m4_warn' => 1,
- 'gl_SIZE_MAX' => 1,
- 'gl_THREADLIB_BODY' => 1,
- 'AC_LIB_WITH_FINAL_PREFIX' => 1,
- '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
- 'AM_INTL_SUBDIR' => 1,
- 'AC_LIB_ARG_WITH' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'm4_pattern_allow' => 1,
+ 'AC_LIB_FROMPACKAGE' => 1,
'AM_XGETTEXT_OPTION' => 1,
- 'AM_RUN_LOG' => 1,
- 'AM_ICONV_LINK' => 1,
- 'AM_NLS' => 1,
- 'm4_pattern_forbid' => 1,
- 'AM_XGETTEXT_OPTION_INIT' => 1,
- 'AM_GNU_GETTEXT_NEED' => 1,
- 'AM_MAKE_INCLUDE' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'gl_THREADLIB' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'gt_TYPE_WINT_T' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'gt_PRINTF_POSIX' => 1,
+ '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+ 'include' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
'_AM_PROG_TAR' => 1,
- 'PKG_CHECK_VAR' => 1,
+ 'gt_INTDIV0' => 1,
'_AM_MANGLE_OPTION' => 1,
- 'gl_THREADLIB_EARLY' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'include' => 1,
- 'gl_DISABLE_THREADS' => 1,
- 'AM_CONDITIONAL' => 1,
+ 'gt_TYPE_WCHAR_T' => 1,
+ 'AC_LIB_PREPARE_PREFIX' => 1,
+ 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'gl_XSIZE' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
- 'gt_TYPE_WINT_T' => 1,
- 'AM_ICONV_LINKFLAGS_BODY' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'gl_AC_TYPE_UINTMAX_T' => 1,
- 'gl_EXTERN_INLINE' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'AC_LIB_PREPARE_MULTILIB' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ '_m4_warn' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'AC_LIB_WITH_FINAL_PREFIX' => 1,
'gl_LOCK' => 1,
'AC_LIB_LINKFLAGS_BODY' => 1,
- 'gt_INTTYPES_PRI' => 1,
- 'AM_ICONV' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'PKG_NOARCH_INSTALLDIR' => 1,
+ 'PKG_CHECK_VAR' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'gl_EXTERN_INLINE' => 1,
'AU_DEFUN' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- 'AM_PATH_PROG_WITH_TEST' => 1,
- 'gt_INTL_SUBDIR_CORE' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'gt_GL_ATTRIBUTE' => 1,
- 'gl_THREADLIB' => 1,
- 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
- 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
- 'gt_INTL_MACOSX' => 1,
- 'AM_MISSING_PROG' => 1,
- 'gt_LC_MESSAGES' => 1,
- 'AM_PO_SUBDIRS' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'm4_include' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'gl_AC_HEADER_INTTYPES_H' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'gt_INTDIV0' => 1,
- 'gt_PRINTF_POSIX' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'gl_FCNTL_O_FLAGS' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
'AC_COMPUTE_INT' => 1,
- '_AM_SET_OPTION' => 1,
- 'AC_LIB_FROMPACKAGE' => 1,
- 'gt_GLIBC2' => 1,
- 'gl_PREREQ_LOCK' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_' => 1,
- 'AC_DEFUN' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AC_LIB_PREPARE_MULTILIB' => 1,
+ 'gt_INTL_SUBDIR_CORE' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'm4_pattern_allow' => 1,
'gt_TYPE_INTMAX_T' => 1,
'AM_AUTOMAKE_VERSION' => 1,
- '_AM_IF_OPTION' => 1,
- 'AC_LIB_PROG_LD_GNU' => 1,
- 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'gl_SIZE_MAX' => 1,
'AM_SUBST_NOTMAKE' => 1,
- 'AM_LANGINFO_CODESET' => 1,
- 'AC_LIB_PREPARE_PREFIX' => 1,
- 'AC_LIB_HAVE_LINKFLAGS' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'AM_GNU_GETTEXT' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AM_SILENT_RULES' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'AC_LIB_PROG_LD' => 1,
+ 'AM_ICONV' => 1,
+ 'AC_' => 1,
'gl_GLIBC21' => 1,
+ 'AM_CONDITIONAL' => 1,
'gl_VISIBILITY' => 1,
- 'AC_LIB_RPATH' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'gl_AC_HEADER_STDINT_H' => 1,
- 'AC_LIB_LINKFLAGS' => 1
+ 'AM_ICONV_LINK' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'AM_GNU_GETTEXT_NEED' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'AM_INTL_SUBDIR' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AC_DEFUN' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'gt_GL_ATTRIBUTE' => 1,
+ 'gl_THREADLIB_EARLY_BODY' => 1,
+ 'AM_NLS' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1
}
], 'Autom4te::Request' )
);
diff --git a/config.log b/config.log
index edca255..524297c 100644
--- a/config.log
+++ b/config.log
@@ -2953,3 +2953,39 @@ on Device-13CD59
config.status:1089: creating config.h
config.status:1270: config.h is unchanged
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by ags config.status 0.4.2, which was
+generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ./config.status Makefile depfiles
+
+on Device-13CD59
+
+config.status:1089: creating Makefile
+config.status:1318: executing depfiles commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by ags config.status 0.4.2, which was
+generated by GNU Autoconf 2.69. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ./config.status Makefile depfiles
+
+on Device-13CD59
+
+config.status:1089: creating Makefile
+config.status:1318: executing depfiles commands
diff --git a/src/ags/audio/ags_recycling_container.c b/src/ags/audio/ags_recycling_container.c
index 8a29415..58be48d 100644
--- a/src/ags/audio/ags_recycling_container.c
+++ b/src/ags/audio/ags_recycling_container.c
@@ -617,14 +617,18 @@ ags_recycling_container_reset_recycling(AgsRecyclingContainer *recycling_contain
guint i;
gboolean new_context;
- if(ags_recycling_position(old_first_recycling, old_last_recycling->next,
- new_first_recycling) == -1){
- if(old_first_recycling->prev == new_last_recycling){
- new_context = FALSE;
- }else if(old_first_recycling->next == new_first_recycling){
- new_context = FALSE;
+ if(old_first_recycling != NULL){
+ if(ags_recycling_position(old_first_recycling, old_last_recycling->next,
+ new_first_recycling) == -1){
+ if(old_first_recycling->prev == new_last_recycling){
+ new_context = FALSE;
+ }else if(old_first_recycling->next == new_first_recycling){
+ new_context = FALSE;
+ }else{
+ new_context = TRUE;
+ }
}else{
- new_context = TRUE;
+ new_context = FALSE;
}
}else{
new_context = FALSE;
diff --git a/src/ags/audio/recall/ags_peak_channel.c b/src/ags/audio/recall/ags_peak_channel.c
index 3541e40..8eab4f9 100644
--- a/src/ags/audio/recall/ags_peak_channel.c
+++ b/src/ags/audio/recall/ags_peak_channel.c
@@ -25,6 +25,9 @@
#include <ags/object/ags_mutable.h>
#include <ags/object/ags_plugin.h>
+#include <ags/audio/ags_audio.h>
+#include <ags/audio/ags_output.h>
+
void ags_peak_channel_class_init(AgsPeakChannelClass *peak_channel);
void ags_peak_channel_connectable_interface_init(AgsConnectableInterface *connectable);
void ags_peak_channel_plugin_interface_init(AgsPluginInterface *plugin);
@@ -330,7 +333,7 @@ ags_peak_channel_retrieve_peak(AgsPeakChannel *peak_channel,
source = AGS_RECALL_CHANNEL(peak_channel)->source;
recycling = source->first_recycling;
-
+
/* initialize buffer */
buffer = (double *) malloc(buffer_size * sizeof(double));
for(i = 0; i < buffer_size; i++) buffer[i] = 0.0;
@@ -353,7 +356,7 @@ ags_peak_channel_retrieve_peak(AgsPeakChannel *peak_channel,
}
/* calculate average value */
- current_value = 0.0;
+ current_value = 1.0 / (1.0 / G_MAXUINT16 * (1.0 / 45.0));
for(i = 0; i < buffer_size; i++){
if(buffer[i] == 0){
diff --git a/src/ags/audio/recall/ags_peak_channel_run.c b/src/ags/audio/recall/ags_peak_channel_run.c
index d559eb4..4610345 100644
--- a/src/ags/audio/recall/ags_peak_channel_run.c
+++ b/src/ags/audio/recall/ags_peak_channel_run.c
@@ -46,7 +46,7 @@ void ags_peak_channel_run_finalize(GObject *gobject);
AgsRecall* ags_peak_channel_run_duplicate(AgsRecall *recall,
AgsRecallID *recall_id,
guint *n_params, GParameter *parameter);
-void ags_peak_channel_run_run_post(AgsRecall *recall);
+void ags_peak_channel_run_run_inter(AgsRecall *recall);
/**
* SECTION:ags_peak_channel_run
@@ -126,7 +126,7 @@ ags_peak_channel_run_class_init(AgsPeakChannelRunClass *peak_channel_run)
recall = (AgsRecallClass *) peak_channel_run;
recall->duplicate = ags_peak_channel_run_duplicate;
- recall->run_post = ags_peak_channel_run_run_post;
+ recall->run_inter = ags_peak_channel_run_run_inter;
}
void
@@ -219,7 +219,7 @@ ags_peak_channel_run_duplicate(AgsRecall *recall,
}
void
-ags_peak_channel_run_run_post(AgsRecall *recall)
+ags_peak_channel_run_run_inter(AgsRecall *recall)
{
AgsChannel *source;
AgsRecallChannel *recall_channel;
diff --git a/src/ags/object/ags_playable.c b/src/ags/object/ags_playable.c
index b7e3079..72b1592 100644
--- a/src/ags/object/ags_playable.c
+++ b/src/ags/object/ags_playable.c
@@ -452,6 +452,9 @@ ags_playable_read_audio_signal(AgsPlayable *playable,
guint i, j, k, i_stop, j_stop;
GError *error;
+ g_return_val_if_fail(AGS_IS_PLAYABLE(playable),
+ NULL);
+
ags_playable_info(playable,
&channels, &frames,
&loop_start, &loop_end,
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list