# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1353677192 -7200
# Node ID d4cee32e7050b1eedb70733ae15e35a4df140afd
# Parent  0e39e0bbb5acdb3596409bf86676562852b6459a
Rename internal structures, cosmetics.

diff -r 0e39e0bbb5ac -r d4cee32e7050 jloadxm.c
--- a/jloadxm.c	Thu Nov 22 23:16:38 2012 +0200
+++ b/jloadxm.c	Fri Nov 23 15:26:32 2012 +0200
@@ -38,10 +38,10 @@
             nchannels,         // Number of channels
             npatterns,         // Number of patterns
             ninstruments,      // Number of instruments
-            flags,             /* Module flags:
-                                  bit0: 0 = Amiga frequency table
-                                        1 = Linear frequency table
-                                */
+            flags,             // Module flags:
+                               // bit0: 0 = Amiga frequency table
+                               //       1 = Linear frequency table
+                               //
             defSpeed,          // Default speed
             defTempo;          // Default tempo
     Uint8   orderList[256];    // Order list
@@ -60,21 +60,21 @@
 typedef struct
 {
     Uint16 frame, value;
-} xm_envpoint_t;
+} XMEnvPoint;
 
 
 typedef struct
 {
     Uint8 flags, npoints, sustain, loopS, loopE;
-    xm_envpoint_t points[XM_MaxEnvPoints];
-} xm_envelope_t;
+    XMEnvPoint points[XM_MaxEnvPoints];
+} XMEnvelope;
 
 
 typedef struct
 {
     Uint32 headSize;                  // Header size
     Uint8 sNumForNotes[XM_MaxNotes];  // Sample numbers for notes
-    xm_envelope_t volumeEnv, panningEnv;
+    XMEnvelope volumeEnv, panningEnv;
     Uint8 vibratoType, vibratoSweep, vibratoDepth, vibratoRate;
 
     Uint16 fadeOut, ARESERVED;
@@ -212,7 +212,7 @@
 
 /* Convert XM envelope structure to JSS envelope structure
  */
-static int jssXMConvertEnvelope(JSSEnvelope * d, xm_envelope_t * s, char * e, int instr)
+static int jssXMConvertEnvelope(JSSEnvelope * d, XMEnvelope * s, char * e, int instr)
 {
     int i;
     (void) e; (void) instr;