mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
zsilencer
2014-08-24 02:28:33 -06:00
parent 835871a475
commit dbc7e511f7
2 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/audio.c
View File

@@ -108,10 +108,10 @@ int sound_channel_play(int channel, int a2, int volume, int pan, int frequency)
int sound_channel_set_frequency(int channel, int frequency)
{
LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel];
if(dsbuffer){
if(SUCCEEDED(dsbuffer->lpVtbl->SetFrequency(dsbuffer, frequency))){
if (dsbuffer) {
if (SUCCEEDED(dsbuffer->lpVtbl->SetFrequency(dsbuffer, frequency)))
return 1;
}
}
return 0;
}
@@ -123,10 +123,10 @@ int sound_channel_set_frequency(int channel, int frequency)
int sound_channel_set_pan(int channel, int pan)
{
LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel];
if(dsbuffer){
if(SUCCEEDED(dsbuffer->lpVtbl->SetPan(dsbuffer, pan))){
if (dsbuffer) {
if (SUCCEEDED(dsbuffer->lpVtbl->SetPan(dsbuffer, pan)))
return 1;
}
}
return 0;
}
@@ -138,10 +138,10 @@ int sound_channel_set_pan(int channel, int pan)
int sound_channel_set_volume(int channel, int volume)
{
LPDIRECTSOUNDBUFFER dsbuffer = RCT2_ADDRESS(RCT2_ADDRESS_DSOUND_BUFFERS, LPDIRECTSOUNDBUFFER)[channel];
if(dsbuffer){
if(SUCCEEDED(dsbuffer->lpVtbl->SetVolume(dsbuffer, volume))){
if (dsbuffer) {
if (SUCCEEDED(dsbuffer->lpVtbl->SetVolume(dsbuffer, volume)))
return 1;
}
}
return 0;
}
@@ -152,21 +152,22 @@ int sound_channel_set_volume(int channel, int volume)
*/
int sound_play(rct_sound* sound, int looping, int volume, int pan, int frequency)
{
if(sound){
if (sound) {
sound_set_frequency(sound, frequency);
sound_set_pan(sound, pan);
sound_set_volume(sound, volume);
DWORD playflags;
if(looping){
if(looping != 1)
if (looping) {
if (looping != 1)
return 1;
playflags = DSBPLAY_LOOPING;
}else{
} else {
playflags = 0;
}
if(SUCCEEDED(sound->dsbuffer->lpVtbl->Play(sound->dsbuffer, 0, 0, playflags))){
if (SUCCEEDED(sound->dsbuffer->lpVtbl->Play(sound->dsbuffer, 0, 0, playflags)))
return 1;
}
}
return 0;
}
@@ -177,10 +178,10 @@ int sound_play(rct_sound* sound, int looping, int volume, int pan, int frequency
*/
int sound_set_frequency(rct_sound* sound, int frequency)
{
if(sound){
if(SUCCEEDED(sound->dsbuffer->lpVtbl->SetFrequency(sound->dsbuffer, frequency))){
if (sound) {
if (SUCCEEDED(sound->dsbuffer->lpVtbl->SetFrequency(sound->dsbuffer, frequency)))
return 1;
}
}
return 0;
}
@@ -191,10 +192,10 @@ int sound_set_frequency(rct_sound* sound, int frequency)
*/
int sound_set_pan(rct_sound* sound, int pan)
{
if(sound){
if(SUCCEEDED(sound->dsbuffer->lpVtbl->SetPan(sound->dsbuffer, pan))){
if (sound) {
if (SUCCEEDED(sound->dsbuffer->lpVtbl->SetPan(sound->dsbuffer, pan)))
return 1;
}
}
return 0;
}
@@ -205,10 +206,10 @@ int sound_set_pan(rct_sound* sound, int pan)
*/
int sound_set_volume(rct_sound* sound, int volume)
{
if(sound){
if(SUCCEEDED(sound->dsbuffer->lpVtbl->SetVolume(sound->dsbuffer, volume))){
if (sound) {
if (SUCCEEDED(sound->dsbuffer->lpVtbl->SetVolume(sound->dsbuffer, volume)))
return 1;
}
}
return 0;
}
@@ -219,7 +220,7 @@ int sound_set_volume(rct_sound* sound, int volume)
*/
void sound_stop(rct_sound* sound)
{
if(sound->dsbuffer){
if (sound->dsbuffer) {
sound->dsbuffer->lpVtbl->Release(sound->dsbuffer);
sound->dsbuffer = 0;
sound_remove(sound);
@@ -233,25 +234,23 @@ void sound_stop(rct_sound* sound)
rct_sound* sound_remove(rct_sound* sound)
{
rct_sound* result = RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_BEGIN, rct_sound*);
if(sound == result){
if(sound == RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*)){
if (sound == result) {
if (sound == RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*)) {
RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*) = 0;
RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_BEGIN, rct_sound*) = 0;
}
result = sound->next;
RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_BEGIN, rct_sound*) = result;
}
else{
while(result->next != sound){
} else {
while (result->next != sound)
result = result->next;
}
if(sound == RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*)){
if (sound == RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*)) {
RCT2_GLOBAL(RCT2_ADDRESS_SOUNDLIST_END, rct_sound*) = result;
result->next = 0;
}
else{
} else
result->next = sound->next;
}
}
sound->next = 0;
return result;

7
src/audio.h
View File

@@ -47,14 +47,13 @@ typedef struct {
/**
* Represents a prepared sound.
*/
typedef struct rct_sound rct_sound;
struct rct_sound {
typedef struct rct_sound {
LPDIRECTSOUNDBUFFER dsbuffer;
int id;
int has_caps;
int var_0C;
rct_sound* next;
};
struct rct_sound* next;
} rct_sound;
void get_dsound_devices();
int sound_prepare(int sound_id, rct_sound *sound, int var_8, int var_c);