OSDN Git Service

TiMidity++-2.11.0
authorMasanao Izumo <mo@goice.co.jp>
Thu, 27 Dec 2001 11:54:39 +0000 (20:54 +0900)
committerMasanao Izumo <mo@goice.co.jp>
Thu, 27 Dec 2001 11:54:39 +0000 (20:54 +0900)
40 files changed:
ChangeLog
NEWS
configs/msc-config.h
configs/msc-config.h.in
configure
configure.in
doc/C/timidity.1
interface/Makefile.am
interface/Makefile.in
interface/w32g.h
interface/w32g_c.c
interface/w32g_i.c
interface/w32g_pref.c
interface/w32g_pref.h
interface/w32g_res.h
interface/w32g_res.rc
interface/w32g_res_jp.rc [deleted file]
interface/w32g_subwin.c
interface/w32g_subwin.h
interface/w32g_ut2.c
interface/w32g_utl.c
timidity/Makefile.am
timidity/Makefile.in
timidity/audriv_a.c [changed mode: 0644->0755]
timidity/audriv_none.c [changed mode: 0644->0755]
timidity/gogo_a.c [new file with mode: 0755]
timidity/gogo_a.h [new file with mode: 0755]
timidity/output.c [changed mode: 0644->0755]
timidity/output.h
timidity/sndfont.c [changed mode: 0644->0755]
timidity/sun_a.c
timidity/timidity.c
timidity/timpp32g.ini
timidity/vorbis_a.c [changed mode: 0644->0755]
timidity/w32_gogo.c [new file with mode: 0755]
timidity/w32_gogo.h [new file with mode: 0755]
timidity/w32g_ogg_dll.c [new file with mode: 0755]
timidity/w32g_vorbis_dll.c [new file with mode: 0755]
timidity/w32g_vorbisenc_dll.c [new file with mode: 0755]
timidity/wave_a.c [changed mode: 0644->0755]

index e9dc249..703f9b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,43 @@
+2001-12-27  Masanao Izumo <mo@goice.co.jp>
+
+       * Version 2.11.0 released.
+
+2001-12-27  Masanao Izumo <mo@goice.co.jp>
+
+       * timidity/{wave_a.c,output.c}: Move create_auto_output_name() from
+         wave_a.c to output.c.
+       * interface/{w32g_vorbisenc_dll.c,w32g_vorbis_dll.c,w32g_ogg_dll.c},
+         timidity/{w32g_vorbisenc_dll.c,w32g_vorbis_dll.c,w32g_ogg_dll.c},
+         Move them from interface to timidity.
+
+2001-12-26  Saito <timidity@flashmail.com>
+
+       * timidity/sndfont.c: Bug fixed about LFO.
+
+2001-12-26  Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
+
+       * timidity/sun_a.c: Fixed the way to find the audio queue size
+         on NetBSD.
+
+2001-12-26  Masanao Izumo <mo@goice.co.jp>
+            Daisuke Aoki <dai@sweetparty.ne.jp>
+
+       * timidity/{timidity.c,wave_a.c,w32_gogo.h,w32_gogo.c,vorbis_a.c,
+         sndfont.c,output.c,gogo_a.h,gogo_a.c,audriv_none.c,audriv_a.c},
+         interface/{w32g_i.c,w32g_res.h,w32g_vorbisenc_dll.c,w32g_pref.c,
+         w32g_vorbis_dll.c,w32g_ogg_dll.c,w32g_utl.c,w32g_ut2.c,w32g_subwin.h,
+         w32g_subwin.c,w32g_pref.h,w32g_c.c,w32g.h}:
+         - Marge windows code.
+         - Update windows resource.
+
 2001-12-25  Masanao Izumo <mo@goice.co.jp>
 
        * timidity/w32_a.c: Close&Open to reset/flush the audio device.
 
+2001-12-23  Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
+
+       * doc/C/timidity.1: Updated.
+
 2001-12-23  Masanao Izumo <mo@goice.co.jp>
 
        * timidity/aq.c (aq_flush): Bug fixed.
diff --git a/NEWS b/NEWS
index 2785a8f..62332f0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
+12/27, 2001
     * Version 2.11.0 released.
+    * Configuration menu of Windows GUI was changed.
+    * Supported vorbis for Windows GUI version.
+    * Supported gogo for Windows GUI version.
     * (ncursese interface) Chaged from 3 to 4 digits in audio queue monitor.
     * (Sun audio): Enabled specify audio device file with AUDIODEV environment.
     * Updates Win32GUI version.
index 9b0ef09..a1a4d04 100644 (file)
 /* Define if you have the socket library (-lsocket).  */\r
 #undef HAVE_LIBSOCKET\r
 \r
+/* Define if you have the vorbis library (-lvorbis).  */\r
+#define HAVE_LIBVORBIS\r
+\r
+/* Define if you have the vorbis library (-lgogo).  */\r
+#define HAVE_LIBGOGO\r
+\r
 /* Define if you havee the <mmsystem.h> header file for Win32. */\r
 #define HAVE_MMSYSTEM_H\r
 \r
 /* In VDS Macro AAA=BBB is not available. */\r
 #define __W32__\r
-#define TIMID_VERSION  "2.11.0-pre5"\r
+#define TIMID_VERSION  "2.11.0"\r
 #define DEFAULT_PATH   ".\\"\r
 #define AU_W32\r
+#define AU_VORBIS\r
+#define AU_GOGO\r
 #define WINSOCK\r
 #define __W32READDIR__\r
 // #define URL_DIR_CACHE_ENABLE\r
 #define ANOTHER_MAIN\r
+#define __W32G__       /* for Win32 GUI */\r
+#define SUPPORT_SOCKET\r
 /*\r
   for Visual Studio Project Option \r
   LIB: mmsystem.lib comdlg32.lib\r
index fdb64c6..2e7de50 100644 (file)
 /* Define if you have the socket library (-lsocket).  */\r
 #undef HAVE_LIBSOCKET\r
 \r
+/* Define if you have the vorbis library (-lvorbis).  */\r
+#define HAVE_LIBVORBIS\r
+\r
+/* Define if you have the vorbis library (-lgogo).  */\r
+#define HAVE_LIBGOGO\r
+\r
 /* Define if you havee the <mmsystem.h> header file for Win32. */\r
 #define HAVE_MMSYSTEM_H\r
 \r
 #define TIMID_VERSION  "@VERSION@"\r
 #define DEFAULT_PATH   ".\\"\r
 #define AU_W32\r
+#define AU_VORBIS\r
+#define AU_GOGO\r
 #define WINSOCK\r
 #define __W32READDIR__\r
 // #define URL_DIR_CACHE_ENABLE\r
 #define ANOTHER_MAIN\r
+#define __W32G__       /* for Win32 GUI */\r
+#define SUPPORT_SOCKET\r
 /*\r
   for Visual Studio Project Option \r
   LIB: mmsystem.lib comdlg32.lib\r
index 420bf73..995264a 100755 (executable)
--- a/configure
+++ b/configure
@@ -694,6 +694,7 @@ Optional Features:
                               nas:  NAS - Network Audio System
                               esd:  EsounD
                               vorbis: Ogg Vorbis
+                              gogo: MP3 GOGO (Only Windows is supported)
   --enable-esd            EsounD (Obsoleted.  Use --enable-audio=esd)
   --enable-nas            NAS    (Obsoleted.  Use --enable-audio=nas)
   --enable-alsa           ALSA   (Obsoleted.  Use --enable-audio=alsa)
@@ -742,7 +743,7 @@ Optional Packages:
   --with-nas-library=library  NAS absolute library path (Don't use -laudio)
   --with-nas-includes=DIR     NAS include files are in dir
   --with-default-output=<mode>  Specify default output mode (optional):
-                            default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis
+                       default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis|gogo
   --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)
   --with-alsa-inc-prefix=PFX  Prefix where include libraries are (optional)
   --with-esd-prefix=PFX   Prefix where ESD is installed (optional)
@@ -944,7 +945,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:947: loading site script $ac_site_file" >&5
+    { echo "$as_me:948: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -955,7 +956,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:958: loading cache $cache_file" >&5
+    { echo "$as_me:959: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -963,7 +964,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:966: creating cache $cache_file" >&5
+  { echo "$as_me:967: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -979,21 +980,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:982: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:983: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:986: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:987: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:992: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:993: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:994:   former value:  $ac_old_val" >&5
+        { echo "$as_me:995:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:996:   current value: $ac_new_val" >&5
+        { echo "$as_me:997:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1012,9 +1013,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:1015: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1016: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:1017: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1018: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1034,10 +1035,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1037: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1038: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1040: \$? = $ac_status" >&5
+  echo "$as_me:1041: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1064,7 +1065,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1067: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1068: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1074,11 +1075,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1077: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1078: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1081: checking build system type" >&5
+echo "$as_me:1082: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1087,23 +1088,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1090: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1091: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1094: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1095: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1099: result: $ac_cv_build" >&5
+echo "$as_me:1100: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1106: checking host system type" >&5
+echo "$as_me:1107: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1112,19 +1113,19 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1115: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1116: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1120: result: $ac_cv_host" >&5
+echo "$as_me:1121: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1127: checking target system type" >&5
+echo "$as_me:1128: checking target system type" >&5
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1133,12 +1134,12 @@ else
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:1136: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1137: error: $ac_config_sub $ac_cv_target_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1141: result: $ac_cv_target" >&5
+echo "$as_me:1142: result: $ac_cv_target" >&5
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1163,7 +1164,7 @@ test -n "$target_alias" &&
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1166: checking for a BSD compatible install" >&5
+echo "$as_me:1167: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1212,7 +1213,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1215: result: $INSTALL" >&5
+echo "$as_me:1216: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1223,7 +1224,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1226: checking whether build environment is sane" >&5
+echo "$as_me:1227: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -1247,7 +1248,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:1250: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1251: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
@@ -1260,13 +1261,13 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:1263: error: newly created file is older than distributed files!
+   { { echo "$as_me:1264: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:1269: result: yes" >&5
+echo "$as_me:1270: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
@@ -1291,7 +1292,7 @@ if eval "$MISSING --run true"; then
 else
   am_missing_run=
   am_backtick='`'
-  { echo "$as_me:1294: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+  { echo "$as_me:1295: WARNING: ${am_backtick}missing' script is too old or missing" >&5
 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
@@ -1299,7 +1300,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1302: checking for $ac_word" >&5
+echo "$as_me:1303: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1314,7 +1315,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:1317: found $ac_dir/$ac_word" >&5
+echo "$as_me:1318: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1322,17 +1323,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1325: result: $AWK" >&5
+  echo "$as_me:1326: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1328: result: no" >&5
+  echo "$as_me:1329: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:1335: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1336: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1352,11 +1353,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1355: result: yes" >&5
+  echo "$as_me:1356: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1359: result: no" >&5
+  echo "$as_me:1360: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1392,14 +1393,14 @@ rmdir .deps 2>/dev/null
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { { echo "$as_me:1395: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1396: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 # Define the identity of the package.
 PACKAGE=TiMidity++
-VERSION=2.11.0-pre5
+VERSION=2.11.0
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -1441,7 +1442,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-echo "$as_me:1444: checking whether grep returns status" >&5
+echo "$as_me:1445: checking whether grep returns status" >&5
 echo $ECHO_N "checking whether grep returns status... $ECHO_C" >&6
 echo "grimblepritz" >grimble
 if grep blurfldyick grimble >/dev/null 2>&1 ; then
@@ -1453,11 +1454,11 @@ else
 fi
 rm -f grimble
 case "$contains" in
-grep)  echo "$as_me:1456: result: yes" >&5
+grep)  echo "$as_me:1457: result: yes" >&5
 echo "${ECHO_T}yes" >&6
        ;;
 ./contains)
-       echo "$as_me:1460: result: AGH!  Grep doesn't return a status.  Attempting remedial action." >&5
+       echo "$as_me:1461: result: AGH!  Grep doesn't return a status.  Attempting remedial action." >&5
 echo "${ECHO_T}AGH!  Grep doesn't return a status.  Attempting remedial action." >&6
        cat >./contains <<'EOSS'
 grep "$1" "$2" >.greptmp && cat .greptmp && test -s .greptmp
@@ -1474,9 +1475,9 @@ esac
 if test "${with_lispdir+set}" = set; then
   withval="$with_lispdir"
    lispdir="$withval"
-    echo "$as_me:1477: checking where .elc files should go" >&5
+    echo "$as_me:1478: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
-    echo "$as_me:1479: result: $lispdir" >&5
+    echo "$as_me:1480: result: $lispdir" >&5
 echo "${ECHO_T}$lispdir" >&6
 else
 
@@ -1487,7 +1488,7 @@ else
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1490: checking for $ac_word" >&5
+echo "$as_me:1491: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_EMACS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1502,7 +1503,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_EMACS="$ac_prog"
-echo "$as_me:1505: found $ac_dir/$ac_word" >&5
+echo "$as_me:1506: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1510,10 +1511,10 @@ fi
 fi
 EMACS=$ac_cv_prog_EMACS
 if test -n "$EMACS"; then
-  echo "$as_me:1513: result: $EMACS" >&5
+  echo "$as_me:1514: result: $EMACS" >&5
 echo "${ECHO_T}$EMACS" >&6
 else
-  echo "$as_me:1516: result: no" >&5
+  echo "$as_me:1517: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1523,7 +1524,7 @@ test -n "$EMACS" || EMACS="no"
 
   if test $EMACS != "no"; then
     if test x${lispdir+set} != xset; then
-      echo "$as_me:1526: checking where .elc files should go" >&5
+      echo "$as_me:1527: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
 if test "${am_cv_lispdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1534,7 +1535,7 @@ else
        fi
 
 fi
-echo "$as_me:1537: result: $am_cv_lispdir" >&5
+echo "$as_me:1538: result: $am_cv_lispdir" >&5
 echo "${ECHO_T}$am_cv_lispdir" >&6
       lispdir="$am_cv_lispdir"
     fi
@@ -1630,7 +1631,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1633: checking for $ac_word" >&5
+echo "$as_me:1634: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1645,7 +1646,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1648: found $ac_dir/$ac_word" >&5
+echo "$as_me:1649: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1653,10 +1654,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1656: result: $CC" >&5
+  echo "$as_me:1657: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1659: result: no" >&5
+  echo "$as_me:1660: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1665,7 +1666,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1668: checking for $ac_word" >&5
+echo "$as_me:1669: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1680,7 +1681,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1683: found $ac_dir/$ac_word" >&5
+echo "$as_me:1684: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1688,10 +1689,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1691: result: $ac_ct_CC" >&5
+  echo "$as_me:1692: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1694: result: no" >&5
+  echo "$as_me:1695: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1704,7 +1705,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1707: checking for $ac_word" >&5
+echo "$as_me:1708: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1719,7 +1720,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1722: found $ac_dir/$ac_word" >&5
+echo "$as_me:1723: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1727,10 +1728,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1730: result: $CC" >&5
+  echo "$as_me:1731: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1733: result: no" >&5
+  echo "$as_me:1734: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1739,7 +1740,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1742: checking for $ac_word" >&5
+echo "$as_me:1743: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1754,7 +1755,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1757: found $ac_dir/$ac_word" >&5
+echo "$as_me:1758: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1762,10 +1763,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1765: result: $ac_ct_CC" >&5
+  echo "$as_me:1766: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1768: result: no" >&5
+  echo "$as_me:1769: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1778,7 +1779,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1781: checking for $ac_word" >&5
+echo "$as_me:1782: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1798,7 +1799,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1801: found $ac_dir/$ac_word" >&5
+echo "$as_me:1802: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1820,10 +1821,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1823: result: $CC" >&5
+  echo "$as_me:1824: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1826: result: no" >&5
+  echo "$as_me:1827: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1834,7 +1835,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1837: checking for $ac_word" >&5
+echo "$as_me:1838: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1849,7 +1850,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1852: found $ac_dir/$ac_word" >&5
+echo "$as_me:1853: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1857,10 +1858,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1860: result: $CC" >&5
+  echo "$as_me:1861: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1863: result: no" >&5
+  echo "$as_me:1864: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1873,7 +1874,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1876: checking for $ac_word" >&5
+echo "$as_me:1877: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1888,7 +1889,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1891: found $ac_dir/$ac_word" >&5
+echo "$as_me:1892: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1896,10 +1897,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1899: result: $ac_ct_CC" >&5
+  echo "$as_me:1900: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1902: result: no" >&5
+  echo "$as_me:1903: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1911,32 +1912,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1914: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1915: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1919:" \
+echo "$as_me:1920:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1922: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1923: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1925: \$? = $ac_status" >&5
+  echo "$as_me:1926: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1927: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1928: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1930: \$? = $ac_status" >&5
+  echo "$as_me:1931: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1932: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1933: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1935: \$? = $ac_status" >&5
+  echo "$as_me:1936: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1939 "configure"
+#line 1940 "configure"
 #include "confdefs.h"
 
 int
@@ -1952,13 +1953,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1955: checking for C compiler default output" >&5
+echo "$as_me:1956: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1958: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1959: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1961: \$? = $ac_status" >&5
+  echo "$as_me:1962: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1981,34 +1982,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1984: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1985: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1990: result: $ac_file" >&5
+echo "$as_me:1991: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1995: checking whether the C compiler works" >&5
+echo "$as_me:1996: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:2001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2004: \$? = $ac_status" >&5
+  echo "$as_me:2005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else
-       { { echo "$as_me:2011: error: cannot run C compiled programs.
+       { { echo "$as_me:2012: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -2016,24 +2017,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:2019: result: yes" >&5
+echo "$as_me:2020: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:2026: checking whether we are cross compiling" >&5
+echo "$as_me:2027: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2028: result: $cross_compiling" >&5
+echo "$as_me:2029: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2031: checking for executable suffix" >&5
+echo "$as_me:2032: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2036: \$? = $ac_status" >&5
+  echo "$as_me:2037: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2049,25 +2050,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:2052: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2053: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:2058: result: $ac_cv_exeext" >&5
+echo "$as_me:2059: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:2064: checking for object suffix" >&5
+echo "$as_me:2065: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2070 "configure"
+#line 2071 "configure"
 #include "confdefs.h"
 
 int
@@ -2079,10 +2080,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2085: \$? = $ac_status" >&5
+  echo "$as_me:2086: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -2094,24 +2095,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:2097: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2098: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:2104: result: $ac_cv_objext" >&5
+echo "$as_me:2105: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2108: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2109: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2114 "configure"
+#line 2115 "configure"
 #include "confdefs.h"
 
 int
@@ -2126,16 +2127,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2132: \$? = $ac_status" >&5
+  echo "$as_me:2133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2138: \$? = $ac_status" >&5
+  echo "$as_me:2139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2147,19 +2148,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2150: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2151: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:2156: checking whether $CC accepts -g" >&5
+echo "$as_me:2157: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2162 "configure"
+#line 2163 "configure"
 #include "confdefs.h"
 
 int
@@ -2171,16 +2172,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2177: \$? = $ac_status" >&5
+  echo "$as_me:2178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2183: \$? = $ac_status" >&5
+  echo "$as_me:2184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2190,7 +2191,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2193: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2194: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2217,16 +2218,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2221: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2223: \$? = $ac_status" >&5
+  echo "$as_me:2224: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2229: \$? = $ac_status" >&5
+  echo "$as_me:2230: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -2238,7 +2239,7 @@ if { (eval echo "$as_me:2220: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2241 "configure"
+#line 2242 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2251,16 +2252,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2255: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2257: \$? = $ac_status" >&5
+  echo "$as_me:2258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2263: \$? = $ac_status" >&5
+  echo "$as_me:2264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2270,7 +2271,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2273 "configure"
+#line 2274 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2282,16 +2283,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2285: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2288: \$? = $ac_status" >&5
+  echo "$as_me:2289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2294: \$? = $ac_status" >&5
+  echo "$as_me:2295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2326,7 +2327,7 @@ doit:
        @echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:2329: checking for style of include used by $am_make" >&5
+echo "$as_me:2330: checking for style of include used by $am_make" >&5
 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include='#'
 am__quote=
@@ -2353,13 +2354,13 @@ if test "$am__include" = "#"; then
    fi
 fi
 
-echo "$as_me:2356: result: $_am_result" >&5
+echo "$as_me:2357: result: $_am_result" >&5
 echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:2362: checking dependency style of $depcc" >&5
+echo "$as_me:2363: checking dependency style of $depcc" >&5
 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2421,7 +2422,7 @@ else
 fi
 
 fi
-echo "$as_me:2424: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "$as_me:2425: result: $am_cv_CC_dependencies_compiler_type" >&5
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
@@ -2437,7 +2438,7 @@ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2440: checking for a BSD compatible install" >&5
+echo "$as_me:2441: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2486,7 +2487,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2489: result: $INSTALL" >&5
+echo "$as_me:2490: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2500,7 +2501,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2503: checking for $ac_word" >&5
+echo "$as_me:2504: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2515,7 +2516,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2518: found $ac_dir/$ac_word" >&5
+echo "$as_me:2519: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2523,10 +2524,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2526: result: $RANLIB" >&5
+  echo "$as_me:2527: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2529: result: no" >&5
+  echo "$as_me:2530: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2535,7 +2536,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2538: checking for $ac_word" >&5
+echo "$as_me:2539: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2550,7 +2551,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2553: found $ac_dir/$ac_word" >&5
+echo "$as_me:2554: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2559,10 +2560,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2562: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2563: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2565: result: no" >&5
+  echo "$as_me:2566: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2571,18 +2572,18 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:2574: checking whether ln -s works" >&5
+echo "$as_me:2575: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2578: result: yes" >&5
+  echo "$as_me:2579: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2581: result: no, using $LN_S" >&5
+  echo "$as_me:2582: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:2585: checking whether -rdynamic option is recognized" >&5
+echo "$as_me:2586: checking whether -rdynamic option is recognized" >&5
 echo $ECHO_N "checking whether -rdynamic option is recognized... $ECHO_C" >&6
 ac_ccoption=`echo rdynamic | sed 'y%./+-%__p_%'`
 if eval "test \"\${timidity_cv_ccoption_$ac_ccoption+set}\" = set"; then
@@ -2604,11 +2605,11 @@ fi
 fi
 
 if eval "test \"`echo '$timidity_cv_ccoption_'$ac_ccoption`\" = yes"; then
-  echo "$as_me:2607: result: yes" >&5
+  echo "$as_me:2608: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
-  echo "$as_me:2611: result: no" >&5
+  echo "$as_me:2612: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
@@ -2698,7 +2699,7 @@ case "$target" in
     ;;
 esac
 
-echo "$as_me:2701: checking for sqrt in -lm" >&5
+echo "$as_me:2702: checking for sqrt in -lm" >&5
 echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_sqrt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2706,7 +2707,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2709 "configure"
+#line 2710 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2725,16 +2726,16 @@ sqrt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2731: \$? = $ac_status" >&5
+  echo "$as_me:2732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2737: \$? = $ac_status" >&5
+  echo "$as_me:2738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_sqrt=yes
 else
@@ -2745,7 +2746,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2748: result: $ac_cv_lib_m_sqrt" >&5
+echo "$as_me:2749: result: $ac_cv_lib_m_sqrt" >&5
 echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6
 if test $ac_cv_lib_m_sqrt = yes; then
   cat >>confdefs.h <<EOF
@@ -2756,7 +2757,7 @@ EOF
 
 fi
 
-echo "$as_me:2759: checking for socket in -lsocket" >&5
+echo "$as_me:2760: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2764,7 +2765,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2767 "configure"
+#line 2768 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2783,16 +2784,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2789: \$? = $ac_status" >&5
+  echo "$as_me:2790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2795: \$? = $ac_status" >&5
+  echo "$as_me:2796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -2803,7 +2804,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2806: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:2807: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
   cat >>confdefs.h <<EOF
@@ -2814,7 +2815,7 @@ EOF
 
 fi
 
-echo "$as_me:2817: checking for dlopen in -ldl" >&5
+echo "$as_me:2818: checking for dlopen in -ldl" >&5
 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2822,7 +2823,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2825 "configure"
+#line 2826 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2841,16 +2842,16 @@ dlopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2847: \$? = $ac_status" >&5
+  echo "$as_me:2848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2853: \$? = $ac_status" >&5
+  echo "$as_me:2854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlopen=yes
 else
@@ -2861,7 +2862,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2864: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:2865: result: $ac_cv_lib_dl_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 if test $ac_cv_lib_dl_dlopen = yes; then
   lib_dl_opt=-ldl
@@ -2870,13 +2871,13 @@ fi
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:2873: checking for $ac_func" >&5
+echo "$as_me:2874: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2879 "configure"
+#line 2880 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -2907,16 +2908,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2913: \$? = $ac_status" >&5
+  echo "$as_me:2914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2919: \$? = $ac_status" >&5
+  echo "$as_me:2920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -2926,7 +2927,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:2929: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:2930: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2935,7 +2936,7 @@ EOF
 
 else
 
-echo "$as_me:2938: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:2939: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2943,7 +2944,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2946 "configure"
+#line 2947 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2962,16 +2963,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2968: \$? = $ac_status" >&5
+  echo "$as_me:2969: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2974: \$? = $ac_status" >&5
+  echo "$as_me:2975: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -2982,7 +2983,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2985: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:2986: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   cat >>confdefs.h <<EOF
@@ -3001,7 +3002,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:3004: checking how to run the C preprocessor" >&5
+echo "$as_me:3005: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -3022,18 +3023,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3025 "configure"
+#line 3026 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3030: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3031: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3036: \$? = $ac_status" >&5
+  echo "$as_me:3037: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3056,17 +3057,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3059 "configure"
+#line 3060 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3063: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3064: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3069: \$? = $ac_status" >&5
+  echo "$as_me:3070: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3103,7 +3104,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:3106: result: $CPP" >&5
+echo "$as_me:3107: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -3113,18 +3114,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3116 "configure"
+#line 3117 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:3121: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3122: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3127: \$? = $ac_status" >&5
+  echo "$as_me:3128: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3147,17 +3148,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3150 "configure"
+#line 3151 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:3154: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3155: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3160: \$? = $ac_status" >&5
+  echo "$as_me:3161: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3185,7 +3186,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:3188: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:3189: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3196,7 +3197,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:3199: checking for X" >&5
+echo "$as_me:3200: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -3293,17 +3294,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3296 "configure"
+#line 3297 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:3300: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3301: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3306: \$? = $ac_status" >&5
+  echo "$as_me:3307: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3336,7 +3337,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 3339 "configure"
+#line 3340 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -3348,16 +3349,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3354: \$? = $ac_status" >&5
+  echo "$as_me:3355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3360: \$? = $ac_status" >&5
+  echo "$as_me:3361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -3395,7 +3396,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:3398: result: $have_x" >&5
+  echo "$as_me:3399: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -3405,7 +3406,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
                ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:3408: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:3409: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -3429,11 +3430,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:3432: checking whether -R must be followed by a space" >&5
+      echo "$as_me:3433: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 3436 "configure"
+#line 3437 "configure"
 #include "confdefs.h"
 
 int
@@ -3445,16 +3446,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3449: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3451: \$? = $ac_status" >&5
+  echo "$as_me:3452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3457: \$? = $ac_status" >&5
+  echo "$as_me:3458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -3464,13 +3465,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-       echo "$as_me:3467: result: no" >&5
+       echo "$as_me:3468: result: no" >&5
 echo "${ECHO_T}no" >&6
        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat >conftest.$ac_ext <<_ACEOF
-#line 3473 "configure"
+#line 3474 "configure"
 #include "confdefs.h"
 
 int
@@ -3482,16 +3483,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3488: \$? = $ac_status" >&5
+  echo "$as_me:3489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3494: \$? = $ac_status" >&5
+  echo "$as_me:3495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -3501,11 +3502,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        if test $ac_R_space = yes; then
-         echo "$as_me:3504: result: yes" >&5
+         echo "$as_me:3505: result: yes" >&5
 echo "${ECHO_T}yes" >&6
          X_LIBS="$X_LIBS -R $x_libraries"
        else
-         echo "$as_me:3508: result: neither works" >&5
+         echo "$as_me:3509: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
        fi
       fi
@@ -3525,7 +3526,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 3528 "configure"
+#line 3529 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3544,22 +3545,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3550: \$? = $ac_status" >&5
+  echo "$as_me:3551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3556: \$? = $ac_status" >&5
+  echo "$as_me:3557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3562: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:3563: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3567,7 +3568,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3570 "configure"
+#line 3571 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3586,16 +3587,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3592: \$? = $ac_status" >&5
+  echo "$as_me:3593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3598: \$? = $ac_status" >&5
+  echo "$as_me:3599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -3606,14 +3607,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3609: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:3610: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:3616: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:3617: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3621,7 +3622,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3624 "configure"
+#line 3625 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3640,16 +3641,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3644: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3646: \$? = $ac_status" >&5
+  echo "$as_me:3647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3652: \$? = $ac_status" >&5
+  echo "$as_me:3653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -3660,7 +3661,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3663: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:3664: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -3679,13 +3680,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:3682: checking for gethostbyname" >&5
+    echo "$as_me:3683: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3688 "configure"
+#line 3689 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -3716,16 +3717,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3722: \$? = $ac_status" >&5
+  echo "$as_me:3723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3728: \$? = $ac_status" >&5
+  echo "$as_me:3729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -3735,11 +3736,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3738: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:3739: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:3742: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:3743: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3747,7 +3748,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3750 "configure"
+#line 3751 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3766,16 +3767,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3772: \$? = $ac_status" >&5
+  echo "$as_me:3773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3778: \$? = $ac_status" >&5
+  echo "$as_me:3779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -3786,14 +3787,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3789: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:3790: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:3796: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:3797: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3801,7 +3802,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3804 "configure"
+#line 3805 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3820,16 +3821,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3826: \$? = $ac_status" >&5
+  echo "$as_me:3827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3832: \$? = $ac_status" >&5
+  echo "$as_me:3833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -3840,7 +3841,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3843: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:3844: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -3856,13 +3857,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:3859: checking for connect" >&5
+    echo "$as_me:3860: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3865 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -3893,16 +3894,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3899: \$? = $ac_status" >&5
+  echo "$as_me:3900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3905: \$? = $ac_status" >&5
+  echo "$as_me:3906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -3912,11 +3913,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3915: result: $ac_cv_func_connect" >&5
+echo "$as_me:3916: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:3919: checking for connect in -lsocket" >&5
+      echo "$as_me:3920: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3924,7 +3925,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3927 "configure"
+#line 3928 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3943,16 +3944,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3947: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3949: \$? = $ac_status" >&5
+  echo "$as_me:3950: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3955: \$? = $ac_status" >&5
+  echo "$as_me:3956: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -3963,7 +3964,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3966: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:3967: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -3972,13 +3973,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:3975: checking for remove" >&5
+    echo "$as_me:3976: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3981 "configure"
+#line 3982 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -4009,16 +4010,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4015: \$? = $ac_status" >&5
+  echo "$as_me:4016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4021: \$? = $ac_status" >&5
+  echo "$as_me:4022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -4028,11 +4029,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4031: result: $ac_cv_func_remove" >&5
+echo "$as_me:4032: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:4035: checking for remove in -lposix" >&5
+      echo "$as_me:4036: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4040,7 +4041,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4043 "configure"
+#line 4044 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4059,16 +4060,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4065: \$? = $ac_status" >&5
+  echo "$as_me:4066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4071: \$? = $ac_status" >&5
+  echo "$as_me:4072: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -4079,7 +4080,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4082: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:4083: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -4088,13 +4089,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:4091: checking for shmat" >&5
+    echo "$as_me:4092: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4097 "configure"
+#line 4098 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -4125,16 +4126,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4131: \$? = $ac_status" >&5
+  echo "$as_me:4132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4137: \$? = $ac_status" >&5
+  echo "$as_me:4138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -4144,11 +4145,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4147: result: $ac_cv_func_shmat" >&5
+echo "$as_me:4148: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:4151: checking for shmat in -lipc" >&5
+      echo "$as_me:4152: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4156,7 +4157,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4159 "configure"
+#line 4160 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4175,16 +4176,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4181: \$? = $ac_status" >&5
+  echo "$as_me:4182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4187: \$? = $ac_status" >&5
+  echo "$as_me:4188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -4195,7 +4196,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4198: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:4199: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -4213,7 +4214,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:4216: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:4217: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4221,7 +4222,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4224 "configure"
+#line 4225 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4240,16 +4241,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4246: \$? = $ac_status" >&5
+  echo "$as_me:4247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4252: \$? = $ac_status" >&5
+  echo "$as_me:4253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -4260,7 +4261,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4263: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:4264: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -4273,11 +4274,11 @@ fi
 if test "x$with_x" = xyes; then
   if test "x$have_x" = xno; then
     if test "x$x_config_flag" = xyes; then
-      { { echo "$as_me:4276: error: Could not configure X" >&5
+      { { echo "$as_me:4277: error: Could not configure X" >&5
 echo "$as_me: error: Could not configure X" >&2;}
    { (exit 1); exit 1; }; }
     else
-      { echo "$as_me:4280: WARNING: Could not configure X" >&5
+      { echo "$as_me:4281: WARNING: Could not configure X" >&5
 echo "$as_me: WARNING: Could not configure X" >&2;}
     fi
   fi
@@ -4294,7 +4295,7 @@ if test "x$with_x" = xyes -a "x$have_x" = xyes; then
     CPPFLAGS="$CPPFLAGS -I$x_includes"
   fi
 
-echo "$as_me:4297: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:4298: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4302,7 +4303,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4305 "configure"
+#line 4306 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4321,16 +4322,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4327: \$? = $ac_status" >&5
+  echo "$as_me:4328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4333: \$? = $ac_status" >&5
+  echo "$as_me:4334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -4341,7 +4342,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4344: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:4345: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   cat >>confdefs.h <<EOF
@@ -4352,13 +4353,13 @@ EOF
 
 fi
 
-  echo "$as_me:4355: checking X11 version 6" >&5
+  echo "$as_me:4356: checking X11 version 6" >&5
 echo $ECHO_N "checking X11 version 6... $ECHO_C" >&6
   if test "${timidity_cv_x11_version_6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4361 "configure"
+#line 4362 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int
@@ -4373,16 +4374,16 @@ fail;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4379: \$? = $ac_status" >&5
+  echo "$as_me:4380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4385: \$? = $ac_status" >&5
+  echo "$as_me:4386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   timidity_cv_x11_version_6=yes
 else
@@ -4394,15 +4395,15 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
   if test "$timidity_cv_x11_version_6" = "yes"; then
-    echo "$as_me:4397: result: 6 or newer" >&5
+    echo "$as_me:4398: result: 6 or newer" >&5
 echo "${ECHO_T}6 or newer" >&6
       else
-    echo "$as_me:4400: result: before 6" >&5
+    echo "$as_me:4401: result: before 6" >&5
 echo "${ECHO_T}before 6" >&6
   fi
 
     KEEPLIBS=$LIBS
-  echo "$as_me:4405: checking for XShapeCombineMask in -lXext" >&5
+  echo "$as_me:4406: checking for XShapeCombineMask in -lXext" >&5
 echo $ECHO_N "checking for XShapeCombineMask in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XShapeCombineMask+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4410,7 +4411,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4413 "configure"
+#line 4414 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4429,16 +4430,16 @@ XShapeCombineMask ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4435: \$? = $ac_status" >&5
+  echo "$as_me:4436: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4441: \$? = $ac_status" >&5
+  echo "$as_me:4442: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XShapeCombineMask=yes
 else
@@ -4449,7 +4450,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4452: result: $ac_cv_lib_Xext_XShapeCombineMask" >&5
+echo "$as_me:4453: result: $ac_cv_lib_Xext_XShapeCombineMask" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XShapeCombineMask" >&6
 if test $ac_cv_lib_Xext_XShapeCombineMask = yes; then
   have_xext=yes; LIBS="-lXext $LIBS"
@@ -4457,7 +4458,7 @@ else
   have_xext=no
 fi
 
-echo "$as_me:4460: checking for IceConnectionNumber in -lICE" >&5
+echo "$as_me:4461: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4465,7 +4466,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4468 "configure"
+#line 4469 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4484,16 +4485,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4490: \$? = $ac_status" >&5
+  echo "$as_me:4491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4496: \$? = $ac_status" >&5
+  echo "$as_me:4497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -4504,7 +4505,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4507: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:4508: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   cat >>confdefs.h <<EOF
@@ -4515,7 +4516,7 @@ EOF
 
 fi
 
-  echo "$as_me:4518: checking for SmcOpenConnection in -lSM" >&5
+  echo "$as_me:4519: checking for SmcOpenConnection in -lSM" >&5
 echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6
 if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4523,7 +4524,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSM  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4526 "configure"
+#line 4527 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4542,16 +4543,16 @@ SmcOpenConnection ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4548: \$? = $ac_status" >&5
+  echo "$as_me:4549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4554: \$? = $ac_status" >&5
+  echo "$as_me:4555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_SM_SmcOpenConnection=yes
 else
@@ -4562,7 +4563,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4565: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
+echo "$as_me:4566: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
 echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6
 if test $ac_cv_lib_SM_SmcOpenConnection = yes; then
   have_xprelibs=yes; LIBS="-lSM $LIBS"
@@ -4570,7 +4571,7 @@ else
   have_xprelibs=no
 fi
 
-  echo "$as_me:4573: checking for XtVaAppInitialize in -lXt" >&5
+  echo "$as_me:4574: checking for XtVaAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtVaAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtVaAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4578,7 +4579,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4581 "configure"
+#line 4582 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4597,16 +4598,16 @@ XtVaAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4603: \$? = $ac_status" >&5
+  echo "$as_me:4604: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4609: \$? = $ac_status" >&5
+  echo "$as_me:4610: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtVaAppInitialize=yes
 else
@@ -4617,7 +4618,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4620: result: $ac_cv_lib_Xt_XtVaAppInitialize" >&5
+echo "$as_me:4621: result: $ac_cv_lib_Xt_XtVaAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtVaAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtVaAppInitialize = yes; then
   have_xt=yes; LIBS="-lXt $LIBS"
@@ -4625,7 +4626,7 @@ else
   have_xt=no
 fi
 
-  echo "$as_me:4628: checking for XmuInternAtom in -lXmu" >&5
+  echo "$as_me:4629: checking for XmuInternAtom in -lXmu" >&5
 echo $ECHO_N "checking for XmuInternAtom in -lXmu... $ECHO_C" >&6
 if test "${ac_cv_lib_Xmu_XmuInternAtom+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4633,7 +4634,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4636 "configure"
+#line 4637 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4652,16 +4653,16 @@ XmuInternAtom ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4658: \$? = $ac_status" >&5
+  echo "$as_me:4659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4664: \$? = $ac_status" >&5
+  echo "$as_me:4665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuInternAtom=yes
 else
@@ -4672,7 +4673,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4675: result: $ac_cv_lib_Xmu_XmuInternAtom" >&5
+echo "$as_me:4676: result: $ac_cv_lib_Xmu_XmuInternAtom" >&5
 echo "${ECHO_T}$ac_cv_lib_Xmu_XmuInternAtom" >&6
 if test $ac_cv_lib_Xmu_XmuInternAtom = yes; then
   LIBS="-lXmu $LIBS"
@@ -4681,13 +4682,13 @@ fi
 for ac_func in XmuRegisterExternalAgent
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4684: checking for $ac_func" >&5
+echo "$as_me:4685: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4690 "configure"
+#line 4691 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4718,16 +4719,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4722: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4724: \$? = $ac_status" >&5
+  echo "$as_me:4725: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4730: \$? = $ac_status" >&5
+  echo "$as_me:4731: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4737,7 +4738,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4740: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4741: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4747,7 +4748,7 @@ EOF
 fi
 done
 
-  echo "$as_me:4750: checking for XawInitializeWidgetSet in -lXaw3d" >&5
+  echo "$as_me:4751: checking for XawInitializeWidgetSet in -lXaw3d" >&5
 echo $ECHO_N "checking for XawInitializeWidgetSet in -lXaw3d... $ECHO_C" >&6
 if test "${ac_cv_lib_Xaw3d_XawInitializeWidgetSet+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4755,7 +4756,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw3d  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4758 "configure"
+#line 4759 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4774,16 +4775,16 @@ XawInitializeWidgetSet ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4778: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4780: \$? = $ac_status" >&5
+  echo "$as_me:4781: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4786: \$? = $ac_status" >&5
+  echo "$as_me:4787: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xaw3d_XawInitializeWidgetSet=yes
 else
@@ -4794,12 +4795,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4797: result: $ac_cv_lib_Xaw3d_XawInitializeWidgetSet" >&5
+echo "$as_me:4798: result: $ac_cv_lib_Xaw3d_XawInitializeWidgetSet" >&5
 echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawInitializeWidgetSet" >&6
 if test $ac_cv_lib_Xaw3d_XawInitializeWidgetSet = yes; then
   have_xaw=3d
 else
-   echo "$as_me:4802: checking for XawInitializeWidgetSet in -lXaw" >&5
+   echo "$as_me:4803: checking for XawInitializeWidgetSet in -lXaw" >&5
 echo $ECHO_N "checking for XawInitializeWidgetSet in -lXaw... $ECHO_C" >&6
 if test "${ac_cv_lib_Xaw_XawInitializeWidgetSet+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4807,7 +4808,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4810 "configure"
+#line 4811 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4826,16 +4827,16 @@ XawInitializeWidgetSet ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4832: \$? = $ac_status" >&5
+  echo "$as_me:4833: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4838: \$? = $ac_status" >&5
+  echo "$as_me:4839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xaw_XawInitializeWidgetSet=yes
 else
@@ -4846,7 +4847,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4849: result: $ac_cv_lib_Xaw_XawInitializeWidgetSet" >&5
+echo "$as_me:4850: result: $ac_cv_lib_Xaw_XawInitializeWidgetSet" >&5
 echo "${ECHO_T}$ac_cv_lib_Xaw_XawInitializeWidgetSet" >&6
 if test $ac_cv_lib_Xaw_XawInitializeWidgetSet = yes; then
   have_xaw=yes
@@ -4856,7 +4857,7 @@ fi
 
 fi
 
-  echo "$as_me:4859: checking for XmCreateForm in -lXm" >&5
+  echo "$as_me:4860: checking for XmCreateForm in -lXm" >&5
 echo $ECHO_N "checking for XmCreateForm in -lXm... $ECHO_C" >&6
 if test "${ac_cv_lib_Xm_XmCreateForm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4864,7 +4865,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4867 "configure"
+#line 4868 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4883,16 +4884,16 @@ XmCreateForm ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4889: \$? = $ac_status" >&5
+  echo "$as_me:4890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4895: \$? = $ac_status" >&5
+  echo "$as_me:4896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xm_XmCreateForm=yes
 else
@@ -4903,7 +4904,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4906: result: $ac_cv_lib_Xm_XmCreateForm" >&5
+echo "$as_me:4907: result: $ac_cv_lib_Xm_XmCreateForm" >&5
 echo "${ECHO_T}$ac_cv_lib_Xm_XmCreateForm" >&6
 if test $ac_cv_lib_Xm_XmCreateForm = yes; then
   have_xm=yes
@@ -4914,13 +4915,13 @@ fi
 for ac_func in XShmCreatePixmap
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4917: checking for $ac_func" >&5
+echo "$as_me:4918: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4923 "configure"
+#line 4924 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4951,16 +4952,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4957: \$? = $ac_status" >&5
+  echo "$as_me:4958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4963: \$? = $ac_status" >&5
+  echo "$as_me:4964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4970,7 +4971,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4973: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4974: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4986,13 +4987,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:4989: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:4990: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4995 "configure"
+#line 4996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -5007,16 +5008,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5013: \$? = $ac_status" >&5
+  echo "$as_me:5014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5019: \$? = $ac_status" >&5
+  echo "$as_me:5020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5026,7 +5027,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5029: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5030: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5039,7 +5040,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:5042: checking for opendir in -ldir" >&5
+  echo "$as_me:5043: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5047,7 +5048,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5050 "configure"
+#line 5051 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5066,16 +5067,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5070: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5072: \$? = $ac_status" >&5
+  echo "$as_me:5073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5078: \$? = $ac_status" >&5
+  echo "$as_me:5079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -5086,14 +5087,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5089: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:5090: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:5096: checking for opendir in -lx" >&5
+  echo "$as_me:5097: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5101,7 +5102,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5104 "configure"
+#line 5105 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5120,16 +5121,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5126: \$? = $ac_status" >&5
+  echo "$as_me:5127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5132: \$? = $ac_status" >&5
+  echo "$as_me:5133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -5140,7 +5141,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5143: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:5144: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -5148,13 +5149,13 @@ fi
 
 fi
 
-echo "$as_me:5151: checking for ANSI C header files" >&5
+echo "$as_me:5152: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5157 "configure"
+#line 5158 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5162,13 +5163,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5165: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5166: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5171: \$? = $ac_status" >&5
+  echo "$as_me:5172: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5190,7 +5191,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5193 "configure"
+#line 5194 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5208,7 +5209,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5211 "configure"
+#line 5212 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5229,7 +5230,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5232 "configure"
+#line 5233 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5255,15 +5256,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5261: \$? = $ac_status" >&5
+  echo "$as_me:5262: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5266: \$? = $ac_status" >&5
+  echo "$as_me:5267: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5276,7 +5277,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5279: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5280: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5286,13 +5287,13 @@ EOF
 
 fi
 
-echo "$as_me:5289: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:5290: checking for sys/wait.h that is POSIX.1 compatible" >&5
 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5295 "configure"
+#line 5296 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -5314,16 +5315,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5317: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5318: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5320: \$? = $ac_status" >&5
+  echo "$as_me:5321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5326: \$? = $ac_status" >&5
+  echo "$as_me:5327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -5333,7 +5334,7 @@ ac_cv_header_sys_wait_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5336: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:5337: result: $ac_cv_header_sys_wait_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
 if test $ac_cv_header_sys_wait_h = yes; then
 
@@ -5350,23 +5351,23 @@ for ac_header in fcntl.h limits.h malloc.h strings.h sys/ioctl.h sys/time.h \
        X11/Xmu/ExtAgent.h sys/soundcard.h soundcard.h sys/awe_voice.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5353: checking for $ac_header" >&5
+echo "$as_me:5354: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5359 "configure"
+#line 5360 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5363: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5364: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5369: \$? = $ac_status" >&5
+  echo "$as_me:5370: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5385,7 +5386,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5388: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5389: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5395,23 +5396,23 @@ EOF
 fi
 done
 
-echo "$as_me:5398: checking for string.h" >&5
+echo "$as_me:5399: checking for string.h" >&5
 echo $ECHO_N "checking for string.h... $ECHO_C" >&6
 if test "${ac_cv_header_string_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5404 "configure"
+#line 5405 "configure"
 #include "confdefs.h"
 #include <string.h>
 _ACEOF
-if { (eval echo "$as_me:5408: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5409: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5414: \$? = $ac_status" >&5
+  echo "$as_me:5415: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5430,7 +5431,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5433: result: $ac_cv_header_string_h" >&5
+echo "$as_me:5434: result: $ac_cv_header_string_h" >&5
 echo "${ECHO_T}$ac_cv_header_string_h" >&6
 if test $ac_cv_header_string_h = yes; then
   :
@@ -5438,7 +5439,7 @@ else
    EXTRADEFS="$EXTRADEFS -DNO_STRING_H "
 fi
 
-echo "$as_me:5441: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:5442: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5446,7 +5447,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 5449 "configure"
+#line 5450 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -5495,16 +5496,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5501: \$? = $ac_status" >&5
+  echo "$as_me:5502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5507: \$? = $ac_status" >&5
+  echo "$as_me:5508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -5521,21 +5522,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:5524: result: none needed" >&5
+    echo "$as_me:5525: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:5527: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:5528: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:5532: checking for an ANSI C-conforming const" >&5
+echo "$as_me:5533: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5538 "configure"
+#line 5539 "configure"
 #include "confdefs.h"
 
 int
@@ -5593,16 +5594,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5599: \$? = $ac_status" >&5
+  echo "$as_me:5600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5605: \$? = $ac_status" >&5
+  echo "$as_me:5606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -5612,7 +5613,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5615: result: $ac_cv_c_const" >&5
+echo "$as_me:5616: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -5628,28 +5629,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5631: checking for $ac_header" >&5
+echo "$as_me:5632: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5637 "configure"
+#line 5638 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5646: \$? = $ac_status" >&5
+  echo "$as_me:5647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5652: \$? = $ac_status" >&5
+  echo "$as_me:5653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5659,7 +5660,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5662: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5663: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5669,13 +5670,13 @@ EOF
 fi
 done
 
-echo "$as_me:5672: checking whether char is unsigned" >&5
+echo "$as_me:5673: checking whether char is unsigned" >&5
 echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
 if test "${ac_cv_c_char_unsigned+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5678 "configure"
+#line 5679 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5687,16 +5688,16 @@ int _array_ [1 - 2 * !(((char) -1) < 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5690: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5693: \$? = $ac_status" >&5
+  echo "$as_me:5694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5699: \$? = $ac_status" >&5
+  echo "$as_me:5700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_char_unsigned=no
 else
@@ -5706,7 +5707,7 @@ ac_cv_c_char_unsigned=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5709: result: $ac_cv_c_char_unsigned" >&5
+echo "$as_me:5710: result: $ac_cv_c_char_unsigned" >&5
 echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
   cat >>confdefs.h <<\EOF
@@ -5715,7 +5716,7 @@ EOF
 
 fi
 
-echo "$as_me:5718: checking whether byte ordering is bigendian" >&5
+echo "$as_me:5719: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5723,7 +5724,7 @@ else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line 5726 "configure"
+#line 5727 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -5740,20 +5741,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5746: \$? = $ac_status" >&5
+  echo "$as_me:5747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5752: \$? = $ac_status" >&5
+  echo "$as_me:5753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line 5756 "configure"
+#line 5757 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -5770,16 +5771,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5773: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5776: \$? = $ac_status" >&5
+  echo "$as_me:5777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5782: \$? = $ac_status" >&5
+  echo "$as_me:5783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
@@ -5795,12 +5796,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5798: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5799: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5803 "configure"
+#line 5804 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -5816,15 +5817,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5822: \$? = $ac_status" >&5
+  echo "$as_me:5823: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5827: \$? = $ac_status" >&5
+  echo "$as_me:5828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
@@ -5837,7 +5838,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5840: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:5841: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 if test $ac_cv_c_bigendian = yes; then
 
@@ -5847,7 +5848,7 @@ EOF
 
 fi
 
-echo "$as_me:5850: checking for inline" >&5
+echo "$as_me:5851: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5855,7 +5856,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 5858 "configure"
+#line 5859 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -5864,16 +5865,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5870: \$? = $ac_status" >&5
+  echo "$as_me:5871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5876: \$? = $ac_status" >&5
+  echo "$as_me:5877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5884,7 +5885,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:5887: result: $ac_cv_c_inline" >&5
+echo "$as_me:5888: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -5899,13 +5900,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:5902: checking for off_t" >&5
+echo "$as_me:5903: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5908 "configure"
+#line 5909 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5920,16 +5921,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5926: \$? = $ac_status" >&5
+  echo "$as_me:5927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5932: \$? = $ac_status" >&5
+  echo "$as_me:5933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5939,7 +5940,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5942: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5943: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -5951,13 +5952,13 @@ EOF
 
 fi
 
-echo "$as_me:5954: checking for pid_t" >&5
+echo "$as_me:5955: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5960 "configure"
+#line 5961 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5972,16 +5973,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5978: \$? = $ac_status" >&5
+  echo "$as_me:5979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5984: \$? = $ac_status" >&5
+  echo "$as_me:5985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -5991,7 +5992,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5994: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:5995: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -6003,13 +6004,13 @@ EOF
 
 fi
 
-echo "$as_me:6006: checking for size_t" >&5
+echo "$as_me:6007: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6012 "configure"
+#line 6013 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6024,16 +6025,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6030: \$? = $ac_status" >&5
+  echo "$as_me:6031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6036: \$? = $ac_status" >&5
+  echo "$as_me:6037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -6043,7 +6044,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6046: result: $ac_cv_type_size_t" >&5
+echo "$as_me:6047: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -6055,13 +6056,13 @@ EOF
 
 fi
 
-echo "$as_me:6058: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:6059: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6064 "configure"
+#line 6065 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -6077,16 +6078,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6083: \$? = $ac_status" >&5
+  echo "$as_me:6084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6089: \$? = $ac_status" >&5
+  echo "$as_me:6090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -6096,7 +6097,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6099: result: $ac_cv_header_time" >&5
+echo "$as_me:6100: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -6106,13 +6107,13 @@ EOF
 
 fi
 
-echo "$as_me:6109: checking volatile declaration" >&5
+echo "$as_me:6110: checking volatile declaration" >&5
 echo $ECHO_N "checking volatile declaration... $ECHO_C" >&6
 if test "${timidity_cv_type_volatile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6115 "configure"
+#line 6116 "configure"
 #include "confdefs.h"
 
 int
@@ -6124,16 +6125,16 @@ volatile int x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6130: \$? = $ac_status" >&5
+  echo "$as_me:6131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6136: \$? = $ac_status" >&5
+  echo "$as_me:6137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   timidity_cv_type_volatile=yes
 else
@@ -6143,19 +6144,19 @@ timidity_cv_type_volatile=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6146: result: $timidity_cv_type_volatile" >&5
+echo "$as_me:6147: result: $timidity_cv_type_volatile" >&5
 echo "${ECHO_T}$timidity_cv_type_volatile" >&6
 if test $timidity_cv_type_volatile = no; then
   EXTRADEFS="$EXTRADEFS -DNO_VOLATILE"
 fi
 
-echo "$as_me:6152: checking union semun declaration" >&5
+echo "$as_me:6153: checking union semun declaration" >&5
 echo $ECHO_N "checking union semun declaration... $ECHO_C" >&6
 if test "${timidity_cv_type_union_semun+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6158 "configure"
+#line 6159 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -6169,16 +6170,16 @@ union semun x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6175: \$? = $ac_status" >&5
+  echo "$as_me:6176: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6181: \$? = $ac_status" >&5
+  echo "$as_me:6182: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   timidity_cv_type_union_semun=yes
 else
@@ -6188,20 +6189,20 @@ timidity_cv_type_union_semun=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6191: result: $timidity_cv_type_union_semun" >&5
+echo "$as_me:6192: result: $timidity_cv_type_union_semun" >&5
 echo "${ECHO_T}$timidity_cv_type_union_semun" >&6
 if test $timidity_cv_type_union_semun = yes; then
   EXTRADEFS="$EXTRADEFS -DHAVE_UNION_SEMUN"
 fi
 
 if test "x$CYGNUS" = xyes; then
-  echo "$as_me:6198: checking Cygwin new mmsystem" >&5
+  echo "$as_me:6199: checking Cygwin new mmsystem" >&5
 echo $ECHO_N "checking Cygwin new mmsystem... $ECHO_C" >&6
 if test "${timidity_cv_header_new_mmsystem+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6204 "configure"
+#line 6205 "configure"
 #include "confdefs.h"
 #include <windows.h>
   #include <mmsystem.h>
@@ -6214,16 +6215,16 @@ return WOM_OPEN != 0x3BB
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6220: \$? = $ac_status" >&5
+  echo "$as_me:6221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6226: \$? = $ac_status" >&5
+  echo "$as_me:6227: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   timidity_cv_header_new_mmsystem=yes
 else
@@ -6233,7 +6234,7 @@ timidity_cv_header_new_mmsystem=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6236: result: $timidity_cv_header_new_mmsystem" >&5
+echo "$as_me:6237: result: $timidity_cv_header_new_mmsystem" >&5
 echo "${ECHO_T}$timidity_cv_header_new_mmsystem" >&6
   if test $timidity_cv_header_new_mmsystem = yes; then
     EXTRADEFS="$EXTRADEFS -DHAVE_NEW_MMSYSTEM=1"
@@ -6241,14 +6242,14 @@ echo "${ECHO_T}$timidity_cv_header_new_mmsystem" >&6
 fi
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:6244: checking whether $CC needs -traditional" >&5
+    echo "$as_me:6245: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line 6251 "configure"
+#line 6252 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -6263,7 +6264,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 6266 "configure"
+#line 6267 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -6276,14 +6277,14 @@ rm -f conftest*
 
   fi
 fi
-echo "$as_me:6279: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:6280: result: $ac_cv_prog_gcc_traditional" >&5
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-echo "$as_me:6286: checking for working memcmp" >&5
+echo "$as_me:6287: checking for working memcmp" >&5
 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
 if test "${ac_cv_func_memcmp_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6292,7 +6293,7 @@ else
   ac_cv_func_memcmp_working=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6295 "configure"
+#line 6296 "configure"
 #include "confdefs.h"
 
 int
@@ -6328,15 +6329,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6334: \$? = $ac_status" >&5
+  echo "$as_me:6335: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6339: \$? = $ac_status" >&5
+  echo "$as_me:6340: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memcmp_working=yes
 else
@@ -6348,30 +6349,30 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6351: result: $ac_cv_func_memcmp_working" >&5
+echo "$as_me:6352: result: $ac_cv_func_memcmp_working" >&5
 echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
 test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6358: checking for $ac_header" >&5
+echo "$as_me:6359: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6364 "configure"
+#line 6365 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6368: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6369: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6374: \$? = $ac_status" >&5
+  echo "$as_me:6375: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6390,7 +6391,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6393: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6394: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6403,13 +6404,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6406: checking for $ac_func" >&5
+echo "$as_me:6407: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6412 "configure"
+#line 6413 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6440,16 +6441,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6446: \$? = $ac_status" >&5
+  echo "$as_me:6447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6452: \$? = $ac_status" >&5
+  echo "$as_me:6453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6459,7 +6460,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6462: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6463: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6469,7 +6470,7 @@ EOF
 fi
 done
 
-echo "$as_me:6472: checking for working mmap" >&5
+echo "$as_me:6473: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6478,7 +6479,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6481 "configure"
+#line 6482 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6605,15 +6606,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6611: \$? = $ac_status" >&5
+  echo "$as_me:6612: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6616: \$? = $ac_status" >&5
+  echo "$as_me:6617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6625,7 +6626,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6628: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:6629: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -6636,18 +6637,18 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:6639: checking whether setvbuf arguments are reversed" >&5
+echo "$as_me:6640: checking whether setvbuf arguments are reversed" >&5
 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:6645: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:6646: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6650 "configure"
+#line 6651 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -6664,15 +6665,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6670: \$? = $ac_status" >&5
+  echo "$as_me:6671: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6675: \$? = $ac_status" >&5
+  echo "$as_me:6676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -6685,7 +6686,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:6688: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:6689: result: $ac_cv_func_setvbuf_reversed" >&5
 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
 if test $ac_cv_func_setvbuf_reversed = yes; then
 
@@ -6695,13 +6696,13 @@ EOF
 
 fi
 
-echo "$as_me:6698: checking return type of signal handlers" >&5
+echo "$as_me:6699: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6704 "configure"
+#line 6705 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -6723,16 +6724,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6729: \$? = $ac_status" >&5
+  echo "$as_me:6730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6735: \$? = $ac_status" >&5
+  echo "$as_me:6736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -6742,7 +6743,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6745: result: $ac_cv_type_signal" >&5
+echo "$as_me:6746: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -6752,13 +6753,13 @@ EOF
 for ac_func in vprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6755: checking for $ac_func" >&5
+echo "$as_me:6756: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6761 "configure"
+#line 6762 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6789,16 +6790,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6795: \$? = $ac_status" >&5
+  echo "$as_me:6796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6801: \$? = $ac_status" >&5
+  echo "$as_me:6802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6808,20 +6809,20 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6811: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6812: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
-echo "$as_me:6818: checking for _doprnt" >&5
+echo "$as_me:6819: checking for _doprnt" >&5
 echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
 if test "${ac_cv_func__doprnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6824 "configure"
+#line 6825 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt (); below.  */
@@ -6852,16 +6853,16 @@ f = _doprnt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6858: \$? = $ac_status" >&5
+  echo "$as_me:6859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6864: \$? = $ac_status" >&5
+  echo "$as_me:6865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func__doprnt=yes
 else
@@ -6871,7 +6872,7 @@ ac_cv_func__doprnt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6874: result: $ac_cv_func__doprnt" >&5
+echo "$as_me:6875: result: $ac_cv_func__doprnt" >&5
 echo "${ECHO_T}$ac_cv_func__doprnt" >&6
 if test $ac_cv_func__doprnt = yes; then
 
@@ -6888,13 +6889,13 @@ for ac_func in gettimeofday select socket strdup strstr vsnprintf snprintf \
        sleep usleep strncasecmp strerror getopt getcwd popen signal isatty
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6891: checking for $ac_func" >&5
+echo "$as_me:6892: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6897 "configure"
+#line 6898 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6925,16 +6926,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6931: \$? = $ac_status" >&5
+  echo "$as_me:6932: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6937: \$? = $ac_status" >&5
+  echo "$as_me:6938: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6944,7 +6945,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6947: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6948: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6957,13 +6958,13 @@ done
 if test "x$CYGNUS" = xyes; then
   case "$ac_cv_header_dirent_dirent_h$ac_cv_header_dirent_sys_ndir_h$ac_cv_header_dirent_sys_dir_h$ac_cv_header_dirent_ndir_h" in
   *yes*)
-    echo "$as_me:6960: checking for opendir" >&5
+    echo "$as_me:6961: checking for opendir" >&5
 echo $ECHO_N "checking for opendir... $ECHO_C" >&6
 if test "${ac_cv_func_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6966 "configure"
+#line 6967 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char opendir (); below.  */
@@ -6994,16 +6995,16 @@ f = opendir;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7000: \$? = $ac_status" >&5
+  echo "$as_me:7001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7006: \$? = $ac_status" >&5
+  echo "$as_me:7007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_opendir=yes
 else
@@ -7013,7 +7014,7 @@ ac_cv_func_opendir=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7016: result: $ac_cv_func_opendir" >&5
+echo "$as_me:7017: result: $ac_cv_func_opendir" >&5
 echo "${ECHO_T}$ac_cv_func_opendir" >&6
 if test $ac_cv_func_opendir = yes; then
   :
@@ -7028,13 +7029,13 @@ fi
     ;;
   esac
   if test "x$enable_network" = "xyes"; then
-    echo "$as_me:7031: checking for socket" >&5
+    echo "$as_me:7032: checking for socket" >&5
 echo $ECHO_N "checking for socket... $ECHO_C" >&6
 if test "${ac_cv_func_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7037 "configure"
+#line 7038 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket (); below.  */
@@ -7065,16 +7066,16 @@ f = socket;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7071: \$? = $ac_status" >&5
+  echo "$as_me:7072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7077: \$? = $ac_status" >&5
+  echo "$as_me:7078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_socket=yes
 else
@@ -7084,12 +7085,12 @@ ac_cv_func_socket=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7087: result: $ac_cv_func_socket" >&5
+echo "$as_me:7088: result: $ac_cv_func_socket" >&5
 echo "${ECHO_T}$ac_cv_func_socket" >&6
 if test $ac_cv_func_socket = yes; then
   :
 else
-  echo "$as_me:7092: checking for WSAStartup in -lwsock32" >&5
+  echo "$as_me:7093: checking for WSAStartup in -lwsock32" >&5
 echo $ECHO_N "checking for WSAStartup in -lwsock32... $ECHO_C" >&6
 ac_lib_var=`echo wsock32'_'WSAStartup | sed 'y%./+-%__p_%'`
 if eval "test \"\${wapi_cv_lib_$ac_lib_var+set}\" = set"; then
@@ -7098,7 +7099,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lwsock32  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7101 "configure"
+#line 7102 "configure"
 #include "confdefs.h"
 #include <windows.h>
 #include <winsock.h>
@@ -7112,16 +7113,16 @@ WSAStartup(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7118: \$? = $ac_status" >&5
+  echo "$as_me:7119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7124: \$? = $ac_status" >&5
+  echo "$as_me:7125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "wapi_cv_lib_$ac_lib_var=yes"
 else
@@ -7134,12 +7135,12 @@ LIBS="$ac_save_LIBS"
 
 fi
 if eval "test \"`echo '$wapi_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$as_me:7137: result: yes" >&5
+  echo "$as_me:7138: result: yes" >&5
 echo "${ECHO_T}yes" >&6
    EXTRALIBS="$EXTRALIBS -lwsock32"
          EXTRADEFS="$EXTRADEFS -DWINSOCK"
 else
-  echo "$as_me:7142: result: no" >&5
+  echo "$as_me:7143: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7152,7 +7153,7 @@ fi
 if test "${with_tcl_includes+set}" = set; then
   withval="$with_tcl_includes"
    if test ! -d $withval; then
-      { echo "$as_me:7155: WARNING: $withval is not found." >&5
+      { echo "$as_me:7156: WARNING: $withval is not found." >&5
 echo "$as_me: WARNING: $withval is not found." >&2;}
     fi
     tcl_include_dir="-I$withval"
@@ -7163,7 +7164,7 @@ fi;
 if test "${with_tcl_libs+set}" = set; then
   withval="$with_tcl_libs"
    if test ! -d $withval; then
-      { echo "$as_me:7166: WARNING: $withval is not found." >&5
+      { echo "$as_me:7167: WARNING: $withval is not found." >&5
 echo "$as_me: WARNING: $withval is not found." >&2;}
     fi
     tcl_libdir="-L$withval"
@@ -7173,7 +7174,7 @@ fi;
 if test "${with_tk_includes+set}" = set; then
   withval="$with_tk_includes"
    if test ! -d $withval; then
-      { echo "$as_me:7176: WARNING: $withval is not found." >&5
+      { echo "$as_me:7177: WARNING: $withval is not found." >&5
 echo "$as_me: WARNING: $withval is not found." >&2;}
     fi
     tk_includes="-I$withval"
@@ -7183,7 +7184,7 @@ fi;
 if test "${with_tk_libs+set}" = set; then
   withval="$with_tk_libs"
    if test ! -d $withval; then
-      { echo "$as_me:7186: WARNING: $withval is not found." >&5
+      { echo "$as_me:7187: WARNING: $withval is not found." >&5
 echo "$as_me: WARNING: $withval is not found." >&2;}
     fi
     tk_libdir="-L$withval"
@@ -7193,7 +7194,7 @@ fi;
 if test "${with_offix_includes+set}" = set; then
   withval="$with_offix_includes"
    if test ! -d $withval; then
-      { echo "$as_me:7196: WARNING: $withval is not found." >&5
+      { echo "$as_me:7197: WARNING: $withval is not found." >&5
 echo "$as_me: WARNING: $withval is not found." >&2;}
     fi
     offix_include_dir="-I$withval"
@@ -7203,13 +7204,13 @@ fi;
 if test "${with_offix_libs+set}" = set; then
   withval="$with_offix_libs"
    if test ! -d $withval; then
-      { echo "$as_me:7206: WARNING: $withval is not found." >&5
+      { echo "$as_me:7207: WARNING: $withval is not found." >&5
 echo "$as_me: WARNING: $withval is not found." >&2;}
     fi
     offix_lib_dir="-L$withval"
 fi;
 
-audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis'
+audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis gogo'
 
 # Check whether --with-nas-library or --without-nas-library was given.
 if test "${with_nas_library+set}" = set; then
@@ -7250,7 +7251,7 @@ if test "${with_default_output+set}" = set; then
       DEFAULT_PLAYMODE=$withval
       eval "au_enable_$DEFAULT_PLAYMODE=yes"
     else
-      { echo "$as_me:7253: WARNING: --with-default-output=$withval: audio is not enabled" >&5
+      { echo "$as_me:7254: WARNING: --with-default-output=$withval: audio is not enabled" >&5
 echo "$as_me: WARNING: --with-default-output=$withval: audio is not enabled" >&2;}
     fi
 fi;
@@ -7304,39 +7305,39 @@ if test "x$au_enable_default" = xyes; then
       au_enable_w32=yes
       ;;
     *)
-      { echo "$as_me:7307: WARNING: No --enable-audio=default audio for $target" >&5
+      { echo "$as_me:7308: WARNING: No --enable-audio=default audio for $target" >&5
 echo "$as_me: WARNING: No --enable-audio=default audio for $target" >&2;}
       ;;
   esac
 fi
 
-echo "$as_me:7313: checking enable_audio=oss" >&5
+echo "$as_me:7314: checking enable_audio=oss" >&5
 echo $ECHO_N "checking enable_audio=oss... $ECHO_C" >&6
 if test "x$au_enable_oss" = xyes; then
   EXTRADEFS="$EXTRADEFS -DAU_OSS"
   SYSEXTRAS="$SYSEXTRAS oss_a.c"
   if test "x$ac_cv_header_sys_soundcard_h" = xyes; then
-    echo "$as_me:7319: result: yes - <sys/soundcard.h>" >&5
+    echo "$as_me:7320: result: yes - <sys/soundcard.h>" >&5
 echo "${ECHO_T}yes - <sys/soundcard.h>" >&6
   else
     case "$target" in
       *linux*|*freebsd*)
-               echo "$as_me:7324: result: yes" >&5
+               echo "$as_me:7325: result: yes" >&5
 echo "${ECHO_T}yes" >&6
        ;;
       *)
        if test "x$ac_cv_header_soundcard_h" = xyes; then
-         echo "$as_me:7329: result: yes - <soundcard.h>" >&5
+         echo "$as_me:7330: result: yes - <soundcard.h>" >&5
 echo "${ECHO_T}yes - <soundcard.h>" >&6
        else
-         { echo "$as_me:7332: WARNING: <sys/soundcard.h> is not found" >&5
+         { echo "$as_me:7333: WARNING: <sys/soundcard.h> is not found" >&5
 echo "$as_me: WARNING: <sys/soundcard.h> is not found" >&2;}
        fi
        ;;
     esac
   fi
 
-echo "$as_me:7339: checking for open in -lossaudio" >&5
+echo "$as_me:7340: checking for open in -lossaudio" >&5
 echo $ECHO_N "checking for open in -lossaudio... $ECHO_C" >&6
 if test "${ac_cv_lib_ossaudio_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7344,7 +7345,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossaudio  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7347 "configure"
+#line 7348 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7363,16 +7364,16 @@ open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7369: \$? = $ac_status" >&5
+  echo "$as_me:7370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7375: \$? = $ac_status" >&5
+  echo "$as_me:7376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ossaudio_open=yes
 else
@@ -7383,7 +7384,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7386: result: $ac_cv_lib_ossaudio_open" >&5
+echo "$as_me:7387: result: $ac_cv_lib_ossaudio_open" >&5
 echo "${ECHO_T}$ac_cv_lib_ossaudio_open" >&6
 if test $ac_cv_lib_ossaudio_open = yes; then
   cat >>confdefs.h <<EOF
@@ -7402,92 +7403,92 @@ fi
       ;;
   esac
 else
-  echo "$as_me:7405: result: no" >&5
+  echo "$as_me:7406: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7409: checking enable_audio=sun" >&5
+echo "$as_me:7410: checking enable_audio=sun" >&5
 echo $ECHO_N "checking enable_audio=sun... $ECHO_C" >&6
 if test "x$au_enable_sun" = xyes; then
   case "$target" in
     *-*-sunos4*)
       if test -f /usr/demo/SOUND/libaudio.a; then
        EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/libaudio.a"
-       echo "$as_me:7416: result: yes" >&5
+       echo "$as_me:7417: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       else
-       echo "$as_me:7419: result: Notice: libaudio.a is not found (ignore)" >&5
+       echo "$as_me:7420: result: Notice: libaudio.a is not found (ignore)" >&5
 echo "${ECHO_T}Notice: libaudio.a is not found (ignore)" >&6
       fi
       ;;
     *-*-solaris*)
       if test -f /usr/demo/SOUND/lib/libaudio.a; then
        EXTRALIBS="$EXTRALIBS /usr/demo/SOUND/lib/libaudio.a"
-       echo "$as_me:7426: result: yes" >&5
+       echo "$as_me:7427: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       else
-       echo "$as_me:7429: result: Notice: libaudio.a is not found (ignore)" >&5
+       echo "$as_me:7430: result: Notice: libaudio.a is not found (ignore)" >&5
 echo "${ECHO_T}Notice: libaudio.a is not found (ignore)" >&6
       fi
       ;;
-    *)         echo "$as_me:7433: result: yes" >&5
+    *)         echo "$as_me:7434: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       ;;
   esac
   EXTRADEFS="$EXTRADEFS -DAU_SUN"
   SYSEXTRAS="$SYSEXTRAS sun_a.c"
 else
-  echo "$as_me:7440: result: no" >&5
+  echo "$as_me:7441: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7444: checking enable_audio=hpux" >&5
+echo "$as_me:7445: checking enable_audio=hpux" >&5
 echo $ECHO_N "checking enable_audio=hpux... $ECHO_C" >&6
 if test "x$au_enable_hpux" = xyes; then
   case "$target" in
-    *-*-hpux*) echo "$as_me:7448: result: yes" >&5
+    *-*-hpux*) echo "$as_me:7449: result: yes" >&5
 echo "${ECHO_T}yes" >&6 ;;
-    *) { echo "$as_me:7450: WARNING: may not work on $target" >&5
+    *) { echo "$as_me:7451: WARNING: may not work on $target" >&5
 echo "$as_me: WARNING: may not work on $target" >&2;} ;;
   esac
   EXTRADEFS="$EXTRADEFS -DAU_HPUX_AUDIO"
   SYSEXTRAS="$SYSEXTRAS hpux_d_a.c"
 else
-  echo "$as_me:7456: result: no" >&5
+  echo "$as_me:7457: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7460: checking enable_audio=irix" >&5
+echo "$as_me:7461: checking enable_audio=irix" >&5
 echo $ECHO_N "checking enable_audio=irix... $ECHO_C" >&6
 if test "x$au_enable_irix" = xyes; then
   case "$target" in
     *-sgi-irix5*|*-sgi-irix6.2)
       EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_OLDAL"
-      echo "$as_me:7466: result: yes" >&5
+      echo "$as_me:7467: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       ;;
     *-sgi-irix6*)
       EXTRADEFS="$EXTRADEFS -DAU_AUDRIV -DSGI_NEWAL"
-      echo "$as_me:7471: result: yes" >&5
+      echo "$as_me:7472: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       ;;
-    *) { echo "$as_me:7474: WARNING: may not work on $target" >&5
+    *) { echo "$as_me:7475: WARNING: may not work on $target" >&5
 echo "$as_me: WARNING: may not work on $target" >&2;} ;;
   esac
   SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_al.c"
   EXTRALIBS="$EXTRASLIBS -laudio"
 else
-  echo "$as_me:7480: result: no" >&5
+  echo "$as_me:7481: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7484: checking enable_audio=mme" >&5
+echo "$as_me:7485: checking enable_audio=mme" >&5
 echo $ECHO_N "checking enable_audio=mme... $ECHO_C" >&6
 if test "x$au_enable_mme" = xyes; then
   case "$target" in
-    *-dec-*) echo "$as_me:7488: result: yes" >&5
+    *-dec-*) echo "$as_me:7489: result: yes" >&5
 echo "${ECHO_T}yes" >&6 ;;
-    *) { echo "$as_me:7490: WARNING: may not work on $target" >&5
+    *) { echo "$as_me:7491: WARNING: may not work on $target" >&5
 echo "$as_me: WARNING: may not work on $target" >&2;} ;;
   esac
   EXTRADEFS="$EXTRADEFS -DAU_DEC -DAU_AUDRIV"
@@ -7495,36 +7496,36 @@ echo "$as_me: WARNING: may not work on $target" >&2;} ;;
   CPPFLAGS="$CPPFLAGS -I/usr/opt/MME210/include"
   EXTRALIBS="$EXTRALIBS /usr/opt/MME220/lib/libmme.a"
 else
-  echo "$as_me:7498: result: no" >&5
+  echo "$as_me:7499: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7502: checking enable_audio=sb_dsp" >&5
+echo "$as_me:7503: checking enable_audio=sb_dsp" >&5
 echo $ECHO_N "checking enable_audio=sb_dsp... $ECHO_C" >&6
 if test "x$au_enable_sb_dsp" = xyes; then
   case "$target" in
-    *-*-bsdi2.0) echo "$as_me:7506: result: yes" >&5
+    *-*-bsdi2.0) echo "$as_me:7507: result: yes" >&5
 echo "${ECHO_T}yes" >&6 ;;
-    *) { echo "$as_me:7508: WARNING: may not work on $target" >&5
+    *) { echo "$as_me:7509: WARNING: may not work on $target" >&5
 echo "$as_me: WARNING: may not work on $target" >&2;} ;;
   esac
   EXTRADEFS="$EXTRADEFS -DAU_BSDI -DDEFAULT_RATE=22500"
   SYSEXTRAS="$SYSEXTRAS bsd20_a.c"
 else
-  echo "$as_me:7514: result: no" >&5
+  echo "$as_me:7515: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7518: checking enable_audio=w32" >&5
+echo "$as_me:7519: checking enable_audio=w32" >&5
 echo $ECHO_N "checking enable_audio=w32... $ECHO_C" >&6
 if test "x$au_enable_w32" = xyes; then
   case "$target" in
     *-*-cygwin*)
-     echo "$as_me:7523: result: yes" >&5
+     echo "$as_me:7524: result: yes" >&5
 echo "${ECHO_T}yes" >&6
      ;;
     *)
-     { echo "$as_me:7527: WARNING: may not work on $target" >&5
+     { echo "$as_me:7528: WARNING: may not work on $target" >&5
 echo "$as_me: WARNING: may not work on $target" >&2;}
      ;;
   esac
@@ -7532,14 +7533,14 @@ echo "$as_me: WARNING: may not work on $target" >&2;}
   EXTRALIBS="$EXTRALIBS -lwinmm"
   EXTRADEFS="$EXTRADEFS -DAU_W32"
 else
-  echo "$as_me:7535: result: no" >&5
+  echo "$as_me:7536: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7539: checking enable_audio=alsa" >&5
+echo "$as_me:7540: checking enable_audio=alsa" >&5
 echo $ECHO_N "checking enable_audio=alsa... $ECHO_C" >&6
 if test "x$au_enable_alsa" = xyes; then
-  echo "$as_me:7542: result: " >&5
+  echo "$as_me:7543: result: " >&5
 echo "${ECHO_T}" >&6
   KEEPCFLAGS=$CFLAGS
   KEEPLIBS=$LIBS
@@ -7569,16 +7570,16 @@ else
   enable_alsatest=yes
 fi;
 
-echo "$as_me:7572: checking for ALSA CFLAGS" >&5
+echo "$as_me:7573: checking for ALSA CFLAGS" >&5
 echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6
 if test "$alsa_inc_prefix" != "" ; then
        ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
         CFLAGS="$CFLAGS -I$alsa_inc_prefix"
 fi
-echo "$as_me:7578: result: $ALSA_CFLAGS" >&5
+echo "$as_me:7579: result: $ALSA_CFLAGS" >&5
 echo "${ECHO_T}$ALSA_CFLAGS" >&6
 
-echo "$as_me:7581: checking for ALSA LDFLAGS" >&5
+echo "$as_me:7582: checking for ALSA LDFLAGS" >&5
 echo $ECHO_N "checking for ALSA LDFLAGS... $ECHO_C" >&6
 if test "$alsa_prefix" != "" ; then
        ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
@@ -7586,11 +7587,11 @@ if test "$alsa_prefix" != "" ; then
 fi
 
 ALSA_LIBS="$ALSA_LIBS -lasound"
-echo "$as_me:7589: result: $ALSA_LIBS" >&5
+echo "$as_me:7590: result: $ALSA_LIBS" >&5
 echo "${ECHO_T}$ALSA_LIBS" >&6
 
 min_alsa_version=0.1.1
-echo "$as_me:7593: checking for libasound headers version >= $min_alsa_version" >&5
+echo "$as_me:7594: checking for libasound headers version >= $min_alsa_version" >&5
 echo $ECHO_N "checking for libasound headers version >= $min_alsa_version... $ECHO_C" >&6
 no_alsa=""
     alsa_min_major_version=`echo $min_alsa_version | \
@@ -7601,7 +7602,7 @@ no_alsa=""
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7604 "configure"
+#line 7605 "configure"
 #include "confdefs.h"
 
 #include <sys/asoundlib.h>
@@ -7647,30 +7648,30 @@ exit(0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7651: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7653: \$? = $ac_status" >&5
+  echo "$as_me:7654: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7659: \$? = $ac_status" >&5
+  echo "$as_me:7660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:7661: result: found." >&5
+  echo "$as_me:7662: result: found." >&5
 echo "${ECHO_T}found." >&6
    have_alsa=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:7667: result: not present." >&5
+echo "$as_me:7668: result: not present." >&5
 echo "${ECHO_T}not present." >&6
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
-echo "$as_me:7673: checking for snd_cards in -lasound" >&5
+echo "$as_me:7674: checking for snd_cards in -lasound" >&5
 echo $ECHO_N "checking for snd_cards in -lasound... $ECHO_C" >&6
 if test "${ac_cv_lib_asound_snd_cards+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7678,7 +7679,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7681 "configure"
+#line 7682 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7697,16 +7698,16 @@ snd_cards ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7703: \$? = $ac_status" >&5
+  echo "$as_me:7704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:7710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_asound_snd_cards=yes
 else
@@ -7717,7 +7718,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7720: result: $ac_cv_lib_asound_snd_cards" >&5
+echo "$as_me:7721: result: $ac_cv_lib_asound_snd_cards" >&5
 echo "${ECHO_T}$ac_cv_lib_asound_snd_cards" >&6
 if test $ac_cv_lib_asound_snd_cards = yes; then
   cat >>confdefs.h <<EOF
@@ -7727,19 +7728,19 @@ EOF
   LIBS="-lasound $LIBS"
 
 else
-  echo "$as_me:7730: result: No linkable libasound was found." >&5
+  echo "$as_me:7731: result: No linkable libasound was found." >&5
 echo "${ECHO_T}No linkable libasound was found." >&6
 
 fi
 
   if test have_alsa = no; then
-    { echo "$as_me:7736: WARNING: ALSA: Couldn't configure" >&5
+    { echo "$as_me:7737: WARNING: ALSA: Couldn't configure" >&5
 echo "$as_me: WARNING: ALSA: Couldn't configure" >&2;}
     CFLAGS=$KEEPCFLAGS
     LIBS=$KEEPLIBS
     LDFLAGS=$KEEPLDFLAGS
   else
-    echo "$as_me:7742: result: ALSA: Enabled" >&5
+    echo "$as_me:7743: result: ALSA: Enabled" >&5
 echo "${ECHO_T}ALSA: Enabled" >&6
     EXTRADEFS="$EXTRADEFS -DAU_ALSA"
     SYSEXTRAS="$SYSEXTRAS alsa_a.c"
@@ -7753,17 +7754,17 @@ done
     LIBS="$KEEPLIBS $ALSA_LIBS"
   fi
 else
-  echo "$as_me:7756: result: no" >&5
+  echo "$as_me:7757: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7760: checking enable_audio=alib" >&5
+echo "$as_me:7761: checking enable_audio=alib" >&5
 echo $ECHO_N "checking enable_audio=alib... $ECHO_C" >&6
 if test "x$au_enable_alib" = xyes; then
   case "$target" in
-    *-*-hpux*) echo "$as_me:7764: result: yes" >&5
+    *-*-hpux*) echo "$as_me:7765: result: yes" >&5
 echo "${ECHO_T}yes" >&6 ;;
-    *) { echo "$as_me:7766: WARNING: may not work on $target" >&5
+    *) { echo "$as_me:7767: WARNING: may not work on $target" >&5
 echo "$as_me: WARNING: may not work on $target" >&2;} ;;
   esac
   SYSEXTRAS="$SYSEXTRAS hpux_a.c"
@@ -7776,15 +7777,15 @@ echo "$as_me: WARNING: may not work on $target" >&2;} ;;
   fi
   EXTRALIBS="$EXTRALIBS -lAlib"
 else
-  echo "$as_me:7779: result: no" >&5
+  echo "$as_me:7780: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7783: checking enable_audio=nas" >&5
+echo "$as_me:7784: checking enable_audio=nas" >&5
 echo $ECHO_N "checking enable_audio=nas... $ECHO_C" >&6
 if test "x$au_enable_nas" = xyes; then
   if test "x$with_x" != xyes; then
-    { { echo "$as_me:7787: error: nas: --with-x option must be specified" >&5
+    { { echo "$as_me:7788: error: nas: --with-x option must be specified" >&5
 echo "$as_me: error: nas: --with-x option must be specified" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -7792,13 +7793,13 @@ echo "$as_me: error: nas: --with-x option must be specified" >&2;}
   SYSEXTRAS="$SYSEXTRAS nas_a.c"
 
   if test "x$with_nas_library" != x; then
-    echo "$as_me:7795: result: $with_nas_library" >&5
+    echo "$as_me:7796: result: $with_nas_library" >&5
 echo "${ECHO_T}$with_nas_library" >&6;
     EXTRALIBS="$EXTRALIBS $with_nas_library"
   else
-    echo "$as_me:7799: result: " >&5
+    echo "$as_me:7800: result: " >&5
 echo "${ECHO_T}" >&6
-    echo "$as_me:7801: checking for library containing AuOpenServer" >&5
+    echo "$as_me:7802: checking for library containing AuOpenServer" >&5
 echo $ECHO_N "checking for library containing AuOpenServer... $ECHO_C" >&6
 if test "${timidity_cv_search_AuOpenServer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7810,7 +7811,7 @@ for i in $x_libraries/libaudio.a \
        /usr/lib/libaudio.a ; do
   LIBS="$i  $ac_func_search_save_LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 7813 "configure"
+#line 7814 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7829,16 +7830,16 @@ AuOpenServer ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7833: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7835: \$? = $ac_status" >&5
+  echo "$as_me:7836: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7841: \$? = $ac_status" >&5
+  echo "$as_me:7842: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   timidity_cv_search_AuOpenServer="$i"; break
 else
@@ -7849,14 +7850,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 LIBS="$ac_func_search_save_LIBS"
 fi
-echo "$as_me:7852: result: $timidity_cv_search_AuOpenServer" >&5
+echo "$as_me:7853: result: $timidity_cv_search_AuOpenServer" >&5
 echo "${ECHO_T}$timidity_cv_search_AuOpenServer" >&6
 if test "$timidity_cv_search_AuOpenServer" != "no"; then
-   echo "$as_me:7855: result: NAS: $timidity_cv_search_AuOpenServer" >&5
+   echo "$as_me:7856: result: NAS: $timidity_cv_search_AuOpenServer" >&5
 echo "${ECHO_T}NAS: $timidity_cv_search_AuOpenServer" >&6
          EXTRALIBS="$EXTRALIBS $timidity_cv_search_AuOpenServer"
 else :
-  { echo "$as_me:7859: WARNING: NAS library is not found." >&5
+  { echo "$as_me:7860: WARNING: NAS library is not found." >&5
 echo "$as_me: WARNING: NAS library is not found." >&2;}
 fi
   fi
@@ -7869,14 +7870,14 @@ fi
     lib_xprelibs_opt='-lSM -lICE'
   fi
 else
-  echo "$as_me:7872: result: no" >&5
+  echo "$as_me:7873: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7876: checking enable_audio=esd" >&5
+echo "$as_me:7877: checking enable_audio=esd" >&5
 echo $ECHO_N "checking enable_audio=esd... $ECHO_C" >&6
 if test "x$au_enable_esd" = xyes; then
-  echo "$as_me:7879: result: " >&5
+  echo "$as_me:7880: result: " >&5
 echo "${ECHO_T}" >&6
   KEEPCFLAGS=$CFLAGS
   KEEPLIBS=$LIBS
@@ -7920,7 +7921,7 @@ fi;
 
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
-echo "$as_me:7923: checking for $ac_word" >&5
+echo "$as_me:7924: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ESD_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7937,7 +7938,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:7940: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7941: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7949,15 +7950,15 @@ fi
 ESD_CONFIG=$ac_cv_path_ESD_CONFIG
 
 if test -n "$ESD_CONFIG"; then
-  echo "$as_me:7952: result: $ESD_CONFIG" >&5
+  echo "$as_me:7953: result: $ESD_CONFIG" >&5
 echo "${ECHO_T}$ESD_CONFIG" >&6
 else
-  echo "$as_me:7955: result: no" >&5
+  echo "$as_me:7956: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   min_esd_version=0.2.7
-  echo "$as_me:7960: checking for ESD - version >= $min_esd_version" >&5
+  echo "$as_me:7961: checking for ESD - version >= $min_esd_version" >&5
 echo $ECHO_N "checking for ESD - version >= $min_esd_version... $ECHO_C" >&6
   no_esd=""
   if test "$ESD_CONFIG" = "no" ; then
@@ -7982,7 +7983,7 @@ echo $ECHO_N "checking for ESD - version >= $min_esd_version... $ECHO_C" >&6
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7985 "configure"
+#line 7986 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8040,15 +8041,15 @@ int main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8046: \$? = $ac_status" >&5
+  echo "$as_me:8047: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8051: \$? = $ac_status" >&5
+  echo "$as_me:8052: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8064,11 +8065,11 @@ fi
      fi
   fi
   if test "x$no_esd" = x ; then
-     echo "$as_me:8067: result: yes" >&5
+     echo "$as_me:8068: result: yes" >&5
 echo "${ECHO_T}yes" >&6
      :
   else
-     echo "$as_me:8071: result: no" >&5
+     echo "$as_me:8072: result: no" >&5
 echo "${ECHO_T}no" >&6
      if test "$ESD_CONFIG" = "no" ; then
        echo "*** The esd-config script installed by ESD could not be found"
@@ -8083,7 +8084,7 @@ echo "${ECHO_T}no" >&6
           CFLAGS="$CFLAGS $ESD_CFLAGS"
           LIBS="$LIBS $ESD_LIBS"
           cat >conftest.$ac_ext <<_ACEOF
-#line 8086 "configure"
+#line 8087 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8098,16 +8099,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8104: \$? = $ac_status" >&5
+  echo "$as_me:8105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8110: \$? = $ac_status" >&5
+  echo "$as_me:8111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding ESD or finding the wrong"
@@ -8142,7 +8143,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   LIBS=$KEEPLIBS
   LDFLAGS=$KEEPLDFLAGS
   if test "x$no_esd" = x; then
-    echo "$as_me:8145: result: EsounD: Enabled" >&5
+    echo "$as_me:8146: result: EsounD: Enabled" >&5
 echo "${ECHO_T}EsounD: Enabled" >&6
     EXTRADEFS="$EXTRADEFS -DAU_ESD"
     SYSEXTRAS="$SYSEXTRAS esd_a.c"
@@ -8155,18 +8156,18 @@ done
 
     LIBS="$LIBS $ESD_LIBS"
   else
-    { echo "$as_me:8158: WARNING: EsounD: Couldn't configure" >&5
+    { echo "$as_me:8159: WARNING: EsounD: Couldn't configure" >&5
 echo "$as_me: WARNING: EsounD: Couldn't configure" >&2;}
   fi
 else
-  echo "$as_me:8162: result: no" >&5
+  echo "$as_me:8163: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:8166: checking enable_audio=vorbis" >&5
+echo "$as_me:8167: checking enable_audio=vorbis" >&5
 echo $ECHO_N "checking enable_audio=vorbis... $ECHO_C" >&6
 if test "x$au_enable_vorbis" = xyes; then
-  echo "$as_me:8169: result: yes" >&5
+  echo "$as_me:8170: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 # Check whether --with-ogg-prefix or --without-ogg-prefix was given.
@@ -8196,7 +8197,7 @@ fi;
 
   OGG_LIBS="$OGG_LIBS -logg"
 
-  echo "$as_me:8199: checking for Ogg" >&5
+  echo "$as_me:8200: checking for Ogg" >&5
 echo $ECHO_N "checking for Ogg... $ECHO_C" >&6
   no_ogg=""
 
@@ -8210,7 +8211,7 @@ echo $ECHO_N "checking for Ogg... $ECHO_C" >&6
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8213 "configure"
+#line 8214 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8226,15 +8227,15 @@ int main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8232: \$? = $ac_status" >&5
+  echo "$as_me:8233: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8237: \$? = $ac_status" >&5
+  echo "$as_me:8238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8250,7 +8251,7 @@ fi
   fi
 
   if test "x$no_ogg" = "x" ; then
-     echo "$as_me:8253: result: yes" >&5
+     echo "$as_me:8254: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 # Check whether --with-vorbis-prefix or --without-vorbis-prefix was given.
@@ -8282,7 +8283,7 @@ fi;
   VORBISFILE_LIBS="-lvorbisfile"
   VORBISENC_LIBS="-lvorbisenc"
 
-  echo "$as_me:8285: checking for Vorbis" >&5
+  echo "$as_me:8286: checking for Vorbis" >&5
 echo $ECHO_N "checking for Vorbis... $ECHO_C" >&6
   no_vorbis=""
 
@@ -8296,7 +8297,7 @@ echo $ECHO_N "checking for Vorbis... $ECHO_C" >&6
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8299 "configure"
+#line 8300 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8312,15 +8313,15 @@ int main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8318: \$? = $ac_status" >&5
+  echo "$as_me:8319: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8323: \$? = $ac_status" >&5
+  echo "$as_me:8324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8336,16 +8337,19 @@ fi
   fi
 
   if test "x$no_vorbis" = "x" ; then
-     echo "$as_me:8339: result: yes" >&5
+     echo "$as_me:8340: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
       have_vorbis=yes
       SYSEXTRAS="$SYSEXTRAS vorbis_a.c"
       EXTRADEFS="$EXTRADEFS -DAU_VORBIS $OGG_CFLAGS $VORBIS_CFLAGS"
-      EXTRALIBS="$EXTRALIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS"
+      EXTRALIBS="$EXTRALIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
+      if test "x$CYGNUS" = "xyes"; then
+       SYSEXTRAS="$SYSEXTRAS w32g_vorbisenc_dll.c w32g_vorbis_dll.c w32g_ogg_dll.c"
+      fi
 
   else
-     echo "$as_me:8348: result: no" >&5
+     echo "$as_me:8352: result: no" >&5
 echo "${ECHO_T}no" >&6
      if test -f conf.vorbistest ; then
        :
@@ -8354,7 +8358,7 @@ echo "${ECHO_T}no" >&6
        CFLAGS="$CFLAGS $VORBIS_CFLAGS"
        LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
        cat >conftest.$ac_ext <<_ACEOF
-#line 8357 "configure"
+#line 8361 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8369,16 +8373,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8375: \$? = $ac_status" >&5
+  echo "$as_me:8379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8381: \$? = $ac_status" >&5
+  echo "$as_me:8385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    echo "*** The test program compiled, but did not run. This usually means"
        echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
@@ -8405,7 +8409,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      VORBISFILE_LIBS=""
      VORBISENC_LIBS=""
 
-      { echo "$as_me:8408: WARNING: Unable to configure vorbis, but ogg is there (???)" >&5
+      { echo "$as_me:8412: WARNING: Unable to configure vorbis, but ogg is there (???)" >&5
 echo "$as_me: WARNING: Unable to configure vorbis, but ogg is there (???)" >&2;}
 
   fi
@@ -8413,7 +8417,7 @@ echo "$as_me: WARNING: Unable to configure vorbis, but ogg is there (???)" >&2;}
   rm -f conf.vorbistest
 
   else
-     echo "$as_me:8416: result: no" >&5
+     echo "$as_me:8420: result: no" >&5
 echo "${ECHO_T}no" >&6
      if test -f conf.oggtest ; then
        :
@@ -8422,7 +8426,7 @@ echo "${ECHO_T}no" >&6
        CFLAGS="$CFLAGS $OGG_CFLAGS"
        LIBS="$LIBS $OGG_LIBS"
        cat >conftest.$ac_ext <<_ACEOF
-#line 8425 "configure"
+#line 8429 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8437,16 +8441,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8443: \$? = $ac_status" >&5
+  echo "$as_me:8447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8449: \$? = $ac_status" >&5
+  echo "$as_me:8453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    echo "*** The test program compiled, but did not run. This usually means"
        echo "*** that the run-time linker is not finding Ogg or finding the wrong"
@@ -8472,7 +8476,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      OGG_CFLAGS=""
      OGG_LIBS=""
 
-    { echo "$as_me:8475: WARNING: Unable to configure vorbis!" >&5
+    { echo "$as_me:8479: WARNING: Unable to configure vorbis!" >&5
 echo "$as_me: WARNING: Unable to configure vorbis!" >&2;}
     have_vorbis=no
 
@@ -8481,7 +8485,26 @@ echo "$as_me: WARNING: Unable to configure vorbis!" >&2;}
   rm -f conf.oggtest
 
 else
-  echo "$as_me:8484: result: no" >&5
+  echo "$as_me:8488: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+echo "$as_me:8492: checking enable_audio=gogo" >&5
+echo $ECHO_N "checking enable_audio=gogo... $ECHO_C" >&6
+if test "x$au_enable_gogo" = xyes; then
+  if test "x$CYGNUS" = "xyes"; then
+    echo "$as_me:8496: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  else
+    { echo "$as_me:8499: WARNING: May be gogo is not supported.  You need hack the gogo_a.c" >&5
+echo "$as_me: WARNING: May be gogo is not supported.  You need hack the gogo_a.c" >&2;}
+  fi
+  have_gogo=yes
+  SYSEXTRAS="$SYSEXTRAS gogo_a.c w32_gogo.c"
+  EXTRADEFS="$EXTRADEFS -DAU_GOGO"
+  EXTRALIBS="$EXTRALIBS -lgogo"
+else
+  echo "$as_me:8507: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8490,7 +8513,7 @@ if test "x$au_enable_none" = xyes; then
     SYSEXTRAS="$SYSEXTRAS audriv_a.c audriv_none.c"
 fi
 
-echo "$as_me:8493: checking default output mode" >&5
+echo "$as_me:8516: checking default output mode" >&5
 echo $ECHO_N "checking default output mode... $ECHO_C" >&6
 if test "x$DEFAULT_PLAYMODE" = x; then
   DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'`
@@ -8513,9 +8536,10 @@ case ".$DEFAULT_PLAYMODE" in
   .aiff) TIMIDITY_OUTPUT_ID=a ;;
   .list) TIMIDITY_OUTPUT_ID=l ;;
   .vorbis) TIMIDITY_OUTPUT_ID=v ;;
+  .gogo) TIMIDITY_OUTPUT_ID=g ;;
   *)     TIMIDITY_OUTPUT_ID= ;;
 esac
-echo "$as_me:8518: result: $DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" >&5
+echo "$as_me:8542: result: $DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" >&5
 echo "${ECHO_T}$DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID" >&6
 
 interface_targets='dynamic ncurses slang motif tcltk emacs vt100 xaw xskin gtk alsaseq'
@@ -8556,13 +8580,13 @@ case "x$enable_ump" in xyes|xdynamic) EXTRACFLAGS="$EXTRACFLAGS -DXP_UNIX $SHCFL
 if test "$NEEDDLOPEN" = "yes"; then
   have_dl=no
 
-  echo "$as_me:8559: checking for LoadLibrary" >&5
+  echo "$as_me:8583: checking for LoadLibrary" >&5
 echo $ECHO_N "checking for LoadLibrary... $ECHO_C" >&6
 if test "${wapi_cv_func_LoadLibrary+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8565 "configure"
+#line 8589 "configure"
 #include "confdefs.h"
 #include <windows.h>
 
@@ -8575,16 +8599,16 @@ LoadLibrary(0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8581: \$? = $ac_status" >&5
+  echo "$as_me:8605: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8587: \$? = $ac_status" >&5
+  echo "$as_me:8611: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   wapi_cv_func_LoadLibrary=yes
 else
@@ -8596,24 +8620,24 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$wapi_cv_func_'LoadLibrary`\" = yes"; then
-  echo "$as_me:8599: result: yes" >&5
+  echo "$as_me:8623: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   have_dl=w32
 else
-  echo "$as_me:8603: result: no" >&5
+  echo "$as_me:8627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test $wapi_cv_func_LoadLibrary = yes && have_dl=w32
 
   if test "$have_dl" = "no"; then
-    echo "$as_me:8610: checking for shl_load" >&5
+    echo "$as_me:8634: checking for shl_load" >&5
 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
 if test "${ac_cv_func_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8616 "configure"
+#line 8640 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.  */
@@ -8644,16 +8668,16 @@ f = shl_load;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8650: \$? = $ac_status" >&5
+  echo "$as_me:8674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8656: \$? = $ac_status" >&5
+  echo "$as_me:8680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shl_load=yes
 else
@@ -8663,7 +8687,7 @@ ac_cv_func_shl_load=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8666: result: $ac_cv_func_shl_load" >&5
+echo "$as_me:8690: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
 if test $ac_cv_func_shl_load = yes; then
   have_dl=hpux
@@ -8674,13 +8698,13 @@ fi
     have_dl=dlopen
   fi
   if test "$have_dl" = "no"; then
-    echo "$as_me:8677: checking for dlopen" >&5
+    echo "$as_me:8701: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
 if test "${ac_cv_func_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8683 "configure"
+#line 8707 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.  */
@@ -8711,16 +8735,16 @@ f = dlopen;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8717: \$? = $ac_status" >&5
+  echo "$as_me:8741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8723: \$? = $ac_status" >&5
+  echo "$as_me:8747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dlopen=yes
 else
@@ -8730,7 +8754,7 @@ ac_cv_func_dlopen=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8733: result: $ac_cv_func_dlopen" >&5
+echo "$as_me:8757: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
 if test $ac_cv_func_dlopen = yes; then
   have_dl=dlopen
@@ -8738,13 +8762,13 @@ fi
 
   fi
   if test "$have_dl" = "no"; then
-    echo "$as_me:8741: checking for dld_init" >&5
+    echo "$as_me:8765: checking for dld_init" >&5
 echo $ECHO_N "checking for dld_init... $ECHO_C" >&6
 if test "${ac_cv_func_dld_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8747 "configure"
+#line 8771 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dld_init (); below.  */
@@ -8775,16 +8799,16 @@ f = dld_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8781: \$? = $ac_status" >&5
+  echo "$as_me:8805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8787: \$? = $ac_status" >&5
+  echo "$as_me:8811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dld_init=yes
 else
@@ -8794,7 +8818,7 @@ ac_cv_func_dld_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8797: result: $ac_cv_func_dld_init" >&5
+echo "$as_me:8821: result: $ac_cv_func_dld_init" >&5
 echo "${ECHO_T}$ac_cv_func_dld_init" >&6
 if test $ac_cv_func_dld_init = yes; then
   have_dl=dld
@@ -8802,7 +8826,7 @@ fi
 
   fi
   if test "$have_dl" = "no"; then
-    echo "$as_me:8805: checking for dld_init in -ldld" >&5
+    echo "$as_me:8829: checking for dld_init in -ldld" >&5
 echo $ECHO_N "checking for dld_init in -ldld... $ECHO_C" >&6
 if test "${ac_cv_lib_dld_dld_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8810,7 +8834,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8813 "configure"
+#line 8837 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8829,16 +8853,16 @@ dld_init ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8835: \$? = $ac_status" >&5
+  echo "$as_me:8859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8841: \$? = $ac_status" >&5
+  echo "$as_me:8865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dld_dld_init=yes
 else
@@ -8849,7 +8873,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8852: result: $ac_cv_lib_dld_dld_init" >&5
+echo "$as_me:8876: result: $ac_cv_lib_dld_dld_init" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_init" >&6
 if test $ac_cv_lib_dld_dld_init = yes; then
   have_dl=dld;lib_dl_opt=-ldld
@@ -8857,14 +8881,14 @@ fi
 
   fi
 
-  echo "$as_me:8860: checking dynamic link method" >&5
+  echo "$as_me:8884: checking dynamic link method" >&5
 echo $ECHO_N "checking dynamic link method... $ECHO_C" >&6
   case "$have_dl" in
     dlopen)
-      echo "$as_me:8864: result: use dl_dlopen.c" >&5
+      echo "$as_me:8888: result: use dl_dlopen.c" >&5
 echo "${ECHO_T}use dl_dlopen.c" >&6
       SYSEXTRAS="$SYSEXTRAS dl_dlopen.c"
-      echo "$as_me:8867: checking whether your dlsym() needs a leading underscore" >&5
+      echo "$as_me:8891: checking whether your dlsym() needs a leading underscore" >&5
 echo $ECHO_N "checking whether your dlsym() needs a leading underscore... $ECHO_C" >&6
 if test "${timidity_cv_func_dlsym_underscore+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8929,10 +8953,10 @@ if ${CC-cc} $CFLAGS $SHCFLAGS $CPPFLAGS -c dyna.c > /dev/null 2>&1 &&
        ${CC-cc} -o fred $CFLAGS $CPPFLAGS $LDFLAGS fred.c $LIBS $lib_dl_opt > /dev/null 2>&1; then
        xxx=`./fred`
        case $xxx in
-       1)      { echo "$as_me:8932: WARNING: Test program failed using dlopen.  Perhaps you should not use dynamic loading." >&5
+       1)      { echo "$as_me:8956: WARNING: Test program failed using dlopen.  Perhaps you should not use dynamic loading." >&5
 echo "$as_me: WARNING: Test program failed using dlopen.  Perhaps you should not use dynamic loading." >&2;}
                ;;
-       2)      { echo "$as_me:8935: WARNING: Test program failed using dlsym.  Perhaps you should not use dynamic loading." >&5
+       2)      { echo "$as_me:8959: WARNING: Test program failed using dlsym.  Perhaps you should not use dynamic loading." >&5
 echo "$as_me: WARNING: Test program failed using dlsym.  Perhaps you should not use dynamic loading." >&2;}
                ;;
        3)      timidity_cv_func_dlsym_underscore=yes
@@ -8941,7 +8965,7 @@ echo "$as_me: WARNING: Test program failed using dlsym.  Perhaps you should not
                ;;
        esac
 else
-       { echo "$as_me:8944: WARNING: I can't compile and run the test program." >&5
+       { echo "$as_me:8968: WARNING: I can't compile and run the test program." >&5
 echo "$as_me: WARNING: I can't compile and run the test program." >&2;}
 fi
 rm -f dyna.c dyna.o dyna.$so tmp-dyna.o fred.c fred.o fred
@@ -8950,35 +8974,35 @@ fi
 
 case "x$timidity_cv_func_dlsym_underscore" in
 xyes)  EXTRADEFS="$EXTRADEFS -DDLSYM_NEEDS_UNDERSCORE"
-       echo "$as_me:8953: result: yes" >&5
+       echo "$as_me:8977: result: yes" >&5
 echo "${ECHO_T}yes" >&6
        ;;
 xno)
-       echo "$as_me:8957: result: no" >&5
+       echo "$as_me:8981: result: no" >&5
 echo "${ECHO_T}no" >&6
        ;;
 esac
 
       ;;
     dld)
-      echo "$as_me:8964: result: use dl_dld.c" >&5
+      echo "$as_me:8988: result: use dl_dld.c" >&5
 echo "${ECHO_T}use dl_dld.c" >&6
       SYSEXTRAS="$SYSEXTRAS dl_dld.c"
       ;;
     hpux)
-      echo "$as_me:8969: result: use dl_hpux.c" >&5
+      echo "$as_me:8993: result: use dl_hpux.c" >&5
 echo "${ECHO_T}use dl_hpux.c" >&6
       SYSEXTRAS="$SYSEXTRAS dl_hpux.c"
       LDFLAGS="$LDFLAGS -Wl,-E $LDFLAGS"
       ;;
     w32)
-      echo "$as_me:8975: result: use dl_w32.c" >&5
+      echo "$as_me:8999: result: use dl_w32.c" >&5
 echo "${ECHO_T}use dl_w32.c" >&6
       SYSEXTRAS="$SYSEXTRAS dl_w32.c"
       ;;
     *)
       NEEDDLOPEN="no"
-      { echo "$as_me:8981: WARNING: no method to open a shared object" >&5
+      { echo "$as_me:9005: WARNING: no method to open a shared object" >&5
 echo "$as_me: WARNING: no method to open a shared object" >&2;}
       ;;
   esac
@@ -9017,23 +9041,23 @@ if test "${enable_ncurses+set}" = set; then
 for ac_header in ncurses.h ncurses/curses.h curses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9020: checking for $ac_header" >&5
+echo "$as_me:9044: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9026 "configure"
+#line 9050 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9030: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9054: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9036: \$? = $ac_status" >&5
+  echo "$as_me:9060: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9052,7 +9076,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9055: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9079: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9066,7 +9090,7 @@ done
     *yes*);;
     *) for i in /usr/include /usr/local/include; do
        if test -f "$i/ncurses/curses.h" -a -f "$i/ncurses/unctrl.h"; then
-           { echo "$as_me:9069: WARNING: ncurses test is failure.  Please check config.h and common.makefile later" >&5
+           { echo "$as_me:9093: WARNING: ncurses test is failure.  Please check config.h and common.makefile later" >&5
 echo "$as_me: WARNING: ncurses test is failure.  Please check config.h and common.makefile later" >&2;}
            CPPFLAGS="$CPPFLAGS -I$i/ncurses"
            break
@@ -9075,7 +9099,7 @@ echo "$as_me: WARNING: ncurses test is failure.  Please check config.h and commo
        ;;
     esac
 
-    echo "$as_me:9078: checking for initscr in -lncurses" >&5
+    echo "$as_me:9102: checking for initscr in -lncurses" >&5
 echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
 if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9083,7 +9107,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9086 "configure"
+#line 9110 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9102,16 +9126,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9105: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9108: \$? = $ac_status" >&5
+  echo "$as_me:9132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9114: \$? = $ac_status" >&5
+  echo "$as_me:9138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ncurses_initscr=yes
 else
@@ -9122,12 +9146,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9125: result: $ac_cv_lib_ncurses_initscr" >&5
+echo "$as_me:9149: result: $ac_cv_lib_ncurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6
 if test $ac_cv_lib_ncurses_initscr = yes; then
   lib_curses_opt=-lncurses
 else
-         echo "$as_me:9130: checking for PDC_set_ctrl_break in -lcurses" >&5
+         echo "$as_me:9154: checking for PDC_set_ctrl_break in -lcurses" >&5
 echo $ECHO_N "checking for PDC_set_ctrl_break in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_PDC_set_ctrl_break+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9135,7 +9159,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses $lib_user32_test $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9138 "configure"
+#line 9162 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9154,16 +9178,16 @@ PDC_set_ctrl_break ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9160: \$? = $ac_status" >&5
+  echo "$as_me:9184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9166: \$? = $ac_status" >&5
+  echo "$as_me:9190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_PDC_set_ctrl_break=yes
 else
@@ -9174,7 +9198,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9177: result: $ac_cv_lib_curses_PDC_set_ctrl_break" >&5
+echo "$as_me:9201: result: $ac_cv_lib_curses_PDC_set_ctrl_break" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_PDC_set_ctrl_break" >&6
 if test $ac_cv_lib_curses_PDC_set_ctrl_break = yes; then
    lib_curses_opt=-lcurses
@@ -9182,7 +9206,7 @@ if test $ac_cv_lib_curses_PDC_set_ctrl_break = yes; then
                  lib_user32_opt="$lib_user32_test"
 
 else
-                 echo "$as_me:9185: checking for PDC_set_ctrl_break in -lpdcurses" >&5
+                 echo "$as_me:9209: checking for PDC_set_ctrl_break in -lpdcurses" >&5
 echo $ECHO_N "checking for PDC_set_ctrl_break in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_PDC_set_ctrl_break+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9190,7 +9214,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9193 "configure"
+#line 9217 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9209,16 +9233,16 @@ PDC_set_ctrl_break ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9215: \$? = $ac_status" >&5
+  echo "$as_me:9239: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9221: \$? = $ac_status" >&5
+  echo "$as_me:9245: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_PDC_set_ctrl_break=yes
 else
@@ -9229,7 +9253,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9232: result: $ac_cv_lib_pdcurses_PDC_set_ctrl_break" >&5
+echo "$as_me:9256: result: $ac_cv_lib_pdcurses_PDC_set_ctrl_break" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_PDC_set_ctrl_break" >&6
 if test $ac_cv_lib_pdcurses_PDC_set_ctrl_break = yes; then
    lib_curses_opt=-lpdcurses
@@ -9239,7 +9263,7 @@ if test $ac_cv_lib_pdcurses_PDC_set_ctrl_break = yes; then
 else
                          case "$target" in
                            *openbsd*)
-                               echo "$as_me:9242: checking for initscr in -lcurses" >&5
+                               echo "$as_me:9266: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9247,7 +9271,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9250 "configure"
+#line 9274 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9266,16 +9290,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9272: \$? = $ac_status" >&5
+  echo "$as_me:9296: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9278: \$? = $ac_status" >&5
+  echo "$as_me:9302: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -9286,18 +9310,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9289: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:9313: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   lib_curses_opt=-lcurses
 else
-   { echo "$as_me:9294: WARNING: ncurses interface is not enabled" >&5
+   { echo "$as_me:9318: WARNING: ncurses interface is not enabled" >&5
 echo "$as_me: WARNING: ncurses interface is not enabled" >&2;}
                                          enable_ncurses=no
 fi
 
                                ;;
-                           *)  { echo "$as_me:9300: WARNING: ncurses interface is not enabled" >&5
+                           *)  { echo "$as_me:9324: WARNING: ncurses interface is not enabled" >&5
 echo "$as_me: WARNING: ncurses interface is not enabled" >&2;}
                                enable_ncurses=no
                                ;;
@@ -9357,7 +9381,7 @@ fi
 # Check whether --enable-slang or --disable-slang was given.
 if test "${enable_slang+set}" = set; then
   enableval="$enable_slang"
-  case "x$enable_slang" in xyes|xdynamic)  echo "$as_me:9360: checking for SLang_init_tty in -lslang" >&5
+  case "x$enable_slang" in xyes|xdynamic)  echo "$as_me:9384: checking for SLang_init_tty in -lslang" >&5
 echo $ECHO_N "checking for SLang_init_tty in -lslang... $ECHO_C" >&6
 if test "${ac_cv_lib_slang_SLang_init_tty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9365,7 +9389,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lslang  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9368 "configure"
+#line 9392 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9384,16 +9408,16 @@ SLang_init_tty ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9390: \$? = $ac_status" >&5
+  echo "$as_me:9414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9396: \$? = $ac_status" >&5
+  echo "$as_me:9420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_slang_SLang_init_tty=yes
 else
@@ -9404,36 +9428,36 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9407: result: $ac_cv_lib_slang_SLang_init_tty" >&5
+echo "$as_me:9431: result: $ac_cv_lib_slang_SLang_init_tty" >&5
 echo "${ECHO_T}$ac_cv_lib_slang_SLang_init_tty" >&6
 if test $ac_cv_lib_slang_SLang_init_tty = yes; then
   :
 else
    enable_slang=no
-         { echo "$as_me:9413: WARNING: slang interface is not enabled" >&5
+         { echo "$as_me:9437: WARNING: slang interface is not enabled" >&5
 echo "$as_me: WARNING: slang interface is not enabled" >&2;}
 fi
 
 for ac_header in slang/slang.h slang.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9420: checking for $ac_header" >&5
+echo "$as_me:9444: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9426 "configure"
+#line 9450 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9430: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9454: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9436: \$? = $ac_status" >&5
+  echo "$as_me:9460: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9452,7 +9476,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9455: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9479: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9484,7 +9508,7 @@ fi
 xdynamic)
   dynamic_targets="$dynamic_targets interface_s.\$(so)"
    s_so_libs="-lslang"
-    echo "$as_me:9487: checking for initscr in -ltermcap" >&5
+    echo "$as_me:9511: checking for initscr in -ltermcap" >&5
 echo $ECHO_N "checking for initscr in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9492,7 +9516,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9495 "configure"
+#line 9519 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9511,16 +9535,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9538: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9517: \$? = $ac_status" >&5
+  echo "$as_me:9541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9523: \$? = $ac_status" >&5
+  echo "$as_me:9547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_initscr=yes
 else
@@ -9531,7 +9555,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9534: result: $ac_cv_lib_termcap_initscr" >&5
+echo "$as_me:9558: result: $ac_cv_lib_termcap_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_initscr" >&6
 if test $ac_cv_lib_termcap_initscr = yes; then
   s_so_libs="$s_so_libs -ltermcap"
@@ -9554,12 +9578,12 @@ fi
 if test "${enable_motif+set}" = set; then
   enableval="$enable_motif"
   case "x$enable_motif" in xyes|xdynamic)  if test "x$with_x" != xyes; then
-        { { echo "$as_me:9557: error: motif: --with-x option must be specified" >&5
+        { { echo "$as_me:9581: error: motif: --with-x option must be specified" >&5
 echo "$as_me: error: motif: --with-x option must be specified" >&2;}
    { (exit 1); exit 1; }; }
     fi
     if test "x$have_xm" != xyes; then
-      { echo "$as_me:9562: WARNING: Motif library is not found." >&5
+      { echo "$as_me:9586: WARNING: Motif library is not found." >&5
 echo "$as_me: WARNING: Motif library is not found." >&2;}
       enable_motif=no
     fi  ;; esac
@@ -9610,7 +9634,7 @@ fi
 if test "${enable_tcltk+set}" = set; then
   enableval="$enable_tcltk"
   case "x$enable_tcltk" in xyes|xdynamic)  if test "x$with_x" != xyes; then
-        { { echo "$as_me:9613: error: tcltk: --with-x option must be specified" >&5
+        { { echo "$as_me:9637: error: tcltk: --with-x option must be specified" >&5
 echo "$as_me: error: tcltk: --with-x option must be specified" >&2;}
    { (exit 1); exit 1; }; }
     fi
@@ -9627,7 +9651,7 @@ echo "$as_me: error: tcltk: --with-x option must be specified" >&2;}
     tk_lib=
     for l in tcl tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do
       case "x$tcl_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tcl_Init" | $as_tr_sh`
-echo "$as_me:9630: checking for Tcl_Init in -l$l" >&5
+echo "$as_me:9654: checking for Tcl_Init in -l$l" >&5
 echo $ECHO_N "checking for Tcl_Init in -l$l... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9635,7 +9659,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$l  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9638 "configure"
+#line 9662 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9654,16 +9678,16 @@ Tcl_Init ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9657: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9660: \$? = $ac_status" >&5
+  echo "$as_me:9684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9666: \$? = $ac_status" >&5
+  echo "$as_me:9690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9674,7 +9698,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9677: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9701: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   tcl_lib=-l$l
@@ -9684,7 +9708,7 @@ fi
     LIBS="$LIBS $tcl_lib"
     for l in tk tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
       case "x$tk_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tk_Init" | $as_tr_sh`
-echo "$as_me:9687: checking for Tk_Init in -l$l" >&5
+echo "$as_me:9711: checking for Tk_Init in -l$l" >&5
 echo $ECHO_N "checking for Tk_Init in -l$l... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9692,7 +9716,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$l  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9695 "configure"
+#line 9719 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9711,16 +9735,16 @@ Tk_Init ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9717: \$? = $ac_status" >&5
+  echo "$as_me:9741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9723: \$? = $ac_status" >&5
+  echo "$as_me:9747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9731,7 +9755,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9734: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9758: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   tk_lib=-l$l
@@ -9744,7 +9768,7 @@ fi
       CPPFLAGS=$KEEPCPPFLAGS
       LDFLAGS=$KEEPLDFLAGS
       enable_tcltk=no
-      { echo "$as_me:9747: WARNING: tcl/tk is not enable" >&5
+      { echo "$as_me:9771: WARNING: tcl/tk is not enable" >&5
 echo "$as_me: WARNING: tcl/tk is not enable" >&2;}
     else
       tcltk_dep='tclIndex'
@@ -9882,12 +9906,12 @@ fi
 if test "${enable_xaw+set}" = set; then
   enableval="$enable_xaw"
   case "x$enable_xaw" in xyes|xdynamic)  if test "x$with_x" != xyes; then
-        { { echo "$as_me:9885: error: xaw: --with-x option must be specified" >&5
+        { { echo "$as_me:9909: error: xaw: --with-x option must be specified" >&5
 echo "$as_me: error: xaw: --with-x option must be specified" >&2;}
    { (exit 1); exit 1; }; }
     fi
     if test "x$have_xaw" != "xyes" -a "x$have_xaw" != "x3d"; then
-      { echo "$as_me:9890: WARNING: X Athena Widget library is not found." >&5
+      { echo "$as_me:9914: WARNING: X Athena Widget library is not found." >&5
 echo "$as_me: WARNING: X Athena Widget library is not found." >&2;}
       enable_xaw=no
     fi  ;; esac
@@ -9965,7 +9989,7 @@ fi
 if test "${enable_xskin+set}" = set; then
   enableval="$enable_xskin"
   case "x$enable_xskin" in xyes|xdynamic)  if test "x$with_x" != xyes; then
-        { { echo "$as_me:9968: error: xskin: --with-x option must be specified" >&5
+        { { echo "$as_me:9992: error: xskin: --with-x option must be specified" >&5
 echo "$as_me: error: xskin: --with-x option must be specified" >&2;}
    { (exit 1); exit 1; }; }
     fi ;; esac
@@ -10043,7 +10067,7 @@ fi;
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
-echo "$as_me:10046: checking for $ac_word" >&5
+echo "$as_me:10070: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10060,7 +10084,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:10063: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10087: found $ac_dir/$ac_word" >&5
    break
 fi
 done
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
 
 if test -n "$GTK_CONFIG"; then
-  echo "$as_me:10075: result: $GTK_CONFIG" >&5
+  echo "$as_me:10099: result: $GTK_CONFIG" >&5
 echo "${ECHO_T}$GTK_CONFIG" >&6
 else
-  echo "$as_me:10078: result: no" >&5
+  echo "$as_me:10102: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   min_gtk_version=1.1.3
-  echo "$as_me:10083: checking for GTK - version >= $min_gtk_version" >&5
+  echo "$as_me:10107: checking for GTK - version >= $min_gtk_version" >&5
 echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
@@ -10104,7 +10128,7 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10107 "configure"
+#line 10131 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -10171,15 +10195,15 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10177: \$? = $ac_status" >&5
+  echo "$as_me:10201: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10182: \$? = $ac_status" >&5
+  echo "$as_me:10206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
      fi
   fi
   if test "x$no_gtk" = x ; then
-     echo "$as_me:10198: result: yes" >&5
+     echo "$as_me:10222: result: yes" >&5
 echo "${ECHO_T}yes" >&6
      :
   else
-     echo "$as_me:10202: result: no" >&5
+     echo "$as_me:10226: result: no" >&5
 echo "${ECHO_T}no" >&6
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
@@ -10214,7 +10238,7 @@ echo "${ECHO_T}no" >&6
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat >conftest.$ac_ext <<_ACEOF
-#line 10217 "configure"
+#line 10241 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -10229,16 +10253,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10235: \$? = $ac_status" >&5
+  echo "$as_me:10259: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10241: \$? = $ac_status" >&5
+  echo "$as_me:10265: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
 for ac_header in sys/soundcard.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10357: checking for $ac_header" >&5
+echo "$as_me:10381: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10363 "configure"
+#line 10387 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10367: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10391: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10373: \$? = $ac_status" >&5
+  echo "$as_me:10397: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10389,7 +10413,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10392: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10416: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 for ac_header in sys/asoundlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10442: checking for $ac_header" >&5
+echo "$as_me:10466: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10448 "configure"
+#line 10472 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10452: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10476: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10458: \$? = $ac_status" >&5
+  echo "$as_me:10482: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10474,7 +10498,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10477: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10501: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10519,7 +10543,7 @@ else
   ENABLE_W32GUI_TRUE='#'
   ENABLE_W32GUI_FALSE=
 fi
-   lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32'
+   lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32 -lole32'
     lib_user32_opt='-luser32'
     LDFLAGS="-mwindows $LDFLAGS"
     INTERFACE_SRCS="$INTERFACE_SRCS w32g_c.c w32g_ini.c w32g_i.c w32g_playlist.c w32g_utl.c w32g_pref.c w32g_subwin.c w32g_ut2.c"
@@ -10538,27 +10562,27 @@ esac
 if test "${enable_ump+set}" = set; then
   enableval="$enable_ump"
   case "x$enable_ump" in xyes|xdynamic)  if test ! -d ump; then
-       { { echo "$as_me:10541: error: UMP Package is not exists.  Can't configure it." >&5
+       { { echo "$as_me:10565: error: UMP Package is not exists.  Can't configure it." >&5
 echo "$as_me: error: UMP Package is not exists.  Can't configure it." >&2;}
    { (exit 1); exit 1; }; }
     fi
-    echo "$as_me:10545: checking for X11/xpm.h" >&5
+    echo "$as_me:10569: checking for X11/xpm.h" >&5
 echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_xpm_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10551 "configure"
+#line 10575 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:10555: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10579: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10561: \$? = $ac_status" >&5
+  echo "$as_me:10585: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10577,17 +10601,17 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10580: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:10604: result: $ac_cv_header_X11_xpm_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
 if test $ac_cv_header_X11_xpm_h = yes; then
   :
 else
-  { { echo "$as_me:10585: error: UMP Package needs xpm.h, but could not find it." >&5
+  { { echo "$as_me:10609: error: UMP Package needs xpm.h, but could not find it." >&5
 echo "$as_me: error: UMP Package needs xpm.h, but could not find it." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-    echo "$as_me:10590: checking for XpmCreatePixmapFromData in -lXpm" >&5
+    echo "$as_me:10614: checking for XpmCreatePixmapFromData in -lXpm" >&5
 echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6
 if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10595,7 +10619,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10598 "configure"
+#line 10622 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10614,16 +10638,16 @@ XpmCreatePixmapFromData ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10641: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10620: \$? = $ac_status" >&5
+  echo "$as_me:10644: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10626: \$? = $ac_status" >&5
+  echo "$as_me:10650: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10637: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:10661: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6
 if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then
   :
 else
-  { { echo "$as_me:10642: error: UMP Package needs libXpm.a, but could not find it." >&5
+  { { echo "$as_me:10666: error: UMP Package needs libXpm.a, but could not find it." >&5
 echo "$as_me: error: UMP Package needs libXpm.a, but could not find it." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10688,7 +10712,7 @@ if test "${enable_offix+set}" = set; then
       CPPFLAGS="$CPPFLAGS $offix_include_dir"
       LDFLAGS="$LDFLAGS $offix_lib_dir"
       LIBS="$LIBS $lib_xmu_opt $lib_xt_opt $lib_xprelibs_opt $lib_xext_opt -lX11"
-      echo "$as_me:10691: checking for DndInitialize in -lDnd" >&5
+      echo "$as_me:10715: checking for DndInitialize in -lDnd" >&5
 echo $ECHO_N "checking for DndInitialize in -lDnd... $ECHO_C" >&6
 if test "${ac_cv_lib_Dnd_DndInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10696,7 +10720,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lDnd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10699 "configure"
+#line 10723 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10715,16 +10739,16 @@ DndInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10721: \$? = $ac_status" >&5
+  echo "$as_me:10745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10727: \$? = $ac_status" >&5
+  echo "$as_me:10751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Dnd_DndInitialize=yes
 else
@@ -10735,7 +10759,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10738: result: $ac_cv_lib_Dnd_DndInitialize" >&5
+echo "$as_me:10762: result: $ac_cv_lib_Dnd_DndInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Dnd_DndInitialize" >&6
 if test $ac_cv_lib_Dnd_DndInitialize = yes; then
 
@@ -10775,7 +10799,7 @@ if test "${enable_spectrogram+set}" = set; then
   enableval="$enable_spectrogram"
    if test "$enableval" = "yes"; then
       if test "x$with_x" != xyes; then
-       { { echo "$as_me:10778: error: spectrogram: --with-x option must be specified" >&5
+       { { echo "$as_me:10802: error: spectrogram: --with-x option must be specified" >&5
 echo "$as_me: error: spectrogram: --with-x option must be specified" >&2;}
    { (exit 1); exit 1; }; }
       fi
@@ -10808,7 +10832,7 @@ if test "${enable_spline+set}" = set; then
        EXTRADEFS="$EXTRADEFS -DNO_INTERPOLATION"
        ;;
       *)
-       { { echo "$as_me:10811: error: Invalid method of --enable-spline" >&5
+       { { echo "$as_me:10835: error: Invalid method of --enable-spline" >&5
 echo "$as_me: error: Invalid method of --enable-spline" >&2;}
    { (exit 1); exit 1; }; }
        ;;
@@ -10820,13 +10844,13 @@ if test "${enable_wrd+set}" = set; then
   enableval="$enable_wrd"
    if test "$enableval" = "yes"; then
       if test "x$with_x" != xyes; then
-       { { echo "$as_me:10823: error: wrd: --with-x option must be specified" >&5
+       { { echo "$as_me:10847: error: wrd: --with-x option must be specified" >&5
 echo "$as_me: error: wrd: --with-x option must be specified" >&2;}
    { (exit 1); exit 1; }; }
       fi
       EXTRADEFS="$EXTRADEFS -DWRDT_X"
       enable_sherry_wrd=yes
-      echo "$as_me:10829: checking for zlibVersion in -lz" >&5
+      echo "$as_me:10853: checking for zlibVersion in -lz" >&5
 echo $ECHO_N "checking for zlibVersion in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_zlibVersion+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10834,7 +10858,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10837 "configure"
+#line 10861 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10853,16 +10877,16 @@ zlibVersion ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10859: \$? = $ac_status" >&5
+  echo "$as_me:10883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10865: \$? = $ac_status" >&5
+  echo "$as_me:10889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_z_zlibVersion=yes
 else
@@ -10873,7 +10897,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10876: result: $ac_cv_lib_z_zlibVersion" >&5
+echo "$as_me:10900: result: $ac_cv_lib_z_zlibVersion" >&5
 echo "${ECHO_T}$ac_cv_lib_z_zlibVersion" >&6
 if test $ac_cv_lib_z_zlibVersion = yes; then
   :
@@ -10881,23 +10905,23 @@ else
   enable_sherry_wrd=no
 fi
 
-      echo "$as_me:10884: checking for png.h" >&5
+      echo "$as_me:10908: checking for png.h" >&5
 echo $ECHO_N "checking for png.h... $ECHO_C" >&6
 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10890 "configure"
+#line 10914 "configure"
 #include "confdefs.h"
 #include <png.h>
 _ACEOF
-if { (eval echo "$as_me:10894: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10918: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10900: \$? = $ac_status" >&5
+  echo "$as_me:10924: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10916,7 +10940,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10919: result: $ac_cv_header_png_h" >&5
+echo "$as_me:10943: result: $ac_cv_header_png_h" >&5
 echo "${ECHO_T}$ac_cv_header_png_h" >&6
 if test $ac_cv_header_png_h = yes; then
   :
@@ -10924,7 +10948,7 @@ else
   enable_sherry_wrd=no
 fi
 
-      echo "$as_me:10927: checking for png_init_io in -lpng" >&5
+      echo "$as_me:10951: checking for png_init_io in -lpng" >&5
 echo $ECHO_N "checking for png_init_io in -lpng... $ECHO_C" >&6
 if test "${ac_cv_lib_png_png_init_io+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10932,7 +10956,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10935 "configure"
+#line 10959 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10951,16 +10975,16 @@ png_init_io ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10957: \$? = $ac_status" >&5
+  echo "$as_me:10981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10963: \$? = $ac_status" >&5
+  echo "$as_me:10987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_png_png_init_io=yes
 else
@@ -10971,7 +10995,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10974: result: $ac_cv_lib_png_png_init_io" >&5
+echo "$as_me:10998: result: $ac_cv_lib_png_png_init_io" >&5
 echo "${ECHO_T}$ac_cv_lib_png_png_init_io" >&6
 if test $ac_cv_lib_png_png_init_io = yes; then
   :
@@ -10984,7 +11008,7 @@ fi
        lib_zip_opt=-lz
        lib_png_opt=-lpng
       else
-        { echo "$as_me:10987: WARNING: Sherry WRD is disabled: png.h, libpng.a, libz.a are required" >&5
+        { echo "$as_me:11011: WARNING: Sherry WRD is disabled: png.h, libpng.a, libz.a are required" >&5
 echo "$as_me: WARNING: Sherry WRD is disabled: png.h, libpng.a, libz.a are required" >&2;}
       fi
       if test "x$have_xext" = xyes; then
@@ -11165,7 +11189,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:11168: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:11192: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -11341,7 +11365,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:11344: error: ambiguous option: $1
+    { { echo "$as_me:11368: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -11360,7 +11384,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:11363: error: unrecognized option: $1
+  -*) { { echo "$as_me:11387: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -11421,7 +11445,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   "interface.h" ) CONFIG_HEADERS="$CONFIG_HEADERS interface.h" ;;
-  *) { { echo "$as_me:11424: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:11448: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -11750,7 +11774,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:11753: creating $ac_file" >&5
+    { echo "$as_me:11777: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -11768,7 +11792,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:11771: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:11795: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -11781,7 +11805,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:11784: error: cannot find input file: $f" >&5
+           { { echo "$as_me:11808: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -11842,7 +11866,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:11845: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:11869: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -11853,7 +11877,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:11856: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:11880: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -11866,7 +11890,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:11869: error: cannot find input file: $f" >&5
+           { { echo "$as_me:11893: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -11983,7 +12007,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:11986: $ac_file is unchanged" >&5
+      { echo "$as_me:12010: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
index ba8ee83..5ae81c1 100644 (file)
@@ -55,7 +55,7 @@ dnl
 AC_INIT(timidity/timidity.c)
 SHELL=${CONFIG_SHELL-/bin/sh}
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(TiMidity++, 2.11.0-pre5)
+AM_INIT_AUTOMAKE(TiMidity++, 2.11.0)
 
 dnl To use CONTAINS() macro (See acinclude.m4)
 CONTAINS_INIT
@@ -442,8 +442,9 @@ dnl alib(A):        HPUX network audio (Alib)
 dnl nas(n):    Network Audio System
 dnl esd(e):    EsounD
 dnl vorbis(v): Ogg Vorbis
+dnl gogo(g):   MP3 GOGO
 
-audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis'
+audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas esd vorbis gogo'
 
 AC_ARG_WITH(nas-library,
   [  --with-nas-library=library  NAS absolute library path (Don't use -laudio)])
@@ -465,7 +466,8 @@ AC_ARG_ENABLE(audio,
                               alib: HPUX network audio (Alib)
                               nas:  NAS - Network Audio System
                               esd:  EsounD
-                              vorbis: Ogg Vorbis],
+                              vorbis: Ogg Vorbis
+                              gogo: MP3 GOGO (Only Windows is supported)],
   [ enable_audio=$enableval
     have_audio_opt=yes ],
   [ enable_audio=yes
@@ -484,7 +486,7 @@ dnl Turn on default output mode
 DEFAULT_PLAYMODE=
 AC_ARG_WITH(default-output,
   [  --with-default-output=<mode>  Specify default output mode (optional):
-                            default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis],
+                       default|alsa|alib|nas|esd|wav|au|aiff|list|vorbis|gogo],
   [ if test "$enable_audio" != no; then
       DEFAULT_PLAYMODE=$withval
       eval "au_enable_$DEFAULT_PLAYMODE=yes"
@@ -792,7 +794,10 @@ if test "x$au_enable_vorbis" = xyes; then
       have_vorbis=yes
       SYSEXTRAS="$SYSEXTRAS vorbis_a.c"
       EXTRADEFS="$EXTRADEFS -DAU_VORBIS $OGG_CFLAGS $VORBIS_CFLAGS"
-      EXTRALIBS="$EXTRALIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS"
+      EXTRALIBS="$EXTRALIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
+      if test "x$CYGNUS" = "xyes"; then
+       SYSEXTRAS="$SYSEXTRAS w32g_vorbisenc_dll.c w32g_vorbis_dll.c w32g_ogg_dll.c"
+      fi
     ],[
       AC_MSG_WARN([Unable to configure vorbis, but ogg is there (???)])
     ])
@@ -804,6 +809,20 @@ else
   AC_MSG_RESULT(no)
 fi
 
+AC_MSG_CHECKING(enable_audio=gogo)
+if test "x$au_enable_gogo" = xyes; then
+  if test "x$CYGNUS" = "xyes"; then
+    AC_MSG_RESULT(yes, configuring gogo)
+  else
+    AC_MSG_WARN(May be gogo is not supported.  You need hack the gogo_a.c)
+  fi
+  have_gogo=yes
+  SYSEXTRAS="$SYSEXTRAS gogo_a.c w32_gogo.c"
+  EXTRADEFS="$EXTRADEFS -DAU_GOGO"
+  EXTRALIBS="$EXTRALIBS -lgogo"
+else
+  AC_MSG_RESULT(no)
+fi
 
 dnl Pseudo audio device (Undocumented).
 if test "x$au_enable_none" = xyes; then
@@ -837,6 +856,7 @@ case ".$DEFAULT_PLAYMODE" in
   .aiff) TIMIDITY_OUTPUT_ID=a ;;
   .list) TIMIDITY_OUTPUT_ID=l ;;
   .vorbis) TIMIDITY_OUTPUT_ID=v ;;
+  .gogo) TIMIDITY_OUTPUT_ID=g ;;
   *)     TIMIDITY_OUTPUT_ID= ;;
 esac
 AC_MSG_RESULT($DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID)
@@ -1241,13 +1261,12 @@ AM_CONDITIONAL(ENABLE_W32GUI, false)
 CONFIG_INTERFACE(w32gui, W32GUI, w,
   [  --enable-w32gui         Enable Windows GUI interface    (default is no)],
   ,
-  [ lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32'
+  [ lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32 -lole32'
     lib_user32_opt='-luser32'
     LDFLAGS="-mwindows $LDFLAGS"
     INTERFACE_SRCS="$INTERFACE_SRCS w32g_c.c w32g_ini.c w32g_i.c w32g_playlist.c w32g_utl.c w32g_pref.c w32g_subwin.c w32g_ut2.c"
   ])
 
-
 dnl UMP configuration
 CONFIG_INTERFACE(ump, PLUGIN, p,
   [  --enable-ump            UMP configuration               (default is no)],
index 59144ad..0ba72c7 100644 (file)
@@ -357,6 +357,14 @@ Sort file list arguments before playing
 Enable the loading of patch files during play.
 
 .TP
+.B \-k " msec"
+Specify audio queue time limit to reduce voices.
+If the remaining audio buffer is less than \fImsec\fB milliseconds,
+TiMidity tries to kill some voices.
+This feature makes it possible to play complicated MIDI files on slow CPUs.
+Setting \fImsec\fB to zero tells TiMidity to never remove any voices.
+
+.TP
 .B \-L " directory"
 Adds \fIdirectory\fP to the library path.  Patch, configuration,
 and MIDI files are searched along this
@@ -618,8 +626,7 @@ emulate all known bugs
 
 .TP
 .BI F="filename"
-Use \fIfilename\fP as WRD file only (input\-file\-name):r.wrd
-(like csh syntax) is not available.
+Use \fIfilename\fP as WRD file only no file matching *.wrd is found.
 .TP
 .BI f="filename"
 Uses \fIfilename\fP as WRD file.
index 9a0c6c9..08f8a18 100644 (file)
@@ -177,8 +177,7 @@ EXTRA_DIST = \
        interface_i.txt \
        interface_m.txt \
        interface_n.txt \
-       interface_s.txt \
-       w32g_res_jp.rc
+       interface_s.txt
 
 .ptcl.tcl:
        sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@
@@ -312,6 +311,8 @@ endif
 
 clean-compile:
        -rm -f *.$(so)
+       -rm -f *.res
+       -rm -f *.RES
 
 install-exec-local: $(install_tk) $(install_xaw) $(install_el) $(install_dynamics)
 ########## End of Makefile
index be4bde6..3c1ea18 100644 (file)
@@ -293,8 +293,7 @@ EXTRA_DIST = \
        interface_i.txt \
        interface_m.txt \
        interface_n.txt \
-       interface_s.txt \
-       w32g_res_jp.rc
+       interface_s.txt
 
 
 @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
@@ -836,6 +835,8 @@ w32g_res.res: w32g_res.h w32g_rec.h w32g_res.rc \
 
 clean-compile:
        -rm -f *.$(so)
+       -rm -f *.res
+       -rm -f *.RES
 
 install-exec-local: $(install_tk) $(install_xaw) $(install_el) $(install_dynamics)
 ########## End of Makefile
index 250f8ab..83ed4e5 100644 (file)
 #define ___W32G_H_\r
 \r
 #include <process.h>\r
+#ifdef RC_NONE\r
+#undef RC_NONE\r
+#endif\r
 #include <windows.h>\r
+#ifdef RC_NONE\r
 #undef RC_NONE\r
+#endif\r
 #define RC_NONE        0\r
 \r
 #define LANGUAGE_JAPANESE                              0x0001\r
@@ -351,7 +356,8 @@ extern int DocMaxSize;
 extern char *DocFileExt;\r
 \r
 extern int w32g_has_ini_file;\r
-\r
+extern char *w32g_output_dir;\r
+extern int w32g_auto_output_mode;\r
 \r
 // HWND\r
 extern HWND hStartWnd;\r
@@ -366,5 +372,9 @@ extern HWND hSoundSpecWnd;
 extern HWND hDebugEditWnd;\r
 extern HWND hDocEditWnd;\r
 \r
+// gdi_lock\r
+extern int gdi_lock(void);\r
+extern int gdi_unlock(void);\r
+#define GDI_SAFETY(command) (gdi_lock(),(command),gdi_unlock);\r
 \r
 #endif\r
index 6a1b1d1..82f7c59 100644 (file)
 #include "w32g.h"\r
 #include "w32g_subwin.h"\r
 \r
-#include <process.h>\r
-\r
+extern int CanvasGetMode(void);\r
+extern void CanvasUpdate(int flag);\r
+extern void CanvasReadPanelInfo(int flag);\r
+extern void CanvasPaint(void);\r
+extern void CanvasPaintAll(void);\r
+extern void CanvasReset(void);\r
+extern void CanvasClear(void);\r
+extern void MPanelPaintAll(void);\r
+extern void MPanelReadPanelInfo(int flag);\r
+extern void MPanelReset(void);\r
+extern void MPanelUpdate(void);\r
+extern void MPanelUpdateAll(void);\r
+extern void MPanelPaint(void);\r
+extern int w32g_msg_box(char *message, char *title, int type);\r
+extern int is_directory(char *path);\r
+extern int directory_form(char *buffer);\r
 \r
 volatile int w32g_play_active;\r
 volatile int w32g_restart_gui_flag = 0;\r
@@ -60,6 +74,9 @@ PanelInfo *Panel = NULL;
 static void CanvasUpdateInterval(void);\r
 static void ctl_panel_refresh(void);\r
 \r
+char *w32g_output_dir = NULL;\r
+int w32g_auto_output_mode = 0;\r
+\r
 //****************************************************************************/\r
 // Control funcitons\r
 \r
@@ -76,7 +93,7 @@ ControlMode ctl=
 {\r
     "Win32 GUI interface", 'w',\r
     1,1,0,\r
-    CTLF_AUTOSTART | CTLF_LIST_LOOP | CTLF_DRAG_START,\r
+    CTLF_AUTOSTART | CTLF_DRAG_START,\r
     ctl_open,\r
     ctl_close,\r
     ctl_pass_playing_list,\r
@@ -352,7 +369,6 @@ static int ctl_load_playlist(char *fileptr)
 static int ctl_save_playlist(char *fileptr)\r
 {\r
     FILE *fp;\r
-    char *filename;\r
     int i, nfiles;\r
 \r
     if((fp = fopen(fileptr, "w")) == NULL)\r
@@ -420,8 +436,6 @@ static int ctl_refine_playlist(void)
 \r
 static int w32g_ext_control(int rc, int32 value)\r
 {\r
-    int i;\r
-\r
     switch(rc)\r
     {\r
       case RC_EXT_DROP:\r
@@ -528,8 +542,9 @@ static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
     w32g_play_active = 0;\r
     errcnt = 0;\r
 \r
-    if(play_mode->fd != -1 &&\r
-       w32g_nvalid_playlist() && (ctl.flags & CTLF_AUTOSTART))\r
+    if(w32g_nvalid_playlist() && (ctl.flags & CTLF_AUTOSTART))\r
+//    if(play_mode->fd != -1 &&\r
+//       w32g_nvalid_playlist() && (ctl.flags & CTLF_AUTOSTART))\r
        rc = RC_LOAD_FILE;\r
     else\r
        rc = RC_NONE;\r
@@ -561,7 +576,6 @@ static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
                w32g_play_active = 1;\r
                if(play_mode->fd == -1)\r
                {\r
-                   int err;\r
                    if(play_mode->open_output() == -1)\r
                    {\r
                        ctl.cmsg(CMSG_FATAL, VERB_NORMAL,\r
@@ -574,12 +588,15 @@ static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
                    aq_setup();\r
                    timidity_init_aq_buff();\r
                }\r
-               w32g_setcur_playlist();\r
+//             w32g_setcur_playlist();\r
                if(play_mode->id_character == 'l')\r
                    w32g_show_console();\r
                if(!DocWndIndependent){\r
                        w32g_setup_doc(selected);\r
-                   w32g_open_doc(1);\r
+                       if(DocWndAutoPopup)\r
+                               w32g_open_doc(1);\r
+                       else\r
+                               w32g_open_doc(2);\r
                }\r
                {\r
                        char *p = w32g_get_playlist(selected);\r
@@ -608,8 +625,12 @@ static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
 \r
          case RC_ERROR:\r
          case RC_TUNE_END:\r
+#if 0\r
            if(play_mode->id_character != 'd' ||\r
               (ctl.flags & CTLF_NOT_CONTINUE))\r
+#else\r
+           if(ctl.flags & CTLF_NOT_CONTINUE)\r
+#endif\r
                break;\r
            /* FALLTHROUGH */\r
          case RC_NEXT:\r
index 96fa43a..ffe50d2 100644 (file)
@@ -54,6 +54,7 @@ int WINAPI timeKillEvent(UINT uTimerID);
 #else\r
 #include <strings.h>\r
 #endif\r
+#include <shlobj.h>\r
 \r
 #include <windowsx.h>  /* There is no <windowsx.h> on CYGWIN.\r
                         * Edit_* and ListBox_* are defined in\r
@@ -257,6 +258,7 @@ LPSTR lpCmdLine, int nCmdShow)
 {\r
        int argc;\r
        CHAR **argv = NULL;\r
+puts("#### WINMAIN");\r
        CmdLineToArgv(lpCmdLine,&argc,&argv);\r
 #if 0\r
        FirstLoadIniFile();\r
@@ -337,7 +339,7 @@ static LRESULT CALLBACK StartWinProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARA
 void InitStartWnd(int nCmdShow)\r
 {\r
        WNDCLASS wndclass ;\r
-       wndclass.style         = CS_HREDRAW | CS_VREDRAW ;\r
+       wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC;\r
        wndclass.lpfnWndProc   = StartWinProc ;\r
        wndclass.cbClsExtra    = 0 ;\r
        wndclass.cbWndExtra    = 0 ;\r
@@ -428,7 +430,10 @@ void OnHide(void);
 static void InitMainWnd(HWND hParentWnd)\r
 {\r
        HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON_TIMIDITY));\r
-       hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN),hParentWnd,MainProc);\r
+       if (PlayerLanguage == LANGUAGE_JAPANESE)\r
+         hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN),hParentWnd,MainProc);\r
+       else\r
+         hMainWnd = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_MAIN_EN),hParentWnd,MainProc);\r
        if (hIcon!=NULL) SendMessage(hMainWnd,WM_SETICON,FALSE,(LPARAM)hIcon);\r
        {  // Set the title of the main window again.\r
        char buffer[256];\r
@@ -1211,7 +1216,7 @@ static void InitCanvasWnd(HWND hwnd)
 {\r
        WNDCLASS wndclass ;\r
        hCanvasWnd = 0;\r
-       wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;\r
+       wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_CLASSDC;\r
        wndclass.lpfnWndProc   = CanvasWndProc ;\r
        wndclass.cbClsExtra    = 0 ;\r
        wndclass.cbWndExtra    = 0 ;\r
@@ -1382,6 +1387,8 @@ static int CanvasOK = 0;
 static void CanvasInit(HWND hwnd)\r
 {\r
        RECT rc;\r
+\r
+       gdi_lock(); // gdi_lock\r
        Canvas.hwnd = hwnd;\r
        Canvas.hParentWnd = GetParent(Canvas.hwnd);\r
        GetClientRect(Canvas.hParentWnd,&rc);\r
@@ -1408,10 +1415,10 @@ static void CanvasInit(HWND hwnd)
        Canvas.MapDelay = 1;\r
        Canvas.MapResidual = 0;\r
        Canvas.MapMode = CMAP_MODE_16;\r
-//     Canvas.MapMode = CMAP_MODE_32;\r
+       //      Canvas.MapMode = CMAP_MODE_32;\r
        Canvas.MapBarMax = 16;\r
-//     Canvas.CKNoteFrom = 24;\r
-//   Canvas.CKNoteTo = 24 + 96;\r
+       //      Canvas.CKNoteFrom = 24;\r
+       //   Canvas.CKNoteTo = 24 + 96;\r
        Canvas.CKNoteFrom = 12;\r
    Canvas.CKNoteTo = Canvas.CKNoteFrom + 96 + 3;\r
        Canvas.CKCh = 16;\r
@@ -1421,6 +1428,7 @@ static void CanvasInit(HWND hwnd)
        Canvas.PaintDone = 0;\r
        CanvasReset();\r
        CanvasOK = 1;\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 // Canvas Map\r
@@ -1432,6 +1440,7 @@ static void CanvasMapClear(void)
        HGDIOBJ hgdiobj_hpen, hgdiobj_hbrush;\r
        if(!CanvasOK)\r
        return;\r
+       gdi_lock(); // gdi_lock\r
        hPen = CreatePen(PS_SOLID,1,CanvasColor(CC_BACK));\r
        hBrush = CreateSolidBrush(CanvasColor(CC_BACK));\r
        hgdiobj_hpen = SelectObject(Canvas.hmdc, hPen);\r
@@ -1443,6 +1452,7 @@ static void CanvasMapClear(void)
        SelectObject(Canvas.hmdc, hgdiobj_hbrush);\r
        DeleteObject(hBrush);\r
        InvalidateRect(hCanvasWnd, NULL, FALSE);\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 static void CanvasMapReset(void)\r
@@ -1455,7 +1465,7 @@ static void CanvasMapReset(void)
                Canvas.MapCh = 32;\r
 #ifdef MAPBAR_LIKE_TIMIDI\r
                Canvas.MapBarWidth = 5;\r
-               Canvas.MapBarMax = 10;\r
+               Canvas.MapBarMax = 10+1;\r
                Canvas.rcMapMap.bottom = Canvas.rcMapMap.top + 3*Canvas.MapBarMax*2 + 6 - 1;\r
 #else\r
                Canvas.MapBarWidth = 2;\r
@@ -1507,25 +1517,17 @@ static void CanvasMapReadPanelInfo(int flag)
        Canvas.DrumChannel = drumchannels;\r
        for(ch=0;ch<Canvas.MapCh;ch++){\r
                Canvas.MapBarOld[ch] = Canvas.MapBar[ch];\r
-               if(Panel->v_flags[ch] == FLAG_NOTE_ON)\r
+               if(Panel->v_flags[ch] == FLAG_NOTE_ON){\r
 #if 0\r
                        v = Panel->ctotal[ch]/8;\r
 #else\r
                        v = (int) Panel->ctotal[ch] * Canvas.MapBarMax / 128;\r
 #endif\r
-               else\r
-               v = 0;\r
-               if(v<0) v = 0; else if(v>Canvas.MapBarMax-1) v = Canvas.MapBarMax-1;\r
-#if 0          // \90U\93®\r
-               if(v == Canvas.MapBar[ch]){\r
-                       v = v * (rand()%7 + 7) / 10;\r
-      if(v<0)\r
+               } else {\r
        v = 0;\r
                }\r
-       {\r
-#else\r
+               if(v<0) v = 0; else if(v>Canvas.MapBarMax-1) v = Canvas.MapBarMax-1;\r
                if(v != Canvas.MapBar[ch]){\r
-#endif\r
                        // \92x\89\84\r
                if(Canvas.MapDelay){\r
                        int old = Canvas.MapBar[ch];\r
@@ -1644,7 +1646,8 @@ static void CanvasMapUpdate(int flag)
        CanvasMapDrawMapBar(flag);\r
    if(Canvas.UpdateAll)\r
        flag = 1;\r
-       if(PInfoOK && Canvas.MapMode==CMAP_MODE_16)\r
+       gdi_lock(); // gdi_lock\r
+       if(PInfoOK && Canvas.MapMode==CMAP_MODE_16){\r
    if(flag || Panel->changed){\r
                int ch;\r
                for(ch=0;ch<Canvas.MapCh;ch++){\r
@@ -1666,9 +1669,10 @@ static void CanvasMapUpdate(int flag)
                        // PAN\r
          rc.top = Canvas.rcMapSub.top;\r
          rc.bottom = rc.top + 3 - 1;\r
-                       for(x=rc.left;x<=rc.right;x++)\r
+                               for(x=rc.left;x<=rc.right;x++){\r
                                for(y=rc.top;y<=rc.bottom;y++)\r
                                SetPixelV(Canvas.hmdc,x,y,colorBG);\r
+                               }\r
                        if(Canvas.MapPan[ch]>=0){\r
                                x = rc.left + Canvas.MapPan[ch];\r
                                for(y=rc.top;y<=rc.bottom;y++)\r
@@ -1677,14 +1681,16 @@ static void CanvasMapUpdate(int flag)
          // SUSTAIN\r
          rc.top = rc.bottom + 2;\r
          rc.bottom = rc.top + 2 - 1;\r
-         if(Canvas.MapSustain[ch])\r
-                               for(x=rc.left;x<=rc.right;x++)\r
+                               if(Canvas.MapSustain[ch]){\r
+                                       for(x=rc.left;x<=rc.right;x++){\r
                                        for(y=rc.top;y<=rc.bottom;y++)\r
                                        SetPixelV(Canvas.hmdc,x,y,colorFG);\r
-                       else\r
-                               for(x=rc.left;x<=rc.right;x++)\r
+                                       }\r
+                               } else {\r
+                                       for(x=rc.left;x<=rc.right;x++){\r
                                        for(y=rc.top;y<=rc.bottom;y++)\r
                                        SetPixelV(Canvas.hmdc,x,y,colorBG);\r
+                                       }\r
          // EXPRESSION\r
          rc.top = rc.bottom + 2;\r
          rc.bottom = rc.top + 2 - 1;\r
@@ -1712,9 +1718,10 @@ static void CanvasMapUpdate(int flag)
          // PITCH_BEND\r
          rc.top = rc.bottom + 2;\r
          rc.bottom = rc.top + 3 - 1;\r
-                       for(x=rc.left;x<=rc.right;x++)\r
+                                       for(x=rc.left;x<=rc.right;x++){\r
                                for(y=rc.top;y<=rc.bottom;y++)\r
                                SetPixelV(Canvas.hmdc,x,y,colorBG);\r
+                                       }\r
          if(Canvas.MapPitchbend[ch]==-2){\r
                y = rc.top + 1;\r
                                for(x=rc.left;x<=rc.right;x++)\r
@@ -1744,7 +1751,9 @@ static void CanvasMapUpdate(int flag)
                                        SetPixelV(Canvas.hmdc,x,y,colorFG);\r
          }\r
       }\r
-               InvalidateRect(hCanvasWnd,(RECT *)&(Canvas.rcMapSub),FALSE);\r
+      }\r
+                       InvalidateRect(hCanvasWnd,(RECT *)&(Canvas.rcMapSub),FALSE);\r
+   }\r
    }\r
        if(!Canvas.MapResidual && !flag)\r
        return;\r
@@ -1767,7 +1776,7 @@ static void CanvasMapUpdate(int flag)
        }\r
        }\r
 #else\r
-       if(Canvas.MapMode==CMAP_MODE_16)\r
+       if(Canvas.MapMode==CMAP_MODE_16){\r
        for(i=0;i<Canvas.MapCh;i++){\r
                for(j=0;j<Canvas.MapBarMax;j++){\r
                        if(Canvas.MapMap[i][j]!=Canvas.MapMapOld[i][j] || flag){\r
@@ -1777,14 +1786,15 @@ static void CanvasMapUpdate(int flag)
                                rc.right = rc.left -1 + Canvas.MapBarWidth;\r
                                rc.top = Canvas.rcMap.top + (2 + 1) * j;\r
                                rc.bottom = rc.top -1 + 2;\r
-                               for(x=rc.left;x<=rc.right;x++)\r
+                                       for(x=rc.left;x<=rc.right;x++){\r
                                        for(y=rc.top;y<=rc.bottom;y++)\r
                                SetPixelV(Canvas.hmdc,x,y,color);\r
+                                       }\r
                                change_flag = 1;\r
                }\r
                }\r
        }\r
-       else\r
+       } else {\r
        for(i=0;i<Canvas.MapCh;i++){\r
                for(j=0;j<Canvas.MapBarMax;j++){\r
                        if(Canvas.MapMap[i][j]!=Canvas.MapMapOld[i][j] || flag){\r
@@ -1793,12 +1803,12 @@ static void CanvasMapUpdate(int flag)
                                if(i<=15){\r
                                        rc.left = Canvas.rcMap.left + (Canvas.MapBarWidth + 1) * i;\r
                                        rc.right = rc.left -1 + Canvas.MapBarWidth;\r
-                                       rc.top = 3 + Canvas.rcMap.top + (2 + 1) * j;\r
+                                               rc.top = -1 + Canvas.rcMap.top + (2 + 1) * j;\r
                                        rc.bottom = rc.top -1 + 2;\r
                                } else {\r
                                        rc.left = Canvas.rcMap.left + (Canvas.MapBarWidth + 1) * (i-16);\r
                                        rc.right = rc.left -1 + Canvas.MapBarWidth;\r
-                                       rc.top = 3 + Canvas.rcMap.top + (2 + 1) * j + Canvas.MapBarMax*(2+1) + 3 ;\r
+                                               rc.top = -1 + Canvas.rcMap.top + (2 + 1) * j + Canvas.MapBarMax*(2+1) + 2 ;\r
                                        rc.bottom = rc.top -1 + 2;\r
                                }\r
                                for(x=rc.left;x<=rc.right;x++)\r
@@ -1808,6 +1818,7 @@ static void CanvasMapUpdate(int flag)
                }\r
                }\r
        }\r
+       }\r
 #endif\r
 #ifdef CMAP_ALL_UPDATE\r
        if(change_flag)\r
@@ -1820,6 +1831,7 @@ static void CanvasMapUpdate(int flag)
                InvalidateRect(hCanvasWnd,NULL,FALSE);\r
        if(Canvas.MapResidual<0)\r
                Canvas.MapResidual = 0;\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 static void CanvasSleepClear(void)\r
@@ -1828,6 +1840,7 @@ static void CanvasSleepClear(void)
        HPEN hPen;\r
        HBRUSH hBrush;\r
        HGDIOBJ hgdiobj_hpen, hgdiobj_hbrush;\r
+       gdi_lock(); // gdi_lock\r
        hPen = CreatePen(PS_SOLID,1,GetSysColor(COLOR_SCROLLBAR));\r
        hBrush = CreateSolidBrush(GetSysColor(COLOR_SCROLLBAR));\r
        hgdiobj_hpen = SelectObject(Canvas.hmdc, hPen);\r
@@ -1839,6 +1852,7 @@ static void CanvasSleepClear(void)
        SelectObject(Canvas.hmdc, hgdiobj_hbrush);\r
        DeleteObject(hBrush);\r
        InvalidateRect(hCanvasWnd, NULL, FALSE);\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 static void CanvasSleepReset(void)\r
@@ -1857,6 +1871,7 @@ static void CanvasSleepUpdate(int flag)
        RECT rc;\r
        int x,y;\r
        CanvasSleepReset();\r
+       gdi_lock(); // gdi_lock\r
    hdc = CreateCompatibleDC(Canvas.hmdc);\r
        SelectObject(hdc,Canvas.hBitmapSleep);\r
        GetClientRect(Canvas.hwnd, &rc);\r
@@ -1866,6 +1881,7 @@ static void CanvasSleepUpdate(int flag)
        if(y<0) y = 0;\r
        BitBlt(Canvas.hmdc,x,y,Canvas.rcSleep.right,Canvas.rcSleep.bottom,hdc,0,0,SRCCOPY);\r
        DeleteDC(hdc);\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 \r
@@ -1929,6 +1945,7 @@ static void CanvasKeyboardUpdate(int flag)
        return;\r
        ChFrom = (Canvas.CKPart - 1) * Canvas.CKCh;\r
        ChTo = Canvas.CKPart * Canvas.CKCh - 1;\r
+       gdi_lock(); // gdi_lock\r
        for(channel=ChFrom;channel<=ChTo;channel++){\r
                int change_flag = 0;\r
                int drumflag = IS_SET_CHANNELMASK(drumchannels,channel);\r
@@ -2007,6 +2024,7 @@ static void CanvasKeyboardUpdate(int flag)
        if(flag)\r
                InvalidateRect(hCanvasWnd, NULL, FALSE);\r
        Canvas.DrumChannel = drumchannels;\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 static void CanvasKeyboardClear(void)\r
@@ -2022,6 +2040,7 @@ static void CanvasKeyboardClear(void)
        char buffer[16];\r
        if(!CanvasOK)\r
        return;\r
+       gdi_lock(); // gdi_lock\r
 #if 0\r
        hPen = CreatePen(PS_SOLID,1,CanvasColor(CC_BACK));\r
        hBrush = CreateSolidBrush(CanvasColor(CC_BACK));\r
@@ -2078,6 +2097,7 @@ static void CanvasKeyboardClear(void)
        CanvasKeyboardReadPanelInfo(1);\r
        CanvasKeyboardUpdate(1);\r
        InvalidateRect(hCanvasWnd, NULL, FALSE);\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 // Canvas All\r
@@ -2086,10 +2106,12 @@ static void CanvasPaintDo(void)
 {\r
        PAINTSTRUCT ps;\r
        RECT rc;\r
+       gdi_lock(); // gdi_lock\r
        Canvas.hdc = BeginPaint(Canvas.hwnd, &ps);\r
        GetClientRect(Canvas.hwnd, &rc);\r
        BitBlt(Canvas.hdc,rc.left,rc.top,rc.right,rc.bottom,Canvas.hmdc,0,0,SRCCOPY);\r
        EndPaint(Canvas.hwnd, &ps);\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 void CanvasPaint(void)\r
 {\r
@@ -2098,7 +2120,9 @@ void CanvasPaint(void)
 }\r
 void CanvasPaintAll(void)\r
 {\r
+       gdi_lock(); // gdi_lock\r
        InvalidateRect(hCanvasWnd, NULL, FALSE);\r
+       gdi_unlock(); // gdi_lock\r
        CanvasPaint();\r
 }\r
 \r
@@ -2113,8 +2137,8 @@ void CanvasReset(void)
                case CANVAS_MODE_KEYBOARD:\r
                        CanvasKeyboardReset();\r
                        break;\r
-               default:\r
                case CANVAS_MODE_SLEEP:\r
+               default:\r
                        CanvasSleepReset();\r
       break;\r
   }\r
@@ -2304,6 +2328,7 @@ struct MPanel_ {
        long UpdateFlag;\r
        COLORREF FGColor;\r
        COLORREF BGColor;\r
+       COLORREF BGBGColor;\r
        enum play_system_modes play_system_mode;\r
        int current_file_info_file_type;\r
        int current_file_info_max_channel;\r
@@ -2321,7 +2346,7 @@ static void InitPanelWnd(HWND hwnd)
 {\r
        WNDCLASS wndclass ;\r
        hPanelWnd = 0;\r
-       wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;\r
+       wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_CLASSDC;\r
        wndclass.lpfnWndProc   = PanelWndProc ;\r
        wndclass.cbClsExtra    = 0 ;\r
        wndclass.cbWndExtra    = 0 ;\r
@@ -2373,6 +2398,7 @@ volatile int MPanelOK = 0;
 static void MPanelInit(HWND hwnd)\r
 {\r
        RECT rc;\r
+       gdi_lock(); // gdi_lock\r
        MPanel.hwnd = hwnd;\r
        MPanel.hParentWnd = GetParent(MPanel.hwnd);\r
        GetClientRect(MPanel.hParentWnd,&rc);\r
@@ -2463,6 +2489,7 @@ static void MPanelInit(HWND hwnd)
        FIXED_PITCH | FF_DONTCARE,MPanel.Font);\r
 #endif\r
        MPanelOK = 1;\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 // \83p\83l\83\8b\8d\\91¢\91Ì\82ð\83\8a\83Z\83b\83g\82·\82é\81B\r
@@ -2492,7 +2519,9 @@ void MPanelReset(void)
 //     MPanel.FGColor = RGB(0x00,0x00,0x00);\r
 //     MPanel.BGColor = RGB(0xff,0xff,0xff);\r
        MPanel.FGColor = RGB(0x00,0x00,0x00);\r
-       MPanel.BGColor = RGB(0xc0,0xc0,0xc0);\r
+//     MPanel.BGColor = RGB(0xc0,0xc0,0xc0);\r
+       MPanel.BGColor = RGB(0xc0,0xc5,0xc3);\r
+       MPanel.BGBGColor = RGB(0x60,0x60,0x60);\r
 #if 0\r
        if(MPanel.hFontTitle!=NULL)\r
        DeleteObject(MPanel.hFontTitle);\r
@@ -2521,11 +2550,13 @@ void MPanelUpdate(void)
                return;\r
        if(MPanel.UpdateFlag==MP_UPDATE_NONE)\r
        return;\r
+       gdi_lock(); // gdi_lock\r
        if(MPanel.UpdateFlag & MP_UPDATE_BACKGROUND){\r
                // \83r\83b\83g\83}\83b\83v\82ð\93\\82è\95t\82¯\82é\82ª\8d¡\82Í\93h\82è\82Â\82Ô\82µ\81B\r
                HPEN hPen;\r
       HBRUSH hBrush;\r
-               COLORREF color = MPanel.FGColor;\r
+//             COLORREF color = MPanel.FGColor;\r
+               COLORREF color = MPanel.BGBGColor;\r
                RECT rc = MPanel.rcMe;\r
                HGDIOBJ hgdiobj_hpen, hgdiobj_hbrush;\r
                hPen = CreatePen(PS_SOLID,1,color);\r
@@ -2757,17 +2788,20 @@ void MPanelUpdate(void)
        if(MPanel.UpdateFlag==MP_UPDATE_ALL)\r
                InvalidateRect(hPanelWnd, NULL, FALSE);\r
        MPanel.UpdateFlag = MP_UPDATE_NONE;\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 static void MPanelPaintDo(void)\r
 {\r
        PAINTSTRUCT ps;\r
        HDC hdc;\r
+       gdi_lock(); // gdi_lock\r
        hdc = BeginPaint(MPanel.hwnd, &ps);\r
        BitBlt(hdc,\r
                MPanel.rcMe.left,MPanel.rcMe.top,MPanel.rcMe.right,MPanel.rcMe.bottom,\r
                MPanel.hmdc,0,0,SRCCOPY);\r
        EndPaint(MPanel.hwnd, &ps);\r
+       gdi_unlock(); // gdi_lock\r
 }\r
 \r
 // \95`\89æ\r
@@ -2779,7 +2813,9 @@ void MPanelPaint(void)
 // \8a®\91S\95`\89æ\r
 void MPanelPaintAll(void)\r
 {\r
+       gdi_lock(); // gdi_lock\r
        InvalidateRect(hPanelWnd, NULL, FALSE);\r
+       gdi_unlock(); // gdi_lock\r
        MPanelPaint();\r
 }\r
 \r
@@ -2978,7 +3014,7 @@ void TiMidityHeapCheck(void)
        dwNumberOfHeaps = GetProcessHeaps(dw, ProcessHeaps);\r
    }\r
    PrintfDebugWnd("NumberOfHeaps=%ld\n",(int)dwNumberOfHeaps);\r
-       for(i=0;i<dwNumberOfHeaps;i++){\r
+       for(i=0;i<(int)dwNumberOfHeaps;i++){\r
        if(HeapValidate(ProcessHeaps[i],0,NULL)==TRUE)\r
                PrintfDebugWnd("Heap %d is Valid\n",i+1);\r
       else\r
@@ -3306,6 +3342,20 @@ static void DlgMidiFileOpen(HWND hwnd)
     w32g_send_rc(RC_EXT_LOAD_FILE, (int32)file);\r
 }\r
 \r
+static volatile LPITEMIDLIST itemidlist_pre = NULL;\r
+int CALLBACK DlgDirOpenBrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)\r
+{\r
+       switch(uMsg){\r
+       case BFFM_INITIALIZED:\r
+               if(itemidlist_pre)\r
+                       SendMessage(hwnd,BFFM_SETSELECTION,(WPARAM)0,(LPARAM)itemidlist_pre);\r
+               break;\r
+       default:\r
+               break;\r
+       }\r
+       return 0;\r
+}\r
+\r
 static void DlgDirOpen(HWND hwnd)\r
 {\r
        static int initflag = 1;\r
@@ -3327,7 +3377,7 @@ static void DlgDirOpen(HWND hwnd)
     bi.pszDisplayName = biBuffer;\r
        bi.lpszTitle = "Select a directory with MIDI files.";\r
        bi.ulFlags = 0;\r
-       bi.lpfn = NULL;\r
+       bi.lpfn = DlgDirOpenBrowseCallbackProc;\r
     bi.lParam = 0;\r
     bi.iImage = 0;\r
        itemidlist = SHBrowseForFolder(&bi);\r
@@ -3335,6 +3385,9 @@ static void DlgDirOpen(HWND hwnd)
                return; /* Cancel */\r
        SHGetPathFromIDList(itemidlist, Buffer);\r
        strncpy(biBuffer, Buffer, sizeof(Buffer) - 1);\r
+       if(itemidlist_pre)\r
+               CoTaskMemFree(itemidlist_pre);\r
+       itemidlist_pre = itemidlist;\r
     w32g_lock_open_file = 1;\r
        directory_form(Buffer);\r
     w32g_send_rc(RC_EXT_LOAD_FILE, (int32)Buffer);\r
@@ -3627,12 +3680,14 @@ static HANDLE w32g_empty_sem = NULL;
 \r
 void w32g_lock(void)\r
 {\r
-    WaitForSingleObject(w32g_lock_sem, INFINITE);\r
+       if(w32g_lock_sem)\r
+           WaitForSingleObject(w32g_lock_sem, INFINITE);\r
 }\r
 \r
 void w32g_unlock(void)\r
 {\r
-    ReleaseSemaphore(w32g_lock_sem, 1, NULL);\r
+       if(w32g_lock_sem)\r
+           ReleaseSemaphore(w32g_lock_sem, 1, NULL);\r
 }\r
 \r
 void w32g_send_rc(int rc, int32 value)\r
@@ -3650,7 +3705,8 @@ void w32g_send_rc(int rc, int32 value)
     rc_queue[rc_queue_end].rc = rc;\r
     rc_queue[rc_queue_end].value = value;\r
     rc_queue_end = (rc_queue_end + 1) % RC_QUEUE_SIZE;\r
-    ReleaseSemaphore(w32g_empty_sem, 1, NULL);\r
+       if(w32g_empty_sem)\r
+           ReleaseSemaphore(w32g_empty_sem, 1, NULL);\r
     w32g_unlock();\r
 }\r
 \r
@@ -3662,7 +3718,8 @@ int w32g_get_rc(int32 *value, int wait_if_empty)
     {\r
        if(!wait_if_empty)\r
            return RC_NONE;\r
-       WaitForSingleObject(w32g_empty_sem, INFINITE);\r
+       if(w32g_empty_sem)\r
+               WaitForSingleObject(w32g_empty_sem, INFINITE);\r
        VOLATILE_TOUCH(rc_queue_len);\r
     } \r
 \r
@@ -3720,16 +3777,28 @@ static void terminate_main_thread(void)
 void w32g_close(void)\r
 {\r
        terminate_main_thread();\r
-    CloseHandle(w32g_lock_sem);\r
-    CloseHandle(w32g_empty_sem);\r
+       if(w32g_lock_sem){\r
+           CloseHandle(w32g_lock_sem);\r
+               w32g_lock_sem = NULL;\r
+       }\r
+       if(w32g_empty_sem){\r
+           CloseHandle(w32g_empty_sem);\r
+               w32g_empty_sem = NULL;\r
+       }\r
 }\r
 \r
 void w32g_restart(void)\r
 {\r
        w32g_restart_gui_flag = 1;\r
        terminate_main_thread();\r
-    CloseHandle(w32g_lock_sem);\r
-    CloseHandle(w32g_empty_sem);\r
+       if(w32g_lock_sem){\r
+           CloseHandle(w32g_lock_sem);\r
+               w32g_lock_sem = NULL;\r
+       }\r
+       if(w32g_empty_sem){\r
+           CloseHandle(w32g_empty_sem);\r
+               w32g_empty_sem = NULL;\r
+       }\r
 \r
        if(MPanel.hFontTitle!=NULL)\r
                DeleteObject(MPanel.hFontTitle);\r
@@ -3833,3 +3902,28 @@ void w32g_show_console(void)
        SendDlgItemMessage(hMainWnd, IDC_TOOLBARWINDOW_SUBWND,\r
                                           TB_CHECKBUTTON, IDM_CONSOLE, (LPARAM)MAKELONG(TRUE, 0));\r
 }\r
+\r
+///////////////////////////////////////////////////////////////////////\r
+// GDI \83A\83N\83Z\83X\82ð\92P\88ê\83X\83\8c\83b\83h\82É\8cÀ\92è\82·\82é\82½\82ß\82Ì\83\8d\83b\83N\8b@\8d\\r
+\r
+static HANDLE hMutexGDI = NULL;\r
+int gdi_lock(void)\r
+{\r
+       if(hMutexGDI==NULL){\r
+               hMutexGDI = CreateMutex(NULL,FALSE,NULL);\r
+               if(hMutexGDI==NULL)\r
+                       return -1;\r
+       }\r
+       if(WaitForSingleObject(hMutexGDI,INFINITE)==WAIT_FAILED){\r
+               return -1;\r
+       }\r
+       return 0;\r
+}\r
+\r
+extern int gdi_unlock(void)\r
+{\r
+       if(hMutexGDI!=NULL){\r
+               ReleaseMutex(hMutexGDI);\r
+       }\r
+       return 0;\r
+}\r
index e4f7286..886775f 100644 (file)
@@ -960,9 +960,8 @@ PrefTiMidity2DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
 }\r
 \r
 \r
-\r
 // IDC_COMBO_OUTPUT_MODE\r
-static char *cb_info_IDC_COMBO_OUTPUT_MODE[]= {\r
+static char *cb_info_IDC_COMBO_OUTPUT_MODE_jp[]= {\r
        "\88È\89º\82Ì\83t\83@\83C\83\8b\82É\8fo\97Í",(char *)0,\r
 #if defined(__CYGWIN32__) || defined(__MINGW32__)\r
        "\83t\83@\83C\83\8b\96¼\82ð\8e©\93®\82Å\8c\88\92è\82µ\81A\83\\\81[\83X\82Æ\93¯\82\83t\83H\83\8b\83_\82É\8fo\97Í",(char *)1,\r
@@ -974,6 +973,14 @@ static char *cb_info_IDC_COMBO_OUTPUT_MODE[]= {
        "\83t\83@\83C\83\8b\96¼\82ð\8e©\93®\82Å\8c\88\92è\82µ\81A\88È\89º\82Ì\83t\83H\83\8b\83_\82É\8fo\97Í(\83t\83H\83\8b\83_\96¼\95t\82«)",(char *)3,\r
        NULL\r
 };\r
+static char *cb_info_IDC_COMBO_OUTPUT_MODE_en[]= {\r
+       "next output file",(char *)0,\r
+       "auto filename",(char *)1,\r
+       "auto filename and output in next dir",(char *)2,\r
+       "auto filename and output in next dir",(char *)3,\r
+       NULL\r
+};\r
+static char **cb_info_IDC_COMBO_OUTPUT_MODE;\r
 \r
 static BOOL APIENTRY\r
 PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)\r
@@ -987,6 +994,10 @@ PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                        for(i=0;play_mode_list[i]!=0;i++){\r
                                SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)play_mode_list[i]->id_name);\r
                        }\r
+                       if (PlayerLanguage == LANGUAGE_JAPANESE)\r
+                         cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_jp;\r
+                       else\r
+                         cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_en;\r
                        for(i=0;cb_info_IDC_COMBO_OUTPUT_MODE[i];i+=2){\r
                                SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT_MODE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_OUTPUT_MODE[i]);\r
                        }\r
@@ -1215,18 +1226,32 @@ PrefTiMidity3DialogProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                        {\r
                                int cb_num1, cb_num2;\r
                                cb_num1 = SendDlgItemMessage(hwnd,IDC_COMBO_OUTPUT_MODE,CB_GETCURSEL,(WPARAM)0,(LPARAM)0);\r
+                               if (PlayerLanguage == LANGUAGE_JAPANESE)\r
+                                 cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_jp;\r
+                               else\r
+                                 cb_info_IDC_COMBO_OUTPUT_MODE = cb_info_IDC_COMBO_OUTPUT_MODE_en;\r
                                for(cb_num2=0;(int)cb_info_IDC_COMBO_OUTPUT_MODE[cb_num2];cb_num2+=2){\r
                                        if(cb_num1*2==cb_num2){\r
                                                st_temp->auto_output_mode = (int)cb_info_IDC_COMBO_OUTPUT_MODE[cb_num2+1];\r
                                                break;\r
                                        }\r
                                }\r
-                               if(st_temp->auto_output_mode>0){\r
-                                       SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"\8fo\97Í\90æ");\r
-                                       SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputDirName);\r
+                               if (PlayerLanguage == LANGUAGE_JAPANESE) {\r
+                                 if(st_temp->auto_output_mode>0){\r
+                                   SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"\8fo\97Í\90æ");\r
+                                   SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputDirName);\r
+                                 } else {\r
+                                   SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"\8fo\97Í\83t\83@\83C\83\8b");\r
+                                   SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName);\r
+                                 }\r
                                } else {\r
-                                       SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"\8fo\97Í\83t\83@\83C\83\8b");\r
-                                       SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName);\r
+                                 if(st_temp->auto_output_mode>0){\r
+                                   SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"Output File");\r
+                                   SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputDirName);\r
+                                 } else {\r
+                                   SendDlgItemMessage(hwnd,IDC_BUTTON_OUTPUT_FILE,WM_SETTEXT,0,(LPARAM)"Output File");\r
+                                   SetDlgItemText(hwnd,IDC_EDIT_OUTPUT_FILE,st_temp->OutputName);\r
+                                 }\r
                                }\r
                        }\r
                        break;\r
@@ -2333,11 +2358,15 @@ static void gogoConfigDialogProcControlApply(HWND hwnd)
 int gogoConfigDialog(void)\r
 {\r
 #ifdef AU_GOGO\r
-       if(!IsWindow(hgogoConfigDailog))\r
-               hgogoConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_GOGO),(HWND)hPrefWnd,gogoConfigDialogProc);\r
-       ShowWindow(hgogoConfigDailog,SW_SHOW);\r
+  if(!IsWindow(hgogoConfigDailog)) {\r
+    if (PlayerLanguage == LANGUAGE_JAPANESE)\r
+      hgogoConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_GOGO),(HWND)hPrefWnd,gogoConfigDialogProc);\r
+    else\r
+      hgogoConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_GOGO_EN),(HWND)hPrefWnd,gogoConfigDialogProc);\r
+  }\r
+  ShowWindow(hgogoConfigDailog,SW_SHOW);\r
 #endif\r
-       return 0;\r
+  return 0;\r
 }\r
 \r
 #ifdef AU_GOGO\r
@@ -2597,8 +2626,8 @@ volatile vorbis_ConfigDialogInfo_t vorbis_ConfigDialogInfo;
 \r
 // cb_info_type1_\82h\82c  cb_info_type2_\82h\82\82Æ\82¢\82¤\82Ó\82¤\82É\82È\82é\81B\r
 \r
-// IDC_COMBO_MODE\r
-CB_INFO_TYPE2_BEGIN(IDC_COMBO_MODE)\r
+// IDC_COMBO_MODE_jp\r
+CB_INFO_TYPE2_BEGIN(IDC_COMBO_MODE_jp)\r
        "\83f\83t\83H\83\8b\83g(\96ñ128kbps VBR)",(char *)0,\r
        "\96ñ112kbps VBR",(char *)1,\r
        "\96ñ128kbps VBR",(char *)2,\r
@@ -2609,6 +2638,20 @@ CB_INFO_TYPE2_BEGIN(IDC_COMBO_MODE)
        NULL\r
 CB_INFO_TYPE2_END\r
 \r
+// IDC_COMBO_MODE_en\r
+CB_INFO_TYPE2_BEGIN(IDC_COMBO_MODE_en)\r
+       "Default (About 128kbps VBR)",(char *)0,\r
+       "About 112kbps VBR",(char *)1,\r
+       "About 128kbps VBR",(char *)2,\r
+       "About 160kbps VBR",(char *)3,\r
+       "About 192kbps VBR",(char *)4,\r
+       "About 256kbps VBR",(char *)5,\r
+       "About 350kbps VBR",(char *)6,\r
+       NULL\r
+CB_INFO_TYPE2_END\r
+\r
+static char **cb_info_IDC_COMBO_MODE;\r
+\r
 // id \82Ì\83R\83\93\83{\83{\83b\83N\83X\82ð\91I\91ð\82Ì\90Ý\92è\82·\82é\81B\r
 #define CB_SETCURSEL_TYPE1(id) \\r
 { \\r
@@ -2706,6 +2749,11 @@ static BOOL APIENTRY vorbisConfigDialogProc(HWND hwnd, UINT uMess, WPARAM wParam
        {\r
                int i;\r
                // \83R\83\93\83{\83{\83b\83N\83X\82Ì\8f\89\8aú\89»\r
+               if (PlayerLanguage == LANGUAGE_JAPANESE)\r
+                 cb_info_IDC_COMBO_MODE = cb_info_IDC_COMBO_MODE_jp;\r
+               else\r
+                 cb_info_IDC_COMBO_MODE = cb_info_IDC_COMBO_MODE_en;\r
+\r
                for(i=0;cb_info_IDC_COMBO_MODE[i];i+=2){\r
                        SendDlgItemMessage(hwnd,IDC_COMBO_MODE,CB_INSERTSTRING,(WPARAM)-1,(LPARAM)cb_info_IDC_COMBO_MODE[i]);\r
                }\r
@@ -2808,9 +2856,13 @@ static void vorbisConfigDialogProcControlApply(HWND hwnd)
 int vorbisConfigDialog(void)\r
 {\r
 #ifdef AU_VORBIS\r
-       if(!IsWindow(hvorbisConfigDailog))\r
-               hvorbisConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_VORBIS),(HWND)hPrefWnd,vorbisConfigDialogProc);\r
-       ShowWindow(hvorbisConfigDailog,SW_SHOW);\r
+  if(!IsWindow(hvorbisConfigDailog)) {\r
+    if (PlayerLanguage == LANGUAGE_JAPANESE)\r
+      hvorbisConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_VORBIS),(HWND)hPrefWnd,vorbisConfigDialogProc);\r
+    else\r
+      hvorbisConfigDailog = CreateDialog(hInst,MAKEINTRESOURCE(IDD_DIALOG_VORBIS_EN),(HWND)hPrefWnd,vorbisConfigDialogProc);\r
+  }\r
+  ShowWindow(hvorbisConfigDailog,SW_SHOW);\r
 #endif\r
        return 0;\r
 }\r
index 5886808..9022352 100644 (file)
 extern volatile int PrefWndDoing;\r
 void PrefWndCreate(HWND hwnd);\r
 \r
+#ifdef AU_GOGO\r
+\r
+// \83_\83C\83A\83\8d\83O\82Ì\8fî\95ñ\82ð\82Ù\82Æ\82ñ\82Ç\82»\82Ì\82Ü\82Ü\95Û\91\82·\82é\81B\r
+// \83R\83\93\83{\83{\83b\83N\83X\82É\82Â\82¢\82Ä\82Í Index \82Í\96³\88Ó\96¡\82È\82Ì\82Å\92l\82ð\95Û\91\82·\82é\81B\r
+typedef struct gogo_ConfigDialogInfo_t_ {\r
+       int optIDC_CHECK_DEFAULT;\r
+       int optIDC_CHECK_COMMANDLINE_OPTS;\r
+       char optIDC_EDIT_COMMANDLINE_OPTION[1024];\r
+       int optIDC_CHECK_OUTPUT_FORMAT;\r
+       int optIDC_COMBO_OUTPUT_FORMAT;\r
+       int optIDC_CHECK_MPEG1AUDIOBITRATE;\r
+       int optIDC_COMBO_MPEG1_AUDIO_BITRATE;\r
+       int optIDC_CHECK_MPEG2AUDIOBITRATE;\r
+       int optIDC_COMBO_MPEG2_AUDIO_BITRATE;\r
+       int optIDC_CHECK_ENHANCED_LOW_PASS_FILTER;\r
+       char optIDC_EDIT_LPF_PARA1[4];\r
+       char optIDC_EDIT_LPF_PARA2[4];\r
+       int optIDC_CHECK_ENCODE_MODE;\r
+       int optIDC_COMBO_ENCODE_MODE;\r
+       int optIDC_CHECK_EMPHASIS_TYPE;\r
+       int optIDC_COMBO_EMPHASIS_TYPE;\r
+       int optIDC_CHECK_OUTFREQ;\r
+       char optIDC_EDIT_OUTFREQ[6];\r
+       int optIDC_CHECK_MSTHRESHOLD;\r
+       char optIDC_EDIT_MSTHRESHOLD_THRESHOLD[4];\r
+       char optIDC_EDIT_MSTHRESHOLD_MSPOWER[4];\r
+       int optIDC_CHECK_USE_CPU_OPTS;\r
+       int optIDC_CHECK_CPUMMX;\r
+       int optIDC_CHECK_CPUSSE;\r
+       int optIDC_CHECK_CPU3DNOW;\r
+       int optIDC_CHECK_CPUE3DNOW;\r
+       int optIDC_CHECK_VBR;\r
+       int optIDC_COMBO_VBR;\r
+       int optIDC_CHECK_VBR_BITRATE;\r
+       int optIDC_COMBO_VBR_BITRATE_LOW;\r
+       int optIDC_COMBO_VBR_BITRATE_HIGH;\r
+       int optIDC_CHECK_USEPSY;\r
+       int optIDC_CHECK_VERIFY;\r
+       int optIDC_CHECK_16KHZ_LOW_PASS_FILTER;\r
+} gogo_ConfigDialogInfo_t;\r
+\r
+extern volatile gogo_ConfigDialogInfo_t gogo_ConfigDialogInfo;\r
+\r
+extern int gogo_ConfigDialogInfoInit(void);\r
+extern int gogo_ConfigDialogInfoApply(void);\r
+extern int gogo_ConfigDialogInfoSaveINI(void);\r
+extern int gogo_ConfigDialogInfoLoadINI(void);\r
+extern int gogoConfigDialog(void);\r
+\r
+#endif // AU_GOGO\r
+\r
+#ifdef AU_VORBIS\r
+\r
+typedef struct vorbis_ConfigDialogInfo_t_ {\r
+       int optIDC_CHECK_DEFAULT;\r
+       int optIDC_COMBO_MODE;\r
+} vorbis_ConfigDialogInfo_t;\r
+\r
+\r
+extern int vorbis_ConfigDialogInfoInit(void);\r
+extern int vorbis_ConfigDialogInfoApply(void);\r
+extern int vorbis_ConfigDialogInfoSaveINI(void);\r
+extern int vorbis_ConfigDialogInfoLoadINI(void);\r
+\r
+extern int vorbisConfigDialog(void);\r
+\r
+#endif // AU_VORBIS\r
+\r
+\r
 #endif /* __W32G2_PREF_H__ */\r
index 7d27dde..f16c92c 100644 (file)
@@ -12,6 +12,8 @@
 #define IDD_PREF_TIMIDITY4_EN           110\r
 #define IDD_DIALOG_MAIN_EN              111\r
 #define IDM_MENU_MAIN_EN                112\r
+#define IDD_DIALOG_VORBIS_EN            113\r
+#define IDD_DIALOG_GOGO_EN              114\r
 #define IDC_CHECK_SEACHDIRRECURSIVE     1001\r
 #define IDC_CHECK_DOCWNDINDEPENDENT     1002\r
 #define IDC_CHECK_INIFILE_AUTOSAVE      1003\r
index 4658cad..f6f5fcd 100644 (file)
@@ -36,7 +36,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_VISIBLE |
 EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_NOPARENTNOTIFY | WS_EX_ACCEPTFILES | \r
     WS_EX_APPWINDOW\r
 CAPTION "TiMidity++ Win32GUI"\r
-MENU IDM_MENU_MAIN_EN\r
+MENU IDM_MENU_MAIN\r
 FONT 8, "MS Sans Serif", 0, 0\r
 BEGIN\r
     CONTROL         "ToolBarMain",IDC_TOOLBARWINDOW_MAIN,"ToolbarWindow32",\r
@@ -50,279 +50,6 @@ BEGIN
     CONTROL         "",IDC_RECT_CANVAS,"Static",SS_GRAYFRAME,220,0,68,44\r
 END\r
 \r
-IDD_PREF_PLAYER_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    PUSHBUTTON      "Config File",IDC_BUTTON_CONFIG_FILE,4,4,40,12,BS_CENTER\r
-    EDITTEXT        IDC_EDIT_CONFIG_FILE,44,4,164,12,ES_MULTILINE | \r
-                    ES_AUTOHSCROLL | ES_OEMCONVERT\r
-    GROUPBOX        "Player Mode",IDC_GROUPBOX_PLAYERMODE,4,20,64,64,\r
-                    WS_GROUP\r
-    CONTROL         "Auto Quit",IDC_CHECKBOX_AUTOQUIT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,32,44,8\r
-    CONTROL         "Auto Uniq",IDC_CHECKBOX_AUTOUNIQ,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,40,44,8\r
-    CONTROL         "Auto Refine",IDC_CHECKBOX_AUTOREFINE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,48,48,8\r
-    GROUPBOX        "Language",IDC_GROUPBOX_LANGUAGE,72,20,60,40,WS_GROUP\r
-    CONTROL         "Japanese",IDC_RADIOBUTTON_JAPANESE,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,76,32,36,8\r
-    CONTROL         "English",IDC_RADIOBUTTON_ENGLISH,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,76,40,36,8\r
-    LTEXT           "Require Restart!",IDC_STATIC,76,48,52,8,NOT WS_GROUP\r
-    CONTROL         "Not Continue",IDC_CHECKBOX_NOT_CONTINUE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,56,52,8\r
-    CONTROL         "Not Drag Start",IDC_CHECKBOX_NOT_DRAG_START,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,64,56,8\r
-    GROUPBOX        "Directory",IDC_STATIC,136,20,72,20\r
-    CONTROL         "Recursive Seach",IDC_CHECK_SEACHDIRRECURSIVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,140,28,60,10\r
-    GROUPBOX        "Document Window",IDC_STATIC,136,44,72,20\r
-    CONTROL         "Independent Mode",IDC_CHECK_DOCWNDINDEPENDENT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,140,52,64,10\r
-    GROUPBOX        "INI File",IDC_STATIC,136,68,72,20\r
-    CONTROL         "Auto Save",IDC_CHECK_INIFILE_AUTOSAVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,140,76,45,10\r
-    CONTROL         "Not Looping",IDC_CHECKBOX_NOT_LOOPING,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,72,52,8\r
-END\r
-\r
-IDD_PREF_TIMIDITY1_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    CONTROL         "Enable Chorus Control Effect",IDC_CHECKBOX_CHORUS,\r
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,\r
-                    8,4,97,8\r
-    CONTROL         "Chorus Level",IDC_CHECKBOX_CHORUS_LEVEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,12,52,8\r
-    EDITTEXT        IDC_EDIT_CHORUS,68,12,24,10,ES_NUMBER\r
-    CONTROL         "Enable Reverb Control Effect",IDC_CHECKBOX_REVERB,\r
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,\r
-                    8,24,96,8\r
-    CONTROL         "Global Reverb",IDC_CHECKBOX_GLOBAL_REVERB,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,32,52,8\r
-    CONTROL         "Reverb Level",IDC_CHECKBOX_REVERB_LEVEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,40,52,8\r
-    EDITTEXT        IDC_EDIT_REVERB,68,38,24,10,ES_NUMBER\r
-    CONTROL         "L&&R Delay Rotate Effect",IDC_CHECKBOX_DELAY,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,8,52,91,\r
-                    8\r
-    CONTROL         "Left",IDC_RADIOBUTTON_DELAY_LEFT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,60,28,8\r
-    CONTROL         "Right",IDC_RADIOBUTTON_DELAY_RIGHT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,36,60,28,8\r
-    CONTROL         "Rotate",IDC_RADIOBUTTON_DELAY_CENTER,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,64,60,32,8\r
-    LTEXT           "Delay(msec)",IDC_STATIC,12,68,40,8,NOT WS_GROUP | \r
-                    WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_DELAY,52,68,44,10,ES_NUMBER\r
-    LTEXT           "Noise Sharping Level (0..4)",IDC_STATIC,8,80,76,8,NOT \r
-                    WS_GROUP | WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_NOISESHARPING,84,78,16,10,ES_NUMBER\r
-    CONTROL         "Enable Modulation Wheel",IDC_CHECKBOX_MODWHEEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,4,87,10\r
-    CONTROL         "Enable Portamento",IDC_CHECKBOX_PORTAMENTO,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,16,68,10\r
-    CONTROL         "Enable NRPN Vibrato",IDC_CHECKBOX_NRPNVIB,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,28,77,10\r
-    CONTROL         "Enable GM Channel pressure",IDC_CHECKBOX_CHPRESS,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,40,97,10\r
-    CONTROL         "Enable Overlapped same voice",IDC_CHECKBOX_OVOICE,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,52,100,10\r
-    CONTROL         "Enable Trace Text Meta Event",IDC_CHECKBOX_TRACETEXT,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,64,100,10\r
-    LTEXT           "Modify Release(0..1000)",IDC_STATIC,108,76,72,8,NOT \r
-                    WS_GROUP | WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_MODIFY_RELEASE,180,76,28,10\r
-END\r
-\r
-IDD_PREF_TIMIDITY2_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    LTEXT           "Maximum voices",IDC_STATIC,4,4,52,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_VOICES,56,4,24,10,ES_NUMBER\r
-    LTEXT           "Amplification (%)",IDC_STATIC,4,16,52,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_AMPLIFICATION,56,16,24,10\r
-    CONTROL         "Unload Instruments between files",\r
-                    IDC_CHECKBOX_FREE_INST,"Button",BS_AUTOCHECKBOX | \r
-                    BS_LEFT | BS_TOP | WS_TABSTOP,4,52,108,10\r
-    CONTROL         "Antialiasing instrument",IDC_CHECKBOX_ANTIALIAS,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,4,28,80,\r
-                    10\r
-    CONTROL         "Load Instruments while playing",\r
-                    IDC_CHECKBOX_LOADINST_PLAYING,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,41,103,10\r
-    LTEXT           "Allocate Cache Size",IDC_STATIC,120,4,56,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CACHE_SIZE,176,4,32,10\r
-    CONTROL         "Auto Reduce Voice",IDC_CHECKBOX_REDUCE_VOICE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,120,17,72,8\r
-    LTEXT           "Default tonebank",IDC_STATIC,120,28,52,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_DEFAULT_TONEBANK,172,28,24,10\r
-    CONTROL         "Special Tonebank",IDC_CHECKBOX_SPECIAL_TONEBANK,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,120,41,60,8\r
-    EDITTEXT        IDC_EDIT_SPECIAL_TONEBANK,184,41,20,10\r
-    GROUPBOX        "Default Midi Type",IDC_GROUPBOX_DEFAULT_MIDI_TYPE,120,\r
-                    65,88,20\r
-    CONTROL         "GM",IDC_RADIOBUTTON_GM,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,128,73,24,8\r
-    CONTROL         "GS",IDC_RADIOBUTTON_GS,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,156,73,20,8\r
-    CONTROL         "XG",IDC_RADIOBUTTON_XG,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,180,73,20,8\r
-    CONTROL         "Ctl Trace Playing",IDC_CHECKBOX_CTL_TRACE_PLAYING,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,65,64,8\r
-    LTEXT           "Console Verbosity",IDC_STATIC,4,76,56,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CTL_VEBOSITY,60,76,20,10\r
-    LTEXT           "Control Ratio",IDC_STATIC,120,52,40,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CONTROL_RATIO,160,52,24,10\r
-END\r
-\r
-IDD_PREF_TIMIDITY3_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    GROUPBOX        "Output Encoding",IDC_STATIC,4,0,204,88,WS_GROUP | \r
-                    WS_TABSTOP\r
-    GROUPBOX        "Precision",IDC_STATIC,8,8,152,28,WS_GROUP | WS_TABSTOP\r
-    CONTROL         "8bits",IDC_CHECKBOX_8BITS,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,12,16,28,8\r
-    CONTROL         "16bits",IDC_CHECKBOX_16BITS,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,12,24,28,8\r
-    CONTROL         "uLaw",IDC_CHECKBOX_ULAW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,48,16,28,8\r
-    CONTROL         "aLaw",IDC_CHECKBOX_ALAW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,48,24,28,8\r
-    CONTROL         "Signed",IDC_CHECKBOX_SIGNED,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,84,16,28,8\r
-    CONTROL         "Unsignd",IDC_CHECKBOX_UNSIGNED,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,84,24,36,8\r
-    CONTROL         "Byteswap",IDC_CHECKBOX_BYTESWAP,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,120,16,40,8\r
-    CONTROL         "Linear",IDC_CHECKBOX_LINEAR,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,120,24,32,8\r
-    GROUPBOX        "Channels",IDC_STATIC,164,8,40,28,WS_GROUP | WS_TABSTOP\r
-    CONTROL         "Stereo",IDC_RADIO_STEREO,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,168,16,33,10\r
-    CONTROL         "Mono",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,168,24,33,10\r
-    LTEXT           "Sample rate",IDC_STATIC,8,36,36,12,WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_SAMPLE_RATE,44,36,32,10,ES_NUMBER | WS_GROUP\r
-    PUSHBUTTON      "L",IDC_BUTTON_LOW,80,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "M",IDC_BUTTON_MIDDLE,92,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "H",IDC_BUTTON_HIGH,104,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "4",IDC_BUTTON_4,120,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "8",IDC_BUTTON_8,132,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "16",IDC_BUTTON_16,144,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "24",IDC_BUTTON_24,156,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "32",IDC_BUTTON_32,168,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "40",IDC_BUTTON_40,180,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "48",IDC_BUTTON_48,192,36,12,8,BS_CENTER\r
-    GROUPBOX        "Output",IDC_GROUPBOX_OUTPUT,8,44,196,28,WS_GROUP | \r
-                    WS_TABSTOP\r
-    CONTROL         "Win32 Audio",IDC_RADIOBUTTON_WIN32AUDIO,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,52,52,8\r
-    CONTROL         "List Midi Event",IDC_RADIOBUTTON_LIST_MIDI_EVENT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,60,56,8\r
-    CONTROL         "Riff Wave File",IDC_RADIOBUTTON_RIFF_WAVE,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,72,52,56,8\r
-    CONTROL         "Raw Waveform File",IDC_RADIOBUTTON_RAW_WAVEFORM,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,72,60,72,8\r
-    CONTROL         "Sun Audio File",IDC_RADIOBUTTON_SUN_AUDIO,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,144,52,56,8\r
-    CONTROL         "Aiff File",IDC_RADIOBUTTON_AIFF,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,144,60,36,8\r
-    PUSHBUTTON      "Output File",IDC_BUTTON_OUTPUT_FILE,8,72,36,12,\r
-                    BS_CENTER | WS_GROUP\r
-    EDITTEXT        IDC_EDIT_OUTPUT_FILE,44,72,144,12,ES_AUTOHSCROLL | \r
-                    ES_OEMCONVERT | WS_GROUP\r
-    PUSHBUTTON      "DEL",IDC_BUTTON_OUTPUT_FILE_DEL,188,72,16,12,BS_CENTER\r
-END\r
-\r
-IDD_PREF_TIMIDITY4_EN DIALOGEX 0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman", 0, 0\r
-BEGIN\r
-    CONTROL         "Ch01",IDC_CHECKBOX_CH01,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,12,28,8\r
-    CONTROL         "Ch02",IDC_CHECKBOX_CH02,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,20,28,8\r
-    CONTROL         "Ch03",IDC_CHECKBOX_CH03,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,28,28,8\r
-    CONTROL         "Ch04",IDC_CHECKBOX_CH04,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,36,28,8\r
-    CONTROL         "Ch05",IDC_CHECKBOX_CH05,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,44,28,8\r
-    CONTROL         "Ch06",IDC_CHECKBOX_CH06,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,52,28,8\r
-    CONTROL         "Ch07",IDC_CHECKBOX_CH07,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,60,28,8\r
-    CONTROL         "Ch08",IDC_CHECKBOX_CH08,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,68,28,8\r
-    CONTROL         "Ch09",IDC_CHECKBOX_CH09,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,12,28,8\r
-    CONTROL         "Ch10",IDC_CHECKBOX_CH10,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,20,28,8\r
-    CONTROL         "Ch11",IDC_CHECKBOX_CH11,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,28,28,8\r
-    CONTROL         "Ch12",IDC_CHECKBOX_CH12,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,36,28,8\r
-    CONTROL         "Ch13",IDC_CHECKBOX_CH13,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,44,28,8\r
-    CONTROL         "Ch14",IDC_CHECKBOX_CH14,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,52,28,8\r
-    CONTROL         "Ch15",IDC_CHECKBOX_CH15,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,60,28,8\r
-    CONTROL         "Ch16",IDC_CHECKBOX_CH16,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,68,28,8\r
-    CONTROL         "Ch17",IDC_CHECKBOX_CH17,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,12,28,8\r
-    CONTROL         "Ch18",IDC_CHECKBOX_CH18,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,20,28,8\r
-    CONTROL         "Ch19",IDC_CHECKBOX_CH19,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,28,28,8\r
-    CONTROL         "Ch20",IDC_CHECKBOX_CH20,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,36,28,8\r
-    CONTROL         "Ch21",IDC_CHECKBOX_CH21,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,44,28,8\r
-    CONTROL         "Ch22",IDC_CHECKBOX_CH22,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,52,28,8\r
-    CONTROL         "Ch23",IDC_CHECKBOX_CH23,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,60,28,8\r
-    CONTROL         "Ch24",IDC_CHECKBOX_CH24,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,68,28,8\r
-    CONTROL         "Ch25",IDC_CHECKBOX_CH25,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,12,28,8\r
-    CONTROL         "Ch26",IDC_CHECKBOX_CH26,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,20,28,8\r
-    CONTROL         "Ch27",IDC_CHECKBOX_CH27,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,28,28,8\r
-    CONTROL         "Ch28",IDC_CHECKBOX_CH28,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,36,28,8\r
-    CONTROL         "Ch29",IDC_CHECKBOX_CH29,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,44,28,8\r
-    CONTROL         "Ch30",IDC_CHECKBOX_CH30,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,52,28,8\r
-    CONTROL         "Ch31",IDC_CHECKBOX_CH31,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,60,28,8\r
-    CONTROL         "Ch32",IDC_CHECKBOX_CH32,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,68,28,8\r
-    CONTROL         "Drum Channel",IDC_CHECKBOX_DRUM_CHANNEL,"Button",\r
-                    BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,20,64,16\r
-    CONTROL         "Drum Channel Mask",IDC_CHECKBOX_DRUM_CHANNEL_MASK,\r
-                    "Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,\r
-                    40,64,16\r
-    CONTROL         "Quiet Channel",IDC_CHECKBOX_QUIET_CHANNEL,"Button",\r
-                    BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,60,64,16\r
-END\r
-\r
 IDD_DIALOG_MAIN_EN DIALOGEX 0, 0, 308, 64\r
 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_VISIBLE | \r
     WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU\r
@@ -517,14 +244,14 @@ BEGIN
     EDITTEXT        IDC_EDIT_NUM,5,175,45,12,ES_READONLY\r
 END\r
 \r
-IDD_PREF_PLAYER DIALOG DISCARDABLE  0, 0, 199, 155\r
+IDD_PREF_PLAYER DIALOG DISCARDABLE  0, 0, 211, 163\r
 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_POPUP | WS_VISIBLE | \r
     WS_CAPTION\r
 FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
 BEGIN\r
     PUSHBUTTON      "\90Ý\92è\83t\83@\83C\83\8b",IDC_BUTTON_CONFIG_FILE,3,11,52,14,\r
                     BS_CENTER\r
-    EDITTEXT        IDC_EDIT_CONFIG_FILE,62,10,137,16,ES_AUTOHSCROLL | \r
+    EDITTEXT        IDC_EDIT_CONFIG_FILE,71,9,140,17,ES_AUTOHSCROLL | \r
                     ES_OEMCONVERT\r
     GROUPBOX        "\83v\83\8c\83C\83\84\81[",IDC_GROUPBOX_PLAYERMODE,2,32,106,61,\r
                     WS_GROUP\r
@@ -550,7 +277,7 @@ BEGIN
     GROUPBOX        "\83h\83L\83\85\83\81\83\93\83g",IDC_STATIC,2,101,75,38\r
     CONTROL         "\8e©\93®\95\\8e¦\82µ\82È\82¢",IDC_CHECK_DOCWNDINDEPENDENT,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,6,112,56,8\r
-    GROUPBOX        "\90Ý\92è",IDC_STATIC,83,130,70,25\r
+    GROUPBOX        "\90Ý\92è",IDC_STATIC,83,129,70,25\r
     CONTROL         "\90Ý\92è\82Ì\8e©\93®\95Û\91¶",IDC_CHECK_INIFILE_AUTOSAVE,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,88,140,59,10\r
     CONTROL         "\83\8a\83s\81[\83g\82µ\82È\82¢",IDC_CHECKBOX_NOT_LOOPING,"Button",\r
@@ -561,7 +288,52 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,117,80,50,8\r
     CONTROL         "\83|\83b\83v\83A\83b\83v",IDC_CHECK_DOCWNDAUTOPOPUP,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,6,124,59,10\r
-    GROUPBOX        "\83v\83\8c\83C\83\8a\83X\83g",IDC_STATIC,112,32,85,61\r
+    GROUPBOX        "\83v\83\8c\83C\83\8a\83X\83g",IDC_STATIC,112,32,88,61\r
+END\r
+\r
+IDD_PREF_PLAYER_EN DIALOG DISCARDABLE  0, 0, 210, 190\r
+STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_POPUP | WS_VISIBLE | \r
+    WS_CAPTION\r
+FONT 9, "Times New Roman"\r
+BEGIN\r
+    PUSHBUTTON      "Config File",IDC_BUTTON_CONFIG_FILE,3,11,52,11,\r
+                    BS_CENTER\r
+    EDITTEXT        IDC_EDIT_CONFIG_FILE,62,10,137,14,ES_AUTOHSCROLL | \r
+                    ES_OEMCONVERT\r
+    GROUPBOX        "Player",IDC_GROUPBOX_PLAYERMODE,2,32,106,61,WS_GROUP\r
+    CONTROL         "Not Looping",IDC_CHECKBOX_AUTOQUIT,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,44,77,8\r
+    CONTROL         "Auto Uniq",IDC_CHECKBOX_AUTOUNIQ,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,56,76,8\r
+    CONTROL         "Auto Refine",IDC_CHECKBOX_AUTOREFINE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,68,75,8\r
+    GROUPBOX        "Language",IDC_GROUPBOX_LANGUAGE,148,101,50,38,WS_GROUP\r
+    CONTROL         "Japanese",IDC_RADIOBUTTON_JAPANESE,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,152,112,42,8\r
+    CONTROL         "English",IDC_RADIOBUTTON_ENGLISH,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,152,124,43,8\r
+    CONTROL         "Auto Quit",IDC_CHECKBOX_NOT_CONTINUE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,44,64,8\r
+    CONTROL         "Not Drag Start",IDC_CHECKBOX_NOT_DRAG_START,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,56,97,8\r
+    GROUPBOX        "Directory",IDC_STATIC,77,101,67,23\r
+    CONTROL         "Recursive walk",IDC_CHECK_SEACHDIRRECURSIVE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,83,110,57,10\r
+    GROUPBOX        "Document",IDC_STATIC,3,101,72,38\r
+    CONTROL         "Not Auto Display",IDC_CHECK_DOCWNDINDEPENDENT,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,112,63,8\r
+    GROUPBOX        "INI File",IDC_STATIC,77,125,67,24\r
+    CONTROL         "Auto Save",IDC_CHECK_INIFILE_AUTOSAVE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,83,134,53,10\r
+    CONTROL         "Not Continue",IDC_CHECKBOX_NOT_LOOPING,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,68,51,8\r
+    CONTROL         "Auto Start",IDC_CHECKBOX_AUTOSTART,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,80,56,8\r
+    CONTROL         "Random Mode",IDC_CHECKBOX_RANDOM,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,80,75,8\r
+    CONTROL         "Popup",IDC_CHECK_DOCWNDAUTOPOPUP,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,124,59,10\r
+    GROUPBOX        "PlayList",IDC_STATIC,112,32,85,61\r
 END\r
 \r
 IDD_PREF_TIMIDITY1 DIALOG DISCARDABLE  0, 0, 210, 191\r
@@ -633,7 +405,122 @@ BEGIN
                     WS_GROUP | WS_TABSTOP\r
 END\r
 \r
-IDD_PREF_TIMIDITY2 DIALOG DISCARDABLE  0, 0, 213, 141\r
+IDD_PREF_TIMIDITY1_EN DIALOG DISCARDABLE  0, 0, 210, 190\r
+STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
+    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
+FONT 9, "Times New Roman"\r
+BEGIN\r
+    CONTROL         "Chorus Control",IDC_CHECKBOX_CHORUS,"Button",\r
+                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,12,59,\r
+                    10\r
+    CONTROL         "Static Chorus Level",IDC_CHECKBOX_CHORUS_LEVEL,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,101,12,70,10\r
+    CONTROL         "Global Reverb",IDC_CHECKBOX_GLOBAL_REVERB,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,101,34,57,10\r
+    CONTROL         "Reverb Control",IDC_CHECKBOX_REVERB,"Button",\r
+                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,23,58,\r
+                    10\r
+    CONTROL         "Static Reverb Level",IDC_CHECKBOX_REVERB_LEVEL,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,101,23,69,10\r
+    EDITTEXT        IDC_EDIT_REVERB,177,23,24,12,ES_NUMBER\r
+    CONTROL         "L&&R Delay",IDC_CHECKBOX_DELAY,"Button",BS_AUTOCHECKBOX | \r
+                    BS_LEFT | BS_TOP | WS_TABSTOP,101,44,57,10\r
+    CONTROL         "Left",IDC_RADIOBUTTON_DELAY_LEFT,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,106,53,26,10\r
+    CONTROL         "Right",IDC_RADIOBUTTON_DELAY_RIGHT,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,135,53,30,10\r
+    CONTROL         "Rotate",IDC_RADIOBUTTON_DELAY_CENTER,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,167,53,35,10\r
+    LTEXT           "Delay(msec)",IDC_STATIC,113,64,38,8,NOT WS_GROUP | \r
+                    WS_TABSTOP\r
+    EDITTEXT        IDC_EDIT_DELAY,151,63,32,12,ES_NUMBER\r
+    LTEXT           "Noise Sharping Level (0..4)",IDC_STATIC,101,89,63,8,NOT \r
+                    WS_GROUP | WS_TABSTOP\r
+    EDITTEXT        IDC_EDIT_NOISESHARPING,177,89,28,12,ES_NUMBER\r
+    LTEXT           "Feedback Level(0..1000)",IDC_STATIC,101,78,71,8,NOT \r
+                    WS_GROUP | WS_TABSTOP\r
+    EDITTEXT        IDC_EDIT_MODIFY_RELEASE,177,76,28,12\r
+    CONTROL         "Modulation Wheel",IDC_CHECKBOX_MODWHEEL,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,34,67,10\r
+    GROUPBOX        "GM/GS/XG",IDC_STATIC,1,3,91,143\r
+    CONTROL         "Portament",IDC_CHECKBOX_PORTAMENTO,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,45,46,10\r
+    GROUPBOX        "Special",IDC_STATIC,98,3,113,143\r
+    CONTROL         "NRPN Vibrato",IDC_CHECKBOX_NRPNVIB,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,56,57,10\r
+    EDITTEXT        IDC_EDIT_CHORUS,177,12,24,12,ES_NUMBER\r
+    CONTROL         "GM Channel pressure",IDC_CHECKBOX_CHPRESS,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,67,80,10\r
+    CONTROL         "Surround Chorus",IDC_CHECKBOX_SRCHORUS,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,101,98,65,10\r
+    CONTROL         "Overlapped same voce",IDC_CHECKBOX_OVOICE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,89,82,10\r
+    CONTROL         "Trace Text Meta Event",IDC_CHECKBOX_TRACETEXT,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,78,83,10\r
+    CONTROL         "Pseudo Resonance",IDC_CHECKBOX_RESONANCE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,101,107,71,10\r
+    EDITTEXT        IDC_EDIT_ENV_ATTACK,162,119,28,12\r
+    EDITTEXT        IDC_EDIT_VELOCITYTABLE,162,131,28,12\r
+    LTEXT           "Attack Type (0..3)",IDC_STATIC,101,120,53,8,NOT \r
+                    WS_GROUP | WS_TABSTOP\r
+    LTEXT           "Verocity Table (0..2)",IDC_STATIC,101,133,60,8,NOT \r
+                    WS_GROUP | WS_TABSTOP\r
+    CONTROL         "Delay Control",IDC_CHECKBOX_PDELAY,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,133,56,10\r
+    CONTROL         "Attack Time Control",IDC_CHECKBOX_TVAA,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,100,75,10\r
+    CONTROL         "Release Time Control",IDC_CHECKBOX_TVAR,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,122,79,10\r
+    CONTROL         "Decay Time Control",IDC_CHECKBOX_TVAD,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,111,74,10\r
+END\r
+\r
+IDD_PREF_TIMIDITY2_EN DIALOG DISCARDABLE  0, 0, 210, 190\r
+STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
+    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
+FONT 9, "Times New Roman"\r
+BEGIN\r
+    LTEXT           "Maxmum Voices",IDC_STATIC,6,19,71,8,NOT WS_GROUP\r
+    EDITTEXT        IDC_EDIT_VOICES,78,19,24,12,ES_NUMBER\r
+    LTEXT           "Amplification(%)",IDC_STATIC,6,34,47,8,NOT WS_GROUP\r
+    EDITTEXT        IDC_EDIT_AMPLIFICATION,78,32,24,12\r
+    CONTROL         "Unload Instruments between files",\r
+                    IDC_CHECKBOX_FREE_INST,"Button",BS_AUTOCHECKBOX | \r
+                    BS_LEFT | BS_TOP | WS_TABSTOP,6,75,92,10\r
+    CONTROL         "Antialiasing instrument",IDC_CHECKBOX_ANTIALIAS,"Button",\r
+                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,49,97,\r
+                    10\r
+    CONTROL         "Load Instruments While Playing",\r
+                    IDC_CHECKBOX_LOADINST_PLAYING,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,6,63,99,10\r
+    LTEXT           "Resample Cache",IDC_STATIC,117,19,50,8,NOT WS_GROUP\r
+    EDITTEXT        IDC_EDIT_CACHE_SIZE,169,17,36,12\r
+    CONTROL         "Auto Reduction Voice",IDC_CHECKBOX_REDUCE_VOICE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,89,98,8\r
+    LTEXT           "Default tonebank",IDC_STATIC,117,37,50,8,NOT WS_GROUP\r
+    EDITTEXT        IDC_EDIT_DEFAULT_TONEBANK,173,35,24,12\r
+    CONTROL         "All tonebank",IDC_CHECKBOX_SPECIAL_TONEBANK,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,54,54,8\r
+    EDITTEXT        IDC_EDIT_SPECIAL_TONEBANK,173,52,24,12\r
+    CONTROL         "GM",IDC_RADIOBUTTON_GM,"Button",BS_AUTORADIOBUTTON | \r
+                    WS_TABSTOP,14,117,22,8\r
+    CONTROL         "GS",IDC_RADIOBUTTON_GS,"Button",BS_AUTORADIOBUTTON | \r
+                    WS_TABSTOP,39,117,20,8\r
+    CONTROL         "XG",IDC_RADIOBUTTON_XG,"Button",BS_AUTORADIOBUTTON | \r
+                    WS_TABSTOP,63,117,20,8\r
+    CONTROL         "Trace Playing",IDC_CHECKBOX_CTL_TRACE_PLAYING,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,117,88,86,8\r
+    LTEXT           "Console Verbosity",IDC_STATIC,117,105,55,8,NOT WS_GROUP\r
+    EDITTEXT        IDC_EDIT_CTL_VEBOSITY,175,103,20,12\r
+    LTEXT           "Control Ratio",IDC_STATIC,117,72,40,8,NOT WS_GROUP\r
+    EDITTEXT        IDC_EDIT_CONTROL_RATIO,173,70,24,12\r
+    GROUPBOX        "Default MIDI Type",IDC_GROUPBOX_DEFAULT_MIDI_TYPE,6,105,\r
+                    87,27\r
+    GROUPBOX        "Others",IDC_STATIC,111,3,100,119\r
+    GROUPBOX        "Play",IDC_STATIC,1,3,107,133\r
+END\r
+\r
+IDD_PREF_TIMIDITY2 DIALOG DISCARDABLE  0, 0, 210, 141\r
 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
     WS_POPUP | WS_VISIBLE | WS_CAPTION\r
 FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
@@ -678,7 +565,7 @@ BEGIN
     GROUPBOX        "\8dÄ\90¶",IDC_STATIC,1,3,107,133\r
 END\r
 \r
-IDD_PREF_TIMIDITY3 DIALOG DISCARDABLE  0, 0, 205, 181\r
+IDD_PREF_TIMIDITY3 DIALOG DISCARDABLE  0, 0, 210, 181\r
 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
     WS_POPUP | WS_VISIBLE | WS_CAPTION\r
 FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
@@ -734,7 +621,62 @@ BEGIN
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
 END\r
 \r
-IDD_PREF_TIMIDITY4 DIALOG DISCARDABLE  0, 0, 181, 143\r
+IDD_PREF_TIMIDITY3_EN DIALOG DISCARDABLE  0, 0, 210, 190\r
+STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
+    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
+FONT 9, "Times New Roman"\r
+BEGIN\r
+    GROUPBOX        "Output Encoding",IDC_STATIC,0,0,203,140,WS_GROUP | \r
+                    WS_TABSTOP\r
+    GROUPBOX        "Precision",IDC_STATIC,4,7,171,30,WS_GROUP | WS_TABSTOP\r
+    CONTROL         "8bits",IDC_CHECKBOX_8BITS,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,8,15,29,8\r
+    CONTROL         "16bits",IDC_CHECKBOX_16BITS,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,8,25,32,8\r
+    CONTROL         "uLaw",IDC_CHECKBOX_ULAW,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,15,31,8\r
+    CONTROL         "ALaw",IDC_CHECKBOX_ALAW,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,25,31,8\r
+    CONTROL         "Signed",IDC_CHECKBOX_SIGNED,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,77,15,37,8\r
+    CONTROL         "Unsigned",IDC_CHECKBOX_UNSIGNED,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,77,25,37,8\r
+    CONTROL         "Byteswap",IDC_CHECKBOX_BYTESWAP,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,119,15,43,8\r
+    CONTROL         "Linear PCM",IDC_CHECKBOX_LINEAR,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,119,25,45,8\r
+    GROUPBOX        "Channels",IDC_STATIC,4,41,45,33,WS_GROUP | WS_TABSTOP\r
+    CONTROL         "Stereo",IDC_RADIO_STEREO,"Button",BS_AUTORADIOBUTTON | \r
+                    WS_TABSTOP,8,51,36,10\r
+    CONTROL         "Mono",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | \r
+                    WS_TABSTOP,8,63,35,8\r
+    LTEXT           "Sample rate (Hz)",IDC_STATIC,65,46,50,8,WS_TABSTOP\r
+    EDITTEXT        IDC_EDIT_SAMPLE_RATE,122,44,32,12,ES_NUMBER | WS_GROUP\r
+    PUSHBUTTON      "L",IDC_BUTTON_LOW,65,59,8,14,BS_CENTER\r
+    PUSHBUTTON      "M",IDC_BUTTON_MIDDLE,73,59,10,14,BS_CENTER\r
+    PUSHBUTTON      "H",IDC_BUTTON_HIGH,84,59,10,14,BS_CENTER\r
+    PUSHBUTTON      "4",IDC_BUTTON_4,95,59,8,14,BS_CENTER\r
+    PUSHBUTTON      "8",IDC_BUTTON_8,103,59,8,14,BS_CENTER\r
+    PUSHBUTTON      "16",IDC_BUTTON_16,111,59,12,14,BS_CENTER\r
+    PUSHBUTTON      "24",IDC_BUTTON_24,123,59,12,14,BS_CENTER\r
+    PUSHBUTTON      "32",IDC_BUTTON_32,135,59,12,14,BS_CENTER\r
+    PUSHBUTTON      "40",IDC_BUTTON_40,147,59,12,14,BS_CENTER\r
+    PUSHBUTTON      "48",IDC_BUTTON_48,159,59,12,14,BS_CENTER\r
+    GROUPBOX        "Output",IDC_GROUPBOX_OUTPUT,4,80,193,41,WS_GROUP | \r
+                    WS_TABSTOP\r
+    PUSHBUTTON      "Output File",IDC_BUTTON_OUTPUT_FILE,4,123,42,14,\r
+                    BS_CENTER | WS_GROUP\r
+    EDITTEXT        IDC_EDIT_OUTPUT_FILE,47,123,130,15,ES_AUTOHSCROLL | \r
+                    ES_OEMCONVERT | WS_GROUP\r
+    PUSHBUTTON      "DEL",IDC_BUTTON_OUTPUT_FILE_DEL,178,123,19,14,BS_CENTER\r
+    COMBOBOX        IDC_COMBO_OUTPUT,8,89,151,64,CBS_DROPDOWNLIST | CBS_SORT | \r
+                    WS_VSCROLL | WS_TABSTOP\r
+    PUSHBUTTON      "Option",IDC_BUTTON_OUTPUT_OPTIONS,160,88,34,14\r
+    COMBOBOX        IDC_COMBO_OUTPUT_MODE,8,105,186,72,CBS_DROPDOWNLIST | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+END\r
+\r
+IDD_PREF_TIMIDITY4 DIALOG DISCARDABLE  0, 0, 210, 143\r
 STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
     WS_POPUP | WS_VISIBLE | WS_CAPTION\r
 FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
@@ -816,6 +758,86 @@ BEGIN
     GROUPBOX        "\83`\83\83\83\93\83l\83\8b",IDC_STATIC,1,3,179,138\r
 END\r
 \r
+IDD_PREF_TIMIDITY4_EN DIALOG DISCARDABLE  0, 0, 210, 190\r
+STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
+    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
+FONT 9, "Times New Roman"\r
+BEGIN\r
+    CONTROL         "Ch01",IDC_CHECKBOX_CH01,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,16,28,8\r
+    CONTROL         "Ch02",IDC_CHECKBOX_CH02,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,24,28,8\r
+    CONTROL         "Ch03",IDC_CHECKBOX_CH03,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,32,28,8\r
+    CONTROL         "Ch04",IDC_CHECKBOX_CH04,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,40,28,8\r
+    CONTROL         "Ch05",IDC_CHECKBOX_CH05,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,48,28,8\r
+    CONTROL         "Ch06",IDC_CHECKBOX_CH06,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,56,28,8\r
+    CONTROL         "Ch07",IDC_CHECKBOX_CH07,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,64,28,8\r
+    CONTROL         "Ch08",IDC_CHECKBOX_CH08,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,10,72,28,8\r
+    CONTROL         "Ch09",IDC_CHECKBOX_CH09,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,16,28,8\r
+    CONTROL         "Ch10",IDC_CHECKBOX_CH10,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,24,28,8\r
+    CONTROL         "Ch11",IDC_CHECKBOX_CH11,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,32,28,8\r
+    CONTROL         "Ch12",IDC_CHECKBOX_CH12,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,40,28,8\r
+    CONTROL         "Ch13",IDC_CHECKBOX_CH13,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,48,28,8\r
+    CONTROL         "Ch14",IDC_CHECKBOX_CH14,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,56,28,8\r
+    CONTROL         "Ch15",IDC_CHECKBOX_CH15,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,64,28,8\r
+    CONTROL         "Ch16",IDC_CHECKBOX_CH16,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,41,72,28,8\r
+    CONTROL         "Ch17",IDC_CHECKBOX_CH17,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,16,28,8\r
+    CONTROL         "Ch18",IDC_CHECKBOX_CH18,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,24,28,8\r
+    CONTROL         "Ch19",IDC_CHECKBOX_CH19,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,32,28,8\r
+    CONTROL         "Ch20",IDC_CHECKBOX_CH20,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,40,28,8\r
+    CONTROL         "Ch21",IDC_CHECKBOX_CH21,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,48,28,8\r
+    CONTROL         "Ch22",IDC_CHECKBOX_CH22,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,56,28,8\r
+    CONTROL         "Ch23",IDC_CHECKBOX_CH23,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,64,28,8\r
+    CONTROL         "Ch24",IDC_CHECKBOX_CH24,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,73,72,28,8\r
+    CONTROL         "Ch25",IDC_CHECKBOX_CH25,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,16,28,8\r
+    CONTROL         "Ch26",IDC_CHECKBOX_CH26,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,24,28,8\r
+    CONTROL         "Ch27",IDC_CHECKBOX_CH27,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,32,28,8\r
+    CONTROL         "Ch28",IDC_CHECKBOX_CH28,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,40,28,8\r
+    CONTROL         "Ch29",IDC_CHECKBOX_CH29,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,48,28,8\r
+    CONTROL         "Ch30",IDC_CHECKBOX_CH30,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,56,28,8\r
+    CONTROL         "Ch31",IDC_CHECKBOX_CH31,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,64,28,8\r
+    CONTROL         "Ch32",IDC_CHECKBOX_CH32,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,106,72,28,8\r
+    CONTROL         "Default Drum Channel",IDC_CHECKBOX_DRUM_CHANNEL,"Button",\r
+                    BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,87,95,13\r
+    CONTROL         "Ignore Auto Detect Channel",\r
+                    IDC_CHECKBOX_DRUM_CHANNEL_MASK,"Button",BS_AUTOCHECKBOX | \r
+                    BS_PUSHLIKE | WS_TABSTOP,9,105,95,14\r
+    CONTROL         "Mute Channel",IDC_CHECKBOX_QUIET_CHANNEL,"Button",\r
+                    BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,124,95,13\r
+    PUSHBUTTON      "Reverse",IDC_BUTTON_REVERSE,141,18,31,61\r
+    GROUPBOX        "Channel",IDC_STATIC,1,3,179,138\r
+END\r
+\r
 IDD_DIALOG_WAVEFORM DIALOGEX 0, 0, 240, 120\r
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION\r
 EXSTYLE WS_EX_DLGMODALFRAME\r
@@ -826,7 +848,7 @@ END
 IDD_DIALOG_SEARCHBOX DIALOG DISCARDABLE  0, 0, 183, 54\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Seach"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
+FONT 9, "Times New Roman"\r
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,70,33,50,14\r
     PUSHBUTTON      "Cancel",IDCANCEL,126,33,50,14\r
@@ -856,6 +878,29 @@ BEGIN
     PUSHBUTTON      "\93K\97p",IDC_BUTTON_APPLY,152,14,40,11\r
 END\r
 \r
+IDD_DIALOG_VORBIS_EN DIALOG DISCARDABLE  0, 0, 197, 93\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Ogg Vorbis Configurations"\r
+FONT 9, "Times New Roman"\r
+BEGIN\r
+    CONTROL         "Default",IDC_CHECK_DEFAULT,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,4,0,56,10\r
+    COMBOBOX        IDC_COMBO_MODE,25,13,123,56,CBS_DROPDOWNLIST | CBS_SORT | \r
+                    WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "Title",IDC_STATIC,4,49,14,8\r
+    EDITTEXT        IDC_EDIT1,41,48,152,14,ES_AUTOHSCROLL | WS_DISABLED\r
+    LTEXT           "Artist",IDC_STATIC,4,63,18,8\r
+    EDITTEXT        IDC_EDIT2,41,76,152,14,ES_AUTOHSCROLL | WS_DISABLED\r
+    LTEXT           "Arbum",IDC_STATIC,4,77,27,8\r
+    EDITTEXT        IDC_EDIT3,41,62,152,14,ES_AUTOHSCROLL | WS_DISABLED\r
+    CONTROL         "Store follows information",IDC_CHECK_USE_TAG,"Button",\r
+                    BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,4,32,73,10\r
+    LTEXT           "Mode",IDC_STATIC,4,16,18,8\r
+    PUSHBUTTON      "OK",IDOK,152,2,40,12\r
+    PUSHBUTTON      "Cancel",IDCANCEL,152,30,40,12\r
+    PUSHBUTTON      "Apply",IDC_BUTTON_APPLY,152,14,40,11\r
+END\r
+\r
 IDD_DIALOG_GOGO DIALOG DISCARDABLE  0, 0, 346, 196\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "MP3(\8cß\8cã\82Ì\82±\81`\82¾) \90Ý\92è\83_\83C\83A\83\8d\83O"\r
@@ -936,6 +981,86 @@ BEGIN
     GROUPBOX        "\83r\83b\83g\83\8c\81[\83g",IDC_STATIC,2,55,167,86\r
 END\r
 \r
+IDD_DIALOG_GOGO_EN DIALOG DISCARDABLE  0, 0, 346, 196\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "MP3 (gogo) Configuration"\r
+FONT 8, "Times New Roman"\r
+BEGIN\r
+    DEFPUSHBUTTON   "OK",IDOK,173,179,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,285,179,50,14\r
+    COMBOBOX        IDC_COMBO_OUTPUT_FORMAT,4,36,72,64,CBS_DROPDOWNLIST | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Default",IDC_CHECK_DEFAULT,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,4,0,80,10\r
+    CONTROL         "Command line option",IDC_CHECK_COMMANDLINE_OPTS,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,12,86,10\r
+    EDITTEXT        IDC_EDIT_COMMANDLINE_OPTION,91,10,232,14,ES_AUTOHSCROLL\r
+    COMBOBOX        IDC_COMBO_MPEG1_AUDIO_BITRATE,6,72,76,76,\r
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_COMBO_MPEG2_AUDIO_BITRATE,87,72,76,76,\r
+                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_COMBO_VBR_BITRATE_LOW,6,119,76,64,CBS_DROPDOWNLIST | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "VBR - Maximum",IDC_STATIC,86,110,55,8\r
+    COMBOBOX        IDC_COMBO_VBR_BITRATE_HIGH,86,119,76,64,CBS_DROPDOWNLIST | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "16KHz Lowpath filter",IDC_CHECK_16KHZ_LOW_PASS_FILTER,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,57,89,8\r
+    CONTROL         "Enhanced Lowpath Filter",\r
+                    IDC_CHECK_ENHANCED_LOW_PASS_FILTER,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,176,68,104,8\r
+    EDITTEXT        IDC_EDIT_LPF_PARA1,200,77,28,12\r
+    EDITTEXT        IDC_EDIT_LPF_PARA2,251,77,28,12\r
+    LTEXT           "para1",IDC_STATIC,183,79,16,8\r
+    LTEXT           "para2",IDC_STATIC,233,79,16,8\r
+    COMBOBOX        IDC_COMBO_ENCODE_MODE,172,36,84,60,CBS_DROPDOWNLIST | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Use Psy",IDC_CHECK_USEPSY,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,176,90,42,10\r
+    CONTROL         "MMX",IDC_CHECK_CPUMMX,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,193,151,29,10\r
+    CONTROL         "SSE",IDC_CHECK_CPUSSE,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,193,163,27,10\r
+    CONTROL         "3DNOW",IDC_CHECK_CPU3DNOW,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,227,151,39,10\r
+    CONTROL         "E3DNOW",IDC_CHECK_CPUE3DNOW,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,227,163,40,10\r
+    COMBOBOX        IDC_COMBO_EMPHASIS_TYPE,268,36,76,64,CBS_DROPDOWNLIST | \r
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_COMBO_VBR,37,92,124,72,CBS_DROPDOWNLIST | CBS_SORT | \r
+                    WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "VBR",IDC_CHECK_VBR,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,6,94,29,10\r
+    CONTROL         "Output Frequency",IDC_CHECK_OUTFREQ,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,88,28,75,8\r
+    EDITTEXT        IDC_EDIT_OUTFREQ,88,36,72,12\r
+    CONTROL         "J-Stereo Stereo/MS-Stereo Control",\r
+                    IDC_CHECK_MSTHRESHOLD,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,176,103,167,8\r
+    EDITTEXT        IDC_EDIT_MSTHRESHOLD_THRESHOLD,200,112,28,12\r
+    EDITTEXT        IDC_EDIT_MSTHRESHOLD_MSPOWER,252,112,28,12\r
+    LTEXT           "para1",IDC_STATIC,183,114,16,8\r
+    LTEXT           "para2",IDC_STATIC,233,114,16,8\r
+    CONTROL         "Verify",IDC_CHECK_VERIFY,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,176,127,34,10\r
+    PUSHBUTTON      "Apply",IDC_BUTTON_APPLY,229,179,50,14\r
+    CONTROL         "Use follow options",IDC_CHECK_USE_CPU_OPTS,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,176,140,68,8\r
+    CONTROL         "MPEG1Audio",IDC_CHECK_MPEG1AUDIOBITRATE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,64,80,8\r
+    CONTROL         "MPEG2Audio",IDC_CHECK_MPEG2AUDIOBITRATE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,87,64,80,8\r
+    CONTROL         "VBR - Minimum",IDC_CHECK_VBR_BITRATE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,110,67,8\r
+    CONTROL         "Output format",IDC_CHECK_OUTPUT_FORMAT,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,28,64,8\r
+    CONTROL         "Encode Mode",IDC_CHECK_ENCODE_MODE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,172,28,63,8\r
+    CONTROL         "Emphasis type",IDC_CHECK_EMPHASIS_TYPE,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,268,28,62,8\r
+    GROUPBOX        "Bitrate",IDC_STATIC,2,55,167,86\r
+END\r
+\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -973,18 +1098,18 @@ BEGIN
     POPUP "Window(&W)"\r
     BEGIN\r
         MENUITEM "play List(&L)",               IDM_MWPLAYLIST\r
-        MENUITEM "Tracer(&T)",                  IDM_MWTRACER\r
+        MENUITEM "Tracer(&T)",                  IDM_MWTRACER, GRAYED\r
         MENUITEM "Document(&D)",                IDM_MWDOCUMENT\r
-        MENUITEM "Wrd tracer(&W)",              IDM_MWWRDTRACER\r
-        MENUITEM "sound Spectogram(&S)",        IDM_MWSOUNDSPEC\r
+        MENUITEM "Wrd tracer(&W)",              IDM_MWWRDTRACER, GRAYED\r
+        MENUITEM "sound Spectogram(&S)",        IDM_MWSOUNDSPEC, GRAYED\r
         MENUITEM "Console(&C)",                 IDM_MWCONSOLE\r
         MENUITEM SEPARATOR\r
         MENUITEM "deBug(&B)",                   IDM_MWDEBUG\r
     END\r
     POPUP "Help(&H)"\r
     BEGIN\r
-        MENUITEM "Topic(&T)",                   IDM_MHTOPIC\r
-        MENUITEM "Help(&H)",                    IDM_MHHELP\r
+        MENUITEM "Topic(&T)",                   IDM_MHTOPIC, GRAYED\r
+        MENUITEM "Help(&H)",                    IDM_MHHELP, GRAYED\r
         MENUITEM SEPARATOR\r
         MENUITEM "TiMidity(&T)",                IDM_MHTIMIDITY\r
         MENUITEM "Version(&V)",                 IDM_MHVERSION\r
@@ -1103,12 +1228,6 @@ BEGIN
         BOTTOMMARGIN, 179\r
     END\r
 \r
-    IDD_PREF_PLAYER, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 197\r
-        BOTTOMMARGIN, 99\r
-    END\r
-\r
     IDD_PREF_TIMIDITY1, DIALOG\r
     BEGIN\r
         RIGHTMARGIN, 145\r
@@ -1167,8 +1286,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,10,0,4\r
- PRODUCTVERSION 2,10,0,4\r
+ FILEVERSION 2,11,0,0\r
+ PRODUCTVERSION 2,11,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -1186,14 +1305,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "\0"\r
             VALUE "FileDescription", "timw32g\0"\r
-            VALUE "FileVersion", "2, 10, 0, 4\0"\r
+            VALUE "FileVersion", "2, 11, 0, 0\0"\r
             VALUE "InternalName", "timw32g\0"\r
             VALUE "LegalCopyright", "Copyright (C) 1999,2001 Masanao Izumo <mo@goice.co.jp>\r\nCopyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "timw32g.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
             VALUE "ProductName", "TiMidity++ Win32GUI Version\0"\r
-            VALUE "ProductVersion", "2, 10, 0, 4\0"\r
+            VALUE "ProductVersion", "2, 11, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r
diff --git a/interface/w32g_res_jp.rc b/interface/w32g_res_jp.rc
deleted file mode 100755 (executable)
index e675fb5..0000000
+++ /dev/null
@@ -1,1259 +0,0 @@
-//Microsoft Developer Studio generated resource script.\r
-//\r
-#include "w32g_res.h"\r
-\r
-#define APSTUDIO_READONLY_SYMBOLS\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Generated from the TEXTINCLUDE 2 resource.\r
-//\r
-#define APSTUDIO_HIDDEN_SYMBOLS\r
-#include "windows.h"\r
-#undef APSTUDIO_HIDDEN_SYMBOLS\r
-#include "commctrl.h"\r
-#include "w32g_rec.h"\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-#undef APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-// Æ­°Ä×Ù resources\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)\r
-#ifdef _WIN32\r
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r
-#pragma code_page(932)\r
-#endif //_WIN32\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Dialog\r
-//\r
-\r
-IDD_DIALOG_MAIN DIALOGEX 0, 0, 308, 64\r
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_VISIBLE | \r
-    WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU\r
-EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_NOPARENTNOTIFY | WS_EX_ACCEPTFILES | \r
-    WS_EX_APPWINDOW\r
-CAPTION "TiMidity++ Win32GUI"\r
-MENU IDM_MENU_MAIN\r
-FONT 8, "MS Sans Serif", 0, 0\r
-BEGIN\r
-    CONTROL         "ToolBarMain",IDC_TOOLBARWINDOW_MAIN,"ToolbarWindow32",\r
-                    WS_TABSTOP | 0x14c,2,46,112,17\r
-    CONTROL         "ToolBarSubWnd",IDC_TOOLBARWINDOW_SUBWND,"ToolbarWindow32",\r
-                    WS_TABSTOP | 0x44,112,46,80,16\r
-    SCROLLBAR       IDC_SCROLLBAR_PROGRESS,190,48,100,12,WS_DISABLED\r
-    SCROLLBAR       IDC_SCROLLBAR_VOLUME,292,0,12,60,SBS_VERT\r
-    CONTROL         "",IDC_RECT_PANEL,"Static",SS_GRAYFRAME | SS_SUNKEN,0,0,\r
-                    220,44\r
-    CONTROL         "",IDC_RECT_CANVAS,"Static",SS_GRAYFRAME,220,0,68,44\r
-END\r
-\r
-IDD_PREF_PLAYER_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    PUSHBUTTON      "Config File",IDC_BUTTON_CONFIG_FILE,4,4,40,12,BS_CENTER\r
-    EDITTEXT        IDC_EDIT_CONFIG_FILE,44,4,164,12,ES_MULTILINE | \r
-                    ES_AUTOHSCROLL | ES_OEMCONVERT\r
-    GROUPBOX        "Player Mode",IDC_GROUPBOX_PLAYERMODE,4,20,64,64,\r
-                    WS_GROUP\r
-    CONTROL         "Auto Quit",IDC_CHECKBOX_AUTOQUIT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,32,44,8\r
-    CONTROL         "Auto Uniq",IDC_CHECKBOX_AUTOUNIQ,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,40,44,8\r
-    CONTROL         "Auto Refine",IDC_CHECKBOX_AUTOREFINE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,48,48,8\r
-    GROUPBOX        "Language",IDC_GROUPBOX_LANGUAGE,72,20,60,40,WS_GROUP\r
-    CONTROL         "Japanese",IDC_RADIOBUTTON_JAPANESE,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,76,32,36,8\r
-    CONTROL         "English",IDC_RADIOBUTTON_ENGLISH,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,76,40,36,8\r
-    LTEXT           "Require Restart!",IDC_STATIC,76,48,52,8,NOT WS_GROUP\r
-    CONTROL         "Not Continue",IDC_CHECKBOX_NOT_CONTINUE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,56,52,8\r
-    CONTROL         "Not Drag Start",IDC_CHECKBOX_NOT_DRAG_START,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,64,56,8\r
-    GROUPBOX        "Directory",IDC_STATIC,136,20,72,20\r
-    CONTROL         "Recursive Seach",IDC_CHECK_SEACHDIRRECURSIVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,140,28,60,10\r
-    GROUPBOX        "Document Window",IDC_STATIC,136,44,72,20\r
-    CONTROL         "Independent Mode",IDC_CHECK_DOCWNDINDEPENDENT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,140,52,64,10\r
-    GROUPBOX        "INI File",IDC_STATIC,136,68,72,20\r
-    CONTROL         "Auto Save",IDC_CHECK_INIFILE_AUTOSAVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,140,76,45,10\r
-    CONTROL         "Not Looping",IDC_CHECKBOX_NOT_LOOPING,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,72,52,8\r
-END\r
-\r
-IDD_PREF_TIMIDITY1_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    CONTROL         "Enable Chorus Control Effect",IDC_CHECKBOX_CHORUS,\r
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,\r
-                    8,4,97,8\r
-    CONTROL         "Chorus Level",IDC_CHECKBOX_CHORUS_LEVEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,12,52,8\r
-    EDITTEXT        IDC_EDIT_CHORUS,68,12,24,10,ES_NUMBER\r
-    CONTROL         "Enable Reverb Control Effect",IDC_CHECKBOX_REVERB,\r
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,\r
-                    8,24,96,8\r
-    CONTROL         "Global Reverb",IDC_CHECKBOX_GLOBAL_REVERB,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,32,52,8\r
-    CONTROL         "Reverb Level",IDC_CHECKBOX_REVERB_LEVEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,40,52,8\r
-    EDITTEXT        IDC_EDIT_REVERB,68,38,24,10,ES_NUMBER\r
-    CONTROL         "L&&R Delay Rotate Effect",IDC_CHECKBOX_DELAY,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,8,52,91,\r
-                    8\r
-    CONTROL         "Left",IDC_RADIOBUTTON_DELAY_LEFT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,60,28,8\r
-    CONTROL         "Right",IDC_RADIOBUTTON_DELAY_RIGHT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,36,60,28,8\r
-    CONTROL         "Rotate",IDC_RADIOBUTTON_DELAY_CENTER,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,64,60,32,8\r
-    LTEXT           "Delay(msec)",IDC_STATIC,12,68,40,8,NOT WS_GROUP | \r
-                    WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_DELAY,52,68,44,10,ES_NUMBER\r
-    LTEXT           "Noise Sharping Level (0..4)",IDC_STATIC,8,80,76,8,NOT \r
-                    WS_GROUP | WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_NOISESHARPING,84,78,16,10,ES_NUMBER\r
-    CONTROL         "Enable Modulation Wheel",IDC_CHECKBOX_MODWHEEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,4,87,10\r
-    CONTROL         "Enable Portamento",IDC_CHECKBOX_PORTAMENTO,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,16,68,10\r
-    CONTROL         "Enable NRPN Vibrato",IDC_CHECKBOX_NRPNVIB,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,28,77,10\r
-    CONTROL         "Enable GM Channel pressure",IDC_CHECKBOX_CHPRESS,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,40,97,10\r
-    CONTROL         "Enable Overlapped same voice",IDC_CHECKBOX_OVOICE,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,52,100,10\r
-    CONTROL         "Enable Trace Text Meta Event",IDC_CHECKBOX_TRACETEXT,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,64,100,10\r
-    LTEXT           "Modify Release(0..1000)",IDC_STATIC,108,76,72,8,NOT \r
-                    WS_GROUP | WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_MODIFY_RELEASE,180,76,28,10\r
-END\r
-\r
-IDD_PREF_TIMIDITY2_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    LTEXT           "Maximum voices",IDC_STATIC,4,4,52,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_VOICES,56,4,24,10,ES_NUMBER\r
-    LTEXT           "Amplification (%)",IDC_STATIC,4,16,52,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_AMPLIFICATION,56,16,24,10\r
-    CONTROL         "Unload Instruments between files",\r
-                    IDC_CHECKBOX_FREE_INST,"Button",BS_AUTOCHECKBOX | \r
-                    BS_LEFT | BS_TOP | WS_TABSTOP,4,52,108,10\r
-    CONTROL         "Antialiasing instrument",IDC_CHECKBOX_ANTIALIAS,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,4,28,80,\r
-                    10\r
-    CONTROL         "Load Instruments while playing",\r
-                    IDC_CHECKBOX_LOADINST_PLAYING,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,41,103,10\r
-    LTEXT           "Allocate Cache Size",IDC_STATIC,120,4,56,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CACHE_SIZE,176,4,32,10\r
-    CONTROL         "Auto Reduce Voice",IDC_CHECKBOX_REDUCE_VOICE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,120,17,72,8\r
-    LTEXT           "Default tonebank",IDC_STATIC,120,28,52,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_DEFAULT_TONEBANK,172,28,24,10\r
-    CONTROL         "Special Tonebank",IDC_CHECKBOX_SPECIAL_TONEBANK,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,120,41,60,8\r
-    EDITTEXT        IDC_EDIT_SPECIAL_TONEBANK,184,41,20,10\r
-    GROUPBOX        "Default Midi Type",IDC_GROUPBOX_DEFAULT_MIDI_TYPE,120,\r
-                    65,88,20\r
-    CONTROL         "GM",IDC_RADIOBUTTON_GM,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,128,73,24,8\r
-    CONTROL         "GS",IDC_RADIOBUTTON_GS,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,156,73,20,8\r
-    CONTROL         "XG",IDC_RADIOBUTTON_XG,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,180,73,20,8\r
-    CONTROL         "Ctl Trace Playing",IDC_CHECKBOX_CTL_TRACE_PLAYING,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,65,64,8\r
-    LTEXT           "Console Verbosity",IDC_STATIC,4,76,56,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CTL_VEBOSITY,60,76,20,10\r
-    LTEXT           "Control Ratio",IDC_STATIC,120,52,40,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CONTROL_RATIO,160,52,24,10\r
-END\r
-\r
-IDD_PREF_TIMIDITY3_EN DIALOG DISCARDABLE  0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    GROUPBOX        "Output Encoding",IDC_STATIC,4,0,204,88,WS_GROUP | \r
-                    WS_TABSTOP\r
-    GROUPBOX        "Precision",IDC_STATIC,8,8,152,28,WS_GROUP | WS_TABSTOP\r
-    CONTROL         "8bits",IDC_CHECKBOX_8BITS,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,12,16,28,8\r
-    CONTROL         "16bits",IDC_CHECKBOX_16BITS,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,12,24,28,8\r
-    CONTROL         "uLaw",IDC_CHECKBOX_ULAW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,48,16,28,8\r
-    CONTROL         "aLaw",IDC_CHECKBOX_ALAW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,48,24,28,8\r
-    CONTROL         "Signed",IDC_CHECKBOX_SIGNED,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,84,16,28,8\r
-    CONTROL         "Unsignd",IDC_CHECKBOX_UNSIGNED,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,84,24,36,8\r
-    CONTROL         "Byteswap",IDC_CHECKBOX_BYTESWAP,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,120,16,40,8\r
-    CONTROL         "Linear",IDC_CHECKBOX_LINEAR,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,120,24,32,8\r
-    GROUPBOX        "Channels",IDC_STATIC,164,8,40,28,WS_GROUP | WS_TABSTOP\r
-    CONTROL         "Stereo",IDC_RADIO_STEREO,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,168,16,33,10\r
-    CONTROL         "Mono",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,168,24,33,10\r
-    LTEXT           "Sample rate",IDC_STATIC,8,36,36,12,WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_SAMPLE_RATE,44,36,32,10,ES_NUMBER | WS_GROUP\r
-    PUSHBUTTON      "L",IDC_BUTTON_LOW,80,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "M",IDC_BUTTON_MIDDLE,92,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "H",IDC_BUTTON_HIGH,104,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "4",IDC_BUTTON_4,120,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "8",IDC_BUTTON_8,132,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "16",IDC_BUTTON_16,144,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "24",IDC_BUTTON_24,156,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "32",IDC_BUTTON_32,168,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "40",IDC_BUTTON_40,180,36,12,8,BS_CENTER\r
-    PUSHBUTTON      "48",IDC_BUTTON_48,192,36,12,8,BS_CENTER\r
-    GROUPBOX        "Output",IDC_GROUPBOX_OUTPUT,8,44,196,28,WS_GROUP | \r
-                    WS_TABSTOP\r
-    CONTROL         "Win32 Audio",IDC_RADIOBUTTON_WIN32AUDIO,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,52,52,8\r
-    CONTROL         "List Midi Event",IDC_RADIOBUTTON_LIST_MIDI_EVENT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,60,56,8\r
-    CONTROL         "Riff Wave File",IDC_RADIOBUTTON_RIFF_WAVE,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,72,52,56,8\r
-    CONTROL         "Raw Waveform File",IDC_RADIOBUTTON_RAW_WAVEFORM,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,72,60,72,8\r
-    CONTROL         "Sun Audio File",IDC_RADIOBUTTON_SUN_AUDIO,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,144,52,56,8\r
-    CONTROL         "Aiff File",IDC_RADIOBUTTON_AIFF,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,144,60,36,8\r
-    PUSHBUTTON      "Output File",IDC_BUTTON_OUTPUT_FILE,8,72,36,12,\r
-                    BS_CENTER | WS_GROUP\r
-    EDITTEXT        IDC_EDIT_OUTPUT_FILE,44,72,144,12,ES_AUTOHSCROLL | \r
-                    ES_OEMCONVERT | WS_GROUP\r
-    PUSHBUTTON      "DEL",IDC_BUTTON_OUTPUT_FILE_DEL,188,72,16,12,BS_CENTER\r
-END\r
-\r
-IDD_PREF_TIMIDITY4_EN DIALOGEX 0, 0, 212, 92\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "Times New Roman", 0, 0\r
-BEGIN\r
-    CONTROL         "Ch01",IDC_CHECKBOX_CH01,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,12,28,8\r
-    CONTROL         "Ch02",IDC_CHECKBOX_CH02,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,20,28,8\r
-    CONTROL         "Ch03",IDC_CHECKBOX_CH03,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,28,28,8\r
-    CONTROL         "Ch04",IDC_CHECKBOX_CH04,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,36,28,8\r
-    CONTROL         "Ch05",IDC_CHECKBOX_CH05,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,44,28,8\r
-    CONTROL         "Ch06",IDC_CHECKBOX_CH06,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,52,28,8\r
-    CONTROL         "Ch07",IDC_CHECKBOX_CH07,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,60,28,8\r
-    CONTROL         "Ch08",IDC_CHECKBOX_CH08,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,68,28,8\r
-    CONTROL         "Ch09",IDC_CHECKBOX_CH09,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,12,28,8\r
-    CONTROL         "Ch10",IDC_CHECKBOX_CH10,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,20,28,8\r
-    CONTROL         "Ch11",IDC_CHECKBOX_CH11,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,28,28,8\r
-    CONTROL         "Ch12",IDC_CHECKBOX_CH12,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,36,28,8\r
-    CONTROL         "Ch13",IDC_CHECKBOX_CH13,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,44,28,8\r
-    CONTROL         "Ch14",IDC_CHECKBOX_CH14,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,52,28,8\r
-    CONTROL         "Ch15",IDC_CHECKBOX_CH15,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,60,28,8\r
-    CONTROL         "Ch16",IDC_CHECKBOX_CH16,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,36,68,28,8\r
-    CONTROL         "Ch17",IDC_CHECKBOX_CH17,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,12,28,8\r
-    CONTROL         "Ch18",IDC_CHECKBOX_CH18,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,20,28,8\r
-    CONTROL         "Ch19",IDC_CHECKBOX_CH19,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,28,28,8\r
-    CONTROL         "Ch20",IDC_CHECKBOX_CH20,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,36,28,8\r
-    CONTROL         "Ch21",IDC_CHECKBOX_CH21,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,44,28,8\r
-    CONTROL         "Ch22",IDC_CHECKBOX_CH22,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,52,28,8\r
-    CONTROL         "Ch23",IDC_CHECKBOX_CH23,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,60,28,8\r
-    CONTROL         "Ch24",IDC_CHECKBOX_CH24,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,64,68,28,8\r
-    CONTROL         "Ch25",IDC_CHECKBOX_CH25,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,12,28,8\r
-    CONTROL         "Ch26",IDC_CHECKBOX_CH26,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,20,28,8\r
-    CONTROL         "Ch27",IDC_CHECKBOX_CH27,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,28,28,8\r
-    CONTROL         "Ch28",IDC_CHECKBOX_CH28,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,36,28,8\r
-    CONTROL         "Ch29",IDC_CHECKBOX_CH29,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,44,28,8\r
-    CONTROL         "Ch30",IDC_CHECKBOX_CH30,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,52,28,8\r
-    CONTROL         "Ch31",IDC_CHECKBOX_CH31,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,60,28,8\r
-    CONTROL         "Ch32",IDC_CHECKBOX_CH32,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,92,68,28,8\r
-    CONTROL         "Drum Channel",IDC_CHECKBOX_DRUM_CHANNEL,"Button",\r
-                    BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,20,64,16\r
-    CONTROL         "Drum Channel Mask",IDC_CHECKBOX_DRUM_CHANNEL_MASK,\r
-                    "Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,\r
-                    40,64,16\r
-    CONTROL         "Quiet Channel",IDC_CHECKBOX_QUIET_CHANNEL,"Button",\r
-                    BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,136,60,64,16\r
-END\r
-\r
-IDD_DIALOG_MAIN_EN DIALOGEX 0, 0, 308, 64\r
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_VISIBLE | \r
-    WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU\r
-EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_NOPARENTNOTIFY | WS_EX_ACCEPTFILES | \r
-    WS_EX_APPWINDOW\r
-CAPTION "TiMidity++ Win32GUI"\r
-MENU IDM_MENU_MAIN_EN\r
-FONT 8, "MS Sans Serif", 0, 0\r
-BEGIN\r
-    CONTROL         "ToolBarMain",IDC_TOOLBARWINDOW_MAIN,"ToolbarWindow32",\r
-                    WS_TABSTOP | 0x14c,2,46,112,17\r
-    CONTROL         "ToolBarSubWnd",IDC_TOOLBARWINDOW_SUBWND,"ToolbarWindow32",\r
-                    WS_TABSTOP | 0x44,112,46,80,16\r
-    SCROLLBAR       IDC_SCROLLBAR_PROGRESS,190,48,100,12,WS_DISABLED\r
-    SCROLLBAR       IDC_SCROLLBAR_VOLUME,292,0,12,60,SBS_VERT\r
-    CONTROL         "",IDC_RECT_PANEL,"Static",SS_GRAYFRAME | SS_SUNKEN,0,0,\r
-                    220,44\r
-    CONTROL         "",IDC_RECT_CANVAS,"Static",SS_GRAYFRAME,220,0,68,44\r
-END\r
-\r
-#endif    // Æ­°Ä×Ù resources\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-// \93ú\96{\8cê resources\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)\r
-#ifdef _WIN32\r
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r
-#pragma code_page(932)\r
-#endif //_WIN32\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Dialog\r
-//\r
-\r
-IDD_DIALOG_DEBUG DIALOG DISCARDABLE  0, 0, 240, 240\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Debug Window (TiMidity Win32GUI)"\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    PUSHBUTTON      "C L E A R",IDCLEAR,72,164,68,16,BS_CENTER\r
-    CONTROL         "VALID",IDC_CHECKBOX_DEBUG_WND_VALID,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,20,164,36,16\r
-    CONTROL         "",-1,"Static",SS_ETCHEDFRAME,16,164,44,16\r
-    PUSHBUTTON      "E X I T",IDC_BUTTON_EXIT,144,164,48,16,BS_CENTER | \r
-                    WS_DISABLED\r
-    PUSHBUTTON      "ExitProcess",IDC_BUTTON_EXITPROCESS,196,164,40,16,\r
-                    BS_CENTER\r
-    CONTROL         "",-1,"Static",SS_ETCHEDHORZ,0,184,240,1\r
-    PUSHBUTTON      "Heaps Check",IDC_BUTTON_HEAP_CHECK,4,188,50,16,\r
-                    BS_CENTER\r
-    PUSHBUTTON      "Variables Check",IDC_BUTTON_VARIABLES_CHECK,60,188,50,\r
-                    16,BS_CENTER\r
-    EDITTEXT        IDC_EDIT,0,0,240,160,ES_MULTILINE | ES_AUTOVSCROLL | \r
-                    ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | \r
-                    WS_VSCROLL | WS_HSCROLL\r
-END\r
-\r
-IDD_DIALOG_CONSOLE DIALOGEX 0, 0, 243, 184\r
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CAPTION | WS_SYSMENU\r
-CAPTION "\83R\83\93\83\\81[\83\8b (TiMidity++ Win32GUI)"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N", 0, 0\r
-BEGIN\r
-    PUSHBUTTON      "\83N\83\8a\83A",IDCLEAR,140,167,96,16,BS_CENTER\r
-    EDITTEXT        IDC_EDIT_VERBOSITY,44,167,16,16,ES_OEMCONVERT\r
-    CONTROL         "\97L\8cø",IDC_CHECKBOX_VALID,"Button",BS_AUTOCHECKBOX | \r
-                    BS_LEFTTEXT | WS_TABSTOP,97,167,27,16\r
-    CONTROL         "",-1,"Static",SS_ETCHEDFRAME,4,167,80,16\r
-    EDITTEXT        IDC_EDIT,0,0,242,160,ES_MULTILINE | ES_AUTOVSCROLL | \r
-                    ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | \r
-                    WS_VSCROLL | WS_HSCROLL,WS_EX_STATICEDGE\r
-    PUSHBUTTON      "\83\8c\83x\83\8b",IDC_BUTTON_VERBOSITY,4,167,40,16,BS_CENTER,\r
-                    WS_EX_CLIENTEDGE\r
-    PUSHBUTTON      "<<",IDC_BUTTON_DEC,60,167,12,16,BS_CENTER\r
-    PUSHBUTTON      ">>",IDC_BUTTON_INC,72,167,12,16,BS_CENTER\r
-    CONTROL         "",-1,"Static",SS_ETCHEDFRAME,93,167,38,16\r
-END\r
-\r
-IDD_DIALOG_CONSOLE_EN DIALOGEX 0, 0, 247, 181\r
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Console Window (TiMidity Win32GUI)"\r
-FONT 8, "Times New Roman", 0, 0\r
-BEGIN\r
-    PUSHBUTTON      "C L E A R",IDCLEAR,150,165,90,15,BS_CENTER\r
-    EDITTEXT        IDC_EDIT_VERBOSITY,50,165,21,15,ES_OEMCONVERT\r
-    CONTROL         "VALID",IDC_CHECKBOX_VALID,"Button",BS_AUTOCHECKBOX | \r
-                    BS_LEFTTEXT | WS_TABSTOP,110,165,32,15\r
-    CONTROL         "",-1,"Static",SS_ETCHEDFRAME,5,165,96,16\r
-    EDITTEXT        IDC_EDIT,0,0,245,160,ES_MULTILINE | ES_AUTOVSCROLL | \r
-                    ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | \r
-                    WS_VSCROLL | WS_HSCROLL,WS_EX_STATICEDGE\r
-    PUSHBUTTON      "VERBOSITY",IDC_BUTTON_VERBOSITY,4,165,46,15,BS_CENTER,\r
-                    WS_EX_CLIENTEDGE\r
-    PUSHBUTTON      "<<",IDC_BUTTON_DEC,70,165,15,16,BS_CENTER\r
-    PUSHBUTTON      ">>",IDC_BUTTON_INC,85,165,15,16,BS_CENTER\r
-    CONTROL         "",-1,"Static",SS_ETCHEDFRAME,105,165,40,16\r
-END\r
-\r
-IDD_DIALOG_DOC DIALOG DISCARDABLE  0, 0, 302, 257\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-CAPTION "\83h\83L\83\85\83\81\83\93\83g (TiMidity++ Win32GUI)"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    EDITTEXT        IDC_EDIT_FILENAME,100,240,150,16,ES_CENTER | ES_READONLY\r
-    PUSHBUTTON      "<<",IDC_BUTTON_PREV,255,240,20,16,BS_CENTER\r
-    PUSHBUTTON      ">>",IDC_BUTTON_NEXT,275,240,20,16,BS_CENTER\r
-    EDITTEXT        IDC_EDIT,0,0,295,220,ES_MULTILINE | ES_AUTOVSCROLL | \r
-                    ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | \r
-                    WS_VSCROLL | WS_HSCROLL\r
-    EDITTEXT        IDC_EDIT_INFO,0,240,95,16,ES_READONLY\r
-END\r
-\r
-IDD_DIALOG_DOC_EN DIALOG DISCARDABLE  0, 0, 241, 180\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-CAPTION "Document Window (TiMidity Win32GUI)"\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    EDITTEXT        IDC_EDIT_FILENAME,60,168,140,12,ES_CENTER | ES_READONLY\r
-    PUSHBUTTON      "<<",IDC_BUTTON_PREV,204,168,16,12,BS_CENTER\r
-    PUSHBUTTON      ">>",IDC_BUTTON_NEXT,220,168,16,12,BS_CENTER\r
-    EDITTEXT        IDC_EDIT,0,0,236,160,ES_MULTILINE | ES_AUTOVSCROLL | \r
-                    ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | \r
-                    WS_VSCROLL | WS_HSCROLL\r
-    EDITTEXT        IDC_EDIT_INFO,0,168,56,12,ES_READONLY\r
-END\r
-\r
-IDD_DIALOG_WRD DIALOGEX 0, 0, 320, 220\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Wrd Tracer Window (TiMidity Win32GUI)"\r
-FONT 9, "Times New Roman", 400, 0\r
-BEGIN\r
-    PUSHBUTTON      "FLUSH",IDFLUSH,256,200,60,16,BS_CENTER\r
-    CONTROL         "VALID",IDC_CHECKBOX_DEBUG_WND_VALID,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,16,200,36,16\r
-    CONTROL         "Frame_Valid",-1,"Static",SS_ETCHEDFRAME,12,200,44,16\r
-END\r
-\r
-IDD_DIALOG_SOUNDSPEC DIALOG DISCARDABLE  0, 0, 240, 180\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Sound Spec Window (TiMidity Win32GUI)"\r
-FONT 9, "Times New Roman"\r
-BEGIN\r
-    PUSHBUTTON      "C L E A R",IDCLEAR,136,164,96,16,BS_CENTER\r
-    CONTROL         "VALID",IDC_CHECKBOX_DEBUG_WND_VALID,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,20,164,36,16\r
-    CONTROL         "",-1,"Static",SS_ETCHEDFRAME,16,164,44,16\r
-END\r
-\r
-IDD_DIALOG_TRACER DIALOGEX 0, 0, 320, 220\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Tracer Window (TiMidity Win32GUI)"\r
-FONT 9, "Times New Roman", 400, 0\r
-BEGIN\r
-    PUSHBUTTON      "FLUSH",IDFLUSH,256,200,60,16,BS_CENTER\r
-    CONTROL         "VALID",IDC_CHECKBOX_VALID,"Button",BS_AUTOCHECKBOX | \r
-                    BS_LEFTTEXT | WS_TABSTOP,16,200,36,16\r
-    CONTROL         "Frame_Valid",-1,"Static",SS_ETCHEDFRAME,12,200,44,16\r
-END\r
-\r
-IDD_DIALOG_SIMPLE_LIST DIALOGEX 0, 0, 242, 187\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_ACCEPTFILES\r
-CAPTION "\83v\83\8c\83C\83\8a\83X\83g (TiMidity++ Win32GUI)"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N", 0, 0\r
-BEGIN\r
-    LISTBOX         IDC_LISTBOX_PLAYLIST,0,0,241,172,LBS_HASSTRINGS | \r
-                    LBS_WANTKEYBOARDINPUT | LBS_DISABLENOSCROLL | WS_VSCROLL | \r
-                    WS_HSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "\83h\83L\83\85\83\81\83\93\83g",IDC_BUTTON_DOC,54,175,43,12,BS_CENTER\r
-    PUSHBUTTON      "\83N\83\8a\83A",IDC_BUTTON_CLEAR,200,175,42,12,BS_CENTER\r
-    PUSHBUTTON      "\89\89\91t\82Ì\82Ý",IDC_BUTTON_REFINE,154,175,37,12,BS_CENTER\r
-    PUSHBUTTON      "\8fd\95¡\8dí\8f\9c",IDC_BUTTON_UNIQ,105,175,38,12,BS_CENTER\r
-    EDITTEXT        IDC_EDIT_NUM,5,175,45,12,ES_READONLY\r
-END\r
-\r
-IDD_DIALOG_SIMPLE_LIST_EN DIALOGEX 0, 0, 242, 187\r
-STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
-EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_ACCEPTFILES\r
-CAPTION "List Window (TiMidity Win32GUI)"\r
-FONT 9, "Times New Roman", 0, 0\r
-BEGIN\r
-    LISTBOX         IDC_LISTBOX_PLAYLIST,0,0,241,170,LBS_HASSTRINGS | \r
-                    LBS_WANTKEYBOARDINPUT | LBS_DISABLENOSCROLL | WS_VSCROLL | \r
-                    WS_HSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "DOC",IDC_BUTTON_DOC,55,175,45,10,BS_CENTER\r
-    PUSHBUTTON      "CLEAR",IDC_BUTTON_CLEAR,190,175,46,10,BS_CENTER\r
-    PUSHBUTTON      "REFINE",IDC_BUTTON_REFINE,145,175,29,10,BS_CENTER\r
-    PUSHBUTTON      "UNIQ",IDC_BUTTON_UNIQ,115,175,31,10,BS_CENTER\r
-    EDITTEXT        IDC_EDIT_NUM,5,175,45,12,ES_READONLY\r
-END\r
-\r
-IDD_PREF_PLAYER DIALOG DISCARDABLE  0, 0, 199, 155\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_POPUP | WS_VISIBLE | \r
-    WS_CAPTION\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    PUSHBUTTON      "\90Ý\92è\83t\83@\83C\83\8b",IDC_BUTTON_CONFIG_FILE,3,11,52,14,\r
-                    BS_CENTER\r
-    EDITTEXT        IDC_EDIT_CONFIG_FILE,62,10,137,16,ES_AUTOHSCROLL | \r
-                    ES_OEMCONVERT\r
-    GROUPBOX        "\83v\83\8c\83C\83\84\81[",IDC_GROUPBOX_PLAYERMODE,2,32,106,61,\r
-                    WS_GROUP\r
-    CONTROL         "\91S\8bÈ\89\89\91t\8cã\8fI\97¹",IDC_CHECKBOX_AUTOQUIT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,44,61,8\r
-    CONTROL         "\8fd\95¡\93o\98^\82ð\96h\8e~",IDC_CHECKBOX_AUTOUNIQ,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,56,59,8\r
-    CONTROL         "\89\89\91t\83t\83@\83C\83\8b\82Ì\82Ý\93o\98^",IDC_CHECKBOX_AUTOREFINE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,68,75,8\r
-    GROUPBOX        "\8c¾\8cê",IDC_GROUPBOX_LANGUAGE,160,101,40,38,WS_GROUP\r
-    CONTROL         "\93ú\96{\8cê",IDC_RADIOBUTTON_JAPANESE,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,163,113,30,8\r
-    CONTROL         "\89p\8cê",IDC_RADIOBUTTON_ENGLISH,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,163,126,25,8\r
-    CONTROL         "\88ê\8bÈ\89\89\91t\82µ\82Ä\92â\8e~",IDC_CHECKBOX_NOT_CONTINUE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,44,64,8\r
-    CONTROL         "\83h\83\89\83b\83O&&\83h\83\8d\83b\83v\82Å\8dÄ\90\82µ\82È\82¢",\r
-                    IDC_CHECKBOX_NOT_DRAG_START,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,7,56,97,8\r
-    GROUPBOX        "\83t\83H\83\8b\83_",IDC_STATIC,83,101,70,23\r
-    CONTROL         "\8dÄ\8bA\93I\82É\92T\8dõ",IDC_CHECK_SEACHDIRRECURSIVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,88,111,51,10\r
-    GROUPBOX        "\83h\83L\83\85\83\81\83\93\83g",IDC_STATIC,2,101,75,38\r
-    CONTROL         "\8e©\93®\95\\8e¦\82µ\82È\82¢",IDC_CHECK_DOCWNDINDEPENDENT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,112,56,8\r
-    GROUPBOX        "\90Ý\92è",IDC_STATIC,83,130,70,25\r
-    CONTROL         "\90Ý\92è\82Ì\8e©\93®\95Û\91¶",IDC_CHECK_INIFILE_AUTOSAVE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,88,140,59,10\r
-    CONTROL         "\83\8a\83s\81[\83g\82µ\82È\82¢",IDC_CHECKBOX_NOT_LOOPING,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,68,51,8\r
-    CONTROL         "\83I\81[\83g\83X\83^\81[\83g",IDC_CHECKBOX_AUTOSTART,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,80,56,8\r
-    CONTROL         "\83\89\83\93\83_\83\80\8dÄ\90¶",IDC_CHECKBOX_RANDOM,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,80,50,8\r
-    CONTROL         "\83|\83b\83v\83A\83b\83v",IDC_CHECK_DOCWNDAUTOPOPUP,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,124,59,10\r
-    GROUPBOX        "\83v\83\8c\83C\83\8a\83X\83g",IDC_STATIC,112,32,85,61\r
-END\r
-\r
-IDD_PREF_TIMIDITY1 DIALOG DISCARDABLE  0, 0, 210, 191\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    CONTROL         "\83R\81[\83\89\83X",IDC_CHECKBOX_CHORUS,"Button",BS_AUTOCHECKBOX | \r
-                    BS_LEFT | BS_TOP | WS_TABSTOP,6,17,41,10\r
-    CONTROL         "\83R\81[\83\89\83X\83\8c\83x\83\8b\8ew\92è",IDC_CHECKBOX_CHORUS_LEVEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,101,17,73,10\r
-    CONTROL         "\83\8a\83o\81[\83u",IDC_CHECKBOX_REVERB,"Button",BS_AUTOCHECKBOX | \r
-                    BS_LEFT | BS_TOP | WS_TABSTOP,6,31,41,10\r
-    CONTROL         "\83O\83\8d\81[\83o\83\8b\83\8a\83o\81[\83u",IDC_CHECKBOX_GLOBAL_REVERB,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,101,46,74,10\r
-    CONTROL         "\83\8a\83o\81[\83u\83\8c\83x\83\8b\8ew\92è",IDC_CHECKBOX_REVERB_LEVEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,101,31,74,10\r
-    EDITTEXT        IDC_EDIT_REVERB,177,31,24,10,ES_NUMBER\r
-    CONTROL         "L&&R \83f\83B\83\8c\83C",IDC_CHECKBOX_DELAY,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,101,61,\r
-                    57,10\r
-    CONTROL         "\8d¶",IDC_RADIOBUTTON_DELAY_LEFT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,109,76,23,10\r
-    CONTROL         "\89E",IDC_RADIOBUTTON_DELAY_RIGHT,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,135,76,23,10\r
-    CONTROL         "\89ñ\93]",IDC_RADIOBUTTON_DELAY_CENTER,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,161,76,30,10\r
-    LTEXT           "\92x\89\84(msec)",IDC_STATIC,113,91,35,8,NOT WS_GROUP | \r
-                    WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_DELAY,151,89,32,10,ES_NUMBER\r
-    LTEXT           "\83m\83C\83Y\83V\83F\83C\83s\83\93\83O (0..4)",IDC_STATIC,101,117,74,8,NOT \r
-                    WS_GROUP | WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_NOISESHARPING,178,115,16,10,ES_NUMBER\r
-    CONTROL         "\83\82\83W\83\85\83\8c\81[\83V\83\87\83\93",IDC_CHECKBOX_MODWHEEL,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,45,63,10\r
-    CONTROL         "\83|\83\8b\83^\83\81\83\93\83g",IDC_CHECKBOX_PORTAMENTO,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,59,50,10\r
-    CONTROL         "NRPN \83r\83u\83\89\81[\83g",IDC_CHECKBOX_NRPNVIB,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,73,65,10\r
-    CONTROL         "\83`\83\83\83\93\83l\83\8b\83v\83\8c\83b\83V\83\83\81[",IDC_CHECKBOX_CHPRESS,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,87,80,10\r
-    CONTROL         "\93¯\88ê\89¹\82Ì\8fd\95¡\82ð\8b\96\82·",IDC_CHECKBOX_OVOICE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,115,77,10\r
-    CONTROL         "\83e\83L\83X\83g\83\81\83^\83C\83x\83\93\83g",IDC_CHECKBOX_TRACETEXT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,101,73,10\r
-    LTEXT           "\8ec\8b¿\8cø\89Ê(0..1000)",IDC_STATIC,101,105,52,8,NOT WS_GROUP | \r
-                    WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_MODIFY_RELEASE,155,103,28,10\r
-    GROUPBOX        "GM/GS/XG",IDC_STATIC,1,3,91,182\r
-    GROUPBOX        "\93Á\8eê",IDC_STATIC,97,3,113,187\r
-    CONTROL         "\83A\83^\83b\83N\81E\83^\83C\83\80",IDC_CHECKBOX_TVAA,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,129,59,10\r
-    CONTROL         "\83f\83B\83P\83C\81E\83^\83C\83\80",IDC_CHECKBOX_TVAD,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,143,61,10\r
-    CONTROL         "\83\8a\83\8a\81[\83X\81E\83^\83C\83\80",IDC_CHECKBOX_TVAR,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,157,61,10\r
-    EDITTEXT        IDC_EDIT_CHORUS,177,16,24,10,ES_NUMBER\r
-    CONTROL         "\83f\83B\83\8c\83C",IDC_CHECKBOX_PDELAY,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,6,171,39,10\r
-    CONTROL         "\83T\83\89\83E\83\93\83h\83R\81[\83\89\83X",IDC_CHECKBOX_SRCHORUS,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,101,130,70,10\r
-    CONTROL         "\8bU\83\8c\83]\83i\83\93\83X",IDC_CHECKBOX_RESONANCE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,101,146,53,10\r
-    EDITTEXT        IDC_EDIT_ENV_ATTACK,161,160,28,10\r
-    EDITTEXT        IDC_EDIT_VELOCITYTABLE,178,174,28,10\r
-    LTEXT           "\83A\83^\83b\83N\83^\83C\83v (0..3)",IDC_STATIC,101,162,56,8,NOT \r
-                    WS_GROUP | WS_TABSTOP\r
-    LTEXT           "\83x\83\8d\83V\83e\83B\83e\81[\83u\83\8b (0..2)",IDC_STATIC,101,175,72,8,NOT \r
-                    WS_GROUP | WS_TABSTOP\r
-END\r
-\r
-IDD_PREF_TIMIDITY2 DIALOG DISCARDABLE  0, 0, 213, 141\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    LTEXT           "\8dÅ\91å\93¯\8e\9e\94­\89¹\90\94(\83{\83C\83X)",IDC_STATIC,6,19,71,8,NOT \r
-                    WS_GROUP\r
-    EDITTEXT        IDC_EDIT_VOICES,78,19,24,12,ES_NUMBER\r
-    LTEXT           "\83{\83\8a\83\85\81[\83\80(%)",IDC_STATIC,6,33,40,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_AMPLIFICATION,47,31,24,12\r
-    CONTROL         "\88ê\8bÈ\96\88\82É\83p\83b\83`\82ð\83A\83\93\83\8d\81[\83h",IDC_CHECKBOX_FREE_INST,\r
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,\r
-                    6,75,92,10\r
-    CONTROL         "\83A\83\93\83`\83G\83C\83\8a\83A\83X",IDC_CHECKBOX_ANTIALIAS,"Button",\r
-                    BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | WS_TABSTOP,6,49,62,\r
-                    10\r
-    CONTROL         "\89\89\91t\92\86\82É\83p\83b\83`\82ð\83\8d\81[\83h",IDC_CHECKBOX_LOADINST_PLAYING,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,63,83,10\r
-    LTEXT           "\83L\83\83\83b\83V\83\85\97e\97Ê",IDC_STATIC,117,19,44,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CACHE_SIZE,162,17,39,12\r
-    CONTROL         "\94­\89¹\90\94\82ð\8e©\93®\92²\90®",IDC_CHECKBOX_REDUCE_VOICE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,89,67,8\r
-    LTEXT           "\95W\8f\80\82Ì\83o\83\93\83N",IDC_STATIC,117,37,41,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_DEFAULT_TONEBANK,158,35,24,12\r
-    CONTROL         "\83o\83\93\83N\8b­\90§",IDC_CHECKBOX_SPECIAL_TONEBANK,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,54,43,8\r
-    EDITTEXT        IDC_EDIT_SPECIAL_TONEBANK,161,52,24,12\r
-    CONTROL         "GM",IDC_RADIOBUTTON_GM,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,14,117,22,8\r
-    CONTROL         "GS",IDC_RADIOBUTTON_GS,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,39,117,20,8\r
-    CONTROL         "XG",IDC_RADIOBUTTON_XG,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,63,117,20,8\r
-    CONTROL         "\83g\83\8c\81[\83X\83\82\81[\83h",IDC_CHECKBOX_CTL_TRACE_PLAYING,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,117,88,54,8\r
-    LTEXT           "\83R\83\93\83\\81[\83\8b\83\8c\83x\83\8b",IDC_STATIC,117,105,51,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CTL_VEBOSITY,170,103,20,12\r
-    LTEXT           "\90§\8cä\83\8c\81[\83g",IDC_STATIC,117,72,32,8,NOT WS_GROUP\r
-    EDITTEXT        IDC_EDIT_CONTROL_RATIO,149,70,24,12\r
-    GROUPBOX        "\95W\8f\80\82Å\97\98\97p\82·\82é\8bK\8ai",IDC_GROUPBOX_DEFAULT_MIDI_TYPE,6,\r
-                    105,87,27\r
-    GROUPBOX        "\8d\82\93x\82È\90Ý\92è",IDC_STATIC,111,3,100,119\r
-    GROUPBOX        "\8dÄ\90¶",IDC_STATIC,1,3,107,133\r
-END\r
-\r
-IDD_PREF_TIMIDITY3 DIALOG DISCARDABLE  0, 0, 205, 181\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    GROUPBOX        "\8fo\97Í",IDC_STATIC,1,0,203,180,WS_GROUP | WS_TABSTOP\r
-    GROUPBOX        "\8fo\97Í\83\82\81[\83h",IDC_STATIC,4,14,171,33,WS_GROUP | \r
-                    WS_TABSTOP\r
-    CONTROL         "8\83r\83b\83g",IDC_CHECKBOX_8BITS,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,23,29,8\r
-    CONTROL         "16\83r\83b\83g",IDC_CHECKBOX_16BITS,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,8,35,32,8\r
-    CONTROL         "U-Law",IDC_CHECKBOX_ULAW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,23,31,8\r
-    CONTROL         "A-Law",IDC_CHECKBOX_ALAW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,35,31,8\r
-    CONTROL         "\95\84\8d\86\95t\82«",IDC_CHECKBOX_SIGNED,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,77,23,37,8\r
-    CONTROL         "\95\84\8d\86\96³\82µ",IDC_CHECKBOX_UNSIGNED,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,77,35,37,8\r
-    CONTROL         "\83o\83C\83g\94½\93]",IDC_CHECKBOX_BYTESWAP,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,119,23,43,8\r
-    CONTROL         "Linear PCM",IDC_CHECKBOX_LINEAR,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,119,35,45,8\r
-    GROUPBOX        "\83`\83\83\83\93\83l\83\8b",IDC_STATIC,4,55,45,33,WS_GROUP | WS_TABSTOP\r
-    CONTROL         "\83X\83e\83\8c\83I",IDC_RADIO_STEREO,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,8,65,36,10\r
-    CONTROL         "\83\82\83m\83\89\83\8b",IDC_RADIO_MONO,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,8,77,35,8\r
-    LTEXT           "\83T\83\93\83v\83\8b\83\8c\81[\83g(Hz)",IDC_STATIC,65,60,56,8,WS_TABSTOP\r
-    EDITTEXT        IDC_EDIT_SAMPLE_RATE,122,58,32,10,ES_NUMBER | WS_GROUP\r
-    PUSHBUTTON      "L",IDC_BUTTON_LOW,65,73,8,14,BS_CENTER\r
-    PUSHBUTTON      "M",IDC_BUTTON_MIDDLE,73,73,10,14,BS_CENTER\r
-    PUSHBUTTON      "H",IDC_BUTTON_HIGH,84,73,10,14,BS_CENTER\r
-    PUSHBUTTON      "4",IDC_BUTTON_4,95,73,8,14,BS_CENTER\r
-    PUSHBUTTON      "8",IDC_BUTTON_8,103,73,8,14,BS_CENTER\r
-    PUSHBUTTON      "16",IDC_BUTTON_16,111,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "24",IDC_BUTTON_24,123,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "32",IDC_BUTTON_32,135,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "40",IDC_BUTTON_40,147,73,12,14,BS_CENTER\r
-    PUSHBUTTON      "48",IDC_BUTTON_48,159,73,12,14,BS_CENTER\r
-    GROUPBOX        "\8fo\97Í\95û\96@",IDC_GROUPBOX_OUTPUT,4,102,193,49,WS_GROUP | \r
-                    WS_TABSTOP\r
-    PUSHBUTTON      "\8fo\97Í\83t\83@\83C\83\8b",IDC_BUTTON_OUTPUT_FILE,4,156,42,14,\r
-                    BS_CENTER | WS_GROUP\r
-    EDITTEXT        IDC_EDIT_OUTPUT_FILE,47,156,130,15,ES_AUTOHSCROLL | \r
-                    ES_OEMCONVERT | WS_GROUP\r
-    PUSHBUTTON      "\8dí\8f\9c",IDC_BUTTON_OUTPUT_FILE_DEL,178,156,19,14,\r
-                    BS_CENTER\r
-    COMBOBOX        IDC_COMBO_OUTPUT,8,116,151,64,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "\83I\83v\83V\83\87\83\93",IDC_BUTTON_OUTPUT_OPTIONS,160,115,34,14\r
-    COMBOBOX        IDC_COMBO_OUTPUT_MODE,8,134,186,72,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-END\r
-\r
-IDD_PREF_TIMIDITY4 DIALOG DISCARDABLE  0, 0, 181, 143\r
-STYLE DS_SYSMODAL | DS_3DLOOK | DS_CONTROL | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | \r
-    WS_POPUP | WS_VISIBLE | WS_CAPTION\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    CONTROL         "Ch01",IDC_CHECKBOX_CH01,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,16,28,8\r
-    CONTROL         "Ch02",IDC_CHECKBOX_CH02,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,24,28,8\r
-    CONTROL         "Ch03",IDC_CHECKBOX_CH03,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,32,28,8\r
-    CONTROL         "Ch04",IDC_CHECKBOX_CH04,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,40,28,8\r
-    CONTROL         "Ch05",IDC_CHECKBOX_CH05,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,48,28,8\r
-    CONTROL         "Ch06",IDC_CHECKBOX_CH06,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,56,28,8\r
-    CONTROL         "Ch07",IDC_CHECKBOX_CH07,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,64,28,8\r
-    CONTROL         "Ch08",IDC_CHECKBOX_CH08,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,72,28,8\r
-    CONTROL         "Ch09",IDC_CHECKBOX_CH09,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,16,28,8\r
-    CONTROL         "Ch10",IDC_CHECKBOX_CH10,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,24,28,8\r
-    CONTROL         "Ch11",IDC_CHECKBOX_CH11,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,32,28,8\r
-    CONTROL         "Ch12",IDC_CHECKBOX_CH12,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,40,28,8\r
-    CONTROL         "Ch13",IDC_CHECKBOX_CH13,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,48,28,8\r
-    CONTROL         "Ch14",IDC_CHECKBOX_CH14,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,56,28,8\r
-    CONTROL         "Ch15",IDC_CHECKBOX_CH15,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,64,28,8\r
-    CONTROL         "Ch16",IDC_CHECKBOX_CH16,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,41,72,28,8\r
-    CONTROL         "Ch17",IDC_CHECKBOX_CH17,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,16,28,8\r
-    CONTROL         "Ch18",IDC_CHECKBOX_CH18,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,24,28,8\r
-    CONTROL         "Ch19",IDC_CHECKBOX_CH19,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,32,28,8\r
-    CONTROL         "Ch20",IDC_CHECKBOX_CH20,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,40,28,8\r
-    CONTROL         "Ch21",IDC_CHECKBOX_CH21,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,48,28,8\r
-    CONTROL         "Ch22",IDC_CHECKBOX_CH22,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,56,28,8\r
-    CONTROL         "Ch23",IDC_CHECKBOX_CH23,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,64,28,8\r
-    CONTROL         "Ch24",IDC_CHECKBOX_CH24,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,73,72,28,8\r
-    CONTROL         "Ch25",IDC_CHECKBOX_CH25,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,16,28,8\r
-    CONTROL         "Ch26",IDC_CHECKBOX_CH26,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,24,28,8\r
-    CONTROL         "Ch27",IDC_CHECKBOX_CH27,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,32,28,8\r
-    CONTROL         "Ch28",IDC_CHECKBOX_CH28,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,40,28,8\r
-    CONTROL         "Ch29",IDC_CHECKBOX_CH29,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,48,28,8\r
-    CONTROL         "Ch30",IDC_CHECKBOX_CH30,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,56,28,8\r
-    CONTROL         "Ch31",IDC_CHECKBOX_CH31,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,64,28,8\r
-    CONTROL         "Ch32",IDC_CHECKBOX_CH32,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,106,72,28,8\r
-    CONTROL         "\83f\83t\83H\83\8b\83g\82Ì\83h\83\89\83\80\83`\83\83\83\93\83l\83\8b",IDC_CHECKBOX_DRUM_CHANNEL,\r
-                    "Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,87,\r
-                    95,13\r
-    CONTROL         "\83h\83\89\83\80\83p\81[\83g\8e©\93®\94F\8e¯\82ð\96³\8e\8b\82·\82é\83`\83\83\83\93\83l\83\8b",\r
-                    IDC_CHECKBOX_DRUM_CHANNEL_MASK,"Button",BS_AUTOCHECKBOX | \r
-                    BS_PUSHLIKE | WS_TABSTOP,9,105,137,14\r
-    CONTROL         "\83~\83\85\81[\83g\82·\82é\83`\83\83\83\93\83l\83\8b",IDC_CHECKBOX_QUIET_CHANNEL,\r
-                    "Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,9,\r
-                    124,76,13\r
-    PUSHBUTTON      "\91S\82Ä\94½\93]",IDC_BUTTON_REVERSE,141,18,31,61\r
-    GROUPBOX        "\83`\83\83\83\93\83l\83\8b",IDC_STATIC,1,3,179,138\r
-END\r
-\r
-IDD_DIALOG_WAVEFORM DIALOGEX 0, 0, 240, 120\r
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION\r
-EXSTYLE WS_EX_DLGMODALFRAME\r
-FONT 9, "Times New Roman", 400, 0\r
-BEGIN\r
-END\r
-\r
-IDD_DIALOG_SEARCHBOX DIALOG DISCARDABLE  0, 0, 183, 54\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Seach"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,70,33,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,126,33,50,14\r
-    EDITTEXT        IDC_EDIT1,7,7,169,24,ES_AUTOHSCROLL | ES_OEMCONVERT\r
-END\r
-\r
-IDD_DIALOG_VORBIS DIALOG DISCARDABLE  0, 0, 197, 93\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Ogg Vorbis \90Ý\92è\83_\83C\83A\83\8d\83O"\r
-FONT 9, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    CONTROL         "\83f\83t\83H\83\8b\83g\90Ý\92è",IDC_CHECK_DEFAULT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,0,56,10\r
-    COMBOBOX        IDC_COMBO_MODE,25,13,123,56,CBS_DROPDOWNLIST | CBS_SORT | \r
-                    WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "\83^\83C\83g\83\8b",IDC_STATIC,4,49,23,8\r
-    EDITTEXT        IDC_EDIT1,41,48,152,14,ES_AUTOHSCROLL | WS_DISABLED\r
-    LTEXT           "\83A\81[\83e\83B\83X\83g",IDC_STATIC,4,63,36,8\r
-    EDITTEXT        IDC_EDIT2,41,76,152,14,ES_AUTOHSCROLL | WS_DISABLED\r
-    LTEXT           "\83A\83\8b\83o\83\80",IDC_STATIC,4,77,27,8\r
-    EDITTEXT        IDC_EDIT3,41,62,152,14,ES_AUTOHSCROLL | WS_DISABLED\r
-    CONTROL         "\8e\9f\82Ì\8fî\95ñ\82ð\8f\91\82«\8d\9e\82Þ",IDC_CHECK_USE_TAG,"Button",\r
-                    BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,4,32,73,10\r
-    LTEXT           "\83\82\81[\83h",IDC_STATIC,4,16,18,8\r
-    PUSHBUTTON      "OK",IDOK,152,2,40,12\r
-    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,152,30,40,12\r
-    PUSHBUTTON      "\93K\97p",IDC_BUTTON_APPLY,152,14,40,11\r
-END\r
-\r
-IDD_DIALOG_GOGO DIALOG DISCARDABLE  0, 0, 346, 196\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "MP3(\8cß\8cã\82Ì\82±\81`\82¾) \90Ý\92è\83_\83C\83A\83\8d\83O"\r
-FONT 8, "\82l\82\82o\83S\83V\83b\83N"\r
-BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,173,179,50,14\r
-    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,285,179,50,14\r
-    COMBOBOX        IDC_COMBO_OUTPUT_FORMAT,4,36,72,64,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "\83f\83t\83H\83\8b\83g\90Ý\92è",IDC_CHECK_DEFAULT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,0,80,10\r
-    CONTROL         "\83R\83}\83\93\83h\83\89\83C\83\93\83I\83v\83V\83\87\83\93",IDC_CHECK_COMMANDLINE_OPTS,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,12,86,10\r
-    EDITTEXT        IDC_EDIT_COMMANDLINE_OPTION,91,10,232,14,ES_AUTOHSCROLL\r
-    COMBOBOX        IDC_COMBO_MPEG1_AUDIO_BITRATE,6,72,76,76,\r
-                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_COMBO_MPEG2_AUDIO_BITRATE,87,72,76,76,\r
-                    CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_COMBO_VBR_BITRATE_LOW,6,119,76,64,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "VBR - \8dÅ\8d\82",IDC_STATIC,86,110,55,8\r
-    COMBOBOX        IDC_COMBO_VBR_BITRATE_HIGH,86,119,76,64,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "16KHz \83\8d\81[\83p\83X\83t\83B\83\8b\83^",IDC_CHECK_16KHZ_LOW_PASS_FILTER,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,57,89,8\r
-    CONTROL         "\83G\83\93\83n\83\93\83X\83g\83\8d\81[\83p\83X\83t\83B\83\8b\83^",\r
-                    IDC_CHECK_ENHANCED_LOW_PASS_FILTER,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,176,68,104,8\r
-    EDITTEXT        IDC_EDIT_LPF_PARA1,200,77,28,12\r
-    EDITTEXT        IDC_EDIT_LPF_PARA2,251,77,28,12\r
-    LTEXT           "para1",IDC_STATIC,183,79,16,8\r
-    LTEXT           "para2",IDC_STATIC,233,79,16,8\r
-    COMBOBOX        IDC_COMBO_ENCODE_MODE,172,36,84,60,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "\90S\97\9d\89ð\90Í",IDC_CHECK_USEPSY,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,176,90,42,10\r
-    CONTROL         "MMX",IDC_CHECK_CPUMMX,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,193,151,29,10\r
-    CONTROL         "SSE",IDC_CHECK_CPUSSE,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,193,163,27,10\r
-    CONTROL         "3DNOW",IDC_CHECK_CPU3DNOW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,227,151,39,10\r
-    CONTROL         "E3DNOW",IDC_CHECK_CPUE3DNOW,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,227,163,40,10\r
-    COMBOBOX        IDC_COMBO_EMPHASIS_TYPE,268,36,76,64,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_COMBO_VBR,37,92,124,72,CBS_DROPDOWNLIST | CBS_SORT | \r
-                    WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "VBR",IDC_CHECK_VBR,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,6,94,29,10\r
-    CONTROL         "\8eü\94g\90\94",IDC_CHECK_OUTFREQ,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,88,28,35,8\r
-    EDITTEXT        IDC_EDIT_OUTFREQ,88,36,72,12\r
-    CONTROL         "J-Stereo\82Å\82Ì Stereo/MS-Stereo \82Ì\90Ø\91Ö\82¦\90§\8cä",\r
-                    IDC_CHECK_MSTHRESHOLD,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,176,103,167,8\r
-    EDITTEXT        IDC_EDIT_MSTHRESHOLD_THRESHOLD,200,112,28,12\r
-    EDITTEXT        IDC_EDIT_MSTHRESHOLD_MSPOWER,252,112,28,12\r
-    LTEXT           "para1",IDC_STATIC,183,114,16,8\r
-    LTEXT           "para2",IDC_STATIC,233,114,16,8\r
-    CONTROL         "\83x\83\8a\83t\83@\83C",IDC_CHECK_VERIFY,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,176,127,45,10\r
-    PUSHBUTTON      "\93K\97p",IDC_BUTTON_APPLY,229,179,50,14\r
-    CONTROL         "\88È\89º\82Ì\96½\97ß\82ð\8eg\82¤",IDC_CHECK_USE_CPU_OPTS,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,176,140,68,8\r
-    CONTROL         "MPEG1Audio",IDC_CHECK_MPEG1AUDIOBITRATE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,64,80,8\r
-    CONTROL         "MPEG2Audio",IDC_CHECK_MPEG2AUDIOBITRATE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,87,64,80,8\r
-    CONTROL         "VBR - \8dÅ\92á",IDC_CHECK_VBR_BITRATE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,110,67,8\r
-    CONTROL         "\8fo\97Í\83t\83H\81[\83}\83b\83g",IDC_CHECK_OUTPUT_FORMAT,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,28,64,8\r
-    CONTROL         "\83\82\81[\83h",IDC_CHECK_ENCODE_MODE,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,172,28,34,8\r
-    CONTROL         "\83G\83\93\83t\83@\83V\83X",IDC_CHECK_EMPHASIS_TYPE,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,268,28,62,8\r
-    GROUPBOX        "\83r\83b\83g\83\8c\81[\83g",IDC_STATIC,2,55,167,86\r
-END\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Icon\r
-//\r
-\r
-// Icon with lowest ID value placed first to ensure application icon\r
-// remains consistent on all systems.\r
-IDI_ICON_TIMIDITY       ICON    DISCARDABLE     "w32g_icon.ico"\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Menu\r
-//\r
-\r
-IDM_MENU_MAIN_EN MENU DISCARDABLE \r
-BEGIN\r
-    POPUP "File(&F)"\r
-    BEGIN\r
-        MENUITEM "open File(&F)",               IDM_MFOPENFILE\r
-        MENUITEM "open Directory(&D)",          IDM_MFOPENDIR\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "load Playlist(&P)",           IDM_MFLOADPLAYLIST\r
-        MENUITEM "Save Playlist as(&S)",        IDM_MFSAVEPLAYLISTAS\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "eXit(&X)",                    IDM_MFEXIT\r
-    END\r
-    POPUP "Config(&C)"\r
-    BEGIN\r
-        MENUITEM "Preference(&P)",              IDM_SETTING\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Load ini file(&L)",           IDM_MCLOADINIFILE\r
-        MENUITEM "Save ini file(&S)",           IDM_MCSAVEINIFILE\r
-    END\r
-    POPUP "Window(&W)"\r
-    BEGIN\r
-        MENUITEM "play List(&L)",               IDM_MWPLAYLIST\r
-        MENUITEM "Tracer(&T)",                  IDM_MWTRACER\r
-        MENUITEM "Document(&D)",                IDM_MWDOCUMENT\r
-        MENUITEM "Wrd tracer(&W)",              IDM_MWWRDTRACER\r
-        MENUITEM "sound Spectogram(&S)",        IDM_MWSOUNDSPEC\r
-        MENUITEM "Console(&C)",                 IDM_MWCONSOLE\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "deBug(&B)",                   IDM_MWDEBUG\r
-    END\r
-    POPUP "Help(&H)"\r
-    BEGIN\r
-        MENUITEM "Topic(&T)",                   IDM_MHTOPIC\r
-        MENUITEM "Help(&H)",                    IDM_MHHELP\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "TiMidity(&T)",                IDM_MHTIMIDITY\r
-        MENUITEM "Version(&V)",                 IDM_MHVERSION\r
-    END\r
-END\r
-\r
-IDM_MENU_MAIN MENU DISCARDABLE \r
-BEGIN\r
-    POPUP "\83t\83@\83C\83\8b(&F)"\r
-    BEGIN\r
-        MENUITEM "\83t\83@\83C\83\8b\82ð\8aJ\82­(&F)",          IDM_MFOPENFILE\r
-        MENUITEM "\83t\83H\83\8b\83_\82ð\8aJ\82­(&D)",          IDM_MFOPENDIR\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "\83v\83\8c\83C\83\8a\83X\83g\82ð\8aJ\82­(&P)",      IDM_MFLOADPLAYLIST\r
-        MENUITEM "\83v\83\8c\83C\83\8a\83X\83g\82ð\95Û\91¶(&S)",      IDM_MFSAVEPLAYLISTAS\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "\8fI\97¹(&X)",                    IDM_MFEXIT\r
-    END\r
-    POPUP "\90Ý\92è(&C)"\r
-    BEGIN\r
-        MENUITEM "\8fÚ\8d×\90Ý\92è(&P)",                IDM_SETTING\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "\90Ý\92è\93Ç\8d\9e(&L)",                IDM_MCLOADINIFILE\r
-        MENUITEM "\90Ý\92è\95Û\91¶(&S)",                IDM_MCSAVEINIFILE\r
-    END\r
-    POPUP "\83E\83B\83\93\83h\83E(&W)"\r
-    BEGIN\r
-        MENUITEM "\83v\83\8c\83C\83\8a\83X\83g(&L)",            IDM_MWPLAYLIST\r
-        MENUITEM "\83g\83\8c\81[\83T(&T)",                IDM_MWTRACER, GRAYED\r
-        MENUITEM "\83h\83L\83\85\83\81\83\93\83g(&D)",            IDM_MWDOCUMENT\r
-        MENUITEM "WRD(&W)",                     IDM_MWWRDTRACER, GRAYED\r
-        MENUITEM "Sound Spectogram(&S)",        IDM_MWSOUNDSPEC, GRAYED\r
-        MENUITEM "\83R\83\93\83\\81[\83\8b(&C)",              IDM_MWCONSOLE\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "\83f\83o\83b\83O(&B)",                IDM_MWDEBUG\r
-    END\r
-    POPUP "\83w\83\8b\83v(&H)"\r
-    BEGIN\r
-        MENUITEM "\83g\83s\83b\83N(&T)",                IDM_MHTOPIC, GRAYED\r
-        MENUITEM "\83w\83\8b\83v(&H)",                  IDM_MHHELP, GRAYED\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "TiMidity\82É\82Â\82¢\82Ä(&T)",        IDM_MHTIMIDITY\r
-        MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&V)",          IDM_MHVERSION\r
-    END\r
-END\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Bitmap\r
-//\r
-\r
-IDB_BITMAP_MAIN_BUTTON  BITMAP  MOVEABLE PURE   "w32g_btn.bmp"\r
-IDB_BITMAP_SUBWND_BUTTON BITMAP  MOVEABLE PURE   "w32g_subbtn.bmp"\r
-IDB_BITMAP_SLEEP        BITMAP  MOVEABLE PURE   "w32g_sleep.bmp"\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// TEXTINCLUDE\r
-//\r
-\r
-1 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "w32g_res.h\0"\r
-END\r
-\r
-2 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"\r
-    "#include ""windows.h""\r\n"\r
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"\r
-    "#include ""commctrl.h""\r\n"\r
-    "#include ""w32g_rec.h""\r\n"\r
-    "\0"\r
-END\r
-\r
-3 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "\r\n"\r
-    "\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// DESIGNINFO\r
-//\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO DISCARDABLE \r
-BEGIN\r
-    IDD_DIALOG_CONSOLE, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 241\r
-        BOTTOMMARGIN, 181\r
-    END\r
-\r
-    IDD_DIALOG_DOC, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 268\r
-        BOTTOMMARGIN, 255\r
-    END\r
-\r
-    IDD_DIALOG_SIMPLE_LIST, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 241\r
-        BOTTOMMARGIN, 185\r
-    END\r
-\r
-    IDD_DIALOG_SIMPLE_LIST_EN, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 241\r
-        BOTTOMMARGIN, 179\r
-    END\r
-\r
-    IDD_PREF_PLAYER, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 197\r
-        BOTTOMMARGIN, 99\r
-    END\r
-\r
-    IDD_PREF_TIMIDITY1, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 145\r
-        BOTTOMMARGIN, 148\r
-    END\r
-\r
-    IDD_PREF_TIMIDITY2, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 209\r
-        BOTTOMMARGIN, 122\r
-    END\r
-\r
-    IDD_PREF_TIMIDITY3, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 190\r
-        BOTTOMMARGIN, 138\r
-    END\r
-\r
-    IDD_PREF_TIMIDITY4, DIALOG\r
-    BEGIN\r
-        RIGHTMARGIN, 168\r
-        BOTTOMMARGIN, 125\r
-    END\r
-\r
-    IDD_DIALOG_SEARCHBOX, DIALOG\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 176\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 47\r
-    END\r
-\r
-    IDD_DIALOG_VORBIS, DIALOG\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 190\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 86\r
-    END\r
-\r
-    IDD_DIALOG_GOGO, DIALOG\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 339\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 189\r
-    END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-#ifndef _MAC\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Version\r
-//\r
-\r
-VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,10,0,4\r
- PRODUCTVERSION 2,10,0,4\r
- FILEFLAGSMASK 0x3fL\r
-#ifdef _DEBUG\r
- FILEFLAGS 0x1L\r
-#else\r
- FILEFLAGS 0x0L\r
-#endif\r
- FILEOS 0x40004L\r
- FILETYPE 0x1L\r
- FILESUBTYPE 0x0L\r
-BEGIN\r
-    BLOCK "StringFileInfo"\r
-    BEGIN\r
-        BLOCK "000004e4"\r
-        BEGIN\r
-            VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "\0"\r
-            VALUE "FileDescription", "timw32g\0"\r
-            VALUE "FileVersion", "2, 10, 0, 4\0"\r
-            VALUE "InternalName", "timw32g\0"\r
-            VALUE "LegalCopyright", "Copyright (C) 1999,2001 Masanao Izumo <mo@goice.co.jp>\r\nCopyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>\0"\r
-            VALUE "LegalTrademarks", "\0"\r
-            VALUE "OriginalFilename", "timw32g.exe\0"\r
-            VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "TiMidity++ Win32GUI Version\0"\r
-            VALUE "ProductVersion", "2, 10, 0, 4\0"\r
-            VALUE "SpecialBuild", "\0"\r
-        END\r
-    END\r
-    BLOCK "VarFileInfo"\r
-    BEGIN\r
-        VALUE "Translation", 0x0, 1252\r
-    END\r
-END\r
-\r
-#endif    // !_MAC\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// String Table\r
-//\r
-\r
-STRINGTABLE DISCARDABLE \r
-BEGIN\r
-    IDM_MHVERSION           "Version information of TiMidity++."\r
-    IDM_SETTING             "Open the dialog of the modification of TiMidity parameters."\r
-END\r
-\r
-STRINGTABLE DISCARDABLE \r
-BEGIN\r
-    IDM_MFOPENFILE          "Open midi files and add them to the playlist."\r
-    IDM_MFOPENDIR           "Not Supported."\r
-    IDM_MFLOADPLAYLIST      "Not Supported."\r
-    IDM_MFSAVEPLAYLISTAS    "Not Supported."\r
-    IDM_MFEXIT              "Exit TiMidity."\r
-    IDM_MCLOADINIFILE       "Load ini file to apply TiMidity parameters."\r
-    IDM_MCSAVEINIFILE       "Save ini file to save TiMidity parameters."\r
-    IDM_MWPLAYLIST          "Open/Close playlist window to select midi files."\r
-    IDM_MWTRACER            "Not Supported."\r
-    IDM_MWDOCUMENT          "Not Supported."\r
-    IDM_MWWRDTRACER         "Not Supported."\r
-    IDM_MWSOUNDSPEC         "Not Supported."\r
-    IDM_MWCONSOLE           "Open/Close Console Window."\r
-    IDM_MWDEBUG             "For debugging by developpers of TiMidity."\r
-    IDM_MHTOPIC             "Not Supported."\r
-    IDM_MHHELP              "Not Supported."\r
-END\r
-\r
-STRINGTABLE DISCARDABLE \r
-BEGIN\r
-    IDM_MHTIMIDITY          "Copying of TiMidity++."\r
-END\r
-\r
-#endif    // \93ú\96{\8cê resources\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-\r
-\r
-#ifndef APSTUDIO_INVOKED\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Generated from the TEXTINCLUDE 3 resource.\r
-//\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-#endif    // not APSTUDIO_INVOKED\r
-\r
index 89b41c0..2f5b3f8 100644 (file)
@@ -88,6 +88,8 @@ extern void PrintfEditCtlWnd(HWND hwnd, char *fmt, ...);
 extern void PutsEditCtlWnd(HWND hwnd, char *str);\r
 extern void ClearEditCtlWnd(HWND hwnd);\r
 \r
+extern char *nkf_convert(char *si,char *so,int maxsize,char *in_mode,char *out_mode);\r
+\r
 // ***************************************************************************\r
 //\r
 // Console Window\r
@@ -343,6 +345,7 @@ void InitListWnd(HWND hParentWnd)
 \r
        ListWndInfo.hPopupMenu = CreatePopupMenu();\r
        AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_PLAY,"Play");\r
+       AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDC_BUTTON_DOC,"Doc");\r
        AppendMenu(ListWndInfo.hPopupMenu,MF_SEPARATOR,0,0);\r
        AppendMenu(ListWndInfo.hPopupMenu,MF_STRING,IDM_LISTWND_REMOVE,"Remove");\r
        AppendMenu(ListWndInfo.hPopupMenu,MF_SEPARATOR,0,0);\r
@@ -360,6 +363,7 @@ void InitListWnd(HWND hParentWnd)
 \r
 void SetNumListWnd(int cursel, int nfiles);\r
 \r
+#define WM_CHOOSEFONT_DIAG     (WM_APP+100)\r
 static BOOL CALLBACK\r
 ListWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)\r
 {\r
@@ -376,18 +380,33 @@ ListWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
        case WM_SETCURSOR:\r
                switch(HIWORD(lParam)){\r
                case WM_RBUTTONDOWN:\r
-                       {\r
+                       if(LOWORD(lParam)!=HTCAPTION){  // \83^\83C\83g\83\8b\83o\81[\82É\82È\82¢\82Æ\82«\r
                                POINT point;\r
+                               int res;\r
                                GetCursorPos(&point);\r
-                               TrackPopupMenu(ListWndInfo.hPopupMenu,TPM_TOPALIGN|TPM_LEFTALIGN,\r
+                               res = TrackPopupMenu(ListWndInfo.hPopupMenu,TPM_TOPALIGN|TPM_LEFTALIGN,\r
                                        point.x,point.y,0,hwnd,NULL);\r
+                               return TRUE;\r
                        }\r
                        break;\r
                default:\r
                        break;\r
                }\r
                break;\r
-               case WM_COMMAND:\r
+       case WM_CHOOSEFONT_DIAG:\r
+               {\r
+                       char fontName[64];\r
+                       int fontHeight;\r
+                       int fontWidth;\r
+                       strcpy(fontName,ListWndInfo.fontName);\r
+                       fontHeight = ListWndInfo.fontHeight;\r
+                       fontWidth = ListWndInfo.fontWidth;\r
+                       if(DlgChooseFont(hwnd,fontName,&fontHeight,&fontWidth)==0){\r
+                               ListWndSetFontListBox(fontName,fontWidth,fontHeight);\r
+                       }\r
+               }\r
+               break;\r
+       case WM_COMMAND:\r
                        switch (HIWORD(wParam)) {\r
                        case IDCLOSE:\r
                                ShowWindow(hwnd, SW_HIDE);\r
@@ -444,15 +463,7 @@ ListWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
                                return FALSE;\r
                        case IDM_LISTWND_CHOOSEFONT:\r
                                {\r
-                                       char fontName[64];\r
-                                       int fontHeight;\r
-                                       int fontWidth;\r
-                                       strcpy(fontName,ListWndInfo.fontName);\r
-                                       fontHeight = ListWndInfo.fontHeight;\r
-                                       fontWidth = ListWndInfo.fontWidth;\r
-                                       if(DlgChooseFont(hwnd,fontName,&fontHeight,&fontWidth)==0){\r
-                                               ListWndSetFontListBox(fontName,fontWidth,fontHeight);\r
-                                       }\r
+                                       SendMessage(hwnd,WM_CHOOSEFONT_DIAG,0,0);\r
                                }\r
                                return FALSE;\r
                        default:\r
@@ -818,6 +829,7 @@ WrdWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
 \r
 #define IDM_DOCWND_CHOOSEFONT 4232\r
 int DocWndIndependent = 0; /* Independent document viewer mode.(\93Æ\97§\83h\83L\83\85\83\81\83\93\83g\83r\83\85\83\8f\81[\83\82\81[\83h) */\r
+int DocWndAutoPopup = 0;\r
 DOCWNDINFO DocWndInfo;\r
 \r
 static BOOL CALLBACK DocWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam);\r
@@ -1507,12 +1519,13 @@ SoundSpecWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
 \r
 void w32g_open_doc(int close_if_no_doc)\r
 {\r
-       if(close_if_no_doc && DocWndInfo.DocFileMax <= 0)\r
+       if(close_if_no_doc==1 && DocWndInfo.DocFileMax <= 0)\r
                ShowSubWindow(hDocWnd, 0);\r
        else\r
        {\r
                DocWndReadDoc(1);\r
-               ShowSubWindow(hDocWnd, 1);\r
+               if(close_if_no_doc!=2)\r
+                       ShowSubWindow(hDocWnd, 1);\r
        }\r
 }\r
 \r
index 47f99a2..1785c25 100644 (file)
@@ -35,6 +35,7 @@ void InitListWnd(HWND hParentWnd);
 \r
 // Doc Window\r
 extern int DocWndIndependent;\r
+extern int DocWndAutoPopup;\r
 void InitDocWnd(HWND hParentWnd);\r
 void DocWndInfoReset(void);\r
 void DocWndAddDocFile(char *filename);\r
index 99ec161..8270873 100644 (file)
@@ -519,12 +519,15 @@ int UniqTiMidity(void)
 // \82·\82Å\82É TiMidity \82ª\91\8dÝ\82·\82é\82©\r
 int ExistOldTiMidity(void)\r
 {\r
-       HANDLE hMutex = OpenMutex(0,TRUE,TIMIDTY_MUTEX_NAME);\r
-       if(hMutex==NULL){\r
-               return FALSE;\r
-       }\r
+       HANDLE hMutex = CreateMutex(NULL,TRUE,TIMIDTY_MUTEX_NAME);\r
+       if(GetLastError()==ERROR_ALREADY_EXISTS){\r
+               if(hMutex!=NULL)\r
        CloseHandle(hMutex);\r
        return TRUE;\r
+       }\r
+       if(hMutex!=NULL)\r
+               CloseHandle(hMutex);\r
+       return FALSE;\r
 }\r
 \r
 // \89½\89ñ\82©\97B\88ê\82Ì TiMidity \82É\82È\82ë\82¤\82Æ\82µ\82Ü\82·\r
@@ -707,4 +710,4 @@ int isURLFile(char *filename)
        } else {\r
                return FALSE;\r
        }\r
-}\r
\ No newline at end of file
+}\r
index e3098c9..8ae3fd9 100644 (file)
@@ -68,14 +68,11 @@ extern int PlayerLanguage;
 extern volatile int data_block_bits;
 extern volatile int data_block_num;
 extern int DocWndIndependent;
-int DocWndAutoPopup;
+extern int DocWndAutoPopup;
 extern int SeachDirRecursive;
 extern int IniFileAutoSave;
 extern int SecondMode;
 
-static char *w32g_output_dir;
-static int w32g_auto_output_mode;
-
 //*****************************************************************************/
 // ini
 
index a0333c8..9a5b5f3 100644 (file)
@@ -125,7 +125,14 @@ EXTRA_timidity_SOURCES = \
        vorbis_a.c \
        w32_a.c \
        w32g_a.c \
-       timpp32g.ini
+       timpp32g.ini \
+       w32_gogo.c \
+       w32_gogo.h \
+       gogo_a.h \
+       gogo_a.c \
+       w32g_vorbisenc_dll.c \
+       w32g_vorbis_dll.c \
+       w32g_ogg_dll.c
 
 if ENABLE_W32GUI
 W32GUI_RES = $(top_builddir)/interface/w32g_res.res
index 79c1395..318fc05 100644 (file)
@@ -236,7 +236,14 @@ EXTRA_timidity_SOURCES = \
        vorbis_a.c \
        w32_a.c \
        w32g_a.c \
-       timpp32g.ini
+       timpp32g.ini \
+       w32_gogo.c \
+       w32_gogo.h \
+       gogo_a.h \
+       gogo_a.c \
+       w32g_vorbisenc_dll.c \
+       w32g_vorbis_dll.c \
+       w32g_ogg_dll.c
 
 
 @ENABLE_W32GUI_TRUE@W32GUI_RES = $(top_builddir)/interface/w32g_res.res
@@ -305,26 +312,29 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 @AMDEP_TRUE@   $(DEPDIR)/dl_hpux.Po $(DEPDIR)/dl_w32.Po \
 @AMDEP_TRUE@   $(DEPDIR)/effect.Po $(DEPDIR)/esd_a.Po \
 @AMDEP_TRUE@   $(DEPDIR)/filter.Po $(DEPDIR)/freq.Po \
-@AMDEP_TRUE@   $(DEPDIR)/hpux_a.Po $(DEPDIR)/hpux_d_a.Po \
-@AMDEP_TRUE@   $(DEPDIR)/instrum.Po $(DEPDIR)/list_a.Po \
-@AMDEP_TRUE@   $(DEPDIR)/loadtab.Po $(DEPDIR)/m2m.Po \
-@AMDEP_TRUE@   $(DEPDIR)/mac_a.Po $(DEPDIR)/mac_dlog.Po \
-@AMDEP_TRUE@   $(DEPDIR)/mac_main.Po $(DEPDIR)/mac_qt_a.Po \
-@AMDEP_TRUE@   $(DEPDIR)/mac_soundspec.Po $(DEPDIR)/mfnode.Po \
-@AMDEP_TRUE@   $(DEPDIR)/miditrace.Po $(DEPDIR)/mix.Po \
-@AMDEP_TRUE@   $(DEPDIR)/mod.Po $(DEPDIR)/mod2midi.Po \
-@AMDEP_TRUE@   $(DEPDIR)/modmid_a.Po $(DEPDIR)/nas_a.Po \
-@AMDEP_TRUE@   $(DEPDIR)/oss_a.Po $(DEPDIR)/output.Po \
-@AMDEP_TRUE@   $(DEPDIR)/playmidi.Po $(DEPDIR)/raw_a.Po \
-@AMDEP_TRUE@   $(DEPDIR)/rcp.Po $(DEPDIR)/readmidi.Po \
-@AMDEP_TRUE@   $(DEPDIR)/recache.Po $(DEPDIR)/resample.Po \
-@AMDEP_TRUE@   $(DEPDIR)/reverb.Po $(DEPDIR)/sbkconv.Po \
-@AMDEP_TRUE@   $(DEPDIR)/sffile.Po $(DEPDIR)/sfitem.Po \
-@AMDEP_TRUE@   $(DEPDIR)/smfconv.Po $(DEPDIR)/sndfont.Po \
-@AMDEP_TRUE@   $(DEPDIR)/sun_a.Po $(DEPDIR)/tables.Po \
-@AMDEP_TRUE@   $(DEPDIR)/timidity.Po $(DEPDIR)/version.Po \
-@AMDEP_TRUE@   $(DEPDIR)/vorbis_a.Po $(DEPDIR)/w32_a.Po \
-@AMDEP_TRUE@   $(DEPDIR)/w32g_a.Po $(DEPDIR)/wave_a.Po \
+@AMDEP_TRUE@   $(DEPDIR)/gogo_a.Po $(DEPDIR)/hpux_a.Po \
+@AMDEP_TRUE@   $(DEPDIR)/hpux_d_a.Po $(DEPDIR)/instrum.Po \
+@AMDEP_TRUE@   $(DEPDIR)/list_a.Po $(DEPDIR)/loadtab.Po \
+@AMDEP_TRUE@   $(DEPDIR)/m2m.Po $(DEPDIR)/mac_a.Po \
+@AMDEP_TRUE@   $(DEPDIR)/mac_dlog.Po $(DEPDIR)/mac_main.Po \
+@AMDEP_TRUE@   $(DEPDIR)/mac_qt_a.Po $(DEPDIR)/mac_soundspec.Po \
+@AMDEP_TRUE@   $(DEPDIR)/mfnode.Po $(DEPDIR)/miditrace.Po \
+@AMDEP_TRUE@   $(DEPDIR)/mix.Po $(DEPDIR)/mod.Po \
+@AMDEP_TRUE@   $(DEPDIR)/mod2midi.Po $(DEPDIR)/modmid_a.Po \
+@AMDEP_TRUE@   $(DEPDIR)/nas_a.Po $(DEPDIR)/oss_a.Po \
+@AMDEP_TRUE@   $(DEPDIR)/output.Po $(DEPDIR)/playmidi.Po \
+@AMDEP_TRUE@   $(DEPDIR)/raw_a.Po $(DEPDIR)/rcp.Po \
+@AMDEP_TRUE@   $(DEPDIR)/readmidi.Po $(DEPDIR)/recache.Po \
+@AMDEP_TRUE@   $(DEPDIR)/resample.Po $(DEPDIR)/reverb.Po \
+@AMDEP_TRUE@   $(DEPDIR)/sbkconv.Po $(DEPDIR)/sffile.Po \
+@AMDEP_TRUE@   $(DEPDIR)/sfitem.Po $(DEPDIR)/smfconv.Po \
+@AMDEP_TRUE@   $(DEPDIR)/sndfont.Po $(DEPDIR)/sun_a.Po \
+@AMDEP_TRUE@   $(DEPDIR)/tables.Po $(DEPDIR)/timidity.Po \
+@AMDEP_TRUE@   $(DEPDIR)/version.Po $(DEPDIR)/vorbis_a.Po \
+@AMDEP_TRUE@   $(DEPDIR)/w32_a.Po $(DEPDIR)/w32_gogo.Po \
+@AMDEP_TRUE@   $(DEPDIR)/w32g_a.Po $(DEPDIR)/w32g_ogg_dll.Po \
+@AMDEP_TRUE@   $(DEPDIR)/w32g_vorbis_dll.Po \
+@AMDEP_TRUE@   $(DEPDIR)/w32g_vorbisenc_dll.Po $(DEPDIR)/wave_a.Po \
 @AMDEP_TRUE@   $(DEPDIR)/wrd_read.Po $(DEPDIR)/wrdt.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -396,6 +406,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/esd_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/freq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gogo_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hpux_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hpux_d_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/instrum.Po@am__quote@
@@ -434,7 +445,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/version.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vorbis_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32_a.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32_gogo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_a.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_ogg_dll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_vorbis_dll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/w32g_vorbisenc_dll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wave_a.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrd_read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrdt.Po@am__quote@
old mode 100644 (file)
new mode 100755 (executable)
index 5dd78e5..ef359d9
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <fcntl.h>
 #include <stdio.h>
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif /* HAVE_SYS_IOCTL_H */
 #ifndef NO_STRING_H
 #include <string.h>
 #else
old mode 100644 (file)
new mode 100755 (executable)
index 38bf7d1..21db1b6
@@ -197,6 +197,9 @@ int audriv_get_play_output(void)
     return output_port;
 }
 
+#ifdef CFG_FOR_SF
+static int record_volume = 0;
+#endif
 int audriv_get_record_volume(void)
 /* Ï¿²»²»Î̤ò 0 ¡Á 255 Æâ¤ÇÆÀ¤Þ¤¹¡¥0 ¤Ï̵²»¡¤255 ¤ÏºÇÂç²»ÎÌ¡¥
  * ¼ºÇÔ¤¹¤ë¤È -1 ¤òÊÖ¤·¡¤¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï 0 ¡Á 255 Æâ¤Î²»Î̤òÊÖ¤·¤Þ¤¹¡¥
diff --git a/timidity/gogo_a.c b/timidity/gogo_a.c
new file mode 100755 (executable)
index 0000000..70fe031
--- /dev/null
@@ -0,0 +1,1299 @@
+/*\r
+    TiMidity++ -- MIDI to WAVE converter and player\r
+    Copyright (C) 1999,2000 Masanao Izumo <mo@goice.co.jp>\r
+    Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>\r
+\r
+    This program is free software; you can redistribute it and/or modify\r
+    it under the terms of the GNU General Public License as published by\r
+    the Free Software Foundation; either version 2 of the License, or\r
+    (at your option) any later version.\r
+\r
+    This program is distributed in the hope that it will be useful,\r
+    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+    GNU General Public License for more details.\r
+\r
+    You should have received a copy of the GNU General Public License\r
+    along with this program; if not, write to the Free Software\r
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
+\r
+    gogo_a.c\r
+\r
+    Functions to output mp3 by gogo.lib or gogo.dll.\r
+*/\r
+\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif /* HAVE_CONFIG_H */\r
+#include "interface.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+\r
+#ifdef __W32__\r
+#include <io.h>\r
+#include <windows.h>\r
+#include <process.h>\r
+#endif\r
+\r
+#ifdef HAVE_UNISTD_H\r
+#include <unistd.h>\r
+#endif /* HAVE_UNISTD_H */\r
+\r
+#ifndef NO_STRING_H\r
+#include <string.h>\r
+#else\r
+#include <strings.h>\r
+#endif\r
+#include <fcntl.h>\r
+\r
+#include <musenc.h>            /* for gogo */\r
+\r
+#include "w32_gogo.h"\r
+#include "gogo_a.h"\r
+\r
+#include "timidity.h"\r
+#include "common.h"\r
+#include "output.h"\r
+#include "controls.h"\r
+#include "instrum.h"\r
+#include "playmidi.h"\r
+#include "readmidi.h"\r
+\r
+static int open_output(void); /* 0=success, 1=warning, -1=fatal error */\r
+static void close_output(void);\r
+static int output_data(char *buf, int32 bytes);\r
+static int acntl(int request, void *arg);\r
+\r
+/* export the playback mode */\r
+#define dpm gogo_play_mode\r
+\r
+PlayMode dpm = {\r
+    DEFAULT_RATE,\r
+#ifdef LITTLE_ENDIAN\r
+    PE_16BIT|PE_SIGNED,\r
+#else\r
+    PE_16BIT|PE_SIGNED|PE_BYTESWAP,\r
+#endif\r
+    PF_PCM_STREAM,\r
+    -1,\r
+    {0,0,0,0,0},\r
+    "MP3 GOGO", 'g',\r
+    NULL,\r
+    open_output,\r
+    close_output,\r
+    output_data,\r
+    acntl\r
+};\r
+\r
+#ifdef IA_W32GUI\r
+#if defined(_MSC_VER)\r
+//typedef void (__cdecl *MSVC_BEGINTHREAD_START_ADDRESS)(void *);\r
+typedef LPTHREAD_START_ROUTINE MSVC_BEGINTHREAD_START_ADDRESS;\r
+#elif defined(_BORLANDC_)\r
+// typedef _USERENTRY (*BCC_BEGINTHREAD_START_ADDRESS)(void *);\r
+typedef LPTHREAD_START_ROUTINE BCC_BEGINTHREAD_START_ADDRESS;\r
+#endif\r
+// (HANDLE)crt_beginthreadex(LPSECURITY_ATTRIBUTES security, DWORD stack_size, LPTHREAD_START_ROUTINE start_address, LPVOID arglist, DWORD initflag, LPDWORD thrdaddr );\r
+#if defined(_MSC_VER)\r
+#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \\r
+(HANDLE)_beginthreadex((void *)security,(unsigned)stack_size,(MSVC_BEGINTHREAD_START_ADDRESS)start_address,(void *)arglist,(unsigned)initflag,(unsigned *)thrdaddr)\r
+#elif defined(_BORLANDC_)\r
+#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \\r
+(HANDLE)_beginthreadNT((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist,(void *)security_attrib,(unsigned long)create_flags,(unsigned long *)thread_id)\r
+#else\r
+#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \\r
+(HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPDWORD)thrdaddr)\r
+#endif\r
+\r
+volatile extern char *w32g_output_dir;\r
+volatile extern int w32g_auto_output_mode;\r
+\r
+volatile static HANDLE hMPGEthread = NULL;\r
+volatile static HANDLE hMutexgogo = NULL;\r
+volatile static DWORD dwMPGEthreadID = 0;\r
+\r
+extern int gogo_ConfigDialogInfoApply(void);\r
+#endif\r
+\r
+volatile gogo_opts_t gogo_opts;\r
+\r
+/*************************************************************************/\r
+\r
+static int gogo_error(MERET rval)\r
+{\r
+       switch(rval){\r
+       case ME_NOERR:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : return normally (%d).",rval);\r
+               break;\r
+       case ME_EMPTYSTREAM:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : stream becomes empty (%d).",rval);\r
+               break;\r
+       case ME_HALTED:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : stopped by user (%d).",rval);\r
+               break;\r
+       case ME_INTERNALERROR:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : internal error (%d).",rval);\r
+               break;\r
+       case ME_PARAMERROR:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : parameters error (%d).",rval);\r
+               break;\r
+       case ME_NOFPU:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : no FPU (%d).",rval);\r
+               break;\r
+       case ME_INFILE_NOFOUND:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : can't open input file (%d).",rval);\r
+               break;\r
+       case ME_OUTFILE_NOFOUND:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : can't open output file (%d).",rval);\r
+               break;\r
+       case ME_FREQERROR:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : frequency is not good (%d).",rval);\r
+               break;\r
+       case ME_BITRATEERROR    :\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : bitrate is not good (%d).",rval);\r
+               break;\r
+       case ME_WAVETYPE_ERR:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : WAV format is not good (%d).",rval);\r
+               break;\r
+       case ME_CANNOT_SEEK:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : can't seek (%d).",rval);\r
+               break;\r
+       case ME_BITRATE_ERR:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : only for compatibility (%d).",rval);\r
+               break;\r
+       case ME_BADMODEORLAYER:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : mode/layer not good (%d).",rval);\r
+               break;\r
+       case ME_NOMEMORY:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : fail to allocate memory (%d).",rval);\r
+               break;\r
+       case ME_CANNOT_SET_SCOPE:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : thread error (%d).",rval);\r
+               break;\r
+       case ME_CANNOT_CREATE_THREAD:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : fail to create thear (%d).",rval);\r
+               break;\r
+       case ME_WRITEERROR:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : lack of capacity of disk (%d).",rval);\r
+               break;\r
+       default:\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : unknown error (%d).",rval);\r
+               break;\r
+       }\r
+       return 0;\r
+}\r
+\r
+/* mode\r
+  0,1: Default mode.\r
+  2: Remove the directory path of input_filename, then add output_dir.\r
+  3: Replace directory separator characters ('/','\',':') with '_', then add output_dir.\r
+ */\r
+extern char *create_auto_output_name(const char *input_filename, char *ext_str, char *output_dir, int mode);\r
\r
+volatile static int gogo_lock_flag = 0;\r
+static int gogo_lock()\r
+{\r
+#ifndef __W32__\r
+       while(gogo_lock_flag){\r
+               usleep(100);\r
+       }\r
+       gogo_lock_flag++;\r
+       return 0;\r
+#else\r
+       if(hMutexgogo==NULL){\r
+               hMutexgogo = CreateMutex(NULL,FALSE,NULL);\r
+               if(hMutexgogo==NULL)\r
+                       return -1;\r
+       }\r
+       if(WaitForSingleObject(hMutexgogo,INFINITE)==WAIT_FAILED){\r
+               return -1;\r
+       }\r
+       return 0;\r
+#endif\r
+}\r
+\r
+static int gogo_unlock()\r
+{\r
+#ifndef __W32__\r
+       if(gogo_lock_flag)\r
+               gogo_lock_flag--;\r
+       return 0;\r
+#else\r
+       if(hMutexgogo!=NULL){\r
+               ReleaseMutex(hMutexgogo);\r
+               Sleep(0);\r
+       }\r
+       return 0;\r
+#endif\r
+}\r
+\r
+//volatile int32 gogo_buffer_size = 1024*1024;\r
+volatile int32 gogo_buffer_size = 1024*256;\r
+volatile static char *gogo_buffer = NULL;      // loop buffer\r
+volatile static char *gogo_buffer_from = NULL;\r
+volatile static char *gogo_buffer_start = NULL;\r
+volatile static char *gogo_buffer_end = NULL;\r
+volatile static int32 gogo_buffer_cur_size = 0;\r
+volatile static int gogo_buffer_termination = 0;\r
+\r
+volatile int gogo_buffer_initflag = 0;\r
+static void gogo_buffer_init(void)\r
+{\r
+       gogo_lock();\r
+       if(!gogo_buffer_initflag){\r
+               gogo_buffer = (char *)safe_malloc(sizeof(char)*(gogo_buffer_size+1));\r
+               gogo_buffer_from = gogo_buffer;\r
+               gogo_buffer_start = gogo_buffer;\r
+               gogo_buffer_end = gogo_buffer + gogo_buffer_size - 1;\r
+               gogo_buffer_cur_size = 0;\r
+       }\r
+       gogo_buffer_initflag = 1;\r
+       gogo_unlock();\r
+}\r
+static void gogo_buffer_reset(void)\r
+{\r
+       gogo_lock();\r
+       if(!gogo_buffer_initflag)\r
+               gogo_buffer_init();\r
+       gogo_buffer_from = gogo_buffer;\r
+       gogo_buffer_cur_size = 0;\r
+       gogo_unlock();\r
+}\r
+\r
+// \93¯\8aú\83m\81[\83`\83F\83b\83N\r
+// gogo_buffer_cur_size \82Ü\82Å buf  \82É gogo_buffer \82Ì\93à\97e\82ð size \82¾\82¯\r
+// \83R\83s\81[\82·\82é\81Bmoveflag \82ª\82 \82é\82Æ\82«\82Í\81A\83R\83s\81[\82µ\82½\95ª\82¾\82¯\r
+// gogo_buffer_from \82Æ gogo_buffer_cur_size \82ð\95Ï\89»\82³\82¹\82é\81B\r
+// \83R\83s\81[\82µ\82½\83T\83C\83Y\82ð\95Ô\82·\81B\r
+static int32 __gogo_buffer_copy(char *buf, int32 size, int moveflag)\r
+{\r
+       int i;\r
+       int32 size1, ret = 0;\r
+       gogo_buffer_init();\r
+       if(size>gogo_buffer_cur_size)\r
+               size = gogo_buffer_cur_size;\r
+       for(i=0;i<2;i++){\r
+               size1 = gogo_buffer_end-gogo_buffer_from+1;\r
+               if(size<=size1)\r
+                       size1 = size;\r
+               memcpy(buf,(char *)gogo_buffer_from,size1);\r
+               ret += size1;\r
+               size -= size1;\r
+               buf += size1;\r
+               if(moveflag){\r
+                       gogo_buffer_from += size1;\r
+                       if(gogo_buffer_from>=gogo_buffer_end+1)\r
+                               gogo_buffer_from = gogo_buffer_start;\r
+                       gogo_buffer_cur_size -= size1;\r
+               }\r
+               if(size<=0){\r
+                       return ret;\r
+               }\r
+       }\r
+       return ret;\r
+}\r
+\r
+// \93¯\8aú\83m\81[\83`\83F\83b\83N\r
+// gogo_buffer_cur_size \82Ü\82Å buf  \82Ì\93à\97e\82ð size \82¾\82¯ gogo_buffer \82É\r
+// \8ai\94[\82·\82é\81B\8ai\94[\82µ\82½\83T\83C\83Y\82ð\95Ô\82·\81B\r
+static int32 __gogo_buffer_push(char *buf, int32 size)\r
+{\r
+       int i;\r
+       int32 size1, ret = 0;\r
+       char *gogo_buffer_pointer;\r
+       gogo_buffer_init();\r
+       if(size>gogo_buffer_size-gogo_buffer_cur_size)\r
+               size = gogo_buffer_size-gogo_buffer_cur_size;\r
+       if(gogo_buffer+gogo_buffer_size>gogo_buffer_from+gogo_buffer_cur_size){\r
+               gogo_buffer_pointer = (char *)gogo_buffer_from + gogo_buffer_cur_size;\r
+               i = 0;\r
+       } else {\r
+               gogo_buffer_pointer = (char *)gogo_buffer_from+gogo_buffer_cur_size-gogo_buffer_size;\r
+               i = 1;\r
+       }\r
+       for(;i<2;i++){\r
+               size1 = gogo_buffer_end-gogo_buffer_pointer+1;\r
+               if(size<=size1)\r
+                       size1 = size;\r
+               memcpy(gogo_buffer_pointer,buf,size1);\r
+               ret += size1;\r
+               size -= size1;\r
+               buf += size1;\r
+               gogo_buffer_cur_size += size1;\r
+               gogo_buffer_pointer += size1;\r
+               if(gogo_buffer_pointer>=gogo_buffer_end+1)\r
+                       gogo_buffer_pointer = (char *)gogo_buffer_start;\r
+               if(size<=0)\r
+                       return ret;\r
+       }\r
+       return ret;\r
+}\r
+\r
+static int __cdecl gogoUserFunc(char *buf, unsigned long nLength )\r
+{\r
+       int flag = 0;\r
+       gogo_buffer_init();\r
+       if(buf==NULL || nLength==0){\r
+               if(!gogo_buffer_termination)\r
+                       gogo_buffer_termination = 1;\r
+               return  ME_NOERR;\r
+       }\r
+       for(;;){\r
+               int32 size;\r
+               if(gogo_buffer_termination<0){\r
+                       return ME_EMPTYSTREAM;\r
+               }\r
+               if(gogo_lock()){\r
+                       gogo_buffer_termination = -1;\r
+                       return ME_EMPTYSTREAM;\r
+               }\r
+               size = __gogo_buffer_copy(buf,nLength,1);\r
+               buf += size;\r
+               nLength -= size;\r
+               if(nLength<=0){\r
+                       gogo_unlock();\r
+                       if(size>0)\r
+                               return ME_NOERR;\r
+                       else\r
+                               return ME_EMPTYSTREAM;\r
+               }\r
+               if(gogo_buffer_termination>0){\r
+                       gogo_unlock();\r
+                       if(size>0 && nLength>0){\r
+                               if(dpm.encoding & PE_16BIT){\r
+                                       unsigned long i;\r
+                                       for(i=0;i+1<nLength;i+=2){\r
+#ifdef LITTLE_ENDIAN\r
+                                               buf[i] = (char)0;\r
+                                               buf[i+1] = (char)0x80;\r
+#else\r
+                                               buf[i] = (char)0x80;\r
+                                               buf[i+1] = (char)0;\r
+#endif\r
+                                       }\r
+                               } else\r
+                                       memset(buf,0x80,nLength);\r
+                               return ME_NOERR;\r
+                       } else {\r
+                               return ME_EMPTYSTREAM;\r
+                       }\r
+               }\r
+               if(gogo_buffer_termination<0){\r
+                       gogo_unlock();\r
+                       return ME_EMPTYSTREAM;\r
+               }\r
+               if(gogo_buffer_cur_size<=0){\r
+                       gogo_unlock();\r
+#ifndef __W32__\r
+                       usleep(100);\r
+#else\r
+                       Sleep(0);\r
+                       Sleep(100);\r
+#endif\r
+               } else {\r
+                       gogo_unlock();\r
+               }\r
+       }\r
+}\r
+\r
+void gogo_opts_reset(void)\r
+{\r
+       gogo_opts.optENCODEMODE = -1;\r
+       gogo_opts.optINPFREQ = -1;\r
+       gogo_opts.optOUTFREQ = -1;\r
+       gogo_opts.optSTARTOFFSET = -1;\r
+       gogo_opts.optUSEPSY = -1;\r
+       gogo_opts.optUSELPF16 = -1;\r
+       gogo_opts.optUSEMMX = -1;\r
+       gogo_opts.optUSE3DNOW = -1;\r
+       gogo_opts.optUSEKNI = -1;\r
+       gogo_opts.optUSEE3DNOW = -1;\r
+       gogo_opts.optADDTAGnum = -1;\r
+       gogo_opts.optEMPHASIS = -1;\r
+       gogo_opts.optVBR = -1;\r
+       gogo_opts.optCPU = -1;\r
+       gogo_opts.optBYTE_SWAP = -1;\r
+       gogo_opts.opt8BIT_PCM = -1;\r
+       gogo_opts.optMONO_PCM = -1;\r
+       gogo_opts.optTOWNS_SND = -1;\r
+       gogo_opts.optTHREAD_PRIORITY = -10000;\r
+       gogo_opts.optREADTHREAD_PRIORITY = -10000;\r
+       gogo_opts.optOUTPUT_FORMAT = -1;\r
+       gogo_opts.optENHANCEDFILTER_A = -1;\r
+       gogo_opts.optENHANCEDFILTER_B = -1;\r
+       gogo_opts.optVBRBITRATE_low = -1;\r
+       gogo_opts.optVBRBITRATE_high = -1;\r
+       gogo_opts.optMSTHRESHOLD_threshold = -1;\r
+       gogo_opts.optMSTHRESHOLD_mspower = -1;\r
+       gogo_opts.optVERIFY = -1;\r
+       gogo_opts.optOUTPUTDIR[0] = '\0';\r
+       gogo_opts.optBITRATE1 = -1;\r
+       gogo_opts.optBITRATE2 = -1;\r
+}\r
+\r
+static volatile int gogo_opts_initflag = 0;\r
+void gogo_opts_init(void)\r
+{\r
+       gogo_lock();\r
+       if(!gogo_opts_initflag){\r
+               gogo_opts_initflag = 1;\r
+               gogo_opts.optADDTAGnum = 0;\r
+               gogo_opts.output_name[0] = '\0';\r
+       }\r
+       gogo_opts_reset();\r
+       gogo_unlock();\r
+}\r
+void gogo_opts_reset_tag(void)\r
+{\r
+  if (gogo_opts.optADDTAGnum >= 0) {\r
+    int i;\r
+    for (i = 0; i < gogo_opts.optADDTAGnum; i++) {\r
+      gogo_opts.optADDTAG_len[i] = 0;\r
+      if (gogo_opts.optADDTAG_buf[i] != NULL) {\r
+       free(gogo_opts.optADDTAG_buf[i]);\r
+       gogo_opts.optADDTAG_buf[i] = NULL;\r
+      }\r
+    }\r
+  }\r
+}\r
+\r
+static void set_gogo_opts(void)\r
+{\r
+       if(gogo_opts.optENCODEMODE>=0)\r
+               MPGE_setConfigure(MC_ENCODEMODE,(UPARAM)gogo_opts.optENCODEMODE,(UPARAM)0);\r
+       if(gogo_opts.optINPFREQ>=0)\r
+               MPGE_setConfigure(MC_INPFREQ,(UPARAM)gogo_opts.optINPFREQ,(UPARAM)0);\r
+       if(gogo_opts.optOUTFREQ>=0)\r
+               MPGE_setConfigure(MC_OUTFREQ,(UPARAM)gogo_opts.optOUTFREQ,(UPARAM)0);\r
+       if(gogo_opts.optSTARTOFFSET>=0)\r
+               MPGE_setConfigure(MC_STARTOFFSET,(UPARAM)gogo_opts.optSTARTOFFSET,(UPARAM)0);\r
+       if(gogo_opts.optUSEPSY>=0)\r
+               MPGE_setConfigure(MC_USEPSY,(UPARAM)gogo_opts.optUSEPSY,(UPARAM)0);\r
+       if(gogo_opts.optUSELPF16>=0)\r
+               MPGE_setConfigure(MC_USELPF16,(UPARAM)gogo_opts.optUSELPF16,(UPARAM)0);\r
+       if(gogo_opts.optUSEMMX>=0)\r
+               MPGE_setConfigure(MC_USEMMX,(UPARAM)gogo_opts.optUSEMMX,(UPARAM)0);\r
+       if(gogo_opts.optUSE3DNOW>=0)\r
+               MPGE_setConfigure(MC_USE3DNOW,(UPARAM)gogo_opts.optUSE3DNOW,(UPARAM)0);\r
+       if(gogo_opts.optUSEKNI>=0)\r
+               MPGE_setConfigure(MC_USEKNI,(UPARAM)gogo_opts.optUSEKNI,(UPARAM)0);\r
+       if(gogo_opts.optUSEE3DNOW>=0)\r
+               MPGE_setConfigure(MC_USEE3DNOW,(UPARAM)gogo_opts.optUSEE3DNOW,(UPARAM)0);\r
+       if(gogo_opts.optADDTAGnum>=0){\r
+               int i;\r
+               for(i=0;i<gogo_opts.optADDTAGnum;i++)\r
+                       MPGE_setConfigure(MC_ADDTAG,(UPARAM)gogo_opts.optADDTAG_len[i],(UPARAM)gogo_opts.optADDTAG_buf[i]);\r
+       }\r
+       if(gogo_opts.optEMPHASIS>=0)\r
+               MPGE_setConfigure(MC_EMPHASIS,(UPARAM)gogo_opts.optEMPHASIS,(UPARAM)0);\r
+       if(gogo_opts.optVBR>=0)\r
+               MPGE_setConfigure(MC_VBR,(UPARAM)gogo_opts.optVBR,(UPARAM)0);\r
+       if(gogo_opts.optCPU>=0)\r
+               MPGE_setConfigure(MC_CPU,(UPARAM)gogo_opts.optCPU,(UPARAM)0);\r
+       if(gogo_opts.optBYTE_SWAP>=0)\r
+               MPGE_setConfigure(MC_BYTE_SWAP,(UPARAM)gogo_opts.optBYTE_SWAP,(UPARAM)0);\r
+       if(gogo_opts.opt8BIT_PCM>=0)\r
+               MPGE_setConfigure(MC_8BIT_PCM,(UPARAM)gogo_opts.opt8BIT_PCM,(UPARAM)0);\r
+       if(gogo_opts.optMONO_PCM>=0)\r
+               MPGE_setConfigure(MC_MONO_PCM,(UPARAM)gogo_opts.optMONO_PCM,(UPARAM)0);\r
+       if(gogo_opts.optTOWNS_SND>=0)\r
+               MPGE_setConfigure(MC_TOWNS_SND,(UPARAM)gogo_opts.optTOWNS_SND,(UPARAM)0);\r
+       if(gogo_opts.optTHREAD_PRIORITY!=-10000)\r
+               MPGE_setConfigure(MC_THREAD_PRIORITY,(UPARAM)gogo_opts.optTHREAD_PRIORITY,(UPARAM)0);\r
+       if(gogo_opts.optREADTHREAD_PRIORITY!=-10000)\r
+               MPGE_setConfigure(MC_READTHREAD_PRIORITY,(UPARAM)gogo_opts.optREADTHREAD_PRIORITY,(UPARAM)0);\r
+       if(gogo_opts.optOUTPUT_FORMAT>=0)\r
+               MPGE_setConfigure(MC_OUTPUT_FORMAT,(UPARAM)gogo_opts.optOUTPUT_FORMAT,(UPARAM)0);\r
+       if(gogo_opts.optENHANCEDFILTER_A>=0 && gogo_opts.optENHANCEDFILTER_B>=0)\r
+               MPGE_setConfigure(MC_ENHANCEDFILTER,(UPARAM)gogo_opts.optENHANCEDFILTER_A,(UPARAM)gogo_opts.optENHANCEDFILTER_B);\r
+       if(gogo_opts.optVBRBITRATE_low>=0 && gogo_opts.optVBRBITRATE_high>=0)\r
+               MPGE_setConfigure(MC_VBRBITRATE,(UPARAM)gogo_opts.optVBRBITRATE_low,(UPARAM)gogo_opts.optVBRBITRATE_high);\r
+       if(gogo_opts.optMSTHRESHOLD_threshold>=0 && gogo_opts.optMSTHRESHOLD_mspower>=0)\r
+               MPGE_setConfigure(MC_MSTHRESHOLD,(UPARAM)gogo_opts.optMSTHRESHOLD_threshold,(UPARAM)gogo_opts.optMSTHRESHOLD_mspower);\r
+       if(gogo_opts.optVERIFY>=0)\r
+               MPGE_setConfigure(MC_VERIFY,(UPARAM)gogo_opts.optVERIFY,(UPARAM)0);\r
+       if(gogo_opts.optOUTPUTDIR[0]!='\0')\r
+               MPGE_setConfigure(MC_OUTPUTDIR,(UPARAM)gogo_opts.optOUTPUTDIR,(UPARAM)0);\r
+       if(strcmp((char *)gogo_opts.output_name,"-")==0){\r
+               MPGE_setConfigure(MC_OUTPUTFILE,(UPARAM)MC_OUTDEV_STDOUT,(UPARAM)0);\r
+       } else {\r
+               MPGE_setConfigure(MC_OUTPUTFILE,(UPARAM)MC_OUTDEV_FILE,(UPARAM)gogo_opts.output_name);\r
+       }\r
+       if(dpm.rate>=32000){\r
+               if(gogo_opts.optBITRATE1>=0)\r
+                       MPGE_setConfigure(MC_BITRATE,(UPARAM)gogo_opts.optBITRATE1,(UPARAM)0);\r
+       } else {\r
+               if(gogo_opts.optBITRATE2>=0)\r
+                       MPGE_setConfigure(MC_BITRATE,(UPARAM)gogo_opts.optBITRATE2,(UPARAM)0);\r
+       }\r
+}\r
+static int id3_to_buffer(mp3_id3_tag_t *id3_tag, char *buffer)\r
+{\r
+       memset(buffer,0x20,128);\r
+#if 0\r
+       memcpy(buffer+0,id3_tag->tag);\r
+#else\r
+       memcpy(buffer+0,"ID3",3);\r
+#endif\r
+       memcpy(buffer+3,id3_tag->title,30);\r
+       memcpy(buffer+33,id3_tag->artist,30);\r
+       memcpy(buffer+63,id3_tag->album,30);\r
+       memcpy(buffer+93,id3_tag->year,4);\r
+       memcpy(buffer+97,id3_tag->comment,30);\r
+       buffer[127] = id3_tag->genre;\r
+       return 0;\r
+}\r
+int gogo_opts_id3_tag(char *title, char *artist, char *album, char *year, char *comment, int genre)\r
+{\r
+       mp3_id3_tag_t id3_tag;\r
+       char *buffer;\r
+       buffer = (char *)malloc(128);\r
+       if(buffer==NULL)\r
+               return -1;\r
+       memset(&id3_tag,0x20,128);\r
+       if(title){\r
+               memset(id3_tag.title,0x20,30);\r
+               strncpy(id3_tag.title,title,30);\r
+       }\r
+       if(artist){\r
+               memset(id3_tag.artist,0x20,30);\r
+               strncpy(id3_tag.artist,artist,30);\r
+       }\r
+       if(album){\r
+               memset(id3_tag.album,0x20,30);\r
+               strncpy(id3_tag.album,album,30);\r
+       }\r
+       if(year){\r
+               memset(id3_tag.year,0x20,4);\r
+               strncpy(id3_tag.year,year,4);\r
+       }\r
+       if(comment){\r
+               memset(id3_tag.comment,0x20,30);\r
+               strncpy(id3_tag.comment,comment,30);\r
+       }\r
+       if(genre>=0);\r
+               id3_tag.genre = (unsigned char)(genre & 0xff);\r
+       id3_to_buffer(&id3_tag,buffer);\r
+       gogo_opts.optADDTAGnum++;\r
+       gogo_opts.optADDTAG_len[gogo_opts.optADDTAGnum-1] = 128;\r
+       gogo_opts.optADDTAG_buf[gogo_opts.optADDTAGnum-1] = buffer;\r
+//     MPGE_setConfigure(MC_ADDTAG,(UPARAM)128,(UPARAM)buffer);\r
+       return 0;\r
+}\r
+\r
+// \83R\83}\83\93\83h\83\89\83C\83\93\82ð\93W\8aJ\82·\82é\r
+int commandline_to_argc_argv(char *commandline, int *argc, char ***argv)\r
+{\r
+       char *p1, *p2, *p3;\r
+       int argc_max = 0;\r
+       *argc = 0;\r
+       *argv = NULL;\r
+       p1 = commandline;\r
+       for(;;){\r
+               int quot = 0;\r
+               while(isspace(*p1))\r
+                       p1++;\r
+               if(*p1=='\"')\r
+                       quot = 1;\r
+               else if(*p1=='\'')\r
+                       quot = 2;\r
+               if(*p1=='\0')\r
+                       return 0;\r
+               p2 = p1+1;\r
+               while((quot==1&&*p2=='\"') || (quot==2&&*p2=='\'') || *p2=='\0')\r
+                       p2++;\r
+               while(!isspace(*p2) || *p2=='\0')\r
+                       p2++;\r
+               if(*p2!='\0'){\r
+                       p3 = p2+1;\r
+                       while(isspace(*p3))\r
+                               p3++;\r
+               } else{\r
+                       p3 = NULL;\r
+               }\r
+               (*argc)++;\r
+               if(*argc>argc_max)\r
+                       argc_max += 100;\r
+               *argv = (char **)realloc(*argv,sizeof(char*)*argc_max);\r
+               if(*argv==NULL)\r
+                       return -1;\r
+               *argv[*argc-1] = (char *)malloc(sizeof(char)*(p2-p1));\r
+               if(*argv[*argc-1]==NULL){\r
+                       (*argc)--;\r
+                       return 0;\r
+               }\r
+               strncpy(*argv[*argc-1],p1,p2-p1);\r
+               *argv[*argc-1][p2-p1] = '\0';\r
+               if(p3==NULL)\r
+                       return 0;\r
+               p1 = p3;\r
+       }\r
+}\r
+void free_argv(char **argv, int argc)\r
+{\r
+       if(argv!=NULL){\r
+               int i;\r
+               for(i=0;i<argc;i++)\r
+                       if(argv[i]!=NULL)\r
+                               free(argv[i]);\r
+               free(argv);\r
+       }\r
+}\r
+       \r
+volatile char *gogo_commandline_options = NULL;\r
+volatile int use_gogo_commandline_options = 0;\r
+void set_gogo_opts_use_commandline_options(char *commandline)\r
+{\r
+       int argc;\r
+       char **argv;\r
+       int num;\r
+       if(commandline_to_argc_argv(commandline,&argc,&argv)){\r
+               return;\r
+       }\r
+       for(num = 0;num<argc;){\r
+               // output bitrate\r
+               // -b kbps\r
+        //     input PCM is higher than 32kHz [ 32,40,48,56,64,80,96,112,128,160,192,224,256,320 ]\r
+        //     input PCM is lower than 32kHz   [ 8,16,24,32,40,48,56,64,80,96,112,128,144,160 ]\r
+               if(strcasecmp("-b",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       gogo_opts.optBITRATE1 = gogo_opts.optBITRATE2 = atoi(argv[num+1]);\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // output bitrate for VBR\r
+               // -br low_kbps high_kbps\r
+        //     [ 32,40,48,56,64,80,96,112,128,160,192,224,256,320 ]\r
+               if(strcasecmp("-br",argv[num])==0){\r
+                       if(num+2>=argc) break;\r
+                       if(gogo_opts.optVBR==-1)\r
+                               gogo_opts.optVBR = 9;\r
+                       gogo_opts.optVBRBITRATE_low = atoi(argv[num+1]);\r
+                       gogo_opts.optVBRBITRATE_high = atoi(argv[num+2]);\r
+                       num += 3;\r
+                       continue;\r
+               }\r
+               // low pass filter\r
+               // -lpf on : 16kHz low pass filter ON\r
+               // -lpf off : 16kHz low pass filter OFF\r
+               // -lpf para1 para2 :  enhanced low pass filter\r
+               //     para1 (0-100)   para2 (0-100)\r
+               if(strcasecmp("-lpf",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       if(strcasecmp("on",argv[num+1])==0){\r
+                               gogo_opts.optENHANCEDFILTER_A = -1;\r
+                               gogo_opts.optENHANCEDFILTER_B = -1;\r
+                               gogo_opts.optUSELPF16 = 1;\r
+                               num += 2;\r
+                               continue;\r
+                       } else if(strcasecmp("off",argv[num+1])==0){\r
+                               gogo_opts.optENHANCEDFILTER_A = -1;\r
+                               gogo_opts.optENHANCEDFILTER_B = -1;\r
+                               gogo_opts.optUSELPF16 = 0;\r
+                               num += 2;\r
+                               continue;\r
+                       }\r
+                       if(num+2>=argc) break;\r
+                       gogo_opts.optENHANCEDFILTER_A = atoi(argv[num+1]);\r
+                       gogo_opts.optENHANCEDFILTER_B = atoi(argv[num+2]);\r
+                       num += 3;\r
+                       continue;\r
+               }\r
+               // encodemode\r
+               // -m m : monoral\r
+               // -m s : stereo\r
+               // -m j : joint stereo\r
+               // -m f : mid/side stereo\r
+               // -m d : dual channel\r
+               if(strcasecmp("-m",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       if(strcasecmp("m",argv[num+1])==0){\r
+                               gogo_opts.optENCODEMODE = MC_MODE_MONO;\r
+                       } else if(strcasecmp("s",argv[num+1])==0){\r
+                               gogo_opts.optENCODEMODE = MC_MODE_STEREO;\r
+                       } else if(strcasecmp("j",argv[num+1])==0){\r
+                               gogo_opts.optENCODEMODE = MC_MODE_JOINT;\r
+                       } else if(strcasecmp("f",argv[num+1])==0){\r
+                               gogo_opts.optENCODEMODE = MC_MODE_MSSTEREO;\r
+                       } else if(strcasecmp("d",argv[num+1])==0){\r
+                               gogo_opts.optENCODEMODE = MC_MODE_DUALCHANNEL;\r
+                       }\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // -psy\r
+               // -nopsy\r
+               if(strcasecmp("-psy",argv[num])==0){\r
+                       gogo_opts.optUSEPSY = 1;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-nopsy",argv[num])==0){\r
+                       gogo_opts.optUSEPSY = 0;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               // -on 3dn\r
+               // -on mmx\r
+               // -on sse\r
+               // -on kni\r
+               // -on e3dn\r
+               if(strcasecmp("-on",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       if(strcasecmp("3dn",argv[num+1])==0){\r
+                               gogo_opts.optUSE3DNOW = 1;\r
+                       } else if(strcasecmp("mmx",argv[num+1])==0){\r
+                               gogo_opts.optUSEMMX = 1;\r
+                       } else if(strcasecmp("sse",argv[num+1])==0 || strcasecmp("kni",argv[num+1])==0){\r
+                               gogo_opts.optUSEKNI = 1;\r
+                       } else if(strcasecmp("e3dn",argv[num+1])==0){\r
+                               gogo_opts.optUSEE3DNOW = 1;\r
+                       }\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // -off 3dn\r
+               // -off mmx\r
+               // -off sse\r
+               // -off kni\r
+               // -off e3dn\r
+               if(strcasecmp("-on",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       if(strcasecmp("3dn",argv[num+1])==0){\r
+                               gogo_opts.optUSE3DNOW = 0;\r
+                       } else if(strcasecmp("mmx",argv[num+1])==0){\r
+                               gogo_opts.optUSEMMX = 0;\r
+                       } else if(strcasecmp("sse",argv[num+1])==0 || strcasecmp("kni",argv[num+1])==0){\r
+                               gogo_opts.optUSEKNI = 0;\r
+                       } else if(strcasecmp("e3dn",argv[num+1])==0){\r
+                               gogo_opts.optUSEE3DNOW = 0;\r
+                       }\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // emphasis type\r
+               // -emp n : none\r
+               // -emp 5 : 50/15ms (normal CD-DA emphasis)\r
+               // -emp c : CCITT\r
+               if(strcasecmp("-emp",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       if(strcasecmp("n",argv[num+1])==0){\r
+                               gogo_opts.optEMPHASIS = MC_EMP_NONE;\r
+                       } else if(strcasecmp("5",argv[num+1])==0){\r
+                               gogo_opts.optEMPHASIS = MC_EMP_5015MS;\r
+                       } else if(strcasecmp("c",argv[num+1])==0){\r
+                               gogo_opts.optEMPHASIS = MC_EMP_CCITT;\r
+                       }\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // -cpu num\r
+               if(strcasecmp("-cpu",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       gogo_opts.optCPU = atoi(argv[num+1]);\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // -v 0..9 (low compression - high compression)\r
+               if(strcasecmp("-v",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       gogo_opts.optVBR = atoi(argv[num+1]);\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // -d freq : output MP3 frequency(kHz) \r
+               if(strcasecmp("-d",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       gogo_opts.optOUTFREQ = (int)(atof(argv[num+1])*1000);\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+#if 0   // Do not use it.\r
+               // -mono\r
+               // -stereo\r
+               // -8bit\r
+               // -16bit\r
+               // -bswap\r
+               // -bswap-  (not bitswap)\r
+               // -tos       (snd file for TonwsOS)\r
+               // -tos-      (not snd file for TonwsOS\r
+               if(strcasecmp("-mono",argv[num])==0){\r
+                       gogo_opts.optMONO_PCM = 1;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-stereo",argv[num])==0){\r
+                       gogo_opts.optMONO_PCM = 0;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-8bit",argv[num])==0){\r
+                       gogo_opts.opt8BIT_PCM = 1;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-16bit",argv[num])==0){\r
+                       gogo_opts.opt8BIT_PCM = 0;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-bswap",argv[num])==0){\r
+                       gogo_opts.optBYTE_SWAP = 1;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-bswap-",argv[num])==0){\r
+                       gogo_opts.optBYTE_SWAP = 0;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-ts",argv[num])==0){\r
+                       gogo_opts.optTOWNS_SND = 1;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-ts-",argv[num])==0){\r
+                       gogo_opts.optTOWNS_SND = 1;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               // -s freq  :  input PCM freqency(kHz)\r
+               if(strcasecmp("-s",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       gogo_opts.optINPFREQ = (int)(atof(argv[num+1])*1000);\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               //  -offset byte   :  jump byte bytes from head.\r
+               if(strcasecmp("-offset",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       gogo_opts.optSTARTOFFSET = atol(argv[num+1]);\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+#endif\r
+               // -th threshold mspower\r
+               if(strcasecmp("-th",argv[num])==0){\r
+                       if(num+2>=argc) break;\r
+                       gogo_opts.optMSTHRESHOLD_threshold = atoi(argv[num+1]);\r
+                       gogo_opts.optMSTHRESHOLD_mspower = atoi(argv[num+2]);\r
+                       num += 3;\r
+                       continue;\r
+               }\r
+               // -riff normal   :  mp3+TAG\r
+               // -riff wave     :  RIFF/WAVE\r
+               // -riff rmp      :  RIFF/RMP\r
+               if(strcasecmp("-riff",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       if(strcasecmp("wave",argv[num+1])==0){\r
+                               gogo_opts.optOUTPUT_FORMAT = MC_OUTPUT_NORMAL;\r
+                       } else if(strcasecmp("wave",argv[num+1])==0){\r
+                               gogo_opts.optOUTPUT_FORMAT = MC_OUTPUT_RIFF_WAVE;\r
+                       } else if(strcasecmp("wave",argv[num+1])==0){\r
+                               gogo_opts.optOUTPUT_FORMAT = MC_OUTPUT_RIFF_RMP;\r
+                       }\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               //   -priority normal  : normal priority\r
+               //   -priority num\r
+               if(strcasecmp("-priority",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       if(strcasecmp("normal",argv[num+1])==0){\r
+                               gogo_opts.optTHREAD_PRIORITY = 10;\r
+                       } else {\r
+                               gogo_opts.optTHREAD_PRIORITY = atol(argv[num+1]);\r
+                       }\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               //  -readthread num\r
+               if(strcasecmp("-readthread",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       gogo_opts.optREADTHREAD_PRIORITY = atol(argv[num+1]);\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               // -i\r
+               // -i-\r
+               if(strcasecmp("-i",argv[num])==0){\r
+                       gogo_opts.optVERIFY = 1;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               if(strcasecmp("-i-",argv[num])==0){\r
+                       gogo_opts.optVERIFY = 0;\r
+                       num += 1;\r
+                       continue;\r
+               }\r
+               // -o directory_path\r
+               if(strcasecmp("-o",argv[num])==0){\r
+                       if(num+1>=argc) break;\r
+                       strncpy((char *)gogo_opts.optOUTPUTDIR,argv[num+1],1023);\r
+                       gogo_opts.optOUTPUTDIR[1023] = '\0';\r
+                       num += 2;\r
+                       continue;\r
+               }\r
+               num += 1;\r
+       }\r
+       return;\r
+}\r
+\r
+// gogo.dll or gogo.lib \82Ì\8aÖ\90\94\82ð\97p\82¢\82½ mp3 \8dì\90¬\95\94\95ª\82Í\95Ê\83X\83\8c\83b\83h\82É\82Ä\8ds\82¤\81B\81@\r
+// \83X\83\8c\83b\83h\8dì\90¬\82É\82Í CreateMPGEthread() \82ð\97p\82¢\82é\81B\r
+// \82»\82Ì\83X\83\8c\83b\83h\82Í\81Agogo_buffer_termination \82ª\94ñ 0 \82É\82È\82Á\82½\82Æ\82«\95K\82¸\8fI\97¹\82·\82é\81B\r
+// \82»\82Ì\83X\83\8c\83b\83h\82ª\8fI\97¹\82µ\82½\82±\82Æ\82Í\81AIsTerminatedMPGEthread()\82É\82æ\82è\8c\9f\92m\82·\82é\81B\r
+// \83X\83\8c\83b\83h\82ª\8fI\97¹\82µ\82½\82±\82Æ\82ð\8am\94F\82µ\82Ä\82©\82ç close_output() \82Í\8a®\97¹\82·\82é\81\r
+// \83f\81[\83^\82Ì\93n\82µ\82Í gogo_buffer \82É\82Ä\8ds\82¤\82ª\81A\83o\83b\83t\83@\82ª\88ê\94t\82Ì\82Æ\82«\82Í\81A\8c³\83X\83\8c\83b\83h\82ª\r
+// \92â\8e~\82µ\81A\83o\83b\83t\83@\82Ì\93Ç\82Ý\8d\9e\82Ý\91Ò\8b@\8e\9e\82Í gogo \97p\83X\83\8c\83b\83h\82ª\92â\8e~\82·\82é\81B\r
+static int __stdcall MPGEthread(void)\r
+{\r
+       MERET   rval;\r
+       struct MCP_INPDEV_USERFUNC mcp_inpdev_userfunc;\r
+\r
+       gogo_buffer_reset();\r
+       rval = MPGE_initializeWork();\r
+       if(rval != ME_NOERR){\r
+               gogo_error(rval);\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+       memset(&mcp_inpdev_userfunc,0,sizeof(struct MCP_INPDEV_USERFUNC));\r
+       mcp_inpdev_userfunc.pUserFunc = gogoUserFunc;\r
+       mcp_inpdev_userfunc.nSize = MC_INPDEV_MEMORY_NOSIZE;\r
+       mcp_inpdev_userfunc.nBit = (dpm.encoding & PE_16BIT) ? 16 : 8;\r
+       mcp_inpdev_userfunc.nFreq = dpm.rate;\r
+       mcp_inpdev_userfunc.nChn = (dpm.encoding & PE_MONO) ? 1 : 2;\r
+#ifndef IA_W32GUI\r
+       if(use_gogo_commandline_options && gogo_commandline_options!=NULL){\r
+               gogo_opts_reset();\r
+               set_gogo_opts_use_commandline_options(gogo_commandline_options);\r
+       }\r
+#else\r
+       gogo_ConfigDialogInfoApply();\r
+#endif\r
+       set_gogo_opts();\r
+       rval = MPGE_setConfigure( MC_INPUTFILE,MC_INPDEV_USERFUNC,(UPARAM)&mcp_inpdev_userfunc);\r
+       if(rval != ME_NOERR){\r
+               gogo_error(rval);\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+       rval = MPGE_setConfigure(MC_STARTOFFSET,(UPARAM)0,(UPARAM)0);\r
+       if(rval != ME_NOERR){\r
+               gogo_error(rval);\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+#if 0\r
+       rval = MPGE_setConfigure(MC_INPFREQ,(UPARAM)dpm.rate,(UPARAM)0);\r
+       if(rval != ME_NOERR){\r
+               gogo_error(rval);\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+#endif\r
+       rval = MPGE_setConfigure(MC_BYTE_SWAP,(UPARAM)((dpm.encoding & PE_BYTESWAP) ? TRUE : FALSE),(UPARAM)0);\r
+       if(rval != ME_NOERR){\r
+               gogo_error(rval);\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+       rval = MPGE_setConfigure(MC_8BIT_PCM,(UPARAM)((dpm.encoding & PE_16BIT) ? FALSE : TRUE),(UPARAM)0);\r
+       if(rval != ME_NOERR){\r
+               gogo_error(rval);\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+       rval = MPGE_setConfigure(MC_MONO_PCM,(UPARAM)((dpm.encoding & PE_MONO) ? TRUE : FALSE),(UPARAM)0);\r
+       if(rval != ME_NOERR){\r
+               gogo_error(rval);\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+       rval = MPGE_detectConfigure();\r
+       if( rval != ME_NOERR ){\r
+               gogo_error(rval);\r
+               return -1;\r
+       } else {\r
+//             UPARAM curFrame;\r
+//             curFrame = 0;\r
+               do {\r
+//                     ctl->cmsg(CMSG_INFO, VERB_DEBUG,"gogo_a : frame %d",curFrame);\r
+//                     curFrame++;\r
+                       rval = MPGE_processFrame();\r
+               } while( rval == ME_NOERR );\r
+               if( rval != ME_EMPTYSTREAM ){\r
+                       gogo_buffer_termination  = -1;\r
+                       gogo_error(rval);\r
+               }\r
+       }\r
+       MPGE_closeCoder();\r
+       MPGE_endCoder();\r
+       return 0;\r
+}\r
+\r
+// Whether the thread of gogo.dll is terminated ?\r
+static int IsTerminatedMPGEthread(void)\r
+{\r
+#ifndef __W32__\r
+#else\r
+       DWORD dwRes;\r
+       if(hMPGEthread==NULL)\r
+               return 1;\r
+       dwRes = WaitForSingleObject(hMPGEthread,0);\r
+       if(dwRes==WAIT_TIMEOUT){\r
+               return 0;\r
+       } else {\r
+               return 1;\r
+       }\r
+#endif\r
+}\r
+\r
+// Create the thread of gogo.dll\r
+static int CreateMPGEthread(void)\r
+{\r
+       // gogo \97p\82Ì\83X\83\8c\83b\83h\82ª\8fI\97¹\82µ\82Ä\82¢\82é\82©\8am\94F\82·\82é\81B\r
+       gogo_buffer_termination  = 1;\r
+       while(!IsTerminatedMPGEthread()){\r
+#ifndef __W32__\r
+               usleep(100);\r
+#else\r
+               Sleep(0);\r
+               Sleep(100);\r
+#endif\r
+       }\r
+       gogo_buffer_termination  = 0;\r
+\r
+       // gogo \97p\82Ì\83X\83\8c\83b\83h\82ð\8dì\90¬\82·\82é\81B\r
+#ifndef __W32__\r
+\r
+#else\r
+       // \83n\83\93\83h\83\8b\82Í\83N\83\8d\81[\83Y\82µ\82Ä\82¨\82­\81B\r
+       if(hMPGEthread!=NULL){\r
+               CloseHandle(hMPGEthread);\r
+       }\r
+       hMPGEthread = (HANDLE)crt_beginthreadex(NULL,0,(LPTHREAD_START_ROUTINE)MPGEthread,NULL,0,&dwMPGEthreadID);\r
+       if(hMPGEthread==(HANDLE)-1 || hMPGEthread==NULL){\r
+               hMPGEthread = NULL;\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : cannot create thread.");\r
+               return -1;\r
+       }\r
+#endif\r
+       return 0;\r
+}\r
+\r
+\r
+/**********************************************************************/\r
+#ifdef IA_W32GUI\r
+extern volatile int w32g_gogo_id3_tag_dialog(void);\r
+extern int w32g_interactive_id3_tag_set;\r
+#endif\r
+static int gogo_output_open(const char *fname)\r
+{\r
+       if(fname[0]=='\0')\r
+               return -1;\r
+       if(!gogo_opts_initflag)\r
+               gogo_opts_init();\r
+       strncpy((char *)gogo_opts.output_name,fname,1023);\r
+       gogo_opts.output_name[1023] = '\0';\r
+#ifdef IA_W32GUI\r
+       gogo_opts_reset_tag();\r
+       if(w32g_interactive_id3_tag_set){       // \89\89\91t\8e\9e\82ÉID3\83^\83O\8fî\95ñ\93ü\97Í\83_\83C\83A\83\8d\83O\82ð\8aJ\82­\81B\r
+               w32g_gogo_id3_tag_dialog();\r
+       }\r
+#endif\r
+\r
+       if(CreateMPGEthread()){\r
+               gogo_buffer_termination  = -1;\r
+               return -1;\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+static int auto_gogo_output_open(const char *input_filename)\r
+{\r
+  char *output_filename;\r
+\r
+#ifndef IA_W32GUI\r
+  output_filename = create_auto_output_name(input_filename,"mp3",NULL,0);\r
+#else\r
+  gogo_ConfigDialogInfoApply();\r
+  switch(gogo_opts.optOUTPUT_FORMAT){\r
+  case MC_OUTPUT_NORMAL:\r
+    output_filename = create_auto_output_name(input_filename,"mp3",(char *)w32g_output_dir,w32g_auto_output_mode);\r
+    break;\r
+  case MC_OUTPUT_RIFF_WAVE:\r
+    output_filename = create_auto_output_name(input_filename,"wav",(char *)w32g_output_dir,w32g_auto_output_mode);\r
+    break;\r
+  case MC_OUTPUT_RIFF_RMP:\r
+    output_filename = create_auto_output_name(input_filename,"rmp",(char *)w32g_output_dir,w32g_auto_output_mode);\r
+    break;\r
+  default:\r
+    output_filename = create_auto_output_name(input_filename,"mp3",(char *)w32g_output_dir,w32g_auto_output_mode);\r
+    break;\r
+  }\r
+#endif\r
+  if(output_filename==NULL){\r
+         return -1;\r
+  }\r
+  if((dpm.fd = gogo_output_open(output_filename)) == -1) {\r
+    free(output_filename);\r
+    return -1;\r
+  }\r
+  if(dpm.name != NULL){\r
+    free(dpm.name);\r
+    dpm.name = NULL;\r
+  }\r
+  dpm.name = output_filename;\r
+  ctl->cmsg(CMSG_INFO, VERB_NORMAL, "Output %s", dpm.name);\r
+  return 0;\r
+}\r
+\r
+#ifdef AU_GOGO_DLL     \r
+extern int gogo_dll_check(void);\r
+#endif\r
+static int open_output(void)\r
+{\r
+    int include_enc, exclude_enc;\r
+\r
+#ifdef AU_VORBIS_DLL\r
+       if(!gogo_dll_check()){\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "can not find gogo.dll.");\r
+               return -1;\r
+       }\r
+#endif\r
+\r
+    include_enc = exclude_enc = 0;\r
+    if(dpm.encoding & PE_16BIT){\r
+#ifdef LITTLE_ENDIAN\r
+               exclude_enc = PE_BYTESWAP;\r
+#else\r
+               include_enc = PE_BYTESWAP;\r
+#endif /* LITTLE_ENDIAN */\r
+               include_enc |= PE_SIGNED;\r
+    } else {\r
+               exclude_enc |= PE_SIGNED;\r
+#if 0\r
+    } else if(!(dpm.encoding & (PE_ULAW|PE_ALAW))){\r
+               exclude_enc = PE_SIGNED;\r
+#endif\r
+    }\r
+\r
+    dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc);\r
+\r
+#ifndef IA_W32GUI\r
+    if(dpm.name == NULL) {\r
+      dpm.flag |= PF_AUTO_SPLIT_FILE;\r
+      dpm.name = NULL;\r
+    } else {\r
+      dpm.flag &= ~PF_AUTO_SPLIT_FILE;\r
+      if((dpm.fd = gogo_output_open(dpm.name)) == -1)\r
+               return -1;\r
+    }\r
+#else\r
+       if(w32g_auto_output_mode>0){\r
+      dpm.flag |= PF_AUTO_SPLIT_FILE;\r
+      dpm.name = NULL;\r
+    } else {\r
+      dpm.flag &= ~PF_AUTO_SPLIT_FILE;\r
+      if((dpm.fd = gogo_output_open(dpm.name)) == -1)\r
+               return -1;\r
+    }\r
+#endif\r
+\r
+    return 0;\r
+}\r
+\r
+static int output_data(char *readbuffer, int32 bytes)\r
+{\r
+       int32 rest_bytes = bytes;\r
+       int32 out_bytes = 0;\r
\r
+       if(dpm.fd<0)\r
+         return 0;\r
\r
+       gogo_buffer_init();\r
+       if(bytes>gogo_buffer_size){\r
+               gogo_buffer_termination = -1;\r
+               ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : buffer size is small.");\r
+               return -1;\r
+       }\r
+       for(;;){\r
+               int32 size;\r
+               if(bytes<=0)\r
+                       break;\r
+               if(gogo_buffer_termination<0){\r
+                       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : output_data error.");\r
+                       return -1;\r
+               }\r
+               if(gogo_buffer_termination)\r
+                       return out_bytes;\r
+               if(gogo_lock()){\r
+                       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "gogo_a : lock error.");\r
+                       gogo_buffer_termination = -1;\r
+                       return -1;\r
+               }\r
+               size = __gogo_buffer_push(readbuffer,bytes);\r
+               readbuffer += size;\r
+               bytes -= size;\r
+               out_bytes += size;\r
+               gogo_unlock();\r
+               if(bytes>0){\r
+#ifndef __W32__\r
+                       usleep(100);\r
+#else\r
+                       Sleep(0);\r
+                       Sleep(100);\r
+#endif\r
+               }\r
+       }\r
+  return out_bytes;\r
+}\r
+\r
+static void close_output(void)\r
+{\r
+  if (dpm.fd < 0)\r
+    return;\r
\r
+  gogo_buffer_termination = 1;\r
+  for (;;) {\r
+    if (IsTerminatedMPGEthread()) {\r
+      break;\r
+    }\r
+#ifndef __W32__\r
+    usleep(100000);\r
+#else\r
+    Sleep(100);\r
+#endif\r
+  }\r
+  dpm.fd = -1;\r
+}\r
+\r
+static int acntl(int request, void *arg)\r
+{\r
+       switch(request) {\r
+       case PM_REQ_PLAY_START:\r
+               if(dpm.flag & PF_AUTO_SPLIT_FILE)\r
+                       return auto_gogo_output_open(current_file_info->filename);\r
+               break;\r
+       case PM_REQ_PLAY_END:\r
+               if(dpm.flag & PF_AUTO_SPLIT_FILE) {\r
+                       close_output();\r
+                       return 0;\r
+               }\r
+               break;\r
+       case PM_REQ_DISCARD:\r
+#if 1\r
+               gogo_buffer_reset();\r
+#endif\r
+               return 0;\r
+       case PM_REQ_FLUSH:\r
+       case PM_REQ_OUTPUT_FINISH:\r
+               break;\r
+       default:\r
+               break;\r
+       }\r
+       return -1;\r
+}\r
diff --git a/timidity/gogo_a.h b/timidity/gogo_a.h
new file mode 100755 (executable)
index 0000000..a9e2325
--- /dev/null
@@ -0,0 +1,58 @@
+#ifndef __GOGO_A_H__\r
+#define __GOGO_A_H__\r
+\r
+typedef struct gogo_opts_t_ {\r
+       int optENCODEMODE;\r
+       int optBITRATE1;\r
+       int optBITRATE2;\r
+       int optINPFREQ;\r
+       int optOUTFREQ;\r
+       long optSTARTOFFSET;\r
+       int optUSEPSY;\r
+       int optUSELPF16;\r
+       int optUSEMMX;\r
+       int optUSE3DNOW;\r
+       int optUSEKNI;\r
+       int optUSEE3DNOW;\r
+       int optADDTAGnum;\r
+       int optADDTAG_len[64];\r
+       char *optADDTAG_buf[64];\r
+       int optEMPHASIS;\r
+       int optVBR;     // 0..9\r
+       int optCPU;     // 1..\r
+       int optBYTE_SWAP;\r
+       int opt8BIT_PCM;\r
+       int optMONO_PCM;\r
+       int optTOWNS_SND;\r
+       int optTHREAD_PRIORITY;\r
+       int optREADTHREAD_PRIORITY;\r
+       int optOUTPUT_FORMAT;\r
+       int optENHANCEDFILTER_A;\r
+       int optENHANCEDFILTER_B;\r
+       int optVBRBITRATE_low;\r
+       int optVBRBITRATE_high;\r
+       int optMSTHRESHOLD_threshold;\r
+       int optMSTHRESHOLD_mspower;\r
+       int optVERIFY;\r
+       char optOUTPUTDIR[1024];\r
+       char output_name[1024];\r
+} gogo_opts_t;\r
+extern volatile gogo_opts_t gogo_opts;\r
+\r
+extern void gogo_opts_init(void);\r
+extern void gogo_opts_reset(void);\r
+extern void gogo_opts_reset_tag(void);\r
+extern int commandline_to_argc_argv(char *commandline, int *argc, char ***argv);\r
+\r
+// ID3 TAG 128bytes\r
+typedef struct mp3_id3_tag_t_ {\r
+       char tag[3];            // "ID3"\r
+       char title[30];\r
+       char artist[30];\r
+       char album[30];\r
+       char year[4];\r
+       char comment[30];\r
+       unsigned char genre;\r
+} mp3_id3_tag_t;\r
+\r
+#endif /* __GOGO_A_H__ */\r
old mode 100644 (file)
new mode 100755 (executable)
index 9299e3e..1b41b05
@@ -91,6 +91,9 @@ extern PlayMode list_play_mode;
 #ifdef AU_VORBIS
 extern PlayMode vorbis_play_mode;
 #endif /* AU_VORBIS */
+#ifdef AU_GOGO
+extern PlayMode gogo_play_mode;
+#endif /* AU_GOGO */
 #endif /* !__MACOS__ */
 
 extern PlayMode modmidi_play_mode;
@@ -124,6 +127,9 @@ PlayMode *play_mode_list[] = {
 #ifdef AU_VORBIS
   &vorbis_play_mode,
 #endif /* AU_VORBIS */
+#ifdef AU_GOGO
+  &gogo_play_mode,
+#endif /* AU_GOGO */
   &list_play_mode,
 #endif /* __MACOS__ */
   &modmidi_play_mode,
@@ -351,3 +357,135 @@ const char *output_encoding_string(int enc)
            return "unsigned 8bit";
     /*NOTREACHED*/
 }
+
+/* mode
+  0,1: Default mode.
+  2: Remove the directory path of input_filename, then add output_dir.
+  3: Replace directory separator characters ('/','\',':') with '_', then add output_dir.
+ */
+char *create_auto_output_name(const char *input_filename, char *ext_str, char *output_dir, int mode)
+{
+  char *output_filename;
+  char *ext, *p;
+  int32 dir_len = 0;
+  char ext_str_tmp[65];
+
+  output_filename = (char *)malloc((output_dir?strlen(output_dir):0) + strlen(input_filename) + 6);
+  if(output_filename==NULL)
+    return NULL;
+  output_filename[0] = '\0';
+  if(output_dir!=NULL && (mode==2 || mode==3)) {
+    strcat(output_filename,output_dir);
+    dir_len = strlen(output_filename);
+#ifndef __W32__
+    if(dir_len>0 && output_filename[dir_len-1]!=PATH_SEP){
+#else
+      if(dir_len>0 && output_filename[dir_len-1]!='/' && output_filename[dir_len-1]!='\\' && output_filename[dir_len-1]!=':'){
+#endif
+       strcat(output_filename,PATH_STRING);
+       dir_len++;
+      }
+    }
+    strcat(output_filename, input_filename);
+
+    if((ext = strrchr(output_filename, '.')) == NULL)
+      ext = output_filename + strlen(output_filename);
+    else {
+      /* strip ".gz" */
+      if(strcasecmp(ext, ".gz") == 0) {
+       *ext = '\0';
+       if((ext = strrchr(output_filename, '.')) == NULL)
+         ext = output_filename + strlen(output_filename);
+      }
+    }
+
+    /* replace '\' , '/' or PATH_SEP between '#' and ext */
+    p = strrchr(output_filename,'#');
+    if(p!=NULL){
+      char *p1;
+#ifdef _mbsrchr
+#define STRCHR(a,b) _mbschr(a,b)
+#else
+#define STRCHR(a,b) strchr(a,b)
+#endif
+#ifndef __W32__
+      p1 = p + 1;
+      while((p1 = STRCHR(p1,PATH_SEP))!=NULL && p1<ext){
+        *p1 = '_';
+       p1++;
+      }
+#else
+      p1 = p + 1;
+      while((p1 = STRCHR(p1,'\\'))!=NULL && p1<ext){
+       *p1 = '_';
+       p1++;
+      }
+      p1 = p;
+      while((p1 = STRCHR(p1,'/'))!=NULL && p1<ext){
+       *p1 = '_';
+       p1++;
+      }
+#endif
+#undef STRCHR
+    }
+
+    /* replace '.' and '#' before ext */
+    for(p = output_filename; p < ext; p++)
+#ifndef __W32__
+      if(*p == '.' || *p == '#')
+#else
+       if(*p == '#')
+#endif
+         *p = '_';
+
+    if(mode==2){
+      char *p1,*p2,*p3;
+#ifndef __W32__
+      p = strrchr(output_filename+dir_len,PATH_SEP);
+#else
+#ifdef _mbsrchr
+#define STRRCHR _mbsrchr
+#else
+#define STRRCHR strrchr
+#endif
+      p1 = STRRCHR(output_filename+dir_len,'/');
+      p2 = STRRCHR(output_filename+dir_len,'\\');
+      p3 = STRRCHR(output_filename+dir_len,':');
+#undef STRRCHR
+      p1>p2 ? (p1>p3 ? (p = p1) : (p = p3)) : (p2>p3 ? (p = p2) : (p = p3));
+#endif
+      if(p!=NULL){
+       for(p1=output_filename+dir_len,p2=p+1; *p2; p1++,p2++)
+         *p1 = *p2;
+       *p1 = '\0';
+      }
+    }
+
+    if(mode==3){
+      for(p=output_filename+dir_len; *p; p++)
+#ifndef __W32__
+       if(*p==PATH_SEP)
+#else
+         if(*p=='/' || *p=='\\' || *p==':')
+#endif
+           *p = '_';
+    }
+
+    if((ext = strrchr(output_filename, '.')) == NULL)
+      ext = output_filename + strlen(output_filename);
+    if(*ext){
+      strncpy(ext_str_tmp,ext_str,64);
+      ext_str_tmp[64]=0;
+      if(isupper(*(ext + 1))){
+       for(p=ext_str_tmp;*p;p++)
+         *p = toupper(*p);
+       *p = '\0';
+      } else {
+       for(p=ext_str_tmp;*p;p++)
+         *p = tolower(*p);
+       *p = '\0';
+      }
+      strcpy(ext+1,ext_str_tmp);
+    }
+    return output_filename;
+}
index 94f56a1..6c071a5 100644 (file)
@@ -166,6 +166,8 @@ extern int32 general_output_convert(int32 *buf, int32 count);
 extern int validate_encoding(int enc, int include_enc, int exclude_enc);
 extern const char *output_encoding_string(int enc);
 
+extern char *create_auto_output_name(const char *input_filename, char *ext_str, char *output_dir, int mode);
+
 #if defined(__W32__)
 #define FILE_OUTPUT_MODE       O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644
 #elif defined(__MACOS__)
old mode 100644 (file)
new mode 100755 (executable)
index e6f5730..0aecc1e
@@ -1044,110 +1044,10 @@ static int sanity_range(LayerTable *tbl)
  * create patch record from the stored data table
  *----------------------------------------------------------------*/
 
-#if 0
-static int make_patch(SFInfo *sf, int pridx, LayerTable *tbl)
-{
-    int bank, preset, keynote;
-    int addr, order;
-    InstList *ip;
-    SFSampleInfo *sample;
-    SampleList *sp;
-
-    sample = &sf->sample[tbl->val[SF_sampleId]];
-    if(sample->sampletype & 0x8000) /* is ROM sample? */
-    {
-       ctl->cmsg(CMSG_INFO, VERB_DEBUG, "preset %d is ROM sample: 0x%x",
-                 pridx, sample->sampletype);
-       return AWE_RET_SKIP;
-    }
-
-    bank = sf->preset[pridx].bank;
-    preset = sf->preset[pridx].preset;
-    if(bank == 128)
-       keynote = LOWNUM(tbl->val[SF_keyRange]);
-    else
-       keynote = -1;
-
-    ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY,
-             "SF make inst pridx=%d bank=%d preset=%d keynote=%d",
-             pridx, bank, preset, keynote);
-
-    if(is_excluded(current_sfrec, bank, preset, keynote))
-    {
-       ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY, " * Excluded");
-       return AWE_RET_SKIP;
-    }
-
-    order = is_ordered(current_sfrec, bank, preset, keynote);
-    if(order < 0)
-       order = current_sfrec->def_order;
-
-    addr = INSTHASH(bank, preset, keynote);
-
-    for(ip = current_sfrec->instlist[addr]; ip; ip = ip->next)
-    {
-       if(ip->pat.bank == bank && ip->pat.preset == preset &&
-          (keynote < 0 || keynote == ip->pat.keynote))
-           break;
-    }
-
-    if(ip == NULL)
-    {
-       ip = (InstList*)SFMalloc(current_sfrec, sizeof(InstList));
-       memset(ip, 0, sizeof(InstList));
-       ip->pr_idx = pridx;
-       ip->pat.bank = bank;
-       ip->pat.preset = preset;
-       ip->pat.keynote = keynote;
-       ip->order = order;
-       ip->samples = 0;
-       ip->slist = NULL;
-       ip->next = current_sfrec->instlist[addr];
-       current_sfrec->instlist[addr] = ip;
-    }
-
-    /* new sample */
-    sp = (SampleList *)SFMalloc(current_sfrec, sizeof(SampleList));
-    memset(sp, 0, sizeof(SampleList));
-
-    if(bank == 128)
-       sp->v.note_to_use = keynote;
-    sp->v.high_vel = 127;
-    make_info(sf, sp, tbl);
-
-    /* add a sample */
-    if(ip->slist == NULL)
-       ip->slist = sp;
-    else
-    {
-       SampleList *cur, *prev;
-       int32 start;
-
-       /* Insert sample */
-       start = sp->start;
-       cur = ip->slist;
-       prev = NULL;
-       while(cur && cur->start <= start)
-       {
-           prev = cur;
-           cur = cur->next;
-       }
-       if(prev == NULL)
-       {
-           sp->next = ip->slist;
-           ip->slist = sp;
-       }
-       else
-       {
-           prev->next = sp;
-           sp->next = cur;
-       }
-    }
-    ip->samples++;
+#ifdef CFG_FOR_SF
+static int cfg_for_sf_scan(char *name, int x_bank, int x_preset, int x_keynote_from, int x_keynote_to, int romflag);
+#endif
 
-    return AWE_RET_OK;
-}
-#else
 static int make_patch(SFInfo *sf, int pridx, LayerTable *tbl)
 {
     int bank, preset, keynote;
@@ -1158,6 +1058,10 @@ static int make_patch(SFInfo *sf, int pridx, LayerTable *tbl)
     SampleList *sp;
 
     sample = &sf->sample[tbl->val[SF_sampleId]];
+#ifdef CFG_FOR_SF
+       cfg_for_sf_scan(sample->name,sf->preset[pridx].bank,sf->preset[pridx].preset,LOWNUM(tbl->val[SF_keyRange]),
+               HIGHNUM(tbl->val[SF_keyRange]),sample->sampletype & 0x8000);
+#endif
     if(sample->sampletype & 0x8000) /* is ROM sample? */
     {
        ctl->cmsg(CMSG_INFO, VERB_DEBUG, "preset %d is ROM sample: 0x%x",
@@ -1261,7 +1165,6 @@ static int make_patch(SFInfo *sf, int pridx, LayerTable *tbl)
        else
        return AWE_RET_OK;
 }
-#endif
 
 /*----------------------------------------------------------------
  *
@@ -1501,6 +1404,10 @@ static void set_rootkey(SFInfo *sf, SampleList *vp, LayerTable *tbl)
 
     /* correct tune with the sustain level of modulation envelope */
     vp->tune += ((int)tbl->val[SF_env1ToPitch] * (1000 - (int)tbl->val[SF_sustainEnv1])) / 1000;
+
+    /* correct tune */
+    vp->tune += (int)tbl->val[SF_lfo1ToPitch]; 
+    vp->tune += (int)tbl->val[SF_lfo2ToPitch]; 
 }
 
 static void set_rootfreq(SampleList *vp)
@@ -1620,7 +1527,7 @@ static void convert_vibrato(SampleList *vp, LayerTable *tbl)
     /* cents to linear; 400cents = 256 */
     shift = shift * 256 / 400;
     if(shift < 0)
-       shift += 256;
+      shift = -shift;
     vp->v.vibrato_depth = (uint8)shift;
 
     /* frequency in mHz */
@@ -1701,3 +1608,334 @@ static void do_lowpass(Sample *sp, int32 freq, FLOAT_T resonance)
                oldy3 = y3;
        }
 }
+
+
+
+#ifdef CFG_FOR_SF
+
+/*********************************************************************
+
+    cfg for soundfont utility.
+
+  demanded sources.
+     common.c  controls.c  dumb_c.c  instrum.c  sbkconv.c  sffile.c
+     sfitem.c  sndfont.c  tables.c  version.c
+     utils/*  libarc/*
+
+  MACRO
+      CFG_FOR_SF
+
+ *********************************************************************/
+
+static FILE *x_out;
+static char *x_sf_file_name = NULL;
+static int x_pre_bank = -1;
+static int x_pre_preset = -1;
+static int x_sort = 1;
+typedef struct x_cfg_info_t_ {
+       char m_bank[128][128];
+       char m_preset[128][128];
+       char m_rom[128][128];
+       char *m_str[128][128];
+       char d_preset[128][128];
+       char d_keynote[128][128];
+       char d_rom[128][128];
+       char *d_str[128][128];
+} x_cfg_info_t;
+static x_cfg_info_t x_cfg_info;
+static int x_cfg_info_init_flag = 0;
+static void x_cfg_info_init(void)
+{
+       if(!x_cfg_info_init_flag){
+               int i,j;
+               for(i=0;i<128;i++){
+                       for(j=0;j<128;j++){
+                               x_cfg_info.m_bank[i][j] = -1;
+                               x_cfg_info.m_preset[i][j] = -1;
+                               x_cfg_info.m_rom[i][j] = -1;
+                               x_cfg_info.m_str[i][j] = NULL;
+                               x_cfg_info.d_preset[i][j] = -1;
+                               x_cfg_info.d_keynote[i][j] = -1;
+                               x_cfg_info.d_rom[i][j] = -1;
+                               x_cfg_info.d_str[i][j] = NULL;
+                       }
+               }
+       }
+       x_cfg_info_init_flag = 1;
+}
+static int cfg_for_sf_scan(char *x_name, int x_bank, int x_preset, int x_keynote_from, int x_keynote_to, int romflag)
+{
+       int x_keynote;
+       x_cfg_info_init();
+       if(x_sort){
+//             if(x_bank!=x_pre_bank || x_preset!=x_pre_preset){
+               {
+                       if(x_bank==128){
+                               char *str;
+                               char buff[256];
+                               for(x_keynote=x_keynote_from;x_keynote<=x_keynote_from;x_keynote++){
+                                       x_cfg_info.d_preset[x_preset][x_keynote] = x_preset;
+                                       x_cfg_info.d_keynote[x_preset][x_keynote] = x_keynote;
+                                       if(romflag && x_cfg_info.d_rom[x_preset][x_keynote])
+                                               x_cfg_info.d_rom[x_preset][x_keynote] = 1;
+                                       else
+                                               x_cfg_info.d_rom[x_preset][x_keynote] = 0;
+                                       str = x_cfg_info.d_str[x_preset][x_keynote];
+                                       if(str==NULL){
+                                               str = (char *)realloc(str,(str==NULL?0:strlen(str))+strlen(x_name)+30);
+                                               str[0] = '\0';
+                                       } else{
+                                               str = (char *)realloc(str,(str==NULL?0:strlen(str))+strlen(x_name)+30);
+                                       }
+                                       sprintf(buff," %s",x_name);
+                                       strcat(str,buff);
+                                       x_cfg_info.d_str[x_preset][x_keynote] = str;
+                               }
+                       } else {
+                               char *str = x_cfg_info.m_str[x_bank][x_preset];
+                               char buff[256];
+                               char *strROM;
+                               x_cfg_info.m_bank[x_bank][x_preset] = x_bank;
+                               x_cfg_info.m_preset[x_bank][x_preset] = x_preset;
+                               if(romflag)
+                                       strROM = " (ROM)";
+                               else
+                                       strROM = "";
+                               if(romflag && x_cfg_info.m_rom[x_bank][x_preset])
+                                       x_cfg_info.m_rom[x_bank][x_preset] = 1;
+                               else
+                                       x_cfg_info.m_rom[x_bank][x_preset] = 0;
+                               if(str==NULL){
+                                       str = (char *)realloc(str,(str==NULL?0:strlen(str))+strlen(x_name)+30);
+                                       str[0] = '\0';
+                               } else{
+                                       str = (char *)realloc(str,(str==NULL?0:strlen(str))+strlen(x_name)+30);
+                               }
+                               if(x_keynote_from!=x_keynote_to)
+                                       sprintf(buff,"        # %d-%d:%s%s\n",x_keynote_from,x_keynote_to,x_name,strROM);
+                               else
+                                       sprintf(buff,"        # %d:%s%s\n",x_keynote_from,x_name,strROM);
+                               strcat(str,buff);
+                               x_cfg_info.m_str[x_bank][x_preset] = str;
+                       }
+               }
+       } else {
+               if(x_bank==128){
+                       if(x_preset!=x_pre_preset)
+                               fprintf(x_out,"drumset %d\n",x_preset);
+               } else {
+                       if(x_bank!=x_pre_bank)
+                               fprintf(x_out,"bank %d\n",x_bank);
+               }
+               if(romflag){
+                       if(x_bank==128){
+                               for(x_keynote=x_keynote_from;x_keynote<=x_keynote_from;x_keynote++)
+                                       fprintf(x_out,"#  %d %%font %s %d %d %d # %s (ROM)\n",x_keynote,x_sf_file_name,x_bank,x_preset,x_keynote,x_name);
+                       } else {
+                               if(x_keynote_from==x_keynote_to)
+                                       fprintf(x_out,"#   %d %%font %s %d %d # %d:%s (ROM)\n",x_preset,x_sf_file_name,x_bank,x_preset,x_keynote_from,x_name);
+                               else
+                                       fprintf(x_out,"#   %d %%font %s %d %d # %d-%d:%s (ROM)\n",x_preset,x_sf_file_name,x_bank,x_preset,x_keynote_from,x_keynote_to,x_name);
+                       }
+               } else {
+                       if(x_bank==128){
+                               for(x_keynote=x_keynote_from;x_keynote<=x_keynote_from;x_keynote++)
+                                       fprintf(x_out,"    %d %%font %s %d %d %d # %s\n",x_keynote,x_sf_file_name,x_bank,x_preset,x_keynote,x_name);
+                       } else {
+                               if(x_keynote_from==x_keynote_to)
+                                       fprintf(x_out,"    %d %%font %s %d %d # %d:%s\n",x_preset,x_sf_file_name,x_bank,x_preset,x_keynote_from,x_name);
+                               else
+                                       fprintf(x_out,"    %d %%font %s %d %d # %d-%d:%s\n",x_preset,x_sf_file_name,x_bank,x_preset,x_keynote_from,x_keynote_to,x_name);
+                       }
+               }
+       }
+       x_pre_bank = x_bank;
+       x_pre_preset = x_preset;
+       return 0;
+}
+
+
+int32 control_ratio = 0;
+PlayMode *play_mode = NULL;
+int32 freq_table[1];
+FLOAT_T bend_fine[1];
+FLOAT_T bend_coarse[1];
+void pre_resample(Sample *sp) {}
+void antialiasing(int16 *data, int32 data_length,int32 sample_rate, int32 output_rate) {}
+char *event2string(int id) { return NULL; }
+int check_apply_control(void) { return 0; }
+char *wrdt = NULL; /* :-P */
+
+#ifdef WIN32
+static int ctl_open(int using_stdin, int using_stdout) { return 0;}
+static void ctl_close(void) {}
+static int ctl_read(int32 *valp) { return 0; } 
+#include <stdarg.h>
+static int cmsg(int type, int verbosity_level, char *fmt, ...)
+{
+  va_list ap;
+  if ((type==CMSG_TEXT || type==CMSG_INFO || type==CMSG_WARNING) &&
+      ctl->verbosity<verbosity_level)
+    return 0;
+  va_start(ap, fmt);
+  vfprintf(stderr, fmt, ap);
+  fputs(NLS, stderr);
+  va_end(ap);
+  return 0;
+}
+static void ctl_event(CtlEvent *e) {}
+void dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {}
+ControlMode w32gui_control_mode =
+{
+       "w32gui interface", 'd',
+    1,0,0,
+    0,
+    ctl_open,
+    ctl_close,
+    dumb_pass_playing_list,
+    ctl_read,
+    cmsg,
+    ctl_event
+};
+#endif
+extern struct URL_module URL_module_file;
+#ifndef __MACOS__
+extern struct URL_module URL_module_dir;
+#endif /* __MACOS__ */
+#ifdef SUPPORT_SOCKET
+extern struct URL_module URL_module_http;
+extern struct URL_module URL_module_ftp;
+extern struct URL_module URL_module_news;
+extern struct URL_module URL_module_newsgroup;
+#endif /* SUPPORT_SOCKET */
+#ifdef HAVE_POPEN
+extern struct URL_module URL_module_pipe;
+#endif /* HAVE_POPEN */
+static struct URL_module *url_module_list[] =
+{
+    &URL_module_file,
+#ifndef __MACOS__
+    &URL_module_dir,
+#endif /* __MACOS__ */
+#ifdef SUPPORT_SOCKET
+    &URL_module_http,
+    &URL_module_ftp,
+    &URL_module_news,
+    &URL_module_newsgroup,
+#endif /* SUPPORT_SOCKET */
+#if !defined(__MACOS__) && defined(HAVE_POPEN)
+    &URL_module_pipe,
+#endif
+#if defined(main) || defined(ANOTHER_MAIN)
+    /* You can put some other modules */
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+#endif /* main */
+    NULL
+};
+int main(int argc, char **argv)
+{
+    SFInsts *sf;
+       int i, x_bank, x_preset, x_keynote;
+       int initial = 0;
+
+       if(argc<=1){
+               printf("USAGE: %s [-s[-]] soundfont [cfg_output]\n");
+               exit(-1);
+       }
+#ifndef strcasecmp
+#define strcasecmp stricmp
+#endif
+       if(strcasecmp(argv[1],"-s-")==0){
+               x_sort = 0;
+               argc--;
+               argv++;
+       } else if(strcasecmp(argv[1],"-s")==0){
+               x_sort = 1;
+               argc--;
+               argv++;
+       }
+       if(argc<=2){
+               x_out = stdout;
+       } else {
+               x_out = fopen(argv[2],"w");
+       }
+       ctl->verbosity = -1;
+#ifdef SUPPORT_SOCKET
+//     init_mail_addr();
+       if(url_user_agent == NULL){
+           url_user_agent = (char *)safe_malloc(10 + strlen(timidity_version));
+           strcpy(url_user_agent, "TiMidity-");
+           strcat(url_user_agent, timidity_version);
+       }
+#endif /* SUPPORT_SOCKET */
+       for(i = 0; url_module_list[i]; i++)
+           url_add_module(url_module_list[i]);
+       x_sf_file_name = argv[1];
+    sf = new_soundfont(x_sf_file_name);
+    sf->next = NULL;
+    sf->def_order = 2;
+    sfrecs = sf;
+       x_cfg_info_init();
+       init_sf(sf);
+       if(x_sort){
+       for(x_bank=0;x_bank<=127;x_bank++){
+               int flag = 0;
+               for(x_preset=0;x_preset<=127;x_preset++){
+                       if(x_cfg_info.m_bank[x_bank][x_preset] >= 0 && x_cfg_info.m_preset[x_bank][x_preset] >= 0){
+                               flag = 1;
+                       }
+               }
+               if(!flag)
+                       continue;
+               if(!initial){
+                       initial = 1;
+                       fprintf(x_out,"bank %d\n",x_bank);
+               } else
+                       fprintf(x_out,"\nbank %d\n",x_bank);
+               for(x_preset=0;x_preset<=127;x_preset++){
+                       if(x_cfg_info.m_bank[x_bank][x_preset] >= 0 && x_cfg_info.m_preset[x_bank][x_preset] >= 0){
+                               if(x_cfg_info.m_rom[x_bank][x_preset])
+                                       fprintf(x_out,"#   %d %%font %s %d %d # (ROM)\n%s",x_preset,x_sf_file_name,x_cfg_info.m_bank[x_bank][x_preset],x_cfg_info.m_preset[x_bank][x_preset],x_cfg_info.m_str[x_bank][x_preset]);
+                               else
+                                       fprintf(x_out,"    %d %%font %s %d %d\n%s",x_preset,x_sf_file_name,x_cfg_info.m_bank[x_bank][x_preset],x_cfg_info.m_preset[x_bank][x_preset],x_cfg_info.m_str[x_bank][x_preset]);
+                       }
+               }
+       }
+       for(x_preset=0;x_preset<=127;x_preset++){
+               int flag = 0;
+               for(x_keynote=0;x_keynote<=127;x_keynote++){
+                       if(x_cfg_info.d_preset[x_preset][x_keynote] >= 0 && x_cfg_info.d_keynote[x_preset][x_keynote] >= 0){
+                               flag = 1;
+                       }
+               }
+               if(!flag)
+                       continue;
+               if(!initial){
+                       initial = 1;
+                       fprintf(x_out,"drumset %d\n",x_preset);
+               } else
+                       fprintf(x_out,"\ndrumset %d\n",x_preset);
+               for(x_keynote=0;x_keynote<=127;x_keynote++){
+                       if(x_cfg_info.d_preset[x_preset][x_keynote] >= 0 && x_cfg_info.d_keynote[x_preset][x_keynote] >= 0){
+                               if(x_cfg_info.d_rom[x_preset][x_keynote])
+                                       fprintf(x_out,"#   %d %%font %s 128 %d %d #%s (ROM)\n",x_keynote,x_sf_file_name,x_cfg_info.d_preset[x_preset][x_keynote],x_cfg_info.d_keynote[x_preset][x_keynote],x_cfg_info.d_str[x_preset][x_keynote]);
+                               else
+                                       fprintf(x_out,"    %d %%font %s 128 %d %d #%s\n",x_keynote,x_sf_file_name,x_cfg_info.d_preset[x_preset][x_keynote],x_cfg_info.d_keynote[x_preset][x_keynote],x_cfg_info.d_str[x_preset][x_keynote]);
+
+                       }
+               }
+       }
+       }
+       if(x_out!=stdout)
+               fclose(x_out);
+       return 0;
+}
+
+#endif /* CFG_FOR_SF */
index 9fbb760..869a1f8 100644 (file)
@@ -330,12 +330,16 @@ static int acntl(int request, void *arg)
       case PM_REQ_GETFILLED:
        if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
            return -1;
+#ifdef __NetBSD__
+       *((int *)arg) = auinfo.play.seek;
+#else
        if(auinfo.play.samples == play_samples_offset)
            return -1; /* auinfo.play.samples is not active */
        i = output_counter;
        if(!(dpm.encoding & PE_MONO)) i >>= 1;
        if(dpm.encoding & PE_16BIT) i >>= 1;
        *((int *)arg) = i - (auinfo.play.samples - play_samples_offset);
+#endif
        return 0;
 
       case PM_REQ_GETSAMPLES:
index 851b1c4..c80e62c 100644 (file)
@@ -3233,7 +3233,6 @@ int main(int argc, char **argv)
     int nfiles;
     char **files;
 
-
 #if defined(DANGEROUS_RENICE) && !defined(__W32__) && !defined(main)
     /*
      * THIS CODES MUST EXECUT BEGINNING OF MAIN FOR SECURITY.
@@ -3245,6 +3244,10 @@ int main(int argc, char **argv)
     extern int setpriority(int which, id_t who, int prio);
     extern int setreuid(int ruid, int euid);
 #endif
+
+puts("#### WINMAIN");
+sleep(3);
+
     uid = getuid();
     if(setpriority(PRIO_PROCESS, 0, DANGEROUS_RENICE) < 0)
     {
index 32ee7ed..3a3acb7 100644 (file)
@@ -15,7 +15,7 @@ DocWndFlag=1
 WrdWndFlag=0\r
 SoundSpecWndFlag=0\r
 SubWindowMax=3\r
-ConfigFile=C:\WINDOWS\TIMIDITY.CFG\r
+ConfigFile=\r
 PlaylistFile=\r
 PlaylistHistoryFile=\r
 MidiFileOpenDir=\r
@@ -58,7 +58,7 @@ opt_nrpn_vibrato=1
 opt_channel_pressure=0\r
 opt_trace_text_meta_event=0\r
 opt_overlap_voice_allow=1\r
-opt_default_mid=0\r
+opt_default_mid=126\r
 default_tonebank=0\r
 special_tonebank=-1\r
 effect_lr_mode=-1\r
@@ -109,14 +109,14 @@ default_program28=0
 default_program29=0\r
 default_program30=0\r
 default_program31=0\r
-opt_ctl=wtld\r
+opt_ctl=wtad\r
 opt_realtime_playing=0\r
 reduce_voice_threshold=-1\r
 opt_playmode=dSs1l\r
-OutputName=\r
+OutputName=output.wav\r
 OutputDirName=\r
 auto_output_mode=0\r
-voices=64\r
+voices=256\r
 auto_reduce_polyphony=1\r
 quietchannels=0\r
 opt_qsize=5.0/100%\r
old mode 100644 (file)
new mode 100755 (executable)
index 7705d99..de616cf
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    ogg_a.c
+    vorbis_a.c
 
     Functions to output Ogg Vorbis (*.ogg).
 */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
+#include "interface.h"
 #include <stdio.h>
 
-#ifdef __W32__
+#ifdef AU_VORBIS_DLL
 #include <stdlib.h>
 #include <io.h>
+#include <ctype.h>
+#include <time.h>
+extern int load_ogg_dll(void);
+extern void free_ogg_dll(void);
+extern int load_vorbis_dll(void);
+extern void free_vorbis_dll(void);
+extern int load_vorbisenc_dll(void);
+extern void free_vorbisenc_dll(void);
 #endif
 
 #ifdef HAVE_UNISTD_H
@@ -80,8 +89,51 @@ static       vorbis_info      vi; /* struct that stores all the static vorbis bitstream
                                settings */
 static vorbis_comment   vc; /* struct that stores all the user comments */
 
+#ifdef IA_W32GUI
+extern char *w32g_output_dir;
+extern int w32g_auto_output_mode;
+extern int vorbis_ConfigDialogInfoApply(void);
+int ogg_vorbis_mode = 0;       /* initial mode. */
+#endif
+
 /*************************************************************************/
 
+#ifdef IA_W32GUI
+static int
+choose_bitrate(int nch, int rate)
+{
+  int bitrate;
+
+  /* choose an encoding mode */
+  /* (mode 0: -> mode2 */
+  /* (mode 1: 44kHz stereo uncoupled, N/A\n */
+  /* (mode 2: 44kHz stereo uncoupled, roughly 128kbps VBR) */
+  /* (mode 3: 44kHz stereo uncoupled, roughly 160kbps VBR) */
+  /* (mode 4: 44kHz stereo uncoupled, roughly 192kbps VBR) */
+  /* (mode 5: 44kHz stereo uncoupled, roughly 256kbps VBR) */
+  /* (mode 6: 44kHz stereo uncoupled, roughly 350kbps VBR) */
+
+  switch (ogg_vorbis_mode) {
+  case 0:
+    bitrate = 128 * 1000; break;
+  case 1:
+    bitrate = 112 * 1000; break;
+  case 2:
+    bitrate = 128 * 1000; break;
+  case 3:
+    bitrate = 160 * 1000; break;
+  case 4:
+    bitrate = 192 * 1000; break;
+  case 5:
+    bitrate = 256 * 1000; break;
+  case 6:
+    bitrate = 350 * 1000; break;
+  default:
+    bitrate = 160 * 1000; break;
+  }
+  return bitrate;
+}
+#else
 static int
 choose_bitrate(int nch, int rate)
 {
@@ -92,6 +144,7 @@ choose_bitrate(int nch, int rate)
 
   return target;
 }
+#endif
 
 static int ogg_output_open(const char *fname, const char *comment)
 {
@@ -99,6 +152,22 @@ static int ogg_output_open(const char *fname, const char *comment)
   int nch;
   int bitrate;
 
+#ifdef AU_VORBIS_DLL
+  {
+         int flag = 0;
+               if(!load_ogg_dll())
+                       if(!load_vorbis_dll())
+                               if(!load_vorbisenc_dll())
+                                       flag = 1;
+               if(!flag){
+                       free_ogg_dll();
+                       free_vorbis_dll();
+                       free_vorbisenc_dll();
+                       return -1;
+               }
+  }
+#endif
+
   if(strcmp(fname, "-") == 0) {
     fd = 1; /* data to stdout */
     if(comment == NULL)
@@ -115,6 +184,10 @@ static int ogg_output_open(const char *fname, const char *comment)
       comment = fname;
   }
 
+#ifdef IA_W32GUI
+  vorbis_ConfigDialogInfoApply();
+#endif
+
   nch = (dpm.encoding & PE_MONO) ? 1 : 2;
 
   /* choose an encoding mode */
@@ -171,32 +244,25 @@ static int ogg_output_open(const char *fname, const char *comment)
   return fd;
 }
 
+/* mode
+  0,1: Default mode.
+  2: Remove the directory path of input_filename, then add output_dir.
+  3: Replace directory separator characters ('/','\',':') with '_', then add output_dir.
+ */
+extern char *create_auto_output_name(const char *input_filename, char *ext_str, char *output_dir, int mode);
+
 static int auto_ogg_output_open(const char *input_filename)
 {
-  char *output_filename = (char *)safe_malloc(strlen(input_filename) + 5);
-  char *ext, *p;
-
-  strcpy(output_filename, input_filename);
-  if((ext = strrchr(output_filename, '.')) == NULL)
-    ext = output_filename + strlen(output_filename);
-  else {
-    /* strip ".gz" */
-    if(strcasecmp(ext, ".gz") == 0) {
-      *ext = '\0';
-      if((ext = strrchr(output_filename, '.')) == NULL)
-       ext = output_filename + strlen(output_filename);
-    }
-  }
+  char *output_filename;
 
-  /* replace '.' and '#' before ext */
-  for(p = output_filename; p < ext; p++)
-    if(*p == '.' || *p == '#')
-      *p = '_';
-
-  if(*ext && isupper(*(ext + 1)))
-    strcpy(ext, ".OGG");
-  else
-    strcpy(ext, ".ogg");
+#ifndef IA_W32GUI
+  output_filename = create_auto_output_name(input_filename,"ogg",NULL,0);
+#else
+  output_filename = create_auto_output_name(input_filename,"ogg",w32g_output_dir,w32g_auto_output_mode);
+#endif
+  if(output_filename==NULL){
+         return -1;
+  }
   if((dpm.fd = ogg_output_open(output_filename, input_filename)) == -1) {
     free(output_filename);
     return -1;
@@ -221,6 +287,7 @@ static int open_output(void)
   exclude_enc |= PE_BYTESWAP;
   dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc);
 
+#ifndef IA_W32GUI
   if(dpm.name == NULL) {
     dpm.flag |= PF_AUTO_SPLIT_FILE;
     dpm.name = NULL;
@@ -229,6 +296,16 @@ static int open_output(void)
     if((dpm.fd = ogg_output_open(dpm.name, NULL)) == -1)
       return -1;
   }
+#else
+       if(w32g_auto_output_mode>0){
+      dpm.flag |= PF_AUTO_SPLIT_FILE;
+      dpm.name = NULL;
+    } else {
+      dpm.flag &= ~PF_AUTO_SPLIT_FILE;
+      if((dpm.fd = ogg_output_open(dpm.name,NULL)) == -1)
+               return -1;
+    }
+#endif
 
   return 0;
 }
@@ -242,6 +319,9 @@ static int output_data(char *readbuffer, int32 bytes)
   ogg_page   og; /* one Ogg bitstream page.  Vorbis packets are inside */
   ogg_packet op; /* one raw packet of data for decode */
 
+  if (dpm.fd<0)
+    return 0;
+
   /* data to encode */
 
   /* expose the buffer to submit data */
@@ -322,7 +402,16 @@ static void close_output(void)
   ogg_stream_clear(&os);
   vorbis_block_clear(&vb);
   vorbis_dsp_clear(&vd);
+  vorbis_comment_clear(&vc);
+  vorbis_info_clear(&vi);
   close(dpm.fd);
+
+#ifdef AU_VORBIS_DLL
+  free_ogg_dll();
+  free_vorbis_dll();
+  free_vorbisenc_dll();
+#endif
+
   dpm.fd = -1;
 }
 
diff --git a/timidity/w32_gogo.c b/timidity/w32_gogo.c
new file mode 100755 (executable)
index 0000000..dafc668
--- /dev/null
@@ -0,0 +1,305 @@
+/*\r
+   TiMidity++ -- MIDI to WAVE converter and player\r
+   Copyright (C) 1999,2000 Masanao Izumo <mo@goice.co.jp>\r
+   Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>\r
+\r
+   This program is free software; you can redistribute it and/or modify\r
+   it under the terms of the GNU General Public License as published by\r
+   the Free Software Foundation; either version 2 of the License, or\r
+   (at your option) any later version.\r
+\r
+   This program is distributed in the hope that it will be useful,\r
+   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+   GNU General Public License for more details.\r
+\r
+   You should have received a copy of the GNU General Public License\r
+   along with this program; if not, write to the Free Software\r
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
+\r
+   w32_gogo.c\r
+\r
+   Functions to use gogo.dll for mp3 gogo (Windows 95/98/NT).\r
+\r
+   Orignal source : stub.c by \82o\82d\82m\81\97\82l\82\81\82\92\82\89\82\8e\82\85\82b\82\81\82\94 and \82Ö\82é\82Ý.\r
+\r
+   Modified by Daisuke Aoki <dai@y7.net>\r
+\r
+   */\r
+\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif /* HAVE_CONFIG_H */\r
+#include "interface.h"\r
+\r
+#ifdef AU_GOGO_DLL\r
+\r
+#include <stdio.h>\r
+\r
+#ifdef __W32__\r
+#include <stdlib.h>\r
+#include <io.h>\r
+#include <windows.h>\r
+#include <process.h>\r
+#include <windowsx.h>\r
+#include <winuser.h>\r
+#include <stdio.h>\r
+#endif\r
+\r
+#include <musenc.h>            /* for gogo.dll */\r
+\r
+#ifdef HAVE_UNISTD_H\r
+#include <unistd.h>\r
+#endif /* HAVE_UNISTD_H */\r
+\r
+#ifndef NO_STRING_H\r
+#include <string.h>\r
+#else\r
+#include <strings.h>\r
+#endif\r
+#include <fcntl.h>\r
+\r
+#include <musenc.h>            /* for gogo */\r
+\r
+#include "w32_gogo.h"\r
+\r
+#include "gogo_a.h"\r
+\r
+#include "timidity.h"\r
+#include "common.h"\r
+#include "output.h"\r
+#include "controls.h"\r
+#include "instrum.h"\r
+#include "playmidi.h"\r
+#include "readmidi.h"\r
+\r
+static HINSTANCE       hModule = NULL;\r
+typedef MERET (*me_init)(void);\r
+typedef MERET (*me_setconf)(MPARAM mode, UPARAM dwPara1, UPARAM dwPara2 );\r
+typedef MERET (*me_getconf)(MPARAM mode, void *para1 );\r
+typedef MERET (*me_detect)();\r
+typedef MERET (*me_procframe)();\r
+typedef MERET (*me_close)();\r
+typedef MERET (*me_end)();\r
+typedef MERET (*me_getver)( unsigned long *vercode,  char *verstring );\r
+typedef MERET (*me_haveunit)( unsigned long *unit );\r
+\r
+static me_init         mpge_init = NULL;\r
+static  me_setconf     mpge_setconf = NULL;\r
+static me_getconf      mpge_getconf = NULL;\r
+static me_detect       mpge_detector = NULL;\r
+static me_procframe mpge_processframe = NULL;\r
+static me_close        mpge_close = NULL;\r
+static me_end          mpge_end = NULL;\r
+static me_getver       mpge_getver = NULL;\r
+static me_haveunit mpge_haveunit = NULL;\r
+\r
+int MPGE_available = 0;\r
+\r
+// DLL\82Ì\93Ç\82Ý\8d\9e\82Ý(\8dÅ\8f\89\82Ì1\89ñ\96Ú\82Ì\82Ý)\82Æ\83\8f\81[\83N\83G\83\8a\83A\82Ì\8f\89\8aú\89»\82ð\8ds\82¢\82Ü\82·\81B\r
+MERET  MPGE_initializeWork(void)\r
+{\r
+       if( hModule == NULL ){\r
+               // (DLL\82ª\93Ç\82Ý\8d\9e\82Ü\82ê\82Ä\82¢\82È\82¢\8fê\8d\87)\r
+               // \83J\83\8c\83\93\83g\83f\83B\83\8c\83N\83g\83\8a\81A\8by\82Ñsystem\83f\83B\83\8c\83N\83g\83\8a\82ÌGOGO.DLL\82Ì\93Ç\82Ý\8d\9e\82Ý\r
+               hModule = LoadLibrary("gogo.dll");\r
+               if( hModule == NULL ){                  // DLL\82ª\8c©\82Â\82©\82ç\82È\82¢\8fê\8d\87\r
+                       #define Key             HKEY_CURRENT_USER\r
+                       #define SubKey "Software\\MarineCat\\GOGO_DLL"\r
+                       HKEY    hKey;\r
+                       DWORD   dwType, dwKeySize;\r
+                       LONG    lResult;\r
+                       static  char    *szName = "INSTPATH";\r
+                       char    szPathName[ _MAX_PATH + 8];\r
+                       dwKeySize = sizeof( szPathName );\r
+\r
+                       // \83\8c\83W\83X\83g\83\8a\8d\80\96Ú\82Ì HEY_CURENT_USER\Software\MarineCat\GOGO_DLL\83L\81[\88È\89º\82Ì \r
+                       // INSTPATH (REG_SZ)\82ð\8eæ\93¾\82µ\82Ü\82·\81B\r
+                       if( RegOpenKeyEx(\r
+                                       Key,\r
+                                       SubKey,\r
+                                       0,\r
+                                       KEY_ALL_ACCESS,\r
+                                       &hKey ) == ERROR_SUCCESS \r
+                       ){\r
+                               lResult = RegQueryValueEx(\r
+                                       hKey,\r
+                                       szName,\r
+                                       0,\r
+                                       &dwType,\r
+                                       (BYTE *)szPathName,\r
+                                       &dwKeySize);\r
+                               RegCloseKey(hKey);\r
+                               if( lResult == ERROR_SUCCESS && REG_SZ == dwType ){\r
+                                       // \83\8c\83W\83X\83g\83\8a\82©\82ç\8eæ\93¾\82µ\82½\83p\83X\82Å\8dÄ\93xDLL\82Ì\93Ç\82Ý\8d\9e\82Ý\82ð\8e\8e\82Ý\82é\r
+                                       hModule = LoadLibrary( szPathName );\r
+                               }\r
+                       }\r
+                       #undef Key\r
+                       #undef SubKey\r
+               }\r
+               // DLL\82ª\8c©\82Â\82©\82ç\82È\82¢\r
+               if( hModule == NULL ){\r
+                       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "can not find gogo.dll.");\r
+                       return ME_INTERNALERROR;\r
+//                     MessageBox( "DLL\82Ì\93Ç\82Ý\8d\9e\82Ý\82ð\8e¸\94s\82µ\82Ü\82µ\82½\81B\nDLL\82ðEXE\83t\83@\83C\83\8b\82Æ\93¯\82\83f\83B\83\8c\83N\83g\83\8a\82Ö\95¡\8eÊ\82µ\82Ä\82­\82¾\82³\82¢\n");\r
+//                     fprintf( stderr,"DLL\82Ì\93Ç\82Ý\8d\9e\82Ý\82ð\8e¸\94s\82µ\82Ü\82µ\82½\81B\nDLL\82ðEXE\83t\83@\83C\83\8b\82Æ\93¯\82\83f\83B\83\8c\83N\83g\83\8a\82Ö\95¡\8eÊ\82µ\82Ä\82­\82¾\82³\82¢\n");\r
+//                     exit( -1 );\r
+               }\r
+               \r
+               // \83G\83N\83X\83|\81[\83g\8aÖ\90\94\82Ì\8eæ\93¾\r
+               mpge_init = (me_init )GetProcAddress( hModule, "MPGE_initializeWork" );\r
+               mpge_setconf = (me_setconf )GetProcAddress( hModule, "MPGE_setConfigure" );\r
+               mpge_getconf = (me_getconf )GetProcAddress( hModule, "MPGE_getConfigure" );\r
+               mpge_detector = (me_detect )GetProcAddress( hModule, "MPGE_detectConfigure" );\r
+               mpge_processframe = (me_procframe )GetProcAddress( hModule, "MPGE_processFrame" );\r
+               mpge_close   = (me_close )GetProcAddress( hModule, "MPGE_closeCoder" );\r
+               mpge_end         = (me_end )GetProcAddress( hModule, "MPGE_endCoder" );\r
+               mpge_getver      = (me_getver )GetProcAddress( hModule, "MPGE_getVersion" );\r
+               mpge_haveunit= (me_haveunit )GetProcAddress( hModule, "MPGE_getUnitStates" );\r
+       }\r
+\r
+       // \82·\82×\82Ä\82Ì\8aÖ\90\94\82ª\90³\8fí\82©\8am\94F\82·\82é\r
+       if( mpge_init && mpge_setconf && mpge_getconf &&\r
+               mpge_detector && mpge_processframe && mpge_end && mpge_getver && mpge_haveunit ){\r
+               MPGE_available = 1;\r
+               return (mpge_init)();\r
+       }\r
+\r
+       // \83G\83\89\81[\r
+       //fprintf( stderr, "DLL\82Ì\93à\97e\82ð\90³\82µ\82­\8e¯\95Ê\82·\82é\82±\82Æ\82ª\8fo\97\88\82Ü\82¹\82ñ\82Å\82µ\82½\n");\r
+       FreeLibrary( hModule );\r
+       hModule = NULL;\r
+       MPGE_available = 0;\r
+       //exit( -1 );\r
+\r
+       return ME_NOERR;\r
+}\r
+\r
+MERET  MPGE_terminateWork(void)        // \8b­\90§\8fI\97¹\r
+{\r
+       mpge_init = NULL;\r
+       mpge_setconf = NULL;\r
+       mpge_getconf = NULL;\r
+       mpge_detector = NULL;\r
+       mpge_processframe = NULL;\r
+       mpge_close   = NULL;\r
+       mpge_end         = NULL;\r
+       mpge_getver      = NULL;\r
+       mpge_haveunit= NULL;\r
+       if(hModule)\r
+               FreeLibrary( hModule );\r
+       hModule = NULL;\r
+       MPGE_available = 0;\r
+\r
+       return ME_NOERR;\r
+}\r
+\r
+\r
+MERET  MPGE_setConfigure(MPARAM mode, UPARAM dwPara1, UPARAM dwPara2 )\r
+{\r
+       if(!mpge_setconf)\r
+               return ME_INTERNALERROR;\r
+       return (mpge_setconf)( mode, dwPara1, dwPara2 );\r
+}\r
+\r
+MERET  MPGE_getConfigure(MPARAM mode, void *para1 )\r
+{\r
+       if(!mpge_getconf)\r
+               return ME_INTERNALERROR;\r
+       return (mpge_getconf)( mode, para1 );\r
+}\r
+\r
+MERET  MPGE_detectConfigure(void)\r
+{\r
+       if(!mpge_detector)\r
+               return ME_INTERNALERROR;\r
+       return (mpge_detector)();\r
+}\r
+\r
+MERET  MPGE_processFrame(void)\r
+{\r
+       if(!mpge_processframe)\r
+               return ME_INTERNALERROR;\r
+       return (mpge_processframe)();\r
+}\r
+\r
+MERET  MPGE_closeCoder(void)\r
+{\r
+       if(!mpge_close)\r
+               return ME_INTERNALERROR;\r
+       return (mpge_close)();\r
+}\r
+\r
+MERET  MPGE_endCoder(void)\r
+{\r
+       MERET val;\r
+       if(!mpge_end)\r
+               return ME_INTERNALERROR;\r
+       val = (mpge_end)();\r
+       if( val == ME_NOERR ){\r
+               mpge_setconf = NULL;\r
+               mpge_getconf = NULL;\r
+               mpge_detector = NULL;\r
+               mpge_processframe = NULL;\r
+               mpge_close   = NULL;\r
+               mpge_end         = NULL;\r
+               mpge_getver      = NULL;\r
+               mpge_haveunit= NULL;\r
+               FreeLibrary( hModule );         // DLL\8aJ\95ú\r
+               hModule = NULL;\r
+               MPGE_available = 0;\r
+       }\r
+       return val;\r
+}\r
+\r
+MERET  MPGE_getVersion( unsigned long *vercode,  char *verstring )\r
+{\r
+       if(!mpge_getver)\r
+               return ME_INTERNALERROR;\r
+       return (mpge_getver)( vercode, verstring );\r
+}\r
+\r
+MERET  MPGE_getUnitStates( unsigned long *unit)\r
+{\r
+       if(!mpge_haveunit)\r
+               return ME_INTERNALERROR;\r
+       return  (mpge_haveunit)( unit );\r
+}\r
+\r
+int gogo_dll_check(void)\r
+{\r
+       HANDLE hDLL = NULL;\r
+       if(hModule)\r
+               return 1;\r
+       hDLL = LoadLibrary("gogo.dll");\r
+       if(hDLL){\r
+               FreeLibrary(hDLL);\r
+               return 1;\r
+       } else {\r
+#define Key            HKEY_CURRENT_USER\r
+#define SubKey "Software\\MarineCat\\GOGO_DLL"\r
+               HKEY    hKey;\r
+               DWORD   dwType, dwKeySize;\r
+               LONG    lResult;\r
+               static  char    *szName = "INSTPATH";\r
+               char    szPathName[ _MAX_PATH + 8];\r
+               dwKeySize = sizeof( szPathName );\r
+               if( RegOpenKeyEx(Key,SubKey,0,KEY_ALL_ACCESS,&hKey ) == ERROR_SUCCESS ){\r
+                       lResult = RegQueryValueEx(hKey,szName,0,&dwType,(BYTE *)szPathName,&dwKeySize);\r
+                       RegCloseKey(hKey);\r
+                       if( lResult == ERROR_SUCCESS && REG_SZ == dwType ){\r
+                               hDLL = LoadLibrary( szPathName );\r
+                       }\r
+               }\r
+#undef Key\r
+#undef SubKey\r
+       }\r
+       if(hDLL){\r
+               FreeLibrary(hDLL);\r
+               return 1;\r
+       }\r
+       return 0;\r
+}\r
+\r
+#endif /* AU_GOGO_DLL */\r
diff --git a/timidity/w32_gogo.h b/timidity/w32_gogo.h
new file mode 100755 (executable)
index 0000000..552c337
--- /dev/null
@@ -0,0 +1,18 @@
+#ifdef __W32_GOGO_H__\r
+#define __W32_GOGO_H__\r
+\r
+extern MERET MPGE_initializeWork(void);\r
+extern MERET MPGE_terminateWork(void);\r
+extern MERET MPGE_setConfigure(MPARAM mode, UPARAM dwPara1, UPARAM dwPara2 );\r
+extern MERET MPGE_getConfigure(MPARAM mode, void *para1 );\r
+extern MERET MPGE_detectConfigure(void);\r
+extern MERET MPGE_processFrame(void);\r
+extern MERET MPGE_closeCoder(void);\r
+extern MERET MPGE_endCoder(void);\r
+extern MERET MPGE_getVersion( unsigned long *vercode,  char *verstring );\r
+extern MERET MPGE_getUnitStates( unsigned long *unit);\r
+extern int MPGE_available;\r
+\r
+extern int gogo_dll_check(void);\r
+\r
+#endif /* __W32_GOGO_H__ */\r
diff --git a/timidity/w32g_ogg_dll.c b/timidity/w32g_ogg_dll.c
new file mode 100755 (executable)
index 0000000..65ff200
--- /dev/null
@@ -0,0 +1,558 @@
+/***************************************************************\r
+ name: ogg_dll  dll: ogg.dll \r
+***************************************************************/\r
+\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif /* HAVE_CONFIG_H */\r
+#include "interface.h"\r
+\r
+#ifdef AU_VORBIS_DLL\r
+\r
+#include <windows.h>\r
+#include <ogg/ogg.h>\r
+\r
+extern int load_ogg_dll(void);\r
+extern void free_ogg_dll(void);\r
+\r
+typedef void (*type_oggpack_writeinit)(oggpack_buffer *b);\r
+typedef void (*type_oggpack_reset)(oggpack_buffer *b);\r
+typedef void (*type_oggpack_writeclear)(oggpack_buffer *b);\r
+typedef void (*type_oggpack_readinit)(oggpack_buffer *b,unsigned char *buf,int bytes);\r
+typedef void (*type_oggpack_write)(oggpack_buffer *b,unsigned long value,int bits);\r
+typedef long (*type_oggpack_look)(oggpack_buffer *b,int bits);\r
+typedef long (*type_oggpack_look_huff)(oggpack_buffer *b,int bits);\r
+typedef long (*type_oggpack_look1)(oggpack_buffer *b);\r
+typedef void (*type_oggpack_adv)(oggpack_buffer *b,int bits);\r
+typedef int  (*type_oggpack_adv_huff)(oggpack_buffer *b,int bits);\r
+typedef void (*type_oggpack_adv1)(oggpack_buffer *b);\r
+typedef long (*type_oggpack_read)(oggpack_buffer *b,int bits);\r
+typedef long (*type_oggpack_read1)(oggpack_buffer *b);\r
+typedef long (*type_oggpack_bytes)(oggpack_buffer *b);\r
+typedef long (*type_oggpack_bits)(oggpack_buffer *b);\r
+typedef unsigned char*(*type_oggpack_get_buffer)(oggpack_buffer *b);\r
+typedef int     (*type_ogg_stream_packetin)(ogg_stream_state *os, ogg_packet *op);\r
+typedef int     (*type_ogg_stream_pageout)(ogg_stream_state *os, ogg_page *og);\r
+typedef int     (*type_ogg_stream_flush)(ogg_stream_state *os, ogg_page *og);\r
+typedef int     (*type_ogg_sync_init)(ogg_sync_state *oy);\r
+typedef int     (*type_ogg_sync_clear)(ogg_sync_state *oy);\r
+typedef int     (*type_ogg_sync_reset)(ogg_sync_state *oy);\r
+typedef int(*type_ogg_sync_destroy)(ogg_sync_state *oy);\r
+typedef char   *(*type_ogg_sync_buffer)(ogg_sync_state *oy, long size);\r
+typedef int     (*type_ogg_sync_wrote)(ogg_sync_state *oy, long bytes);\r
+typedef long    (*type_ogg_sync_pageseek)(ogg_sync_state *oy,ogg_page *og);\r
+typedef int     (*type_ogg_sync_pageout)(ogg_sync_state *oy, ogg_page *og);\r
+typedef int     (*type_ogg_stream_pagein)(ogg_stream_state *os, ogg_page *og);\r
+typedef int     (*type_ogg_stream_packetout)(ogg_stream_state *os,ogg_packet *op);\r
+typedef int     (*type_ogg_stream_init)(ogg_stream_state *os,int serialno);\r
+typedef int     (*type_ogg_stream_clear)(ogg_stream_state *os);\r
+typedef int     (*type_ogg_stream_reset)(ogg_stream_state *os);\r
+typedef int     (*type_ogg_stream_destroy)(ogg_stream_state *os);\r
+typedef int     (*type_ogg_stream_eos)(ogg_stream_state *os);\r
+typedef int     (*type_ogg_page_version)(ogg_page *og);\r
+typedef int     (*type_ogg_page_continued)(ogg_page *og);\r
+typedef int     (*type_ogg_page_bos)(ogg_page *og);\r
+typedef int     (*type_ogg_page_eos)(ogg_page *og);\r
+typedef ogg_int64_t (*type_ogg_page_granulepos)(ogg_page *og);\r
+typedef int     (*type_ogg_page_serialno)(ogg_page *og);\r
+typedef long    (*type_ogg_page_pageno)(ogg_page *og);\r
+typedef int     (*type_ogg_page_packets)(ogg_page *og);\r
+////typedef void    (*type_ogg_packet_clear)(ogg_packet *op);\r
+\r
+static struct ogg_dll_ {\r
+//      type_oggpack_writeinit oggpack_writeinit;\r
+//      type_oggpack_reset oggpack_reset;\r
+//      type_oggpack_writeclear oggpack_writeclear;\r
+//      type_oggpack_readinit oggpack_readinit;\r
+//      type_oggpack_write oggpack_write;\r
+//      type_oggpack_look oggpack_look;\r
+//      type_oggpack_look_huff oggpack_look_huff;\r
+//      type_oggpack_look1 oggpack_look1;\r
+//      type_oggpack_adv oggpack_adv;\r
+//      type_oggpack_adv_huff oggpack_adv_huff;\r
+//      type_oggpack_adv1 oggpack_adv1;\r
+//      type_oggpack_read oggpack_read;\r
+//      type_oggpack_read1 oggpack_read1;\r
+//      type_oggpack_bytes oggpack_bytes;\r
+//      type_oggpack_bits oggpack_bits;\r
+//      type_oggpack_get_buffer oggpack_get_buffer;\r
+        type_ogg_stream_packetin ogg_stream_packetin;\r
+        type_ogg_stream_pageout ogg_stream_pageout;\r
+//      type_ogg_stream_flush ogg_stream_flush;\r
+//      type_ogg_sync_init ogg_sync_init;\r
+//      type_ogg_sync_clear ogg_sync_clear;\r
+//      type_ogg_sync_reset ogg_sync_reset;\r
+//      type_ogg_sync_destroy ogg_sync_destroy;\r
+//      type_ogg_sync_buffer ogg_sync_buffer;\r
+//      type_ogg_sync_wrote ogg_sync_wrote;\r
+//      type_ogg_sync_pageseek ogg_sync_pageseek;\r
+//      type_ogg_sync_pageout ogg_sync_pageout;\r
+//      type_ogg_stream_pagein ogg_stream_pagein;\r
+//      type_ogg_stream_packetout ogg_stream_packetout;\r
+        type_ogg_stream_init ogg_stream_init;\r
+        type_ogg_stream_clear ogg_stream_clear;\r
+//      type_ogg_stream_reset ogg_stream_reset;\r
+//      type_ogg_stream_destroy ogg_stream_destroy;\r
+//      type_ogg_stream_eos ogg_stream_eos;\r
+//      type_ogg_page_version ogg_page_version;\r
+//      type_ogg_page_continued ogg_page_continued;\r
+//      type_ogg_page_bos ogg_page_bos;\r
+        type_ogg_page_eos ogg_page_eos;\r
+//      type_ogg_page_granulepos ogg_page_granulepos;\r
+//      type_ogg_page_serialno ogg_page_serialno;\r
+//      type_ogg_page_pageno ogg_page_pageno;\r
+//      type_ogg_page_packets ogg_page_packets;\r
+////    type_ogg_packet_clear ogg_packet_clear;\r
+} ogg_dll;\r
+\r
+static volatile HANDLE h_ogg_dll = NULL;\r
+\r
+void free_ogg_dll(void)\r
+{\r
+       if(h_ogg_dll){\r
+               FreeLibrary(h_ogg_dll);\r
+               h_ogg_dll = NULL;\r
+       }\r
+}\r
+\r
+int load_ogg_dll(void)\r
+{\r
+       if(!h_ogg_dll){\r
+               h_ogg_dll = LoadLibrary("ogg.dll");\r
+               if(!h_ogg_dll) return -1;\r
+       }\r
+//     ogg_dll.oggpack_writeinit = (type_oggpack_writeinit)GetProcAddress(h_ogg_dll,"oggpack_writeinit");\r
+//     if(!ogg_dll.oggpack_writeinit){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_reset = (type_oggpack_reset)GetProcAddress(h_ogg_dll,"oggpack_reset");\r
+//     if(!ogg_dll.oggpack_reset){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_writeclear = (type_oggpack_writeclear)GetProcAddress(h_ogg_dll,"oggpack_writeclear");\r
+//     if(!ogg_dll.oggpack_writeclear){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_readinit = (type_oggpack_readinit)GetProcAddress(h_ogg_dll,"oggpack_readinit");\r
+//     if(!ogg_dll.oggpack_readinit){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_write = (type_oggpack_write)GetProcAddress(h_ogg_dll,"oggpack_write");\r
+//     if(!ogg_dll.oggpack_write){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_look = (type_oggpack_look)GetProcAddress(h_ogg_dll,"oggpack_look");\r
+//     if(!ogg_dll.oggpack_look){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_look_huff = (type_oggpack_look_huff)GetProcAddress(h_ogg_dll,"oggpack_look_huff");\r
+//     if(!ogg_dll.oggpack_look_huff){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_look1 = (type_oggpack_look1)GetProcAddress(h_ogg_dll,"oggpack_look1");\r
+//     if(!ogg_dll.oggpack_look1){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_adv = (type_oggpack_adv)GetProcAddress(h_ogg_dll,"oggpack_adv");\r
+//     if(!ogg_dll.oggpack_adv){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_adv_huff = (type_oggpack_adv_huff)GetProcAddress(h_ogg_dll,"oggpack_adv_huff");\r
+//     if(!ogg_dll.oggpack_adv_huff){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_adv1 = (type_oggpack_adv1)GetProcAddress(h_ogg_dll,"oggpack_adv1");\r
+//     if(!ogg_dll.oggpack_adv1){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_read = (type_oggpack_read)GetProcAddress(h_ogg_dll,"oggpack_read");\r
+//     if(!ogg_dll.oggpack_read){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_read1 = (type_oggpack_read1)GetProcAddress(h_ogg_dll,"oggpack_read1");\r
+//     if(!ogg_dll.oggpack_read1){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_bytes = (type_oggpack_bytes)GetProcAddress(h_ogg_dll,"oggpack_bytes");\r
+//     if(!ogg_dll.oggpack_bytes){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_bits = (type_oggpack_bits)GetProcAddress(h_ogg_dll,"oggpack_bits");\r
+//     if(!ogg_dll.oggpack_bits){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.oggpack_get_buffer = (type_oggpack_get_buffer)GetProcAddress(h_ogg_dll,"oggpack_get_buffer");\r
+//     if(!ogg_dll.oggpack_get_buffer){ free_ogg_dll(); return -1; }\r
+       ogg_dll.ogg_stream_packetin = (type_ogg_stream_packetin)GetProcAddress(h_ogg_dll,"ogg_stream_packetin");\r
+       if(!ogg_dll.ogg_stream_packetin){ free_ogg_dll(); return -1; }\r
+       ogg_dll.ogg_stream_pageout = (type_ogg_stream_pageout)GetProcAddress(h_ogg_dll,"ogg_stream_pageout");\r
+       if(!ogg_dll.ogg_stream_pageout){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_stream_flush = (type_ogg_stream_flush)GetProcAddress(h_ogg_dll,"ogg_stream_flush");\r
+//     if(!ogg_dll.ogg_stream_flush){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_init = (type_ogg_sync_init)GetProcAddress(h_ogg_dll,"ogg_sync_init");\r
+//     if(!ogg_dll.ogg_sync_init){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_clear = (type_ogg_sync_clear)GetProcAddress(h_ogg_dll,"ogg_sync_clear");\r
+//     if(!ogg_dll.ogg_sync_clear){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_reset = (type_ogg_sync_reset)GetProcAddress(h_ogg_dll,"ogg_sync_reset");\r
+//     if(!ogg_dll.ogg_sync_reset){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_destroy = (type_ogg_sync_destroy)GetProcAddress(h_ogg_dll,"ogg_sync_destroy");\r
+//     if(!ogg_dll.ogg_sync_destroy){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_buffer = (type_ogg_sync_buffer)GetProcAddress(h_ogg_dll,"ogg_sync_buffer");\r
+//     if(!ogg_dll.ogg_sync_buffer){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_wrote = (type_ogg_sync_wrote)GetProcAddress(h_ogg_dll,"ogg_sync_wrote");\r
+//     if(!ogg_dll.ogg_sync_wrote){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_pageseek = (type_ogg_sync_pageseek)GetProcAddress(h_ogg_dll,"ogg_sync_pageseek");\r
+//     if(!ogg_dll.ogg_sync_pageseek){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_sync_pageout = (type_ogg_sync_pageout)GetProcAddress(h_ogg_dll,"ogg_sync_pageout");\r
+//     if(!ogg_dll.ogg_sync_pageout){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_stream_pagein = (type_ogg_stream_pagein)GetProcAddress(h_ogg_dll,"ogg_stream_pagein");\r
+//     if(!ogg_dll.ogg_stream_pagein){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_stream_packetout = (type_ogg_stream_packetout)GetProcAddress(h_ogg_dll,"ogg_stream_packetout");\r
+//     if(!ogg_dll.ogg_stream_packetout){ free_ogg_dll(); return -1; }\r
+       ogg_dll.ogg_stream_init = (type_ogg_stream_init)GetProcAddress(h_ogg_dll,"ogg_stream_init");\r
+       if(!ogg_dll.ogg_stream_init){ free_ogg_dll(); return -1; }\r
+       ogg_dll.ogg_stream_clear = (type_ogg_stream_clear)GetProcAddress(h_ogg_dll,"ogg_stream_clear");\r
+       if(!ogg_dll.ogg_stream_clear){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_stream_reset = (type_ogg_stream_reset)GetProcAddress(h_ogg_dll,"ogg_stream_reset");\r
+//     if(!ogg_dll.ogg_stream_reset){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_stream_destroy = (type_ogg_stream_destroy)GetProcAddress(h_ogg_dll,"ogg_stream_destroy");\r
+//     if(!ogg_dll.ogg_stream_destroy){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_stream_eos = (type_ogg_stream_eos)GetProcAddress(h_ogg_dll,"ogg_stream_eos");\r
+//     if(!ogg_dll.ogg_stream_eos){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_page_version = (type_ogg_page_version)GetProcAddress(h_ogg_dll,"ogg_page_version");\r
+//     if(!ogg_dll.ogg_page_version){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_page_continued = (type_ogg_page_continued)GetProcAddress(h_ogg_dll,"ogg_page_continued");\r
+//     if(!ogg_dll.ogg_page_continued){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_page_bos = (type_ogg_page_bos)GetProcAddress(h_ogg_dll,"ogg_page_bos");\r
+//     if(!ogg_dll.ogg_page_bos){ free_ogg_dll(); return -1; }\r
+       ogg_dll.ogg_page_eos = (type_ogg_page_eos)GetProcAddress(h_ogg_dll,"ogg_page_eos");\r
+       if(!ogg_dll.ogg_page_eos){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_page_granulepos = (type_ogg_page_granulepos)GetProcAddress(h_ogg_dll,"ogg_page_granulepos");\r
+//     if(!ogg_dll.ogg_page_granulepos){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_page_serialno = (type_ogg_page_serialno)GetProcAddress(h_ogg_dll,"ogg_page_serialno");\r
+//     if(!ogg_dll.ogg_page_serialno){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_page_pageno = (type_ogg_page_pageno)GetProcAddress(h_ogg_dll,"ogg_page_pageno");\r
+//     if(!ogg_dll.ogg_page_pageno){ free_ogg_dll(); return -1; }\r
+//     ogg_dll.ogg_page_packets = (type_ogg_page_packets)GetProcAddress(h_ogg_dll,"ogg_page_packets");\r
+//     if(!ogg_dll.ogg_page_packets){ free_ogg_dll(); return -1; }\r
+////   ogg_dll.ogg_packet_clear = (type_ogg_packet_clear)GetProcAddress(h_ogg_dll,"ogg_packet_clear");\r
+////   if(!ogg_dll.ogg_packet_clear){ free_ogg_dll(); return -1; }\r
+       return 0;\r
+}\r
+\r
+#if 0\r
+void oggpack_writeinit(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               ogg_dll.oggpack_writeinit(b);\r
+       }\r
+}\r
+\r
+void oggpack_reset(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               ogg_dll.oggpack_reset(b);\r
+       }\r
+}\r
+\r
+void oggpack_writeclear(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               ogg_dll.oggpack_writeclear(b);\r
+       }\r
+}\r
+\r
+void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes)\r
+{\r
+       if(h_ogg_dll){\r
+               ogg_dll.oggpack_readinit(b,buf,bytes);\r
+       }\r
+}\r
+\r
+void oggpack_write(oggpack_buffer *b,unsigned long value,int bits)\r
+{\r
+       if(h_ogg_dll){\r
+               ogg_dll.oggpack_write(b,value,bits);\r
+       }\r
+}\r
+\r
+long oggpack_look(oggpack_buffer *b,int bits)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_look(b,bits);\r
+       }\r
+       return (long )0;\r
+}\r
+\r
+long oggpack_look_huff(oggpack_buffer *b,int bits)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_look_huff(b,bits);\r
+       }\r
+       return (long )0;\r
+}\r
+\r
+long oggpack_look1(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_look1(b);\r
+       }\r
+       return (long )0;\r
+}\r
+\r
+void oggpack_adv(oggpack_buffer *b,int bits)\r
+{\r
+       if(h_ogg_dll){\r
+               ogg_dll.oggpack_adv(b,bits);\r
+       }\r
+}\r
+\r
+int  oggpack_adv_huff(oggpack_buffer *b,int bits)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_adv_huff(b,bits);\r
+       }\r
+       return (int  )0;\r
+}\r
+\r
+void oggpack_adv1(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               ogg_dll.oggpack_adv1(b);\r
+       }\r
+}\r
+\r
+long oggpack_read(oggpack_buffer *b,int bits)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_read(b,bits);\r
+       }\r
+       return (long )0;\r
+}\r
+\r
+long oggpack_read1(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_read1(b);\r
+       }\r
+       return (long )0;\r
+}\r
+\r
+long oggpack_bytes(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_bytes(b);\r
+       }\r
+       return (long )0;\r
+}\r
+\r
+long oggpack_bits(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_bits(b);\r
+       }\r
+       return (long )0;\r
+}\r
+\r
+unsigned char*oggpack_get_buffer(oggpack_buffer *b)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.oggpack_get_buffer(b);\r
+       }\r
+       return (unsigned char*)0;\r
+}\r
+#endif\r
+\r
+int     ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_packetin(os,op);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_stream_pageout(ogg_stream_state *os, ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_pageout(os,og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+#if 0\r
+int     ogg_stream_flush(ogg_stream_state *os, ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_flush(os,og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_sync_init(ogg_sync_state *oy)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_init(oy);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_sync_clear(ogg_sync_state *oy)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_clear(oy);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_sync_reset(ogg_sync_state *oy)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_reset(oy);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+intogg_sync_destroy(ogg_sync_state *oy)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_destroy(oy);\r
+       }\r
+       return (int)0;\r
+}\r
+\r
+char   *ogg_sync_buffer(ogg_sync_state *oy, long size)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_buffer(oy,size);\r
+       }\r
+       return (char   *)0;\r
+}\r
+\r
+int     ogg_sync_wrote(ogg_sync_state *oy, long bytes)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_wrote(oy,bytes);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+long    ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_pageseek(oy,og);\r
+       }\r
+       return (long    )0;\r
+}\r
+\r
+int     ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_sync_pageout(oy,og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_stream_pagein(ogg_stream_state *os, ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_pagein(os,og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_packetout(os,op);\r
+       }\r
+       return (int     )0;\r
+}\r
+#endif\r
+\r
+int     ogg_stream_init(ogg_stream_state *os,int serialno)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_init(os,serialno);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_stream_clear(ogg_stream_state *os)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_clear(os);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+#if 0\r
+int     ogg_stream_reset(ogg_stream_state *os)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_reset(os);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_stream_destroy(ogg_stream_state *os)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_destroy(os);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_stream_eos(ogg_stream_state *os)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_stream_eos(os);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_page_version(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_version(og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_page_continued(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_continued(og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     ogg_page_bos(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_bos(og);\r
+       }\r
+       return (int     )0;\r
+}\r
+#endif\r
+\r
+int     ogg_page_eos(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_eos(og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+#if 0\r
+ogg_int64_t ogg_page_granulepos(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_granulepos(og);\r
+       }\r
+       return (ogg_int64_t )0;\r
+}\r
+\r
+int     ogg_page_serialno(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_serialno(og);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+long    ogg_page_pageno(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_pageno(og);\r
+       }\r
+       return (long    )0;\r
+}\r
+\r
+int     ogg_page_packets(ogg_page *og)\r
+{\r
+       if(h_ogg_dll){\r
+               return ogg_dll.ogg_page_packets(og);\r
+       }\r
+       return (int     )0;\r
+}\r
+#endif\r
+\r
+//void    ogg_packet_clear(ogg_packet *op)\r
+//{\r
+//     if(h_ogg_dll){\r
+//             ogg_dll.ogg_packet_clear(op);\r
+//     }\r
+//}\r
+\r
+/***************************************************************/\r
+#endif /* AU_VORBIS_DLL */\r
diff --git a/timidity/w32g_vorbis_dll.c b/timidity/w32g_vorbis_dll.c
new file mode 100755 (executable)
index 0000000..052dceb
--- /dev/null
@@ -0,0 +1,327 @@
+/***************************************************************\r
+ name: vorbis_dll  dll: vorbis.dll \r
+***************************************************************/\r
+\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif /* HAVE_CONFIG_H */\r
+#include "interface.h"\r
+\r
+#ifdef AU_VORBIS_DLL\r
+\r
+#include <windows.h>\r
+#include <vorbis/codec.h>\r
+\r
+extern int load_vorbis_dll(void);\r
+extern void free_vorbis_dll(void);\r
+\r
+typedef void    (*type_vorbis_info_init)(vorbis_info *vi);\r
+typedef void    (*type_vorbis_info_clear)(vorbis_info *vi);\r
+typedef void    (*type_vorbis_comment_init)(vorbis_comment *vc);\r
+typedef void    (*type_vorbis_comment_add)(vorbis_comment *vc, char *comment);\r
+typedef void    (*type_vorbis_comment_add_tag)(vorbis_comment *vc, char *tag, char *contents);\r
+typedef char   *(*type_vorbis_comment_query)(vorbis_comment *vc, char *tag, int count);\r
+typedef int     (*type_vorbis_comment_query_count)(vorbis_comment *vc, char *tag);\r
+typedef void    (*type_vorbis_comment_clear)(vorbis_comment *vc);\r
+typedef int     (*type_vorbis_block_init)(vorbis_dsp_state *v, vorbis_block *vb);\r
+typedef int     (*type_vorbis_block_clear)(vorbis_block *vb);\r
+typedef void    (*type_vorbis_dsp_clear)(vorbis_dsp_state *v);\r
+typedef int     (*type_vorbis_analysis_init)(vorbis_dsp_state *v,vorbis_info *vi);\r
+////typedef int     (*type_vorbis_commentheader_out)(vorbis_comment *vc, ogg_packet *op);\r
+typedef int     (*type_vorbis_analysis_headerout)(vorbis_dsp_state *v,vorbis_comment *vc,ogg_packet *op,ogg_packet *op_comm,ogg_packet *op_code);\r
+typedef float **(*type_vorbis_analysis_buffer)(vorbis_dsp_state *v,int vals);\r
+typedef int     (*type_vorbis_analysis_wrote)(vorbis_dsp_state *v,int vals);\r
+typedef int     (*type_vorbis_analysis_blockout)(vorbis_dsp_state *v,vorbis_block *vb);\r
+typedef int     (*type_vorbis_analysis)(vorbis_block *vb,ogg_packet *op);\r
+typedef int     (*type_vorbis_synthesis_headerin)(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op);\r
+typedef int     (*type_vorbis_synthesis_init)(vorbis_dsp_state *v,vorbis_info *vi);\r
+typedef int     (*type_vorbis_synthesis)(vorbis_block *vb,ogg_packet *op);\r
+typedef int     (*type_vorbis_synthesis_blockin)(vorbis_dsp_state *v,vorbis_block *vb);\r
+typedef int     (*type_vorbis_synthesis_pcmout)(vorbis_dsp_state *v,float ***pcm);\r
+typedef int     (*type_vorbis_synthesis_read)(vorbis_dsp_state *v,int samples);\r
+\r
+static struct vorbis_dll_ {\r
+        type_vorbis_info_init vorbis_info_init;\r
+        type_vorbis_info_clear vorbis_info_clear;\r
+        type_vorbis_comment_init vorbis_comment_init;\r
+        type_vorbis_comment_add vorbis_comment_add;\r
+//      type_vorbis_comment_add_tag vorbis_comment_add_tag;\r
+//      type_vorbis_comment_query vorbis_comment_query;\r
+//      type_vorbis_comment_query_count vorbis_comment_query_count;\r
+        type_vorbis_comment_clear vorbis_comment_clear;\r
+        type_vorbis_block_init vorbis_block_init;\r
+        type_vorbis_block_clear vorbis_block_clear;\r
+        type_vorbis_dsp_clear vorbis_dsp_clear;\r
+        type_vorbis_analysis_init vorbis_analysis_init;\r
+////    type_vorbis_commentheader_out vorbis_commentheader_out;\r
+        type_vorbis_analysis_headerout vorbis_analysis_headerout;\r
+        type_vorbis_analysis_buffer vorbis_analysis_buffer;\r
+        type_vorbis_analysis_wrote vorbis_analysis_wrote;\r
+        type_vorbis_analysis_blockout vorbis_analysis_blockout;\r
+        type_vorbis_analysis vorbis_analysis;\r
+//      type_vorbis_synthesis_headerin vorbis_synthesis_headerin;\r
+//      type_vorbis_synthesis_init vorbis_synthesis_init;\r
+//      type_vorbis_synthesis vorbis_synthesis;\r
+//      type_vorbis_synthesis_blockin vorbis_synthesis_blockin;\r
+//      type_vorbis_synthesis_pcmout vorbis_synthesis_pcmout;\r
+//      type_vorbis_synthesis_read vorbis_synthesis_read;\r
+} vorbis_dll;\r
+\r
+static volatile HANDLE h_vorbis_dll = NULL;\r
+\r
+void free_vorbis_dll(void)\r
+{\r
+       if(h_vorbis_dll){\r
+               FreeLibrary(h_vorbis_dll);\r
+               h_vorbis_dll = NULL;\r
+       }\r
+}\r
+\r
+int load_vorbis_dll(void)\r
+{\r
+       if(!h_vorbis_dll){\r
+               h_vorbis_dll = LoadLibrary("vorbis.dll");\r
+               if(!h_vorbis_dll) return -1;\r
+       }\r
+       vorbis_dll.vorbis_info_init = (type_vorbis_info_init)GetProcAddress(h_vorbis_dll,"vorbis_info_init");\r
+       if(!vorbis_dll.vorbis_info_init){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_info_clear = (type_vorbis_info_clear)GetProcAddress(h_vorbis_dll,"vorbis_info_clear");\r
+       if(!vorbis_dll.vorbis_info_clear){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_comment_init = (type_vorbis_comment_init)GetProcAddress(h_vorbis_dll,"vorbis_comment_init");\r
+       if(!vorbis_dll.vorbis_comment_init){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_comment_add = (type_vorbis_comment_add)GetProcAddress(h_vorbis_dll,"vorbis_comment_add");\r
+       if(!vorbis_dll.vorbis_comment_add){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_comment_add_tag = (type_vorbis_comment_add_tag)GetProcAddress(h_vorbis_dll,"vorbis_comment_add_tag");\r
+//     if(!vorbis_dll.vorbis_comment_add_tag){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_comment_query = (type_vorbis_comment_query)GetProcAddress(h_vorbis_dll,"vorbis_comment_query");\r
+//     if(!vorbis_dll.vorbis_comment_query){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_comment_query_count = (type_vorbis_comment_query_count)GetProcAddress(h_vorbis_dll,"vorbis_comment_query_count");\r
+//     if(!vorbis_dll.vorbis_comment_query_count){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_comment_clear = (type_vorbis_comment_clear)GetProcAddress(h_vorbis_dll,"vorbis_comment_clear");\r
+       if(!vorbis_dll.vorbis_comment_clear){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_block_init = (type_vorbis_block_init)GetProcAddress(h_vorbis_dll,"vorbis_block_init");\r
+       if(!vorbis_dll.vorbis_block_init){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_block_clear = (type_vorbis_block_clear)GetProcAddress(h_vorbis_dll,"vorbis_block_clear");\r
+       if(!vorbis_dll.vorbis_block_clear){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_dsp_clear = (type_vorbis_dsp_clear)GetProcAddress(h_vorbis_dll,"vorbis_dsp_clear");\r
+       if(!vorbis_dll.vorbis_dsp_clear){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_analysis_init = (type_vorbis_analysis_init)GetProcAddress(h_vorbis_dll,"vorbis_analysis_init");\r
+       if(!vorbis_dll.vorbis_analysis_init){ free_vorbis_dll(); return -1; }\r
+////   vorbis_dll.vorbis_commentheader_out = (type_vorbis_commentheader_out)GetProcAddress(h_vorbis_dll,"vorbis_commentheader_out");\r
+////   if(!vorbis_dll.vorbis_commentheader_out){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_analysis_headerout = (type_vorbis_analysis_headerout)GetProcAddress(h_vorbis_dll,"vorbis_analysis_headerout");\r
+       if(!vorbis_dll.vorbis_analysis_headerout){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_analysis_buffer = (type_vorbis_analysis_buffer)GetProcAddress(h_vorbis_dll,"vorbis_analysis_buffer");\r
+       if(!vorbis_dll.vorbis_analysis_buffer){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_analysis_wrote = (type_vorbis_analysis_wrote)GetProcAddress(h_vorbis_dll,"vorbis_analysis_wrote");\r
+       if(!vorbis_dll.vorbis_analysis_wrote){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_analysis_blockout = (type_vorbis_analysis_blockout)GetProcAddress(h_vorbis_dll,"vorbis_analysis_blockout");\r
+       if(!vorbis_dll.vorbis_analysis_blockout){ free_vorbis_dll(); return -1; }\r
+       vorbis_dll.vorbis_analysis = (type_vorbis_analysis)GetProcAddress(h_vorbis_dll,"vorbis_analysis");\r
+       if(!vorbis_dll.vorbis_analysis){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_synthesis_headerin = (type_vorbis_synthesis_headerin)GetProcAddress(h_vorbis_dll,"vorbis_synthesis_headerin");\r
+//     if(!vorbis_dll.vorbis_synthesis_headerin){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_synthesis_init = (type_vorbis_synthesis_init)GetProcAddress(h_vorbis_dll,"vorbis_synthesis_init");\r
+//     if(!vorbis_dll.vorbis_synthesis_init){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_synthesis = (type_vorbis_synthesis)GetProcAddress(h_vorbis_dll,"vorbis_synthesis");\r
+//     if(!vorbis_dll.vorbis_synthesis){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_synthesis_blockin = (type_vorbis_synthesis_blockin)GetProcAddress(h_vorbis_dll,"vorbis_synthesis_blockin");\r
+//     if(!vorbis_dll.vorbis_synthesis_blockin){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_synthesis_pcmout = (type_vorbis_synthesis_pcmout)GetProcAddress(h_vorbis_dll,"vorbis_synthesis_pcmout");\r
+//     if(!vorbis_dll.vorbis_synthesis_pcmout){ free_vorbis_dll(); return -1; }\r
+//     vorbis_dll.vorbis_synthesis_read = (type_vorbis_synthesis_read)GetProcAddress(h_vorbis_dll,"vorbis_synthesis_read");\r
+//     if(!vorbis_dll.vorbis_synthesis_read){ free_vorbis_dll(); return -1; }\r
+       return 0;\r
+}\r
+\r
+void    vorbis_info_init(vorbis_info *vi)\r
+{\r
+       if(h_vorbis_dll){\r
+               vorbis_dll.vorbis_info_init(vi);\r
+       }\r
+}\r
+\r
+void    vorbis_info_clear(vorbis_info *vi)\r
+{\r
+       if(h_vorbis_dll){\r
+               vorbis_dll.vorbis_info_clear(vi);\r
+       }\r
+}\r
+\r
+void    vorbis_comment_init(vorbis_comment *vc)\r
+{\r
+       if(h_vorbis_dll){\r
+               vorbis_dll.vorbis_comment_init(vc);\r
+       }\r
+}\r
+\r
+void    vorbis_comment_add(vorbis_comment *vc, char *comment)\r
+{\r
+       if(h_vorbis_dll){\r
+               vorbis_dll.vorbis_comment_add(vc,comment);\r
+       }\r
+}\r
+\r
+#if 0\r
+void    vorbis_comment_add_tag(vorbis_comment *vc, char *tag, char *contents)\r
+{\r
+       if(h_vorbis_dll){\r
+               vorbis_dll.vorbis_comment_add_tag(vc,tag,contents);\r
+       }\r
+}\r
+\r
+char   *vorbis_comment_query(vorbis_comment *vc, char *tag, int count)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_comment_query(vc,tag,count);\r
+       }\r
+       return (char   *)0;\r
+}\r
+\r
+int     vorbis_comment_query_count(vorbis_comment *vc, char *tag)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_comment_query_count(vc,tag);\r
+       }\r
+       return (int     )0;\r
+}\r
+#endif\r
+\r
+void    vorbis_comment_clear(vorbis_comment *vc)\r
+{\r
+       if(h_vorbis_dll){\r
+               vorbis_dll.vorbis_comment_clear(vc);\r
+       }\r
+}\r
+\r
+int     vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_block_init(v,vb);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_block_clear(vorbis_block *vb)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_block_clear(vb);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+void    vorbis_dsp_clear(vorbis_dsp_state *v)\r
+{\r
+       if(h_vorbis_dll){\r
+               vorbis_dll.vorbis_dsp_clear(v);\r
+       }\r
+}\r
+\r
+int     vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_analysis_init(v,vi);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+//int     vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op)\r
+//{\r
+//     if(h_vorbis_dll){\r
+//             return vorbis_dll.vorbis_commentheader_out(vc,op);\r
+//     }\r
+//     return (int     )0;\r
+//}\r
+\r
+int     vorbis_analysis_headerout(vorbis_dsp_state *v,vorbis_comment *vc,ogg_packet *op,ogg_packet *op_comm,ogg_packet *op_code)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_analysis_headerout(v,vc,op,op_comm,op_code);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+float **vorbis_analysis_buffer(vorbis_dsp_state *v,int vals)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_analysis_buffer(v,vals);\r
+       }\r
+       return (float **)0;\r
+}\r
+\r
+int     vorbis_analysis_wrote(vorbis_dsp_state *v,int vals)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_analysis_wrote(v,vals);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_analysis_blockout(v,vb);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_analysis(vorbis_block *vb,ogg_packet *op)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_analysis(vb,op);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+#if 0\r
+int     vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_synthesis_headerin(vi,vc,op);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_synthesis_init(v,vi);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_synthesis(vorbis_block *vb,ogg_packet *op)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_synthesis(vb,op);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_synthesis_blockin(v,vb);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_synthesis_pcmout(vorbis_dsp_state *v,float ***pcm)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_synthesis_pcmout(v,pcm);\r
+       }\r
+       return (int     )0;\r
+}\r
+\r
+int     vorbis_synthesis_read(vorbis_dsp_state *v,int samples)\r
+{\r
+       if(h_vorbis_dll){\r
+               return vorbis_dll.vorbis_synthesis_read(v,samples);\r
+       }\r
+       return (int     )0;\r
+}\r
+#endif\r
+\r
+/***************************************************************/\r
+#endif /* AU_VORBIS_DLL */\r
diff --git a/timidity/w32g_vorbisenc_dll.c b/timidity/w32g_vorbisenc_dll.c
new file mode 100755 (executable)
index 0000000..4e8bd0b
--- /dev/null
@@ -0,0 +1,66 @@
+/***************************************************************\r
+ name: vorbisenc_dll  dll: vorbisenc.dll \r
+***************************************************************/\r
+\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif /* HAVE_CONFIG_H */\r
+#include "interface.h"\r
+\r
+#ifdef AU_VORBIS_DLL\r
+\r
+#include <windows.h>\r
+#include <vorbis/vorbisenc.h>\r
+\r
+extern int load_vorbisenc_dll(void);\r
+extern void free_vorbisenc_dll(void);\r
+\r
+typedef int(*type_vorbis_encode_init)(vorbis_info *vi,long channels,long rate,long max_bitrate,long nominal_bitrate,long min_bitrate);\r
+typedef int(*type_vorbis_encode_ctl)(vorbis_info *vi,int number,void *arg);\r
+\r
+static struct vorbisenc_dll_ {\r
+        type_vorbis_encode_init vorbis_encode_init;\r
+        type_vorbis_encode_ctl vorbis_encode_ctl;\r
+} vorbisenc_dll;\r
+\r
+static volatile HANDLE h_vorbisenc_dll = NULL;\r
+\r
+void free_vorbisenc_dll(void)\r
+{\r
+       if(h_vorbisenc_dll){\r
+               FreeLibrary(h_vorbisenc_dll);\r
+               h_vorbisenc_dll = NULL;\r
+       }\r
+}\r
+\r
+int load_vorbisenc_dll(void)\r
+{\r
+       if(!h_vorbisenc_dll){\r
+               h_vorbisenc_dll = LoadLibrary("vorbisenc.dll");\r
+               if(!h_vorbisenc_dll) return -1;\r
+       }\r
+       vorbisenc_dll.vorbis_encode_init = (type_vorbis_encode_init)GetProcAddress(h_vorbisenc_dll,"vorbis_encode_init");\r
+       if(!vorbisenc_dll.vorbis_encode_init){ free_vorbisenc_dll(); return -1; }\r
+       vorbisenc_dll.vorbis_encode_ctl = (type_vorbis_encode_ctl)GetProcAddress(h_vorbisenc_dll,"vorbis_encode_ctl");\r
+       if(!vorbisenc_dll.vorbis_encode_ctl){ free_vorbisenc_dll(); return -1; }\r
+       return 0;\r
+}\r
+\r
+int vorbis_encode_init(vorbis_info *vi,long channels,long rate,long max_bitrate,long nominal_bitrate,long min_bitrate)\r
+{\r
+       if(h_vorbisenc_dll){\r
+               return vorbisenc_dll.vorbis_encode_init(vi,channels,rate,max_bitrate,nominal_bitrate,min_bitrate);\r
+       }\r
+       return (int)0;\r
+}\r
+\r
+int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg)\r
+{\r
+       if(h_vorbisenc_dll){\r
+               return vorbisenc_dll.vorbis_encode_ctl(vi,number,arg);\r
+       }\r
+       return (int)0;\r
+}\r
+\r
+/***************************************************************/\r
+#endif /* AU_VORBIS_DLL */\r
old mode 100644 (file)
new mode 100755 (executable)
index b7af494..b566b1b
@@ -88,6 +88,11 @@ PlayMode dpm = {
 static uint32 bytes_output, next_bytes;
 static int already_warning_lseek;
 
+#ifdef __W32G__
+extern char *w32g_output_dir;
+extern int w32g_auto_output_mode;
+#endif
+
 /*************************************************************************/
 
 static char *orig_RIFFheader=
@@ -183,30 +188,16 @@ static int wav_output_open(const char *fname)
 
 static int auto_wav_output_open(const char *input_filename)
 {
-  char *output_filename = (char *)safe_malloc(strlen(input_filename) + 5);
-  char *ext, *p;
+  char *output_filename;
 
-  strcpy(output_filename, input_filename);
-  if((ext = strrchr(output_filename, '.')) == NULL)
-    ext = output_filename + strlen(output_filename);
-  else {
-    /* strip ".gz" */
-    if(strcasecmp(ext, ".gz") == 0) {
-      *ext = '\0';
-      if((ext = strrchr(output_filename, '.')) == NULL)
-       ext = output_filename + strlen(output_filename);
-    }
+#ifndef __W32G__
+  output_filename = create_auto_output_name(input_filename,"wav",NULL,0);
+#else
+  output_filename = create_auto_output_name(input_filename,"wav",w32g_output_dir,w32g_auto_output_mode);
+#endif
+  if(output_filename==NULL){
+         return -1;
   }
-
-  /* replace '.' and '#' before ext */
-  for(p = output_filename; p < ext; p++)
-    if(*p == '.' || *p == '#')
-      *p = '_';
-
-  if(*ext && isupper(*(ext + 1)))
-    strcpy(ext, ".WAV");
-  else
-    strcpy(ext, ".wav");
   if((dpm.fd = wav_output_open(output_filename)) == -1) {
     free(output_filename);
     return -1;
@@ -239,6 +230,7 @@ static int open_output(void)
 
     dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc);
 
+#ifndef __W32G__
     if(dpm.name == NULL) {
       dpm.flag |= PF_AUTO_SPLIT_FILE;
       dpm.name = NULL;
@@ -247,6 +239,16 @@ static int open_output(void)
       if((dpm.fd = wav_output_open(dpm.name)) == -1)
        return -1;
     }
+#else
+       if(w32g_auto_output_mode>0){
+      dpm.flag |= PF_AUTO_SPLIT_FILE;
+      dpm.name = NULL;
+    } else {
+      dpm.flag &= ~PF_AUTO_SPLIT_FILE;
+      if((dpm.fd = wav_output_open(dpm.name)) == -1)
+               return -1;
+    }
+#endif
 
     /* Reset the length counter */
     bytes_output = 0;