comparison tools/dumpmod.c @ 1092:03322ee5bb32

Change dumpmod short format sample instrument output.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 03 Mar 2015 01:40:52 +0200
parents 985225a93aeb
children ea2cc4932714
comparison
equal deleted inserted replaced
1091:988a3397839e 1092:03322ee5bb32
304 } 304 }
305 else 305 else
306 { 306 {
307 #ifndef JSS_LIGHT 307 #ifndef JSS_LIGHT
308 if (i->desc && !optDump) 308 if (i->desc && !optDump)
309 fprintf(f, "'%s', ", i->desc); 309 fprintf(f, "%s|", i->desc);
310 #endif 310 #endif
311 fprintf(f, 311 fprintf(f,
312 "s=%ld (%lx), l=%ld-%ld (%lx-%lx), v=%i (%x), f=0x%x, c4=%i (%x), rn=%i (%s%i), ft=%i, pn=%i (%x)\n", 312 "%8ld|%8ld..%-8ld|%03d|%-2s %-2s %-2s|"
313 (unsigned long) i->size, (unsigned long) i->size, 313 "%4d|%s%d|%d|%d\n",
314 (unsigned long) i->loopS, (unsigned long) i->loopE, 314 (unsigned long) i->size,
315 (unsigned long) i->loopS, (unsigned long) i->loopE, 315 (unsigned long) i->loopS,
316 i->volume, i->volume, i->flags, i->C4BaseSpeed, 316 (unsigned long) i->loopE,
317 i->C4BaseSpeed, i->ERelNote, 317 i->volume,
318 patNoteTable[(48 + i->ERelNote) % 12], 318
319 (48 + i->ERelNote) / 12, i->EFineTune, 319 (i->flags & jsfLooped) ? "lp" : "",
320 i->EPanning, i->EPanning); 320 (i->flags & jsfBiDi) ? "bi" : "",
321 (i->flags & jsf16bit) ? "16" : "8",
322
323 i->C4BaseSpeed,
324 patNoteTable[(48 + i->ERelNote) % 12],
325 (48 + i->ERelNote) / 12, i->EFineTune,
326 i->EPanning);
321 } 327 }
322 } 328 }
323 329
324 330
325 void printGeneralInfo(FILE *f, JSSModule *m) 331 void printGeneralInfo(FILE *f, JSSModule *m)
449 "ExtInstruments:\n" 455 "ExtInstruments:\n"
450 "---------------\n" 456 "---------------\n"
451 ); 457 );
452 for (i = 0; i < mod->nextInstruments; i++) 458 for (i = 0; i < mod->nextInstruments; i++)
453 { 459 {
454 printf("#%03i: ", i + 1); 460 printf("#%03d: ", i + 1);
455 printExtInstrument(stdout, mod->extInstruments[i]); 461 printExtInstrument(stdout, mod->extInstruments[i]);
456 } 462 }
457 } 463 }
458 464
459 if (optViewInstruments) 465 if (optViewInstruments)
462 "Instruments:\n" 468 "Instruments:\n"
463 "------------\n" 469 "------------\n"
464 ); 470 );
465 for (i = 0; i < mod->ninstruments; i++) 471 for (i = 0; i < mod->ninstruments; i++)
466 { 472 {
467 printf("#%03i: ", i + 1); 473 printf("#%03d: ", i + 1);
468 printInstrument(stdout, mod->instruments[i]); 474 printInstrument(stdout, mod->instruments[i]);
469 } 475 }
470 } 476 }
471 477
472 // Free module data 478 // Free module data