mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

audio work

This commit is contained in:
zsilencer 2014-08-25 23:11:57 -06:00
parent 44217734d0
commit f6fde582bf
3 changed files with 97 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addresses.h
View File

@ -161,8 +161,10 @@
#define RCT2_ADDRESS_DSOUND_BUFFERS 0x009E1AB0 #define RCT2_ADDRESS_DSOUND_BUFFERS 0x009E1AB0
#define RCT2_ADDRESS_NUM_DSOUND_DEVICES 0x009E2B88 #define RCT2_ADDRESS_NUM_DSOUND_DEVICES 0x009E2B88
#define RCT2_ADDRESS_DSOUND_DEVICES 0x009E2B8C #define RCT2_ADDRESS_DSOUND_DEVICES 0x009E2B8C
#define RCT2_ADDRESS_SOUND_INFO_LIST_OFFSET 0x009E2B94
#define RCT2_ADDRESS_SOUNDLIST_BEGIN 0x009E2B98 #define RCT2_ADDRESS_SOUNDLIST_BEGIN 0x009E2B98
#define RCT2_ADDRESS_SOUNDLIST_END 0x009E2B9C #define RCT2_ADDRESS_SOUNDLIST_END 0x009E2B9C
#define RCT2_ADDRESS_DIRECTSOUND 0x009E2BA0
#define RCT2_ADDRESS_CMDLINE 0x009E2D98 #define RCT2_ADDRESS_CMDLINE 0x009E2D98

116
src/audio.c
View File

@ -159,28 +159,49 @@ void get_dsound_devices()
* *
* rct2: 0x00404D99 * rct2: 0x00404D99
*/ */
int sub_404D99(rct_sound* sound, rct_sound* end) int sound_duplicate(rct_sound* newsound, rct_sound* sound)
{ {
return RCT2_CALLFUNC_2(0x00404D99, int, rct_sound*, rct_sound*, sound, end); if (FAILED(RCT2_GLOBAL(RCT2_ADDRESS_DIRECTSOUND, LPDIRECTSOUND)->lpVtbl->DuplicateSoundBuffer(RCT2_GLOBAL(RCT2_ADDRESS_DIRECTSOUND, LPDIRECTSOUND), sound->dsbuffer, &newsound->dsbuffer))) {
return 0;
} else {
newsound->id = sound->id;
newsound->has_caps = sound->has_caps;
newsound->var_0C = sound->var_0C;
sound_add(newsound);
return 1;
}
}
/**
*
* rct2: 0x00405103
*/
rct_sound* sound_begin()
{
return RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_BEGIN, rct_sound*);
} }
/** /**
* *
* rct2: 0x00405109 * rct2: 0x00405109
*/ */
rct_sound* sub_405109(rct_sound* end) rct_sound* sound_next(rct_sound* sound)
{ {
return RCT2_CALLFUNC_1(0x00405109, rct_sound*, rct_sound*, end); if (RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*) == sound) {
return 0;
} else {
return sound->next;
}
} }
/** /**
* *
* rct2: 0x00405206 * rct2: 0x00405206
*/ */
int sub_405206(uint16 sound_id) rct_sound_info* sound_get_info(uint16 sound_id)
{ {
if (RCT2_GLOBAL(0x009E2B94, uint32) && sound_id < RCT2_GLOBAL(0x009E2B94, uint32)) { if (RCT2_GLOBAL(RCT2_ADDRESS_SOUND_INFO_LIST_OFFSET, int) && sound_id < RCT2_GLOBAL(RCT2_ADDRESS_SOUND_INFO_LIST_OFFSET, int)) {
return RCT2_GLOBAL(0x009E2B94, uint32) + RCT2_GLOBAL(0x009E2B94, uint32*)[sound_id + 1]; return (rct_sound_info*)(RCT2_GLOBAL(RCT2_ADDRESS_SOUND_INFO_LIST_OFFSET, int) + RCT2_GLOBAL(RCT2_ADDRESS_SOUND_INFO_LIST_OFFSET, int*)[sound_id + 1]);
} }
return 0; return 0;
} }
@ -189,11 +210,11 @@ int sub_405206(uint16 sound_id)
* *
* rct2: 0x00405054 * rct2: 0x00405054
*/ */
int sub_405054(int var1, WAVEFORMATEX* waveformat, DWORD* var3, DWORD* buffersize) int sound_info_loadvars(rct_sound_info* sound_info, LPWAVEFORMATEX* waveformat, char** data, DWORD* buffersize)
{ {
*buffersize = *(DWORD*)var1; *buffersize = sound_info->size;
*(DWORD *)&waveformat->wFormatTag = var1 + 4; *waveformat = &sound_info->format;
*var3 = var1 + 22; *data = (char*)&sound_info->data;
return 1; return 1;
} }
@ -226,27 +247,26 @@ int sound_prepare(int sound_id, rct_sound *sound, int channels, int software)
{ {
//return RCT2_CALLFUNC_4(0x00404C6D, int, int, rct_sound*, int, int, sound_id, sound, channels, software); //return RCT2_CALLFUNC_4(0x00404C6D, int, int, rct_sound*, int, int, sound_id, sound, channels, software);
DSBUFFERDESC bufferdesc; DSBUFFERDESC bufferdesc;
void* var2 = 0; char* buffer = 0;
memset(&bufferdesc, 0, sizeof(bufferdesc)); memset(&bufferdesc, 0, sizeof(bufferdesc));
bufferdesc.dwSize = sizeof(bufferdesc); bufferdesc.dwSize = sizeof(bufferdesc);
rct_sound* begin = RCT2_CALLFUNC(0x00405103, rct_sound*); rct_sound* tempsound = sound_begin();
if (begin) { if (tempsound) {
int beginfound = 0; int wasduplicated = 0;
while (!begin->dsbuffer || begin->id != sound_id || !sub_404D99(sound, begin)) { while (!tempsound->dsbuffer || tempsound->id != sound_id || !sound_duplicate(sound, tempsound)) {
begin = sub_405109(begin); tempsound = sound_next(tempsound);
if (!begin) { if (!tempsound) {
beginfound = 1; wasduplicated = 1;
break; break;
} }
} }
if (!beginfound) { if (!wasduplicated) {
return 1; return 1;
} }
} }
int b = sub_405206(sound_id); rct_sound_info* sound_info = sound_get_info(sound_id);
if (b) { if (sound_info) {
if (sub_405054(b, (WAVEFORMATEX*)&bufferdesc.lpwfxFormat, (DWORD*)&var2, &bufferdesc.dwBufferBytes)) { if (sound_info_loadvars(sound_info, &bufferdesc.lpwfxFormat, &buffer, &bufferdesc.dwBufferBytes)) {
bufferdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_STATIC; bufferdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_STATIC;
if (channels) { if (channels) {
if (channels == 2) { if (channels == 2) {
@ -254,23 +274,20 @@ int sound_prepare(int sound_id, rct_sound *sound, int channels, int software)
} else { } else {
bufferdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRL3D | DSBCAPS_STATIC; bufferdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRL3D | DSBCAPS_STATIC;
} }
if (RCT2_GLOBAL(0x009E2B90, uint32)) { if (RCT2_GLOBAL(0x009E2B90, uint32)) {
bufferdesc.dwFlags |= DSBCAPS_CTRLPAN; bufferdesc.dwFlags |= DSBCAPS_CTRLPAN;
} }
if (software) { if (software) {
bufferdesc.dwFlags |= DSBCAPS_LOCSOFTWARE; bufferdesc.dwFlags |= DSBCAPS_LOCSOFTWARE;
} }
if (SUCCEEDED(RCT2_GLOBAL(RCT2_ADDRESS_DIRECTSOUND, LPDIRECTSOUND)->lpVtbl->CreateSoundBuffer(RCT2_GLOBAL(RCT2_ADDRESS_DIRECTSOUND, LPDIRECTSOUND), &bufferdesc, &sound->dsbuffer, 0))) {
if (SUCCEEDED(RCT2_GLOBAL(0x009E2BA0, LPDIRECTSOUND)->lpVtbl->CreateSoundBuffer(RCT2_GLOBAL(0x009E2BA0, LPDIRECTSOUND), &bufferdesc, &sound->dsbuffer, 0))) { if (sound_fill_buffer(sound->dsbuffer, buffer, bufferdesc.dwBufferBytes)) {
if (sound_fill_buffer(sound->dsbuffer, var2, bufferdesc.dwBufferBytes)) {
sound->id = sound_id; sound->id = sound_id;
DSBCAPS caps; DSBCAPS caps;
caps.dwSize = sizeof(caps); caps.dwSize = sizeof(caps);
sound->dsbuffer->lpVtbl->GetCaps(sound->dsbuffer, &caps); sound->dsbuffer->lpVtbl->GetCaps(sound->dsbuffer, &caps);
sound->has_caps = caps.dwFlags; sound->has_caps = caps.dwFlags;
RCT2_CALLPROC_1(0x0040511C, rct_sound*, sound); // adds sound to list sound_add(sound);
return 1; return 1;
} }
sound->dsbuffer->lpVtbl->Release(sound->dsbuffer); sound->dsbuffer->lpVtbl->Release(sound->dsbuffer);
@ -494,6 +511,22 @@ rct_sound* sound_stop(rct_sound* sound)
return sound; return sound;
} }
/**
*
* rct2: 0x0040511C
*/
rct_sound* sound_add(rct_sound* sound)
{
if (RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_BEGIN, rct_sound*)) {
RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*)->next = sound;
} else {
RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_BEGIN, rct_sound*) = sound;
}
RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*) = sound;
sound->next = 0;
return sound;
}
/** /**
* *
* rct2: 0x00405143 * rct2: 0x00405143
@ -523,6 +556,24 @@ rct_sound* sound_remove(rct_sound* sound)
return result; return result;
} }
/**
*
* rct2: 0x00405436
*/
void sound_channel_free(HMMIO* hmmio, HGLOBAL* hmem)
{
if(*hmem)
{
GlobalFree(*hmem);
*hmem = 0;
}
if(*hmmio)
{
mmioClose(*hmmio, 0);
*hmmio = 0;
}
}
/** /**
* *
* rct2: 0x006BABB4 * rct2: 0x006BABB4
@ -639,8 +690,9 @@ int sound_channel_stop(int channel)
while (_InterlockedExchange(&RCT2_GLOBAL(0x009E1AAC, LONG), 1) != 1) { while (_InterlockedExchange(&RCT2_GLOBAL(0x009E1AAC, LONG), 1) != 1) {
Sleep(10); Sleep(10);
} }
if (sound_channel->var_120) if (sound_channel->hmem) {
RCT2_CALLPROC_2(0x00405436, uint32, uint32, sound_channel->var_11C, sound_channel->var_120); // free_sound? sound_channel_free(&sound_channel->hmmio, &sound_channel->hmem);
}
LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel]; LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel];
if (dsbuffer) { if (dsbuffer) {

13
src/audio.h
View File

@ -60,14 +60,20 @@ typedef struct rct_sound {
typedef struct { typedef struct {
uint32 var_0; uint32 var_0;
uint8 pad_4[0x118]; uint8 pad_4[0x118];
uint32 var_11C; HMMIO hmmio;
uint32 var_120; HGLOBAL hmem;
uint8 pad_124[0x3C]; uint8 pad_124[0x3C];
uint32 var_160; uint32 var_160;
uint32 var_164; uint32 var_164;
uint32 var_168; uint32 var_168;
} rct_sound_channel; } rct_sound_channel;
typedef struct {
uint32 size;
WAVEFORMATEX format;
char* data;
} rct_sound_info;
typedef struct { typedef struct {
uint16 id; uint16 id;
uint16 var_2; uint16 var_2;
@ -98,7 +104,10 @@ int sound_channel_set_pan(int channel, int pan);
int sound_channel_set_volume(int channel, int volume); int sound_channel_set_volume(int channel, int volume);
rct_sound* sound_stop(rct_sound *sound); rct_sound* sound_stop(rct_sound *sound);
int sound_channel_stop(int channel); int sound_channel_stop(int channel);
rct_sound* sound_add(rct_sound* sound);
rct_sound* sound_remove(rct_sound* sound); rct_sound* sound_remove(rct_sound* sound);
rct_sound* sound_begin();
rct_sound* sound_next(rct_sound* sound);
void pause_sounds(); void pause_sounds();
void stop_other_sounds(); void stop_other_sounds();
void stop_vehicle_sounds(); void stop_vehicle_sounds();