| 31 |
|
#include "rom_patches.h" |
| 32 |
|
#include "main.h" |
| 33 |
|
#include "audio.h" |
| 34 |
+ |
#include "audio_defs.h" |
| 35 |
|
#include "thunks.h" |
| 36 |
|
|
| 37 |
|
#define DEBUG 0 |
| 449 |
|
|
| 450 |
|
} else if (type == FOURCC('t','h','n','g')) { |
| 451 |
|
// Collect info about used audio sifters |
| 452 |
< |
uint32 c_type = ntohl(0[(uint32 *)p]); |
| 453 |
< |
uint32 sub_type = ntohl(1[(uint32 *)p]); |
| 452 |
> |
uint32 thing = (uintptr)p; |
| 453 |
> |
uint32 c_type = ReadMacInt32(thing); |
| 454 |
> |
uint32 sub_type = ReadMacInt32(thing + 4); |
| 455 |
|
if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) { |
| 456 |
< |
1[(uint32 *)p] = htonl(FOURCC('a','w','g','c')); |
| 456 |
> |
WriteMacInt32(thing + 4, FOURCC('a','w','g','c')); |
| 457 |
|
D(bug("thng %d, type %c%c%c%c (%08x), sub type %c%c%c%c (%08x), data %p\n", id, c_type >> 24, (c_type >> 16) & 0xff, (c_type >> 8) & 0xff, c_type & 0xff, c_type, sub_type >> 24, (sub_type >> 16) & 0xff, (sub_type >> 8) & 0xff, sub_type & 0xff, sub_type, p)); |
| 458 |
< |
AddSifter(ReadMacInt32(((uintptr)p)+20), ntohs(p[12])); |
| 459 |
< |
if (ntohs(p[28])) // componentPFCount |
| 460 |
< |
AddSifter(ReadMacInt32(((uintptr)p)+62), ntohs(p[33])); |
| 458 |
> |
AddSifter(ReadMacInt32(thing + componentResType), ReadMacInt16(thing + componentResID)); |
| 459 |
> |
if (ReadMacInt32(thing + componentPFCount)) |
| 460 |
> |
AddSifter(ReadMacInt32(thing + componentPFResType), ReadMacInt16(thing + componentPFResID)); |
| 461 |
|
} |
| 462 |
|
|
| 463 |
|
} else if (type == FOURCC('s','i','f','t') || type == FOURCC('n','i','f','t')) { |
