Mercurial > hg > forks > bilotrip-mj12

changeset 40:2170556dc71f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Aug 2013 23:31:35 +0300
parents 54e0fc833615
children 78c981f2ff2d
files src/midifile.c
diffstat 1 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/midifile.c	Mon Aug 05 22:23:39 2013 +0300
+++ b/src/midifile.c	Mon Aug 05 23:31:35 2013 +0300
@@ -93,6 +93,7 @@
 
 static void midiErrorV(_MIDI_FILE *pMF, const char *fmt, va_list ap)
 {
+    (void) pMF;
     printf("MIDI: ");
     vprintf(fmt, ap);
 }
@@ -598,11 +599,11 @@
 BOOL midiFileFlushTrack(MIDI_FILE *_pMF, int iTrack, BOOL bFlushToEnd,
                         Uint32 dwEndTimePos)
 {
-    size_t sz, i;
+    size_t sz, index;
     Uint8 *ptr;
     MIDI_END_POINT *pEndPoints;
     int num, mx_pts;
-    BOOL bNoChanges = TRUE;
+    //BOOL bNoChanges = TRUE;
 
     _VAR_CAST;
     if (!IsFilePtrValid(pMF))
@@ -616,14 +617,15 @@
      */
     pEndPoints = (MIDI_END_POINT *) malloc(sz * sizeof(MIDI_END_POINT));
     mx_pts = 0;
-    for (i = 0; i < sz; ++i)
-        if (pMF->Track[iTrack].LastNote[i].valid)
+    for (index = 0; index < sz; index++)
+    {
+        if (pMF->Track[iTrack].LastNote[index].valid)
         {
-            pEndPoints[mx_pts].iIdx = i;
-            pEndPoints[mx_pts].iEndPos =
-                pMF->Track[iTrack].LastNote[i].end_pos;
+            pEndPoints[mx_pts].iIdx = index;
+            pEndPoints[mx_pts].iEndPos = pMF->Track[iTrack].LastNote[index].end_pos;
             mx_pts++;
         }
+    }
 
     if (bFlushToEnd)
     {
@@ -638,33 +640,30 @@
         /* Sort, smallest first, and add the note off msgs */
         qsort(pEndPoints, mx_pts, sizeof(MIDI_END_POINT), qs_cmp_pEndPoints);
 
-        i = 0;
-        while ((dwEndTimePos >= (Uint32) pEndPoints[i].iEndPos || bFlushToEnd)
-               && i < mx_pts)
+        int n = 0;
+        while ((dwEndTimePos >= (Uint32) pEndPoints[n].iEndPos || bFlushToEnd) && n < mx_pts)
         {
             ptr = _midiGetPtr(pMF, iTrack, DT_DEF);
-            if (!ptr)
+            if (ptr == NULL)
                 return FALSE;
 
-            num = pEndPoints[i].iIdx;   /* get 'LastNote' index */
+            num = pEndPoints[n].iIdx;   /* get 'LastNote' index */
 
-            ptr =
-                _midiWriteVarLen(ptr,
-                                 pMF->Track[iTrack].LastNote[num].end_pos -
-                                 pMF->Track[iTrack].pos);
+            ptr = _midiWriteVarLen(ptr,
+                pMF->Track[iTrack].LastNote[num].end_pos -
+                pMF->Track[iTrack].pos);
+
             /* msgNoteOn  msgNoteOff */
-            *ptr++ =
-                (Uint8) (msgNoteOff | pMF->Track[iTrack].LastNote[num].chn);
+            *ptr++ = (Uint8) (msgNoteOff | pMF->Track[iTrack].LastNote[num].chn);
             *ptr++ = pMF->Track[iTrack].LastNote[num].note;
             *ptr++ = 0;
 
             pMF->Track[iTrack].LastNote[num].valid = FALSE;
             pMF->Track[iTrack].pos = pMF->Track[iTrack].LastNote[num].end_pos;
-
             pMF->Track[iTrack].ptr = ptr;
 
-            ++i;
-            bNoChanges = FALSE;
+            //bNoChanges = FALSE;
+            n++;
         }
     }
 
@@ -1047,7 +1046,8 @@
     MIDI_FILE_TRACK *pTrk;
     Uint8 *ptr;
     BOOL bSuccess = FALSE;
-    int i, chn;
+    int chn;
+    size_t i;
 
     _VAR_CAST;
     if (!IsFilePtrValid(pMF))