Changeset 7258c6a in buchla-68k for ram/pix2mid.c

Timestamp:

07/09/2017 04:45:34 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8618599

Parents:

0292fbb

Message:

Use standard integer types.

File:

• ram/pix2mid.c (modified) (4 diffs)

ram/pix2mid.c

@@ -17 +17 @@
 #define PCENTER         256     /* pixel offset of 0 time line */
 
-extern  short   cflag;          /* accidental flag */
-extern  short   cnote;          /* note value at cursor */
-extern  short   cyval;          /* cursor y value */
-extern  short   cxval;          /* cursor x value */
+extern  int16_t cflag;          /* accidental flag */
+extern  int16_t cnote;          /* note value at cursor */
+extern  int16_t cyval;          /* cursor y value */
+extern  int16_t cxval;          /* cursor x value */
 
-extern  long    ctime;          /* time at cursor */
-extern  long    t_cur;          /* time at p_cur */
+extern  int32_t ctime;          /* time at cursor */
+extern  int32_t t_cur;          /* time at p_cur */
 
 /* 
@@ -29 +29 @@
 */
 
-short   mpixtab[52][4] = {      /* pixel to MIDI note for the white keys */
+int16_t mpixtab[52][4] = {      /* pixel to MIDI note for the white keys */
 
 /* [0] = center pixel, [1] = MIDI note, [2] = sharp tag, [3] = flat tag */
@@ -122 +122 @@
 */
 
-short pix2mid(void)
+int16_t pix2mid(void)
 {
-        register short i, cy, mpc;
-        register long ct;
+        register int16_t i, cy, mpc;
+        register int32_t ct;
 
         cnote = -1;
@@ -132 +132 @@
         mpc   = ac_code EQ N_SHARP ? 2 : 3;
 
-        ct = t_cur + ((long)cxval - (long)PCENTER);
+        ct = t_cur + ((int32_t)cxval - (int32_t)PCENTER);
 
         if (ct < 0L)