Fix soundfonts.

diff --git a/ChangeLog b/ChangeLog
index 07d6762..d775958 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-05  Saito <saito@intaa.net>
+
+       * timidity/sndfont.c:
+         Fix for Soundfonts with strange loop points.
+
 2004-03-05  TAMUKI Shoichi <tamuki@linet.gr.jp>
 
        * interface/w32g_pref.c, interface/w32g_res.{h,rc}:

diff --git a/timidity/sndfont.c b/timidity/sndfont.c
index e8d237a..246f029 100644 (file)
--- a/timidity/sndfont.c
+++ b/timidity/sndfont.c
@@ -1232,8 +1232,10 @@ static void set_sample_info(SFInfo *sf, SampleList *vp, LayerTable *tbl)
 
     /* set data length */
     vp->v.data_length = vp->len + 1;
-    if(vp->v.loop_end > vp->len + 1)
+    if (vp->v.loop_end > vp->len + 1)
        vp->v.loop_end = vp->len + 1;
+       if (vp->v.loop_start > vp->len)
+       vp->v.loop_start = vp->len;
 
     /* Sample rate */
        if(sp->samplerate > 50000) {sp->samplerate = 50000;}