comparison minijss/jssmod.h @ 2002:5cec199f49f8

Remove useless __packed__ attributes.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 03 Jul 2018 09:46:35 +0300
parents cedb5ca1533b
children 40ccc09f09be
comparison
equal deleted inserted replaced
2001:c0b062f881e5 2002:5cec199f49f8
192 PATMODE_LAST 192 PATMODE_LAST
193 }; 193 };
194 194
195 /* JSSMOD typedefs 195 /* JSSMOD typedefs
196 */ 196 */
197 typedef struct __attribute__((__packed__)) 197 typedef struct
198 { 198 {
199 char idMagic[2]; // "JM" 199 char idMagic[2]; // "JM"
200 Uint8 idVersion; // 0x10 for 1.0, etc. 200 Uint8 idVersion; // 0x10 for 1.0, etc.
201 Uint16 201 Uint16
202 defFlags, // Flags field: see jmdf* flags 202 defFlags, // Flags field: see jmdf* flags
229 module and other headers are used to indicate if these items exist. 229 module and other headers are used to indicate if these items exist.
230 */ 230 */
231 } JSSMODHeader; 231 } JSSMODHeader;
232 232
233 233
234 typedef struct __attribute__((__packed__)) 234 typedef struct
235 { 235 {
236 Uint16 frame, value; 236 Uint16 frame, value;
237 } JSSMODEnvelopePoint; 237 } JSSMODEnvelopePoint;
238 238
239 239
240 typedef struct __attribute__((__packed__)) 240 typedef struct
241 { 241 {
242 Uint8 242 Uint8
243 flags, 243 flags,
244 npoints, 244 npoints,
245 sustain, 245 sustain,
247 loopE; 247 loopE;
248 JSSMODEnvelopePoint points[jsetMaxEnvPoints]; 248 JSSMODEnvelopePoint points[jsetMaxEnvPoints];
249 } JSSMODEnvelope; 249 } JSSMODEnvelope;
250 250
251 251
252 typedef struct __attribute__((__packed__)) 252 typedef struct
253 { 253 {
254 Uint8 nsamples, 254 Uint8 nsamples,
255 vibratoType; 255 vibratoType;
256 Uint16 vibratoSweep, 256 Uint16 vibratoSweep,
257 vibratoDepth, 257 vibratoDepth,
260 Uint32 sNumForNotes[jsetNNotes]; // 32bit because internally we use global indices 260 Uint32 sNumForNotes[jsetNNotes]; // 32bit because internally we use global indices
261 JSSMODEnvelope volumeEnv, panningEnv; 261 JSSMODEnvelope volumeEnv, panningEnv;
262 } JSSMODExtInstrument; 262 } JSSMODExtInstrument;
263 263
264 264
265 typedef struct __attribute__((__packed__)) 265 typedef struct
266 { 266 {
267 Uint32 size, // Length in units 267 Uint32 size, // Length in units
268 loopS, // Loop start position in units 268 loopS, // Loop start position in units
269 loopE; // Loop end position in units 269 loopE; // Loop end position in units
270 Uint16 flags, // Flags - see jss.h jsfXXXX 270 Uint16 flags, // Flags - see jss.h jsfXXXX
284 #define JM_COMP_EFFECT (0x08) 284 #define JM_COMP_EFFECT (0x08)
285 #define JM_COMP_PARAM (0x10) 285 #define JM_COMP_PARAM (0x10)
286 #define JM_COMP_ALL (JM_COMP_NOTE | JM_COMP_INSTRUMENT | JM_COMP_VOLUME | JM_COMP_EFFECT | JM_COMP_PARAM) 286 #define JM_COMP_ALL (JM_COMP_NOTE | JM_COMP_INSTRUMENT | JM_COMP_VOLUME | JM_COMP_EFFECT | JM_COMP_PARAM)
287 287
288 288
289 typedef struct __attribute__((__packed__)) 289 typedef struct
290 { 290 {
291 Uint32 size; 291 Uint32 size;
292 Uint16 nrows; 292 Uint16 nrows;
293 } JSSMODPattern; 293 } JSSMODPattern;
294 294