Fix to fit with case-insensitive file system

diff --git a/ChangeLog b/ChangeLog
index 2a9ed71..7c60b87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
+2004-10-27  TAMUKI Shoichi <tamuki@linet.gr.jp>
+
+       * configure, autoconf/utils.m4, doc/{C,ja_JP.eucJP}/readme.dl,
+         interface/Makefile.{am,in},interface/{dumb,ncurs,slang,motif,tk,
+         emacs,vt100,xaw,xskin,dynamic,mac,gtk,server,alsaseq,w32g,winsyn,
+         portmidisyn}_c.c, timidity/controls.h, timidity/timiidty.c:
+         Fix to fit with case-insensitive file system
+       * interface/interface_[nsmkeTaigA].txt: remove
+       * interface/if_{ncurses,slang,motif,tcltk,emacs,vt100,xaw,xskin,
+         gtk,alsaseq}.txt: add
+
 2004-10-21  Henrique de Moraes Holschuh <hmh@debian.org>
 
-       * timidity/mod2midi.c (Voice_Play,Voice_SetPeriod):
+       * timidity/mod2midi.c (Voice_Play, Voice_SetPeriod):
          improve the code path when period2note returns -1
 
 2004-10-21  Eric A. Welsh <ewelsh@ccb.wustl.edu>
@@ -18,7 +29,7 @@
        * timidity/mod2midi.c: Change all VERB_NORMAL and VERB_VERBOSE
          messages to VERB_NOISY.
 
-2004-10-17  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-10-17  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * libunimod/mloader.c (SL_LoadSamples): too many arguments to
          function `FreeSampleList'
@@ -26,10 +37,10 @@
          time.h and sys/time.h
        * timidity/aq.c: fix wrong prototype (int -> void)
        * timidity/wrd_read.c: #ifdef-out unknown pragma
-       * configure.in, timidity/timidity.c : no need of <stdbool.h>
-       * timidity/Makefile.am : bug fix
+       * configure.in, timidity/timidity.c: no need of <stdbool.h>
+       * timidity/Makefile.am: bug fix
 
-2004-10-14  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-10-14  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * interface/w32g_i.c (MPanelMessageHaveMesssage): fix typo
        * autoconf/alsa.m4, autoconf/ao.m4, autoconf/arts.m4,
@@ -43,29 +54,28 @@
        * interface/mac_c.c, interface/wrdt_mac.c, timidity/wrd.h,
          utils/support.c: Fixes to compile on Mac OS.
 
-2004-10-03  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-10-03  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * NEWS: Add new entry for 2.13.2
        * configure.in: Change version to 2.13.2
 
-2004-10-02  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-10-02  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
-       * interface/wrdt_wcon.c : Fix double definition of print_ecmd()
+       * interface/wrdt_wcon.c: Fix double definition of print_ecmd()
        * timidity/timidity.c (main): s/strcat/strncat/;
 
-2004-09-29  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-09-29  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * NEWS: Add new entry for 2.13.1
 
-2004-09-28  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-09-28  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * configure.in: Change version to 2.13.1
 
-2004-09-27  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-09-27  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * utils/support.c (vsnprintf): ensure snpritnf() to return a
          \0-terminated string
-
        * interface/mac_c.c, interface/server_c.c, interface/w32g_c.c,
          interface/w32g_i.c, interface/wrdt_dumb.c, interface/wrdt_mac.c,
          interface/wrdt_tty.c, interface/wrdt_w32g.c, interface/xaw_i.c,
@@ -74,7 +84,7 @@
          timidity/sun_a.c, timidity/timidity.c, timidity/wrdt_read.c:
          Fix to use strn* functinos.
 
-2004-09-23  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-09-23  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * utils/support.h: ditto
        * utils/support.c: ditto
@@ -84,7 +94,7 @@
 
        * timidity/resample.c: Reimplement bounds cheking
 
-2004-09-09  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+2004-09-09  URABE Shyouhei <shyouhei@ice.uec.ac.jp>
 
        * interface/gtk_c.c (ctl_total_time): ditto.
        * interface/gtk_i.c (handle_input): Fix counter overflow

diff --git a/autoconf/utils.m4 b/autoconf/utils.m4
index 1e906cb..8f11421 100644 (file)
--- a/autoconf/utils.m4
+++ b/autoconf/utils.m4
@@ -39,7 +39,7 @@ xyes)
   $6
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_$3.\$(so)"
+  dynamic_targets="$dynamic_targets if_$1.\$(so)"
   $7
   ;;
 *)

diff --git a/configure b/configure
index dfbabf9..e91a294 100755 (executable)
--- a/configure
+++ b/configure
@@ -16054,7 +16054,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_n.\$(so)"
+  dynamic_targets="$dynamic_targets if_ncurses.\$(so)"
    n_so_libs="$lib_curses_opt"
     case "$target" in
        *-*-freebsd123*)
@@ -16329,7 +16329,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_s.\$(so)"
+  dynamic_targets="$dynamic_targets if_slang.\$(so)"
    s_so_libs="-lslang"
     echo "$as_me:$LINENO: checking for initscr in -ltermcap" >&5
 echo $ECHO_N "checking for initscr in -ltermcap... $ECHO_C" >&6
@@ -16459,7 +16459,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_m.\$(so)"
+  dynamic_targets="$dynamic_targets if_motif.\$(so)"
    if test x$have_xprelibs = xyes; then
       m_so_libs="-lXext -lSM -lICE"
     fi
@@ -16684,7 +16684,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_k.\$(so)"
+  dynamic_targets="$dynamic_targets if_tcltk.\$(so)"
    k_so_libs="$tcl_libdir $tk_libdir $tcl_lib $tk_lib $lib_dl_opt"
     case "$target" in
       *-*-bsdi*)
@@ -16747,7 +16747,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_e.\$(so)"
+  dynamic_targets="$dynamic_targets if_emacs.\$(so)"
    ELFILES="$ELFILES timidity.el"
   ;;
 *)
@@ -16791,7 +16791,7 @@ fi
    INTERFACE_SRCS="$INTERFACE_SRCS vt100_c.c vt100.c"
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_T.\$(so)"
+  dynamic_targets="$dynamic_targets if_vt100.\$(so)"
 
   ;;
 *)
@@ -16863,7 +16863,7 @@ _ACEOF
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_a.\$(so)"
+  dynamic_targets="$dynamic_targets if_xaw.\$(so)"
    if test "x$have_xext" = xyes; then
       a_so_libs="-lXext -lX11"
     else
@@ -16946,7 +16946,7 @@ fi
    INTERFACE_SRCS="$INTERFACE_SRCS xskin_c.c xskin_i.c xskin_loadBMP.c xskin_spectrum.c"
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_i.\$(so)"
+  dynamic_targets="$dynamic_targets if_xskin.\$(so)"
    i_so_libs="$ldflags_x_opt -lX11"
   ;;
 *)
@@ -17618,7 +17618,7 @@ done
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_g.\$(so)"
+  dynamic_targets="$dynamic_targets if_gtk.\$(so)"
    if test "x$GCC" = xyes; then
                for i in $GTK_LIBS; do
            case "x$i" in
@@ -17829,7 +17829,7 @@ done
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_r.\$(so)"
+  dynamic_targets="$dynamic_targets if_server.\$(so)"
 
   ;;
 *)
@@ -18220,7 +18220,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_A.\$(so)"
+  dynamic_targets="$dynamic_targets if_alsaseq.\$(so)"
 
   ;;
 *)
@@ -18264,7 +18264,7 @@ fi
    INTERFACE_SRCS="$INTERFACE_SRCS winsyn_c.c rtsyn_common.c rtsyn_winmm.c"
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_W.\$(so)"
+  dynamic_targets="$dynamic_targets if_winsyn.\$(so)"
 
   ;;
 *)
@@ -18308,7 +18308,7 @@ fi
    INTERFACE_SRCS="$INTERFACE_SRCS portmidisyn_c.c rtsyn_common.c rtsyn_portmidi.c"
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_P.\$(so)"
+  dynamic_targets="$dynamic_targets if_portmidisyn.\$(so)"
 
   ;;
 *)
@@ -18375,7 +18375,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_W.\$(so)"
+  dynamic_targets="$dynamic_targets if_winsyng.\$(so)"
 
   ;;
 *)
@@ -18443,7 +18443,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_w.\$(so)"
+  dynamic_targets="$dynamic_targets if_w32gui.\$(so)"
 
   ;;
 *)
@@ -18718,7 +18718,7 @@ fi
 
   ;;
 xdynamic)
-  dynamic_targets="$dynamic_targets interface_p.\$(so)"
+  dynamic_targets="$dynamic_targets if_ump.\$(so)"
 
   ;;
 *)

diff --git a/doc/C/README.dl b/doc/C/README.dl
index 541e6af..fc3b48b 100644 (file)
--- a/doc/C/README.dl
+++ b/doc/C/README.dl
@@ -4,12 +4,12 @@
 loadable modules by using dynamic link module.
  Place the shared library 
 
- interface_<ID>.so
+ if_<NAME>.so
 
-on the SHARED_LIB_PATH directory. In this case <ID> is the interface's
-ID that are specified at `-i' option.
+on the SHARED_LIB_PATH directory. In this case <NAME> is the interface's
+short name to be identified.
  TiMidity++ requires to this shared library the following function:
- (the <ID> is the same as above)
+ (In this case <ID> is the interface's ID that are specified at `-i' option.)
 
 ControlMode* interface_<ID>_loader(void)
 {
@@ -20,13 +20,13 @@ ControlMode* interface_<ID>_loader(void)
 }
 
  If the dynamic interface that are specified at -i<ID>, TiMidity++
-loads interface_<ID>.so at the SHARED_LIB_PATH (this is the macro specified
+loads if_<NAME>.so at the SHARED_LIB_PATH (this is the macro specified
 in the Makefile) and calls a function in the shared library
 interface_<ID>_loader().
 
  If a file
 
- interface_<ID>.txt
+ if_<NAME>.txt
 
 describing the information about the interface by 1 line is in the
 SHARED_LIB_PATH, TiMidity++ displays this information when `-h'

diff --git a/doc/ja_JP.eucJP/README.dl b/doc/ja_JP.eucJP/README.dl
index 3f2b82f..46c217c 100644 (file)
--- a/doc/ja_JP.eucJP/README.dl
+++ b/doc/ja_JP.eucJP/README.dl
@@ -3,11 +3,12 @@
 ÍѤ¤¤Æ¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
 SHARED_LIB_PATH ¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¡¤(SHARED_LIB_PATH ¤Ï¥Þ¥¯¥í)
 
-interface_<ID>.so
+if_<NAME>.so
 
-¤È¤¤¤¦¥·¥§¥¢¡¼¥É¥é¥¤¥Ö¥é¥ê¤òºîÀ®¤·¤Þ¤¹¡¥¤³¤³¤Ç¡¤<ID> ¤Ï -i ¥ª¥×¥·¥ç¥ó¤Ç»ØÄê
-¤¹¤ë¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ ID ¤Ç¤¹¡¥¤³¤Î ¥·¥§¥¢¡¼¥É¥é¥¤¥Ö¥é¥êÆâ¤Ç¡¤°Ê²¼¤Î¤è¤¦¤Ê´Ø¿ô¤ò
-ºîÀ®¤·¤Æ¤ª¤­¤Þ¤¹¡¥(¤³¤³¤Ç¤â <ID> ¤Ë¤Ï ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ ID ¤¬¤Ï¤¤¤ê¤Þ¤¹¡¥)
+¤È¤¤¤¦¥·¥§¥¢¡¼¥É¥é¥¤¥Ö¥é¥ê¤òºîÀ®¤·¤Þ¤¹¡¥¤³¤³¤Ç¡¤<NAME> ¤Ï¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ò
+¼±Ê̤¹¤ëû¤¤Ì¾Á°¤Ç¤¹¡¥¤³¤Î ¥·¥§¥¢¡¼¥É¥é¥¤¥Ö¥é¥êÆâ¤Ç¡¤°Ê²¼¤Î¤è¤¦¤Ê´Ø¿ô¤ò
+ºîÀ®¤·¤Æ¤ª¤­¤Þ¤¹¡¥(¤³¤³¤Ç¡¤<ID> ¤Ï -i ¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤹ¤ë¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹
+ID ¤Ç¤¹¡¥)
 
 ControlMode* interface_<ID>_loader(void)
 {
@@ -18,12 +19,12 @@ ControlMode* interface_<ID>_loader(void)
 }
 
 -i<ID> ¤Ç»ØÄꤷ¤¿¥À¥¤¥Ê¥ß¥Ã¥¯¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Ï¡¤
-interface_<ID>.so ¤¬Æɤ߹þ¤Þ¤ì¡¤¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î¼ÂÂΤϡ¤
+if_<NAME>.so ¤¬Æɤ߹þ¤Þ¤ì¡¤¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î¼ÂÂΤϡ¤
 interface_<ID>_loader() ¤¬¥³¡¼¥ë¤µ¤ì¤ë¤³¤È¤ÇºîÀ®¤µ¤ì¤Þ¤¹¡¥
 
 ¤Þ¤¿¡¤SHARED_LIB_PATH ¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¡¤
 
-interface_<ID>.txt
+if_<NAME>.txt
 
 ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Î 1 ¹ÔÌܤ˥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î´Êñ¤ÊÀâÌÀ¤òµ­½Ò¤·¤Æ¤ª¤¯¤È¡¤
 ¤½¤Îʸ»úÎó¤¬ `-h' ¥ª¥×¥·¥ç¥ó»ØÄê»þ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡¥

diff --git a/interface/Makefile.am b/interface/Makefile.am
index b02d085..2fc55df 100644 (file)
--- a/interface/Makefile.am
+++ b/interface/Makefile.am
@@ -222,16 +222,16 @@ EXTRA_DIST = \
        misc.tcl \
        timidity.el \
        tclIndex \
-       interface_A.txt \
-       interface_T.txt \
-       interface_a.txt \
-       interface_e.txt \
-       interface_g.txt \
-       interface_i.txt \
-       interface_k.txt \
-       interface_m.txt \
-       interface_n.txt \
-       interface_s.txt
+       if_ncurses.txt \
+       if_slang.txt \
+       if_motif.txt \
+       if_tcltk.txt \
+       if_emacs.txt \
+       if_vt100.txt \
+       if_xaw.txt \
+       if_xskin.txt \
+       if_gtk.txt \
+       if_alsaseq.txt
 
 .ptcl.tcl:
        sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@
@@ -362,37 +362,37 @@ url_buff.$(so): $(top_srcdir)/libarc/url_buff.c
 support.$(so): $(top_srcdir)/utils/support.c
        $(COMPILE) $(SHCFLAGS) -o $@ -c $<
 
-interface_n.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so)
+if_ncurses.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so)
        $(SHLD) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs)
 
-interface_s.$(so): slang_c.$(so) support.$(so) timer.$(so)
+if_slang.$(so): slang_c.$(so) support.$(so) timer.$(so)
        $(SHLD) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs)
 
-interface_m.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so)
+if_motif.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so)
        $(SHLD) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs)
 
-interface_k.$(so): tk_c.$(so) support.$(so)
+if_tcltk.$(so): tk_c.$(so) support.$(so)
        $(SHLD) -o $@ tk_c.$(so) support.$(so) $(k_so_libs)
 
-interface_e.$(so): emacs_c.$(so) support.$(so)
+if_emacs.$(so): emacs_c.$(so) support.$(so)
        $(SHLD) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs)
 
-interface_T.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so)
+if_vt100.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so)
        $(SHLD) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs)
 
-interface_a.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so)
+if_xaw.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so)
        $(SHLD) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs)
 
-interface_i.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so)
+if_xskin.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so)
        $(SHLD) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs)
 
-interface_g.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so)
+if_gtk.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so)
        $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs)
 
-interface_r.$(so): server_c.$(so) support.$(so)
+if_server.$(so): server_c.$(so) support.$(so)
        $(SHLD) -o $@ server_c.$(so) support.$(so)
 
-interface_A.$(so): alsaseq_c.$(so) support.$(so)
+if_alsaseq.$(so): alsaseq_c.$(so) support.$(so)
        $(SHLD) -o $@ alsaseq_c.$(so) support.$(so)
 
 endif

diff --git a/interface/Makefile.in b/interface/Makefile.in
index 6afdbb4..cac5342 100644 (file)
--- a/interface/Makefile.in
+++ b/interface/Makefile.in
@@ -526,16 +526,16 @@ EXTRA_DIST = \
        misc.tcl \
        timidity.el \
        tclIndex \
-       interface_A.txt \
-       interface_T.txt \
-       interface_a.txt \
-       interface_e.txt \
-       interface_g.txt \
-       interface_i.txt \
-       interface_k.txt \
-       interface_m.txt \
-       interface_n.txt \
-       interface_s.txt
+       if_ncurses.txt \
+       if_slang.txt \
+       if_motif.txt \
+       if_tcltk.txt \
+       if_emacs.txt \
+       if_vt100.txt \
+       if_xaw.txt \
+       if_xskin.txt \
+       if_gtk.txt \
+       if_alsaseq.txt
 
 @ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk
 @ENABLE_TCLTK_TRUE@install_tk = install.tk
@@ -1033,37 +1033,37 @@ install.el: $(ELFILES)
 @NEEDDLOPEN_TRUE@support.$(so): $(top_srcdir)/utils/support.c
 @NEEDDLOPEN_TRUE@      $(COMPILE) $(SHCFLAGS) -o $@ -c $<
 
-@NEEDDLOPEN_TRUE@interface_n.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so)
+@NEEDDLOPEN_TRUE@if_ncurses.$(so): ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ ncurs_c.$(so) support.$(so) bitset.$(so) timer.$(so) $(n_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_s.$(so): slang_c.$(so) support.$(so) timer.$(so)
+@NEEDDLOPEN_TRUE@if_slang.$(so): slang_c.$(so) support.$(so) timer.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ slang_c.$(so) support.$(so) timer.$(so) $(s_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_m.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so)
+@NEEDDLOPEN_TRUE@if_motif.$(so): motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ motif_c.$(so) support.$(so) motif_i.$(so) motif_p.$(so) $(m_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_k.$(so): tk_c.$(so) support.$(so)
+@NEEDDLOPEN_TRUE@if_tcltk.$(so): tk_c.$(so) support.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ tk_c.$(so) support.$(so) $(k_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_e.$(so): emacs_c.$(so) support.$(so)
+@NEEDDLOPEN_TRUE@if_emacs.$(so): emacs_c.$(so) support.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ emacs_c.$(so) support.$(so) $(e_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_T.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so)
+@NEEDDLOPEN_TRUE@if_vt100.$(so): vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ vt100_c.$(so) support.$(so) vt100.$(so) bitset.$(so) timer.$(so) $(T_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_a.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so)
+@NEEDDLOPEN_TRUE@if_xaw.$(so): xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ xaw_c.$(so) support.$(so) xaw_i.$(so) timer.$(so) $(a_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_i.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so)
+@NEEDDLOPEN_TRUE@if_xskin.$(so): xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ xskin_c.$(so) support.$(so) xskin_i.$(so) xskin_loadBMP.$(so) xskin_spectrum.$(so) url_buff.$(so) $(i_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_g.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so)
+@NEEDDLOPEN_TRUE@if_gtk.$(so): gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ gtk_c.$(so) support.$(so) gtk_i.$(so) gtk_p.$(so) $(g_so_libs)
 
-@NEEDDLOPEN_TRUE@interface_r.$(so): server_c.$(so) support.$(so)
+@NEEDDLOPEN_TRUE@if_server.$(so): server_c.$(so) support.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ server_c.$(so) support.$(so)
 
-@NEEDDLOPEN_TRUE@interface_A.$(so): alsaseq_c.$(so) support.$(so)
+@NEEDDLOPEN_TRUE@if_alsaseq.$(so): alsaseq_c.$(so) support.$(so)
 @NEEDDLOPEN_TRUE@      $(SHLD) -o $@ alsaseq_c.$(so) support.$(so)
 
 clean-compile:

diff --git a/interface/alsaseq_c.c b/interface/alsaseq_c.c
index ac7b918..062ef2f 100644 (file)
--- a/interface/alsaseq_c.c
+++ b/interface/alsaseq_c.c
@@ -187,6 +187,7 @@ static void ctl_pass_playing_list(int n, char *args[]);
 ControlMode ctl=
 {
     "ALSA sequencer interface", 'A',
+    "alsaseq",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/dumb_c.c b/interface/dumb_c.c
index 3d16b4f..4fe230c 100644 (file)
--- a/interface/dumb_c.c
+++ b/interface/dumb_c.c
@@ -1,6 +1,6 @@
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,11 +15,11 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     dumb_c.c
     Minimal control mode -- no interaction, just prints out messages.
-    */
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -62,6 +62,7 @@ static void ctl_event(CtlEvent *e);
 ControlMode ctl=
 {
     "dumb interface", 'd',
+    "dumb",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/dynamic_c.c b/interface/dynamic_c.c
index 3b5deaa..a9041ae 100644 (file)
--- a/interface/dynamic_c.c
+++ b/interface/dynamic_c.c
@@ -1,6 +1,6 @@
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #ifdef HAVE_CONFIG_H
@@ -43,7 +43,7 @@
 
 static int ctl_open(int using_stdin, int using_stdout);
 static void ctl_close(void);
-extern char *dynamic_interface_module(int id);
+extern char *dynamic_interface_module(char *name);
 static void ctl_event(){} /* Do nothing */
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
 static void *libhandle;
@@ -52,6 +52,7 @@ static void (* ctl_close_hook)(void);
 ControlMode dynamic_control_mode =
 {
     "Dynamic interface", 0,
+    "\0",
     1,0,0,0,
     ctl_open, ctl_close, NULL, NULL, cmsg, ctl_event,
 };
@@ -85,13 +86,15 @@ static int ctl_open(int using_stdin, int using_stdout)
     char *path;
     char buff[256];
     int id;
+    char name[16];
 
     if(dynamic_control_mode.opened)
        return 0;
     dynamic_control_mode.opened = 1;
 
     id = dynamic_control_mode.id_character;
-    path = dynamic_interface_module(id);
+    name = dynamic_control_mode.id_short_name;
+    path = dynamic_interface_module(name);
     if(path == NULL)
     {
        fprintf(stderr, "FATAL ERROR: dynamic_c.c: ctl_open()\n");

diff --git a/interface/emacs_c.c b/interface/emacs_c.c
index 9063e07..588222d 100644 (file)
--- a/interface/emacs_c.c
+++ b/interface/emacs_c.c
@@ -1,6 +1,6 @@
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,11 +15,11 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     emacs_c.c
     Emacs control mode - written by Masanao Izumo <mo@goice.co.jp>
-    */
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -99,6 +99,7 @@ enum emacs_type_t
 ControlMode ctl=
 {
     "Emacs interface (invoked from `M-x timidity')", 'e',
+    "emacs",
     1, 0, 0,
     0,
     ctl_open,

diff --git a/interface/gtk_c.c b/interface/gtk_c.c
index 18a45f7..11987c9 100644 (file)
--- a/interface/gtk_c.c
+++ b/interface/gtk_c.c
@@ -1,6 +1,6 @@
-/* 
+/*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,23 +15,22 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     motif_ctl.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95
-   
-    A motif interface for TIMIDITY : to prevent X redrawings from 
+
+    A motif interface for TIMIDITY: to prevent X redrawings from
     interfering with the audio computation, I don't use the XtAppAddWorkProc
 
     I create a pipe between the timidity process and a Motif interface
     process forked from the 1st one
 
     Copied the Motif file to create a Gtk+ interface.
-          - Glenn Trigg 29 Oct 1998
+        - Glenn Trigg 29 Oct 1998
 
     Modified for TiMidity++
-         - Isaku Yamahata 03 Dec 1998
-
-    */
+        - Isaku Yamahata 03 Dec 1998
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -85,6 +84,7 @@ static void ctl_lyric(int);
 ControlMode ctl = 
 {
     "gtk+ interface", 'g',
+    "gtk",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/interface_A.txt b/interface/if_alsaseq.txt
similarity index 100%
rename from interface/interface_A.txt
rename to interface/if_alsaseq.txt

diff --git a/interface/interface_e.txt b/interface/if_emacs.txt
similarity index 100%
rename from interface/interface_e.txt
rename to interface/if_emacs.txt

diff --git a/interface/interface_g.txt b/interface/if_gtk.txt
similarity index 100%
rename from interface/interface_g.txt
rename to interface/if_gtk.txt

diff --git a/interface/interface_m.txt b/interface/if_motif.txt
similarity index 100%
rename from interface/interface_m.txt
rename to interface/if_motif.txt

diff --git a/interface/interface_n.txt b/interface/if_ncurses.txt
similarity index 100%
rename from interface/interface_n.txt
rename to interface/if_ncurses.txt

diff --git a/interface/interface_s.txt b/interface/if_slang.txt
similarity index 100%
rename from interface/interface_s.txt
rename to interface/if_slang.txt

diff --git a/interface/interface_k.txt b/interface/if_tcltk.txt
similarity index 100%
rename from interface/interface_k.txt
rename to interface/if_tcltk.txt

diff --git a/interface/interface_T.txt b/interface/if_vt100.txt
similarity index 100%
rename from interface/interface_T.txt
rename to interface/if_vt100.txt

diff --git a/interface/interface_a.txt b/interface/if_xaw.txt
similarity index 100%
rename from interface/interface_a.txt
rename to interface/if_xaw.txt

diff --git a/interface/interface_i.txt b/interface/if_xskin.txt
similarity index 100%
rename from interface/interface_i.txt
rename to interface/if_xskin.txt

diff --git a/interface/mac_c.c b/interface/mac_c.c
index 63084b8..fe3df65 100644 (file)
--- a/interface/mac_c.c
+++ b/interface/mac_c.c
@@ -1,6 +1,6 @@
-/* 
+/*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,11 +15,11 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-       
-       Macintosh interface for TiMidity
-       by T.Nogami     <t-nogami@happy.email.ne.jp>
-       
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+    Macintosh interface for TiMidity
+    by T.Nogami <t-nogami@happy.email.ne.jp>
+
     mac_c.c
     Macintosh control mode
 */
@@ -85,6 +85,7 @@ static void ctl_event(CtlEvent *e);
 ControlMode ctl= 
 {
   "mac interface", 'm',
+  "mac",
   1,1,0,
   0,
   ctl_open,

diff --git a/interface/motif_c.c b/interface/motif_c.c
index 157449f..2ff65fa 100644 (file)
--- a/interface/motif_c.c
+++ b/interface/motif_c.c
@@ -1,6 +1,6 @@
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,16 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     motif_ctl.c: written by Vincent Pagel (pagel@loria.fr) 10/4/95
 
-    A motif interface for TIMIDITY : to prevent X redrawings from
+    A motif interface for TIMIDITY: to prevent X redrawings from
     interfering with the audio computation, I don't use the XtAppAddWorkProc
 
     I create a pipe between the timidity process and a Motif interface
     process forked from the 1st one
-
-    */
+*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -73,6 +72,7 @@ static int motif_ready = 0;
 ControlMode ctl=
 {
     "motif interface", 'm',
+    "motif",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/ncurs_c.c b/interface/ncurs_c.c
index b0cac5a..d351270 100644 (file)
--- a/interface/ncurs_c.c
+++ b/interface/ncurs_c.c
@@ -246,6 +246,7 @@ static void ctl_reset(void);
 ControlMode ctl=
 {
     "ncurses interface", 'n',
+    "ncurses",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/portmidisyn_c.c b/interface/portmidisyn_c.c
index 2487bcf..6470e26 100755 (executable)
--- a/interface/portmidisyn_c.c
+++ b/interface/portmidisyn_c.c
@@ -1,7 +1,6 @@
-
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -13,11 +12,10 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-    
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     portmidisyn_c.c - PortMIDI synthesizer interface
         Copyright (c) 2003 Keishi Suenaga <s_keishi@mutt.freemail.ne.jp>
@@ -27,7 +25,6 @@
             Copyright (c) 2000  Takashi Iwai <tiwai@suse.de>
         readmidi.c
 
-
     DESCRIPTION
     ===========
 
@@ -43,24 +40,22 @@
     TiMidity loads instruments dynamically at each time a PRM_CHANGE
     event is received.  It sometimes causes a noise.
     If you are using a low power machine, invoke timidity as follows:
-      % timidity -s 11025 -iP        (set sampling freq. to 11025Hz)
+      % timidity -s 11025 -iP       (set sampling freq. to 11025Hz)
     or
       % timidity -EFreverb=0 -iP    (disable MIDI reverb effect control)
 
     TiMidity keeps all loaded instruments during executing.
 
     To use TiMidity as output device, you need a MIDI loopback device.
-       (for windows)
-      I use MIDI Yoke. It can freely be obtained MIDI-OX site
+    (for windows)
+      I use MIDI Yoke.  It can freely be obtained MIDI-OX site
       (http://www.midiox.com).
-       (for ALSA)
-      You can easily meke it. See MIDI router section 
+    (for ALSA)
+      You can easily meke it.  See MIDI router section
       of Alsa 0.9.0 howto
-         (http://www.suse.de/~mana/alsa090_howto.html#sect05 ).
-
+      (http://www.suse.de/~mana/alsa090_howto.html#sect05 ).
 */
 
-
 //#define  USE_PORTMIDI 1
 //#define USE_GTK_GUI 1
 
@@ -113,6 +108,7 @@ static char readch(void);
 ControlMode ctl=
 {
     "PortMIDI Synthesizer interface", 'P',
+    "portmidisyn",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/server_c.c b/interface/server_c.c
index 2c41dae..261200b 100644 (file)
--- a/interface/server_c.c
+++ b/interface/server_c.c
@@ -186,6 +186,7 @@ static void ctl_pass_playing_list(int n, char *args[]);
 ControlMode ctl=
 {
     "remote interface", 'r',
+    "server",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/slang_c.c b/interface/slang_c.c
index 74c27d5..73fc62c 100644 (file)
--- a/interface/slang_c.c
+++ b/interface/slang_c.c
@@ -142,6 +142,7 @@ static void ctl_event(CtlEvent *e);
 ControlMode ctl=
 {
     "slang interface", 's',
+    "slang",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/tk_c.c b/interface/tk_c.c
index 2b746d9..a325a24 100644 (file)
--- a/interface/tk_c.c
+++ b/interface/tk_c.c
@@ -1,6 +1,6 @@
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,22 +15,18 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+    The Tcl/Tk interface for Timidity
+    written by Takashi Iwai (iwai@dragon.mm.t.u-tokyo.ac.jp)
+
+    Most of the following codes are derived from both motif_ctl.c
+    and motif_pipe.c.  The communication between Tk program and
+    timidity is established by a pipe stream as in Motif interface.
+    On the contrast to motif, the stdin and stdout are assigned
+    as pipe i/o in Tk interface.
 */
 
-/*================================================================
- *
- * The Tcl/Tk interface for Timidity
- * written by Takashi Iwai (iwai@dragon.mm.t.u-tokyo.ac.jp)
- *
- * Most of the following codes are derived from both motif_ctl.c
- * and motif_pipe.c.  The communication between Tk program and
- * timidity is established by a pipe stream as in Motif interface.
- * On the contrast to motif, the stdin and stdout are assigned
- * as pipe i/o in Tk interface.
- *
- *================================================================*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -146,6 +142,7 @@ typedef struct {
 ControlMode ctl=
 {
     "Tcl/Tk interface", 'k',
+    "tcltk",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/vt100_c.c b/interface/vt100_c.c
index 48a860f..3238d10 100644 (file)
--- a/interface/vt100_c.c
+++ b/interface/vt100_c.c
@@ -133,6 +133,7 @@ static void ctl_event(CtlEvent *e);
 ControlMode ctl=
 {
     "vt100 interface", 'T',
+    "vt100",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/w32g_c.c b/interface/w32g_c.c
index d097ffb..dda58d4 100644 (file)
--- a/interface/w32g_c.c
+++ b/interface/w32g_c.c
@@ -1,7 +1,7 @@
 /*
-    TiMidity -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
-    Copyright (C) 1995 Tuukka Toivonen <toivonen@clinet.fi>
+    TiMidity++ -- MIDI to WAVE converter and player
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
+    Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     w32g_c.c: written by Daisuke Aoki <dai@y7.net>
                          Masanao Izumo <mo@goice.co.jp>
@@ -98,6 +98,7 @@ static int cmsg(int type, int verbosity_level, char *fmt, ...);
 ControlMode ctl=
 {
     "Win32 GUI interface", 'w',
+    "w32gui",
     1,1,0,
     CTLF_AUTOSTART | CTLF_DRAG_START,
     ctl_open,

diff --git a/interface/winsyn_c.c b/interface/winsyn_c.c
index 31b0ade..d816099 100755 (executable)
--- a/interface/winsyn_c.c
+++ b/interface/winsyn_c.c
@@ -1,7 +1,6 @@
-
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -16,8 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     winsyn_c.c - Windows synthesizer interface
         Copyright (c) 2002 2003 Keishi Suenaga <s_keishi@mutt.freemail.ne.jp>
@@ -27,7 +25,6 @@
             Copyright (c) 2000  Takashi Iwai <tiwai@suse.de>
         readmidi.c
 
-
     DESCRIPTION
     ===========
 
@@ -43,7 +40,7 @@
     TiMidity loads instruments dynamically at each time a PRM_CHANGE
     event is received.  It sometimes causes a noise.
     If you are using a low power machine, invoke timidity as follows:
-      % timidity -s 11025 -iW        (set sampling freq. to 11025Hz)
+      % timidity -s 11025 -iW       (set sampling freq. to 11025Hz)
     or
       % timidity -EFreverb=0 -iW    (disable MIDI reverb effect control)
 
@@ -53,6 +50,7 @@
     I use MIDI Yoke. It can freely be obtained MIDI-OX site
     (http://www.midiox.com).
 */
+
 //#define  USE_PORTMIDI 1
 //#define USE_GTK_GUI 1
 
@@ -105,6 +103,7 @@ static char readch(void);
 ControlMode ctl=
 {
     "Windows Synthesizer interface", 'W',
+    "winsyn",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/xaw_c.c b/interface/xaw_c.c
index e4c0bf1..1f78aa0 100644 (file)
--- a/interface/xaw_c.c
+++ b/interface/xaw_c.c
@@ -1,6 +1,6 @@
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,11 +15,11 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     xaw_c.c - XAW Interface from
-       Tomokazu Harada <harada@prince.pe.u-tokyo.ac.jp>
-       Yoshishige Arai <ryo2@on.rim.or.jp>
+        Tomokazu Harada <harada@prince.pe.u-tokyo.ac.jp>
+        Yoshishige Arai <ryo2@on.rim.or.jp>
 */
 
 #ifdef HAVE_CONFIG_H
@@ -105,6 +105,7 @@ extern int amplitude;
 ControlMode ctl=
 {
     "XAW interface", 'a',
+    "xaw",
     1,0,0,
     0,
     ctl_open,

diff --git a/interface/xskin_c.c b/interface/xskin_c.c
index 27adf5c..1c505cf 100644 (file)
--- a/interface/xskin_c.c
+++ b/interface/xskin_c.c
@@ -1,6 +1,6 @@
 /*
     TiMidity++ -- MIDI to WAVE converter and player
-    Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
+    Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>
     Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>
 
     This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
     xskin interface by Daisuke nagano <breeze_geo@geocities.co.jp>
 */
@@ -84,6 +84,7 @@ static int xskin_ready = 0;
 ControlMode ctl=
 {
     "skin interface", 'i',
+    "skin",
     1,0,0,
     0,
     ctl_open,

diff --git a/timidity/controls.h b/timidity/controls.h
index 8e3f4f3..72941d1 100644 (file)
--- a/timidity/controls.h
+++ b/timidity/controls.h
@@ -128,6 +128,7 @@ typedef struct _CtlEvent {
 
 typedef struct {
   char *id_name, id_character;
+  char *id_short_name;
   int verbosity, trace_playing, opened;
 
   int32 flags;

diff --git a/timidity/timidity.c b/timidity/timidity.c
index 1cc1e90..189a9d9 100644 (file)
--- a/timidity/timidity.c
+++ b/timidity/timidity.c
@@ -407,8 +407,8 @@ __attribute__((noreturn))
 static inline int parse_opt_h(const char *);
 #ifdef IA_DYNAMIC
 static inline void list_dyna_interface(FILE *, char *, char *);
-static inline char *dynamic_interface_info(int);
-char *dynamic_interface_module(int);
+static inline char *dynamic_interface_info(char *);
+char *dynamic_interface_module(char *);
 #endif
 static inline int parse_opt_i(const char *);
 static inline int parse_opt_verbose(const char *);
@@ -3924,33 +3924,41 @@ static inline int parse_opt_h(const char *arg)
 static inline void list_dyna_interface(FILE *fp, char *path, char *mark)
 {
        URL url;
-       char fname[BUFSIZ], *info;
+       char fname[BUFSIZ], name[16], *info;
+       ControlMode *cmp, **cmpp;
        int id;
        
        if ((url = url_dir_open(path)) == NULL)
                return;
        while (url_gets(url, fname, sizeof(fname)) != NULL)
-               if (strncmp(fname, "interface_", 10) == 0) {
-                       id = fname[10];
+               if (strncmp(fname, "if_", 3) == 0) {
+                       for (i = 0; i < 15 && fname[i + 3] != '.'; i++)
+                               name[i] = fname[i + 3];
+                       name[i] = '\0'
+                       for (cmpp = ctl_list; (cmp = *cmpp) != NULL; cmpp++)
+                               if (! strcmp(cmp->id_short_name, name)) {
+                                       id = cmp->id_character;
+                                       break;
+                               }
                        if (mark[id])
                                continue;
                        mark[id] = 1;
-                       if ((info = dynamic_interface_info(id)) == NULL)
-                               info = dynamic_interface_module(id);
+                       if ((info = dynamic_interface_info(name)) == NULL)
+                               info = dynamic_interface_module(name);
                        if (info != NULL)
                                fprintf(fp, "  -i%c          %s" NLS, id, info);
                }
        url_close(url);
 }
 
-static inline char *dynamic_interface_info(int id)
+static inline char *dynamic_interface_info(char *name)
 {
        static char libinfo[MAXPATHLEN];
        int fd, n;
        char *nl;
        
-       sprintf(libinfo, "%s" PATH_STRING "interface_%c.txt",
-                       dynamic_lib_root, id);
+       sprintf(libinfo, "%s" PATH_STRING "if_%s.txt",
+                       dynamic_lib_root, name);
        if ((fd = open(libinfo, 0)) < 0)
                return NULL;
        n = read(fd, libinfo, sizeof(libinfo) - 1);
@@ -3968,13 +3976,13 @@ static inline char *dynamic_interface_info(int id)
        return libinfo;
 }
 
-char *dynamic_interface_module(int id)
+char *dynamic_interface_module(char *name)
 {
        static char shared_library[MAXPATHLEN];
        int fd;
        
-       sprintf(shared_library, "%s" PATH_STRING "interface_%c%s",
-                       dynamic_lib_root, id, SHARED_LIB_EXT);
+       sprintf(shared_library, "%s" PATH_STRING "if_%s%s",
+                       dynamic_lib_root, name, SHARED_LIB_EXT);
        if ((fd = open(shared_library, 0)) < 0)
                return NULL;
        close(fd);
@@ -3985,8 +3993,9 @@ char *dynamic_interface_module(int id)
 static inline int parse_opt_i(const char *arg)
 {
        /* interface mode */
-       ControlMode *cmp, **cmpp;
+       ControlMode *cmp, **cmpp, *cmp2, **cmpp2;
        int found = 0;
+       char name[16] = "\0";
        
        for (cmpp = ctl_list; (cmp = *cmpp) != NULL; cmpp++) {
                if (cmp->id_character == *arg) {
@@ -4000,8 +4009,14 @@ static inline int parse_opt_i(const char *arg)
                        break;
                }
 #ifdef IA_DYNAMIC
-               if (cmp->id_character == dynamic_interface_id
-                               && dynamic_interface_module(*arg)) {
+               if (cmp->id_character == dynamic_interface_id) {
+                       for (cmpp2 = ctl_list; (cmp2 = *cmpp2) != NULL; cmpp2++)
+                               if (cmp2->id_character == *arg) {
+                                       strcpy(name, cmp2->id_short_name);
+                                       break;
+                               }
+                       if (! dynamic_interface_module(name))
+                               continue;
                        /* Dynamic interface loader */
                        found = 1;
                        ctl = cmp;