Mercurial > hg > dmlib

changeset 1175:165c673ee012

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename a variable.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Mar 2015 09:32:58 +0200
parents 14ac28580059
children afdbf62ce8ad
files minijss/jloadxm.c
diffstat 1 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/minijss/jloadxm.c	Thu Mar 05 09:18:35 2015 +0200
+++ b/minijss/jloadxm.c	Thu Mar 05 09:32:58 2015 +0200
@@ -494,7 +494,7 @@
     XMInstrument1 xmI1;
     off_t remainder, pos = dmftell(inFile);
     int xmConvTable[XM_MaxInstruments + 1];
-    JSSExtInstrument *pEInst;
+    JSSExtInstrument *einst;
     XMInstrument2 xmI2;
     int i, nsample, ret;
 
@@ -522,13 +522,13 @@
     }
 
     // Allocate instrument
-    if ((pEInst = jssAllocateExtInstrument()) == NULL)
+    if ((einst = jssAllocateExtInstrument()) == NULL)
     {
         JSSERROR(DMERR_MALLOC, DMERR_MALLOC,
         "Could not allocate extended instrument structure #%d\n", ninst);
     }
 
-    module->extInstruments[ninst] = pEInst;
+    module->extInstruments[ninst] = einst;
 
     // Get instrument header #2
     if (!dmf_read_le32(inFile, &xmI2.headSize) ||
@@ -576,28 +576,28 @@
 
     // Check and convert all ext instrument information
 #ifndef JSS_LIGHT
-    pEInst->desc = jssASCIItoStr(xmI1.instName, 0, sizeof(xmI1.instName));
+    einst->desc = jssASCIItoStr(xmI1.instName, 0, sizeof(xmI1.instName));
 #endif
-    jssXMConvertEnvelope(&pEInst->volumeEnv, &xmI2.volumeEnv, "vol", ninst);
-    jssXMConvertEnvelope(&pEInst->panningEnv, &xmI2.panningEnv, "pan", ninst);
+    jssXMConvertEnvelope(&einst->volumeEnv, &xmI2.volumeEnv, "vol", ninst);
+    jssXMConvertEnvelope(&einst->panningEnv, &xmI2.panningEnv, "pan", ninst);
 
     switch (xmI2.vibratoType)
     {
-        case 0: pEInst->vibratoType = jvibSine; break;
-        case 1: pEInst->vibratoType = jvibRamp; break;
-        case 2: pEInst->vibratoType = jvibSquare; break;
-        case 3: pEInst->vibratoType = jvibRandom; break;
+        case 0: einst->vibratoType = jvibSine; break;
+        case 1: einst->vibratoType = jvibRamp; break;
+        case 2: einst->vibratoType = jvibSquare; break;
+        case 3: einst->vibratoType = jvibRandom; break;
         default:
-            pEInst->vibratoType = jvibSine;
+            einst->vibratoType = jvibSine;
             JSSWARNING(DMERR_INVALID_DATA, DMERR_INVALID_DATA,
             "Invalid extinstrument vibrato type %d for inst #%d\n", ninst);
             break;
     }
-    pEInst->vibratoSweep = xmI2.vibratoSweep;
-    pEInst->vibratoDepth = xmI2.vibratoDepth;
-    pEInst->vibratoRate  = xmI2.vibratoRate;
-    pEInst->fadeOut      = xmI2.fadeOut;
-    pEInst->nsamples     = xmI1.nsamples;
+    einst->vibratoSweep = xmI2.vibratoSweep;
+    einst->vibratoDepth = xmI2.vibratoDepth;
+    einst->vibratoRate  = xmI2.vibratoRate;
+    einst->fadeOut      = xmI2.fadeOut;
+    einst->nsamples     = xmI1.nsamples;
 
     // Initialize the SNumForNotes conversion table
     for (i = 0; i < XM_MaxInstruments; i++)
@@ -625,10 +625,10 @@
     {
         int tmp = xmI2.sNumForNotes[i];
         if (tmp >= 0 && tmp < xmI1.nsamples)
-            pEInst->sNumForNotes[i] = xmConvTable[tmp];
+            einst->sNumForNotes[i] = xmConvTable[tmp];
         else
         {
-            pEInst->sNumForNotes[i] = jsetNotSet;
+            einst->sNumForNotes[i] = jsetNotSet;
             JSSWARNING(DMERR_INVALID_DATA, DMERR_INVALID_DATA,
             "Ext.instrument #%d sNumForNotes[%d] out of range (%d).\n",
             ninst, i, tmp);