Fix SoundFont.

diff --git a/ChangeLog b/ChangeLog
index 051beee..ee405b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-01  Saito <saito2@digitalme.com>
+
+       * timidity/sndfont.c:
+         Fix behaviour of SoundFont's scale-tuning like SB-Live!.
+
 2003-11-01  mput <root@mput.dip.jp>
 
        * timidity/timidity.c (parse_opt_h): Fix in help message

diff --git a/timidity/sndfont.c b/timidity/sndfont.c
index 950df25..48f86e9 100644 (file)
--- a/timidity/sndfont.c
+++ b/timidity/sndfont.c
@@ -1419,11 +1419,11 @@ static void set_rootkey(SFInfo *sf, SampleList *vp, LayerTable *tbl)
        int val;
 
     /* scale tuning */
-#ifdef SF_EMULATE_SBLIVE
+/* #ifdef SF_EMULATE_SBLIVE */
        vp->v.scale_tuning = 100;
-#else
+/* #else
        vp->v.scale_tuning = tbl->val[SF_scaleTuning];
-#endif
+#endif */
 
     /* set initial root key & fine tune */
     if(sf->version == 1 && tbl->set[SF_samplePitch])