# HG changeset patch # User Matti Hamalainen # Date 1425563932 -7200 # Node ID aa6c3af36008d4d5bf1f3826e9e308b06b5daa99 # Parent 4d27c4ec8d4d4bd466940622f167a750799156e9 Cosmetics. diff -r 4d27c4ec8d4d -r aa6c3af36008 minijss/jloadjss.c --- a/minijss/jloadjss.c Thu Mar 05 15:58:24 2015 +0200 +++ b/minijss/jloadjss.c Thu Mar 05 15:58:52 2015 +0200 @@ -6,6 +6,7 @@ #include "jssmod.h" +// If all pattern modes are required, enable them here #ifdef JM_SUP_PATMODE_ALL # define JM_SUP_PATMODE_1 1 # define JM_SUP_PATMODE_2 1 @@ -15,8 +16,14 @@ #endif -#define JSGETBUF(XV, XT) if (!dmf_read_str(inFile, XV, sizeof(XT))) return DMERR_OUT_OF_DATA -#define JSGETBYTE(XV) if (!dmf_read_byte(inFile, XV)) return DMERR_OUT_OF_DATA +// Short helper macros for reading data +#define JSGETBUF(XV, XT) \ + if (!dmf_read_str(inFile, XV, sizeof(XT))) \ + return DMERR_OUT_OF_DATA + +#define JSGETBYTE(XV) \ + if (!dmf_read_byte(inFile, XV)) \ + return DMERR_OUT_OF_DATA #if defined(JM_SUP_PATMODE_1) || defined(JM_SUP_PATMODE_3) @@ -98,7 +105,8 @@ if (tmp == 127) note->note = jsetNoteOff; - else if (tmp == 0) + else + if (tmp == 0) note->note = jsetNotSet; else note->note = tmp - 1;