Bug 2327 - Add EQ preset converter

Makefile.am

@@ -71,6 +71,7 @@ nobase_dist_pkgdata_DATA = \
    plug-ins/crossfadeclips.ny \
    plug-ins/crossfadetracks.ny \
    plug-ins/delay.ny \
+   plug-ins/eq-xml-to-txt-converter.ny \
    plug-ins/equalabel.ny \
    plug-ins/highpass.ny \
    plug-ins/limiter.ny \

Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -167,8 +167,7 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
-am__maybe_remake_depfiles = depfiles
+am__depfiles_maybe = depfiles
-am__depfiles_remade = ./$(DEPDIR)/audacity.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -239,7 +238,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -512,6 +511,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -576,8 +576,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -644,13 +644,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity.Po@am__quote@
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -878,10 +872,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1113,7 +1104,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-		-rm -f ./$(DEPDIR)/audacity.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -1162,7 +1153,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-		-rm -f ./$(DEPDIR)/audacity.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1186,24 +1177,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--depfiles am--refresh check check-am clean \
+	am--refresh check check-am clean clean-binPROGRAMS \
-	clean-binPROGRAMS clean-cscope clean-generic clean-libtool \
+	clean-cscope clean-generic clean-libtool cscope cscopelist-am \
-	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
-	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distcheck distclean distclean-compile distclean-generic \
+	distclean-compile distclean-generic distclean-libtool \
-	distclean-libtool distclean-tags distcleancheck distdir \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
+	dvi-am html html-am info info-am install install-am \
-	install install-am install-binPROGRAMS install-data \
+	install-binPROGRAMS install-data install-data-am \
-	install-data-am install-dist_docDATA install-dist_pkgdataDATA \
+	install-dist_docDATA install-dist_pkgdataDATA install-dvi \
-	install-dvi install-dvi-am install-exec install-exec-am \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-html install-html-am install-info install-info-am \
+	install-html-am install-info install-info-am install-man \
-	install-man install-nobase_dist_pkgdataDATA install-pdf \
+	install-nobase_dist_pkgdataDATA install-pdf install-pdf-am \
-	install-pdf-am install-ps install-ps-am install-strip \
+	install-ps install-ps-am install-strip install-suillibDATA \
-	install-suillibDATA installcheck installcheck-am installdirs \
+	installcheck installcheck-am installdirs installdirs-am \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-am uninstall-binPROGRAMS uninstall-dist_docDATA \
+	uninstall-binPROGRAMS uninstall-dist_docDATA \
 	uninstall-dist_pkgdataDATA uninstall-nobase_dist_pkgdataDATA \
 	uninstall-suillibDATA
 
@@ -1249,6 +1240,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
    plug-ins/crossfadeclips.ny \
    plug-ins/crossfadetracks.ny \
    plug-ins/delay.ny \
+   plug-ins/eq-xml-to-txt-converter.ny \
    plug-ins/equalabel.ny \
    plug-ins/highpass.ny \
    plug-ins/limiter.ny \

configure

@@ -834,6 +834,7 @@ am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
+am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -902,6 +903,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -920,8 +922,7 @@ PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL
+SHELL'
-am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -1086,6 +1087,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1338,6 +1340,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1475,7 +1486,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1628,6 +1639,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -2908,7 +2920,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-am__api_version='1.16'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3424,8 +3436,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -3592,7 +3604,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3955,45 +3967,45 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+
-$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+am_make=${MAKE-make}
-cat > confinc.mk << 'END'
+cat > confinc << 'END'
 am__doit:
-	@echo this is the am__doit target >confinc.out
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-# BSD make does it like this.
+_am_result=none
-echo '.include "confinc.mk" # ignored' > confmf.BSD
+# First try GNU make style include.
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo "include confinc" > confmf
-echo 'include confinc.mk # ignored' > confmf.GNU
+# Ignore all kinds of additional output from 'make'.
-_am_result=no
+case `$am_make -s -f confmf 2> /dev/null` in #(
-for s in GNU BSD; do
+*the\ am__doit\ target*)
-  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+  am__include=include
-   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+  am__quote=
-   ac_status=$?
+  _am_result=GNU
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  ;;
-   (exit $ac_status); }
-  case $?:`cat confinc.out 2>/dev/null` in #(
-  '0:this is the am__doit target') :
-    case $s in #(
-  BSD) :
-    am__include='.include' am__quote='"' ;; #(
-  *) :
-    am__include='include' am__quote='' ;;
-esac ;; #(
-  *) :
-     ;;
 esac
-  if test "$am__include" != "#"; then
+# Now try BSD make style include.
-    _am_result="yes ($s style)"
+if test "$am__include" = "#"; then
-    break
+   echo '.include "confinc"' > confmf
-  fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
-done
+   *the\ am__doit\ target*)
-rm -f confinc.* confmf.*
+     am__include=.include
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+     am__quote="\""
-$as_echo "${_am_result}" >&6; }
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
@@ -25171,7 +25183,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
 
-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -26282,35 +26294,29 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
+  case $CONFIG_FILES in
-  # requiring Autoconf 2.70 or later.
+  *\'*) eval set x "$CONFIG_FILES" ;;
-  case $CONFIG_FILES in #(
+  *)   set x $CONFIG_FILES ;;
-  *\'*) :
+  esac
-    eval set x "$CONFIG_FILES" ;; #(
-  *) :
-    set x $CONFIG_FILES ;; #(
-  *) :
-     ;;
-esac
   shift
-  # Used to flag and report bootstrapping failures.
+  for mf
-  am_rc=0
-  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
+    # Check whether this is an Automake generated Makefile or not.
-    # dependency-tracking related rules and includes.
+    # We used to match only the files named 'Makefile.in', but
-    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      || continue
+      dirpart=`$as_dirname -- "$mf" ||
-    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
-$as_echo X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -26328,48 +26334,53 @@ $as_echo X"$am_mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    am_filepart=`$as_basename -- "$am_mf" ||
+    else
-$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+      continue
-	 X"$am_mf" : 'X\(//\)$' \| \
+    fi
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+    # Extract the definition of DEPDIR, am__include, and am__quote
-$as_echo X/"$am_mf" |
+    # from the Makefile without running 'make'.
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\/\(\/\/\)$/{
+	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
-	  /^X\/\(\/\).*/{
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
+      # echo "creating $dirpart/$file"
-        | $MAKE -f - am--depfiles" >&5
+      echo '# dummy' > "$dirpart/$file"
-   (cd "$am_dirpart" \
+    done
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } || am_rc=$?
   done
-  if test $am_rc -ne 0; then
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-  { am_dirpart=; unset am_dirpart;}
-  { am_filepart=; unset am_filepart;}
-  { am_mf=; unset am_mf;}
-  { am_rc=; unset am_rc;}
-  rm -f conftest-deps.mk
 }
  ;;
     "libtool":C)

help/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -389,6 +389,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -421,8 +422,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -510,10 +511,7 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

images/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -393,6 +393,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -503,8 +504,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -696,10 +697,7 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

lib-src/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -189,7 +189,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -434,6 +434,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -983,8 +984,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(srcdir)/dist-libsoxr.mk $(srcdir)/dist-libvamp.mk $(srcdir)/dist-portaudio.mk $(am__empty):
 
@@ -1102,10 +1103,7 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

plug-ins/eq-xml-to-txt-converter.ny

@@ -0,0 +1,157 @@
+$nyquist plug-in
+$version 4
+$type tool
+$name (_ "EQ XML to TXT Converter")
+$manpage "EQ_XML_to_TXT_Converter"
+$debugbutton false
+$preview disabled
+$author (_ "Steve Daulton")
+$release 2.4.0
+$copyright (_ "Released under terms of the GNU General Public License version 2")
+
+
+;; Released under terms of the GNU General Public License version 2:
+;; http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+;;
+;; For information about writing and modifying Nyquist plug-ins:
+;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference
+
+
+$control fxname (_ "Select target EQ effect") choice (("Graphic" (_ "Graphic EQ"))
+                                                      ("FilterCurve" (_ "Filter Curve EQ"))) 0
+
+$control infile (_ "Equalization XML file") file "" "*default*/EQCurves.xml" "XML file|*.xml;*.XML|All files|*.*;*" "open,exists"
+
+$control overwrite (_ "If output text file exists") choice (("Append" (_ "Append number"))
+                                                            ("Overwrite" (_ "Overwrite"))
+                                                            ("Error" (_ "Error"))) 0
+
+; output message
+(setf success
+  (format nil "Input:~%~a~%~%Output:~%" infile))
+
+
+(defun process-xml (filename)
+  (let ((fp-in (open filename :direction :input))
+        curve-name
+        iscurve
+        gotcurve
+        (frequencies ())
+        (values ()))
+    (unless fp-in
+      (throw 'err
+          (format nil (_ "Error.~%Unable to open file~%~s") filename)))
+    ;; Read each line and get the (frequency value) pair, and the curve name.
+    (do ((line (read-line fp-in) (read-line fp-in)))
+        ((not line))
+      (let ((fxname (get-name line)))
+        (when fxname
+          ;; trim in two steps so that we don't remove characters from the curve name.
+          (setf curve-name (string-trim "\t name=" fxname))
+          (setf curve-name (string-trim "\t \"" curve-name))
+          (setf iscurve t)))
+      (when iscurve
+        (let ((f-v-pair (get-f-v-pair (string-trim " <>/point\t" line))))
+          (when f-v-pair
+            (push (first f-v-pair) frequencies)
+            (push (second f-v-pair) values)))
+        (when (get-end-of-curve line)
+          (setf gotcurve t)
+          (setf iscurve nil)))
+      (when gotcurve
+        (write-curve-txt curve-name frequencies values)
+        (psetq gotcurve nil
+               curve-name nil
+               frequencies ()
+               values ())))
+    (close fp-in)
+    (format nil success)))
+
+(defun get-f-v-pair (line &aux (f "")(v ""))
+  ;;Return (list frequency value) or nil
+  (cond
+    ;; Get frequency
+    ((and (> (length line) 3)(string-equal (subseq line 0 3) "f=\""))
+      (setf line (subseq line 3))
+      (setf idx ;number of characters to remove from string
+        (dotimes (i (length line))
+          (setf ch (char line i))
+          (cond
+            ((char= ch #\-) (setf f (format nil "~a~a" f #\-)))
+            ((digit-char-p ch) (setf f (format nil "~a~a" f ch)))
+            ((char= ch #\.) (setf f (format nil "~a~a" f #\.)))
+            (t  (return (1+ i))))))
+      ;; We now have the frequency., and the number of characters.
+      (setf v (string-trim " \td=\"" (subseq line idx)))
+      (list f v))))
+
+(defun get-name (line)
+  ;; If line is in the form: "  <curve name=\"Name of curve\">  "
+  ;; Return "Name of curve", else NIL.
+  (let ((line (string-trim " <>\t" line)))
+    (cond
+      ((string-equal (subseq line 0 6) "curve ")
+        (subseq line 5))
+      (t nil))))
+
+(defun get-end-of-curve (line)
+  ;; If the line is "   </curve>  "
+  ;; Return T else NIL.
+  (let ((line (string-trim " \t" line)))
+    (if (string-equal line "</curve>") t nil)))
+
+(defun write-curve-txt (curvename frequencies values)
+  ;; Write new style curve file(s), ensuring no overwrites unless explicitly allowed.
+  (let ((outfile (get-out-file-name (get-path infile) curvename))
+        fp-out)
+    (if outfile
+        (setf fp-out (open outfile :direction :output))
+        (throw 'err
+            (format nil
+                    ;i18n-hint: Do not translate "~a".txt
+                    (_ "Error.~%File overwrite disallowed:~%\"~a.txt\"")
+                    curvename)))
+    (unless fp-out
+      (throw 'err (format nil
+                          (_ "Error.~%File cannot be written:~%\"~a.txt\"")
+                          curvename)))
+    (format fp-out "~a" (if (= fxname 0) "GraphicEq:" "FilterCurve:"))
+    (dotimes (i (length frequencies))
+      (format fp-out "f~a=~s " i (nth i frequencies)))
+    (format fp-out
+            "filterLength=\"8191\" InterpolateLin=\"0\" ~
+            InterpolationMethod=\"B-spline\"")
+    (dotimes (i (length frequencies))
+      (format fp-out " v~a=~s" i (nth i values)))
+    (close fp-out)
+    (string-append success outfile "\n")))
+
+(defun get-path (fqname)
+  ;; Return file path from fully qualified file name.
+  (do ((i (1- (length fqname)) (1- i)))
+      ((= i 0) nil)
+    (when (char= (char fqname i) *file-separator*)
+      (return-from get-path (subseq fqname 0 (1+ i))))))
+
+(defun get-out-file-name (path fname)
+  ; Return a fully qualified name or nil.
+  (case overwrite
+    (1  ;Overwrite
+      (format nil "~a~a.txt" path fname))
+    (2  ;Error
+      (let* ((fqname (format nil "~a~a.txt" path fname))
+             (fp (open fqname)))
+        (cond
+          (fp (close fp)
+              nil)
+          (t fqname))))
+    (t  ; If file already exists, append a number to the name (up to 99).
+      (dotimes (i 99 nil)
+        (let* ((fqname  (format nil "~a~a~a.txt"
+                                path fname (if (> i 0) i "")))
+               (fp (open fqname)))
+          (if fp
+              (close fp)
+              (return-from get-out-file-name fqname)))))))
+
+(catch 'err (process-xml infile))

tests/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -165,9 +165,7 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
-am__maybe_remake_depfiles = depfiles
+am__depfiles_maybe = depfiles
-am__depfiles_remade = ./$(DEPDIR)/SequenceTest-SequenceTest.Po \
-	./$(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -618,6 +616,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -667,8 +666,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -703,14 +702,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SequenceTest-SequenceTest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SequenceTest-SequenceTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po@am__quote@
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -942,7 +935,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	fi;								\
 	$$success || exit 1
 
-check-TESTS: $(check_PROGRAMS)
+check-TESTS:
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -992,10 +985,7 @@ SimpleBlockFileTest.log: SimpleBlockFileTest$(EXEEXT)
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1070,8 +1060,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/SequenceTest-SequenceTest.Po
+	-rm -rf ./$(DEPDIR)
-	-rm -f ./$(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1117,8 +1106,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/SequenceTest-SequenceTest.Po
+	-rm -rf ./$(DEPDIR)
-	-rm -f ./$(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1139,16 +1127,16 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
+	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	dvi-am html html-am info info-am install install-am \
+	html-am info info-am install install-am install-data \
-	install-data install-data-am install-dvi install-dvi-am \
+	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec install-exec-am install-html install-html-am \
+	install-exec-am install-html install-html-am install-info \
-	install-info install-info-am install-man install-pdf \
+	install-info-am install-man install-pdf install-pdf-am \
-	install-pdf-am install-ps install-ps-am install-strip \
+	install-ps install-ps-am install-strip installcheck \
-	installcheck installcheck-am installdirs maintainer-clean \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	recheck tags tags-am uninstall uninstall-am