--enable-spline was not working

diff --git a/ChangeLog b/ChangeLog
index 153873d..f98b9f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-02  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
+       * timidity/timidity.c (parse_opt_h): ditto.
+       * timidity/timidity.h (DEFAULT_RESAMPLATION): ditto.
+       * configure.in: --enable-spline was not working
+
 2004-04-29  Saito <saito@intaa.net>
 
        * timidity/reverb.c, timidity/optcode.h: Fix around Insertion Effect.

diff --git a/config.h.in b/config.h.in
index e57d6f3..b867431 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,23 +1,20 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define to 1 if you use cubic-spline interpolation. */
-#undef CSPLINE_INTERPOLATION
-
 /* Define to 1 if you are in debug mode */
 #undef DEBUG
 
 /* place to install patches */
 #undef DEFAULT_PATH
 
+/* Define resampler. */
+#undef DEFAULT_RESAMPLATION
+
 /* Define to 1 if you have to add "_" to every identifiers. */
 #undef DLSYM_NEEDS_UNDERSCORE
 
 /* Define to 1 if you enable Sherry WRD */
 #undef ENABLE_SHERRY
 
-/* Define to 1 if you use Gauss interpolation. */
-#undef GAUSS_INTERPOLATION
-
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 
@@ -349,21 +346,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
-/* Define to 1 if you use Lagrange-polynomial interpolation. */
-#undef LAGRANGE_INTERPOLATION
-
-/* Define to 1 if you use linear interpolation. */
-#undef LINEAR_INTERPOLATION
-
 /* Define to 1 if you are NOT in debug mode */
 #undef NDEBUG
 
-/* Define to 1 if you use Newton-polynomial interpolation. */
-#undef NEWTON_INTERPOLATION
-
-/* Define to 1 if you do not use complemention. */
-#undef NO_INTERPOLATION
-
 /* Define to 1 if you do not have <string.h>. */
 #undef NO_STRING_H
 

diff --git a/configure b/configure
index bc91c38..c7b88ab 100755 (executable)
--- a/configure
+++ b/configure
@@ -18359,42 +18359,42 @@ if test "${enable_spline+set}" = set; then
       xlinear)
 
 cat >>confdefs.h <<\_ACEOF
-#define LINEAR_INTERPOLATION 1
+#define DEFAULT_RESAMPLATION resample_linear
 _ACEOF
 
        ;;
       xcubic)
 
 cat >>confdefs.h <<\_ACEOF
-#define CSPLINE_INTERPOLATION 1
+#define DEFAULT_RESAMPLATION resample_cspline
 _ACEOF
 
        ;;
       xlagrange)
 
 cat >>confdefs.h <<\_ACEOF
-#define LAGRANGE_INTERPOLATION 1
+#define DEFAULT_RESAMPLATION resample_lagrange
 _ACEOF
 
        ;;
       xnewton)
 
 cat >>confdefs.h <<\_ACEOF
-#define NEWTON_INTERPOLATION 1
+#define DEFAULT_RESAMPLATION resample_newton
 _ACEOF
 
        ;;
       xgauss)
 
 cat >>confdefs.h <<\_ACEOF
-#define GAUSS_INTERPOLATION 1
+#define DEFAULT_RESAMPLATION resample_gauss
 _ACEOF
 
        ;;
       xno)
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_INTERPOLATION 1
+#define DEFAULT_RESAMPLATION resample_none
 _ACEOF
 
        ;;

diff --git a/configure.in b/configure.in
index 893de27..c13fe41 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1708,22 +1708,22 @@ AC_ARG_ENABLE(spline,
                                                           (default is linear)],
   [ case "x$enableval" in
       xlinear)
-       AC_DEFINE(LINEAR_INTERPOLATION,1,Define to 1 if you use linear interpolation.)
+        AC_DEFINE(DEFAULT_RESAMPLATION,resample_linear,Define resampler.)
        ;;
       xcubic)
-       AC_DEFINE(CSPLINE_INTERPOLATION,1,Define to 1 if you use cubic-spline interpolation.)
+        AC_DEFINE(DEFAULT_RESAMPLATION,resample_cspline,Define resampler.)
        ;;
       xlagrange)
-       AC_DEFINE(LAGRANGE_INTERPOLATION,1,Define to 1 if you use Lagrange-polynomial interpolation.)
+        AC_DEFINE(DEFAULT_RESAMPLATION,resample_lagrange,Define resampler.)
        ;;
       xnewton)
-       AC_DEFINE(NEWTON_INTERPOLATION,1,Define to 1 if you use Newton-polynomial interpolation.)
+        AC_DEFINE(DEFAULT_RESAMPLATION,resample_newton,Define resampler.)
        ;;
       xgauss)
-       AC_DEFINE(GAUSS_INTERPOLATION,1,Define to 1 if you use Gauss interpolation.)
+        AC_DEFINE(DEFAULT_RESAMPLATION,resample_gauss,Define resampler.)
        ;;
       xno)
-       AC_DEFINE(NO_INTERPOLATION,1,Define to 1 if you do not use complemention.)
+        AC_DEFINE(DEFAULT_RESAMPLATION,resample_none,Define resampler.)
        ;;
       *)
        AC_MSG_ERROR(Invalid method of --enable-spline)

diff --git a/interface/Makefile.in b/interface/Makefile.in
index ebd4573..c7a5b56 100644 (file)
--- a/interface/Makefile.in
+++ b/interface/Makefile.in
@@ -430,10 +430,10 @@ EXTRA_libinterface_a_SOURCES = \
 @ENABLE_SOUND_SPEC_TRUE@       soundspec.o
 
 
-@ENABLE_W32GUI_TRUE@W32GUI_DEPS = w32g_res.res
-
 @ENABLE_W32G_SYN_TRUE@W32GUI_DEPS = w32g_res.res
 
+@ENABLE_W32GUI_TRUE@W32GUI_DEPS = w32g_res.res
+
 INTERFACE_OBJS = $(INTERFACE_SRCS:.c=.o)
 
 libinterface_a_LIBADD = \
@@ -476,9 +476,9 @@ EXTRA_DIST = \
        interface_n.txt \
        interface_s.txt
 
-@ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
 
 @ENABLE_TCLTK_TRUE@install_tk = install.tk
+@ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
 
 @ENABLE_XAW_TRUE@install_xaw = install.xaw
 @ENABLE_DYNAMIC_XAW_TRUE@install_xaw = install.xaw

diff --git a/timidity/timidity.c b/timidity/timidity.c
index 5ccfbc2..2cdb9e3 100644 (file)
--- a/timidity/timidity.c
+++ b/timidity/timidity.c
@@ -3787,8 +3787,16 @@ static inline int parse_opt_h(const char *arg)
 "  -EFresamp=c  Enable C-spline resample algorithm" NLS
 "  -EFresamp=L  Enable Lagrange resample algorithm" NLS
 "  -EFresamp=n  Enable Newton resample algorithm" NLS
-"  -EFresamp=g  Enable Gauss-like resample algorithm (default)" NLS
+"  -EFresamp=g  Enable Gauss-like resample algorithm" NLS
 "                 -EFresamp affects the behavior of -N option" NLS, fp);
+#ifdef HAVE_STRINGIZE
+#define tim_str_internal(x) #x
+#define tim_str(x) tim_str_internal(x)
+#else
+#define tim_str(x) "x"
+#endif
+        fputs(
+            "                 default: " tim_str(DEFAULT_RESAMPLATION) NLS, fp);
 #endif
        fputs(NLS, fp);
        fputs("Alternative TiMidity sequencer extensional mode long options:" NLS

diff --git a/timidity/timidity.h b/timidity/timidity.h
index 75a4641..3978a31 100644 (file)
--- a/timidity/timidity.h
+++ b/timidity/timidity.h
@@ -154,7 +154,9 @@ typedef double FLOAT_T;
 /* Default resamplation algorighm.  Define as resample_XXX, where XXX is
    the algorithm name.  The following algorighms are available:
    cspline, gauss, newton, linear, none. */
+#ifndef DEFAULT_RESAMPLATION
 #define DEFAULT_RESAMPLATION resample_gauss
+#endif
 
 /* Don't allow users to choose the resamplation algorithm. */
 /* #define FIXED_RESAMPLATION */