From 5a9492166d630b97b6888e5969c359f8b35862e3 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 3 Sep 2019 22:29:57 +0100 Subject: [PATCH] Restored the new SDL2 audio system While I was at it, I overhauled the thing and found a bunch of optimisations, --- Makefile | 3 +- src/Backends/Audio.h | 22 +++ src/Backends/Audio/SDL2.cpp | 308 ++++++++++++++++++++++++++++++++++++ src/Main.cpp | 2 +- src/Organya.cpp | 152 ++++-------------- src/Organya.h | 2 +- src/Sound.cpp | 138 +++------------- src/Sound.h | 11 +- 8 files changed, 388 insertions(+), 250 deletions(-) create mode 100644 src/Backends/Audio.h create mode 100644 src/Backends/Audio/SDL2.cpp diff --git a/Makefile b/Makefile index 5c97ae75..de23a0fa 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,8 @@ SOURCES = \ src/Star \ src/TextScr \ src/Triangle \ - src/ValueView + src/ValueView \ + src/Backends/Audio/SDL2 RESOURCES = \ BITMAP/Credit01.bmp \ diff --git a/src/Backends/Audio.h b/src/Backends/Audio.h new file mode 100644 index 00000000..90d7a1e5 --- /dev/null +++ b/src/Backends/Audio.h @@ -0,0 +1,22 @@ +#pragma once + +#include "../WindowsWrapper.h" + +typedef struct AudioBackend_Sound AudioBackend_Sound; + +BOOL AudioBackend_Init(void); +void AudioBackend_Deinit(void); + +AudioBackend_Sound* AudioBackend_CreateSound(unsigned int frequency, size_t frames); +void AudioBackend_DestroySound(AudioBackend_Sound *sound); + +unsigned char* AudioBackend_LockSound(AudioBackend_Sound *sound, size_t *size); +void AudioBackend_UnlockSound(AudioBackend_Sound *sound); + +void AudioBackend_PlaySound(AudioBackend_Sound *sound, BOOL looping); +void AudioBackend_StopSound(AudioBackend_Sound *sound); + +void AudioBackend_SetSoundFrequency(AudioBackend_Sound *sound, unsigned int frequency); +void AudioBackend_SetSoundVolume(AudioBackend_Sound *sound, long volume); +void AudioBackend_SetSoundPan(AudioBackend_Sound *sound, long pan); +void AudioBackend_SetSoundPosition(AudioBackend_Sound *sound, size_t position); diff --git a/src/Backends/Audio/SDL2.cpp b/src/Backends/Audio/SDL2.cpp new file mode 100644 index 00000000..9a8d0ee2 --- /dev/null +++ b/src/Backends/Audio/SDL2.cpp @@ -0,0 +1,308 @@ +#include "../Audio.h" + +#include +#include +#include + +#include "SDL.h" + +#include "../../WindowsWrapper.h" + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#define clamp(x, y, z) MIN(MAX(x, y), z) + +struct AudioBackend_Sound +{ + unsigned char *samples; + size_t frames; + double position; + double advance_delta; + BOOL playing; + BOOL looping; + unsigned int frequency; + float volume; + float pan_l; + float pan_r; + float volume_l; + float volume_r; + + struct AudioBackend_Sound *next; +}; + +static AudioBackend_Sound *sound_list_head; +static SDL_AudioDeviceID device_id; + +static double MillibelToScale(long volume) +{ + // Volume is in hundredths of decibels, from 0 to -10000 + volume = clamp(volume, -10000, 0); + return pow(10.0, volume / 2000.0); +} + +static void SetSoundFrequency(AudioBackend_Sound *sound, unsigned int frequency) +{ + sound->frequency = frequency; + sound->advance_delta = frequency / 44100.0; +} + +static void SetSoundVolume(AudioBackend_Sound *sound, long volume) +{ + sound->volume = MillibelToScale(volume); + + sound->volume_l = sound->pan_l * sound->volume; + sound->volume_r = sound->pan_r * sound->volume; +} + +static void SetSoundPan(AudioBackend_Sound *sound, long pan) +{ + sound->pan_l = MillibelToScale(-pan); + sound->pan_r = MillibelToScale(pan); + + sound->volume_l = sound->pan_l * sound->volume; + sound->volume_r = sound->pan_r * sound->volume; +} + +static void SetSoundPosition(AudioBackend_Sound *sound, size_t position) +{ + sound->position = position; +} + +static void Callback(void *user_data, Uint8 *stream_uint8, int len) +{ + (void)user_data; + + float *stream = (float*)stream_uint8; + unsigned int frames_total = len / sizeof(float) / 2; + + for (unsigned int i = 0; i < frames_total * 2; ++i) + stream[i] = 0.0f; + + for (AudioBackend_Sound *sound = sound_list_head; sound != NULL; sound = sound->next) + { + if (sound->playing) + { + float *steam_pointer = stream; + + unsigned int frames_done = 0; + + while (frames_done != frames_total) + { + const unsigned int frames_to_do = MIN(ceil((sound->frames - sound->position) / sound->advance_delta), frames_total - frames_done); + + for (unsigned int i = 0; i < frames_to_do; ++i) + { + // Perform linear interpolation + + // Get two samples + const unsigned char sample1 = sound->samples[(size_t)sound->position]; + const unsigned char sample2 = sound->samples[(size_t)sound->position + 1]; + + // Interpolate + const float interpolated_sample = sample1 + ((sample2 - sample1) * (float)fmod(sound->position, 1.0)); + + // Normalise to 0-1 + const float sample_normalised = (interpolated_sample - 128.0f) / 128.0f; + + *steam_pointer++ += sample_normalised * sound->volume_l; + *steam_pointer++ += sample_normalised * sound->volume_r; + + sound->position += sound->advance_delta; + } + + if ((size_t)sound->position >= sound->frames) + { + if (sound->looping) + { + sound->position = fmod(sound->position, sound->frames); + } + else + { + sound->position = 0.0; + sound->playing = FALSE; + break; + } + } + + frames_done += frames_to_do; + } + } + } +} + +BOOL AudioBackend_Init(void) +{ + if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) + return FALSE; + + SDL_AudioSpec specification; + specification.freq = 44100; + specification.format = AUDIO_F32; + specification.channels = 2; + specification.samples = 0x200; + specification.callback = Callback; + specification.userdata = NULL; + + device_id = SDL_OpenAudioDevice(NULL, 0, &specification, NULL, 0); + + if (device_id == 0) + return FALSE; + + SDL_PauseAudioDevice(device_id, 0); + + return TRUE; +} + +void AudioBackend_Deinit(void) +{ + SDL_CloseAudioDevice(device_id); + + SDL_QuitSubSystem(SDL_INIT_AUDIO); +} + +AudioBackend_Sound* AudioBackend_CreateSound(unsigned int frequency, size_t frames) +{ + AudioBackend_Sound *sound = (AudioBackend_Sound*)malloc(sizeof(AudioBackend_Sound)); + + if (sound == NULL) + return NULL; + + sound->samples = (unsigned char*)malloc(frames + 1); + + if (sound->samples == NULL) + { + free(sound); + return NULL; + } + + sound->frames = frames; + sound->playing = FALSE; + + SetSoundFrequency(sound, frequency); + SetSoundVolume(sound, 0); + SetSoundPan(sound, 0); + SetSoundPosition(sound, 0); + + SDL_LockAudioDevice(device_id); + + sound->next = sound_list_head; + sound_list_head = sound; + + SDL_UnlockAudioDevice(device_id); + + return sound; +} + +void AudioBackend_DestroySound(AudioBackend_Sound *sound) +{ + if (sound == NULL) + return; + + SDL_LockAudioDevice(device_id); + + for (AudioBackend_Sound **sound_pointer = &sound_list_head; *sound_pointer != NULL; sound_pointer = &(*sound_pointer)->next) + { + if (*sound_pointer == sound) + { + *sound_pointer = sound->next; + free(sound->samples); + free(sound); + break; + } + } + + SDL_UnlockAudioDevice(device_id); +} + +unsigned char* AudioBackend_LockSound(AudioBackend_Sound *sound, size_t *size) +{ + if (sound == NULL) + return NULL; + + SDL_LockAudioDevice(device_id); + + if (size) + *size = sound->frames; + + return sound->samples; +} + +void AudioBackend_UnlockSound(AudioBackend_Sound *sound) +{ + SDL_UnlockAudioDevice(device_id); +} + +void AudioBackend_PlaySound(AudioBackend_Sound *sound, BOOL looping) +{ + if (sound == NULL) + return; + + SDL_LockAudioDevice(device_id); + + sound->playing = TRUE; + sound->looping = looping; + + sound->samples[sound->frames] = looping ? sound->samples[0] : 0x80; // For the linear interpolator + + SDL_UnlockAudioDevice(device_id); +} + +void AudioBackend_StopSound(AudioBackend_Sound *sound) +{ + if (sound == NULL) + return; + + SDL_LockAudioDevice(device_id); + + sound->playing = FALSE; + + SDL_UnlockAudioDevice(device_id); +} + +void AudioBackend_SetSoundFrequency(AudioBackend_Sound *sound, unsigned int frequency) +{ + if (sound == NULL) + return; + + SDL_LockAudioDevice(device_id); + + SetSoundFrequency(sound, frequency); + + SDL_UnlockAudioDevice(device_id); +} + +void AudioBackend_SetSoundVolume(AudioBackend_Sound *sound, long volume) +{ + if (sound == NULL) + return; + + SDL_LockAudioDevice(device_id); + + SetSoundVolume(sound, volume); + + SDL_UnlockAudioDevice(device_id); +} + +void AudioBackend_SetSoundPan(AudioBackend_Sound *sound, long pan) +{ + if (sound == NULL) + return; + + SDL_LockAudioDevice(device_id); + + SetSoundPan(sound, pan); + + SDL_UnlockAudioDevice(device_id); +} + +void AudioBackend_SetSoundPosition(AudioBackend_Sound *sound, size_t position) +{ + if (sound == NULL) + return; + + SDL_LockAudioDevice(device_id); + + SetSoundPosition(sound, position); + + SDL_UnlockAudioDevice(device_id); +} diff --git a/src/Main.cpp b/src/Main.cpp index 14c5c3f3..58a43204 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) else { // Initialize sound - InitDirectSound(hWnd); + InitDirectSound(); // Initialize joystick if (conf.bJoystick && InitDirectInput()) diff --git a/src/Organya.cpp b/src/Organya.cpp index 686b9cc5..7fed7147 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -10,10 +10,9 @@ #include #include -#include - #include "WindowsWrapper.h" +#include "Backends/Audio.h" #include "Resource.h" #include "Sound.h" @@ -115,7 +114,7 @@ typedef struct OrgData ORGDATA org_data; -LPDIRECTSOUNDBUFFER lpORGANBUFFER[8][8][2] = {NULL}; +AudioBackend_Sound *lpORGANBUFFER[8][8][2] = {NULL}; int gTrackVol[MAXTRACK]; int gOrgVolume = 100; @@ -147,11 +146,6 @@ static const OCTWAVE oct_wave[8] = { 8,128, 32 }, // 7 Oct }; -static WAVEFORMATEX format_tbl2 = {WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8, 0}; // 22050HzのFormat - -// In the original source code, format_tbl2 was a raw array of bytes, as seen below -// BYTE format_tbl2[] = {0x01,0x00,0x01,0x00,0x22,0x56,0x00,0x00,0x22,0x56,0x00,0x00,0x01,0x00,0x08,0x00,0x00,0x00}; // 22050HzのFormat - BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) { DWORD i,j,k; @@ -161,11 +155,6 @@ BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) BYTE *wp; BYTE *wp_sub; int work; - // セカンダリバッファの生成 (Create secondary buffer) - DSBUFFERDESC dsbd; - - if (lpDS == NULL) - return FALSE; for (j = 0; j < 8; j++) { @@ -178,18 +167,13 @@ BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) else data_size = wave_size; - ZeroMemory(&dsbd, sizeof(dsbd)); + lpORGANBUFFER[track][j][k] = AudioBackend_CreateSound(22050, data_size); - dsbd.dwSize = sizeof(dsbd); - dsbd.dwBufferBytes = data_size; - dsbd.lpwfxFormat = &format_tbl2; - dsbd.dwFlags = DSBCAPS_STATIC | DSBCAPS_GLOBALFOCUS | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY; - - if(lpDS->CreateSoundBuffer(&dsbd, &lpORGANBUFFER[track][j][k], NULL) != DS_OK) // j = se_no + if (lpORGANBUFFER[track][j][k] == NULL) return FALSE; // Get wave data - wp = (BYTE*)malloc(data_size); + wp = AudioBackend_LockSound(lpORGANBUFFER[track][j][k], NULL); wp_sub = wp; wav_tp = 0; @@ -207,29 +191,8 @@ BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) wp_sub++; } - // データの転送 (Data transfer) - LPVOID lpbuf1, lpbuf2; - DWORD dwbuf1, dwbuf2=0; - HRESULT hr; - - hr = lpORGANBUFFER[track][j][k]->Lock(0, data_size, &lpbuf1, &dwbuf1, &lpbuf2, &dwbuf2, 0); - - if (hr != DS_OK) - { -#ifdef FIX_BUGS - free(wp); // The updated Organya source code includes this fix -#endif - return FALSE; - } - - CopyMemory(lpbuf1, (BYTE*)wp, dwbuf1); - - if (dwbuf2 != 0) - CopyMemory(lpbuf2, (BYTE*)wp+dwbuf1, dwbuf2); - - lpORGANBUFFER[track][j][k]->Unlock(lpbuf1, dwbuf1, lpbuf2, dwbuf2); - lpORGANBUFFER[track][j][k]->SetCurrentPosition(0); - free(wp); + AudioBackend_UnlockSound(lpORGANBUFFER[track][j][k]); + AudioBackend_SetSoundPosition(lpORGANBUFFER[track][j][k], 0); } } @@ -240,12 +203,9 @@ static const short freq_tbl[12] = {262, 277, 294, 311, 330, 349, 370, 392, 415, void ChangeOrganFrequency(unsigned char key, signed char track, long a) { - if (lpDS == NULL) - return; - for (int j = 0; j < 8; j++) for (int i = 0; i < 2; i++) - lpORGANBUFFER[track][j][i]->SetFrequency(((oct_wave[j].wave_size * freq_tbl[key]) * oct_wave[j].oct_par) / 8 + (a - 1000)); // 1000を+αのデフォルト値とする (1000 is the default value for + α) + AudioBackend_SetSoundFrequency(lpORGANBUFFER[track][j][i], ((oct_wave[j].wave_size * freq_tbl[key]) * oct_wave[j].oct_par) / 8 + (a - 1000)); // 1000を+αのデフォルト値とする (1000 is the default value for + α) } const short pan_tbl[13] = {0, 43, 86, 129, 172, 215, 256, 297, 340, 383, 426, 469, 512}; @@ -255,28 +215,19 @@ unsigned char key_twin[MAXTRACK]; // 今使っているキー(連続時のノイ void ChangeOrganPan(unsigned char key, unsigned char pan, signed char track) // 512がMAXで256がﾉｰﾏﾙ (512 is MAX and 256 is normal) { - if (lpDS == NULL) - return; - if (old_key[track] != PANDUMMY) - lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetPan((pan_tbl[pan] - 0x100) * 10); + AudioBackend_SetSoundPan(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], (pan_tbl[pan] - 0x100) * 10); } void ChangeOrganVolume(int no, long volume, signed char track) // 300がMAXで300がﾉｰﾏﾙ (300 is MAX and 300 is normal) { - if (lpDS == NULL) - return; - if (old_key[track] != VOLDUMMY) - lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetVolume((volume - 0xFF) * 8); + AudioBackend_SetSoundVolume(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], (volume - 0xFF) * 8); } // サウンドの再生 (Play sound) void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) { - if (lpDS == NULL) - return; - if (lpORGANBUFFER[track][key / 12][key_twin[track]] != NULL) { switch (mode) @@ -284,8 +235,8 @@ void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) case 0: // 停止 (Stop) if (old_key[track] != 0xFF) { - lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->Stop(); - lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetCurrentPosition(0); + AudioBackend_StopSound(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]); + AudioBackend_SetSoundPosition(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], 0); } break; @@ -295,7 +246,7 @@ void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) case 2: // 歩かせ停止 (Stop playback) if (old_key[track] != 0xFF) { - lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->Play(0, 0, 0); + AudioBackend_PlaySound(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], FALSE); old_key[track] = 0xFF; } break; @@ -304,27 +255,27 @@ void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) if (old_key[track] == 0xFF) // 新規鳴らす (New sound) { ChangeOrganFrequency(key % 12, track, freq); // 周波数を設定して (Set the frequency) - lpORGANBUFFER[track][key / 12][key_twin[track]]->Play(0, 0, DSBPLAY_LOOPING); + AudioBackend_PlaySound(lpORGANBUFFER[track][key / 12][key_twin[track]], TRUE); old_key[track] = key; key_on[track] = 1; } else if (key_on[track] == 1 && old_key[track] == key) // 同じ音 (Same sound) { // 今なっているのを歩かせ停止 (Stop playback now) - lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->Play(0, 0, 0); + AudioBackend_PlaySound(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], FALSE); key_twin[track]++; if (key_twin[track] > 1) key_twin[track] = 0; - lpORGANBUFFER[track][key / 12][key_twin[track]]->Play(0, 0, DSBPLAY_LOOPING); + AudioBackend_PlaySound(lpORGANBUFFER[track][key / 12][key_twin[track]], TRUE); } else // 違う音を鳴らすなら (If you make a different sound) { - lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->Play(0, 0, 0); // 今なっているのを歩かせ停止 (Stop playback now) + AudioBackend_PlaySound(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], FALSE); // 今なっているのを歩かせ停止 (Stop playback now) key_twin[track]++; if (key_twin[track] > 1) key_twin[track] = 0; ChangeOrganFrequency(key % 12, track, freq); // 周波数を設定して (Set the frequency) - lpORGANBUFFER[track][key / 12][key_twin[track]]->Play(0, 0, DSBPLAY_LOOPING); + AudioBackend_PlaySound(lpORGANBUFFER[track][key / 12][key_twin[track]], TRUE); old_key[track] = key; } @@ -336,19 +287,16 @@ void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) // オルガーニャオブジェクトを開放 (Open Organya object) void ReleaseOrganyaObject(signed char track) { - if (lpDS == NULL) - return; - for (int i = 0; i < 8; i++) { if (lpORGANBUFFER[track][i][0] != NULL) { - lpORGANBUFFER[track][i][0]->Release(); + AudioBackend_DestroySound(lpORGANBUFFER[track][i][0]); lpORGANBUFFER[track][i][0] = NULL; } if (lpORGANBUFFER[track][i][1] != NULL) { - lpORGANBUFFER[track][i][1]->Release(); + AudioBackend_DestroySound(lpORGANBUFFER[track][i][1]); lpORGANBUFFER[track][i][1] = NULL; } } @@ -361,9 +309,6 @@ BOOL InitWaveData100(void) { const DWORD *lpdword; // リソースのアドレス (Resource address) - if (lpDS == NULL) - return FALSE; - // リソースの検索 (Search for resources) lpdword = (DWORD*)FindResource("WAVE100", "WAVE", NULL); @@ -378,9 +323,6 @@ BOOL InitWaveData100(void) // 波形を１００個の中から選択して作成 (Select from 100 waveforms to create) BOOL MakeOrganyaWave(signed char track, signed char wave_no, signed char pipi) { - if (lpDS == NULL) - return FALSE; - if (wave_no > 99) return FALSE; @@ -396,48 +338,36 @@ BOOL MakeOrganyaWave(signed char track, signed char wave_no, signed char pipi) void ChangeDramFrequency(unsigned char key, signed char track) { - if (lpDS == NULL) - return; - - lpSECONDARYBUFFER[150 + track]->SetFrequency(key * 800 + 100); + AudioBackend_SetSoundFrequency(lpSECONDARYBUFFER[150 + track], key * 800 + 100); } void ChangeDramPan(unsigned char pan, signed char track) { - if (lpDS == NULL) - return; - - lpSECONDARYBUFFER[150 + track]->SetPan((pan_tbl[pan] - 0x100) * 10); + AudioBackend_SetSoundPan(lpSECONDARYBUFFER[150 + track], (pan_tbl[pan] - 0x100) * 10); } void ChangeDramVolume(long volume, signed char track) { - if (lpDS == NULL) - return; - - lpSECONDARYBUFFER[150 + track]->SetVolume((volume - 0xFF) * 8); + AudioBackend_SetSoundVolume(lpSECONDARYBUFFER[150 + track], (volume - 0xFF) * 8); } // サウンドの再生 (Play sound) void PlayDramObject(unsigned char key, int mode, signed char track) { - if (lpDS == NULL) - return; - if (lpSECONDARYBUFFER[150 + track] != NULL) { switch (mode) { case 0: // 停止 (Stop) - lpSECONDARYBUFFER[150 + track]->Stop(); - lpSECONDARYBUFFER[150 + track]->SetCurrentPosition(0); + AudioBackend_StopSound(lpSECONDARYBUFFER[150 + track]); + AudioBackend_SetSoundPosition(lpSECONDARYBUFFER[150 + track], 0); break; case 1: // 再生 (Playback) - lpSECONDARYBUFFER[150 + track]->Stop(); - lpSECONDARYBUFFER[150 + track]->SetCurrentPosition(0); + AudioBackend_StopSound(lpSECONDARYBUFFER[150 + track]); + AudioBackend_SetSoundPosition(lpSECONDARYBUFFER[150 + track], 0); ChangeDramFrequency(key, track); // 周波数を設定して () - lpSECONDARYBUFFER[150 + track]->Play(0, 0, 0); + AudioBackend_PlaySound(lpSECONDARYBUFFER[150 + track], FALSE); break; case 2: // 歩かせ停止 (Stop playback) @@ -945,11 +875,8 @@ void OrgData::SetPlayPointer(long x) } // Start and end organya -BOOL StartOrganya(LPDIRECTSOUND _lpDS, const char *path_wave) // Both arguments are ignored for some reason +BOOL StartOrganya(const char *path_wave) // The argument is ignored for some reason { - if (lpDS == NULL) - return FALSE; - if (!InitWaveData100()) return FALSE; @@ -961,9 +888,6 @@ BOOL StartOrganya(LPDIRECTSOUND _lpDS, const char *path_wave) // Both arguments // Load organya file BOOL LoadOrganya(const char *name) { - if (lpDS == NULL) - return FALSE; - if (!org_data.InitMusicData(name)) return FALSE; @@ -979,9 +903,6 @@ BOOL LoadOrganya(const char *name) void SetOrganyaPosition(unsigned int x) { - if (lpDS == NULL) - return; - org_data.SetPlayPointer(x); gOrgVolume = 100; bFadeout = FALSE; @@ -989,17 +910,11 @@ void SetOrganyaPosition(unsigned int x) unsigned int GetOrganyaPosition(void) { - if (lpDS == NULL) - return 0; - return play_p; } void PlayOrganyaMusic(void) { - if (lpDS == NULL) - return; - QuitMMTimer(); InitMMTimer(); StartTimer(org_data.info.wait); @@ -1007,9 +922,6 @@ void PlayOrganyaMusic(void) BOOL ChangeOrganyaVolume(signed int volume) { - if (lpDS == NULL) - return FALSE; - if (volume < 0 || volume > 100) return FALSE; @@ -1019,9 +931,6 @@ BOOL ChangeOrganyaVolume(signed int volume) void StopOrganyaMusic() { - if (lpDS == NULL) - return; - // Stop timer QuitMMTimer(); @@ -1043,9 +952,6 @@ void SetOrganyaFadeout() void EndOrganya() { - if (lpDS == NULL) - return; - // End timer QuitMMTimer(); diff --git a/src/Organya.h b/src/Organya.h index 53bdb5b9..a234e260 100644 --- a/src/Organya.h +++ b/src/Organya.h @@ -20,5 +20,5 @@ void PlayOrganyaMusic(); BOOL ChangeOrganyaVolume(signed int volume); void StopOrganyaMusic(); void SetOrganyaFadeout(); -BOOL StartOrganya(LPDIRECTSOUND lpDS, const char *wave_filename); +BOOL StartOrganya(const char *wave_filename); void EndOrganya(); diff --git a/src/Sound.cpp b/src/Sound.cpp index 787cfe56..11e96857 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -17,50 +17,29 @@ equivalents. #include #include -#define DIRECTSOUND_VERSION 0x500 -#include - #include "WindowsWrapper.h" +#include "Backends/Audio.h" #include "Organya.h" #include "PixTone.h" #include "Tags.h" #define FREQUENCY 44100 -LPDIRECTSOUND lpDS; // DirectSoundオブジェクト (DirectSound object) -LPDIRECTSOUNDBUFFER lpPRIMARYBUFFER; // 一時バッファ (Temporary buffer) -LPDIRECTSOUNDBUFFER lpSECONDARYBUFFER[SE_MAX]; +AudioBackend_Sound *lpSECONDARYBUFFER[SE_MAX]; // DirectSoundの開始 (Starting DirectSound) -BOOL InitDirectSound(HWND hwnd) +BOOL InitDirectSound(void) { int i; - DSBUFFERDESC dsbd; - // DirectDrawの初期化 (DirectDraw initialization) - if (DirectSoundCreate(NULL, &lpDS, NULL) != DS_OK) - { - lpDS = NULL; -#ifndef FIX_BUGS - // This makes absolutely no sense here - StartOrganya(lpDS, "Org\\Wave.dat"); -#endif + if (!AudioBackend_Init()) return FALSE; - } - - lpDS->SetCooperativeLevel(hwnd, DSSCL_EXCLUSIVE); - - // 一次バッファの初期化 (Initializing the primary buffer) - ZeroMemory(&dsbd, sizeof(dsbd)); - dsbd.dwSize = sizeof(dsbd); - dsbd.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME; - lpDS->CreateSoundBuffer(&dsbd, &lpPRIMARYBUFFER, NULL); for (i = 0; i < SE_MAX; i++) lpSECONDARYBUFFER[i] = NULL; - StartOrganya(lpDS, "Org\\Wave.dat"); + StartOrganya("Org\\Wave.dat"); return TRUE; } @@ -70,24 +49,15 @@ void EndDirectSound(void) { int i; - if (lpDS == NULL) - return; - EndOrganya(); for (i = 0; i < SE_MAX; i++) if (lpSECONDARYBUFFER[i] != NULL) - lpSECONDARYBUFFER[i]->Release(); + AudioBackend_DestroySound(lpSECONDARYBUFFER[i]); - if (lpPRIMARYBUFFER != NULL) - lpPRIMARYBUFFER->Release(); - - if (lpDS != NULL) - lpDS->Release(); - - lpDS = NULL; + AudioBackend_Deinit(); } - +/* // サウンドの設定 (Sound settings) BOOL InitSoundObject(LPCSTR resname, int no) { @@ -219,28 +189,25 @@ BOOL LoadSoundObject(LPCSTR file_name, int no) return TRUE; } - +*/ void PlaySoundObject(int no, int mode) { - if (lpDS == NULL) - return; - if (lpSECONDARYBUFFER[no] != NULL) { switch (mode) { case 0: // 停止 (Stop) - lpSECONDARYBUFFER[no]->Stop(); + AudioBackend_StopSound(lpSECONDARYBUFFER[no]); break; case 1: // 再生 (Playback) - lpSECONDARYBUFFER[no]->Stop(); - lpSECONDARYBUFFER[no]->SetCurrentPosition(0); - lpSECONDARYBUFFER[no]->Play(0, 0, 0); + AudioBackend_StopSound(lpSECONDARYBUFFER[no]); + AudioBackend_SetSoundPosition(lpSECONDARYBUFFER[no], 0); + AudioBackend_PlaySound(lpSECONDARYBUFFER[no], FALSE); break; case -1:// ループ再生 (Loop playback) - lpSECONDARYBUFFER[no]->Play(0, 0, DSBPLAY_LOOPING); + AudioBackend_PlaySound(lpSECONDARYBUFFER[no], TRUE); break; } } @@ -248,81 +215,30 @@ void PlaySoundObject(int no, int mode) void ChangeSoundFrequency(int no, DWORD rate) // 100がMIN9999がMAXで2195?がﾉｰﾏﾙ (100 is MIN, 9999 is MAX, and 2195 is normal) { - if (lpDS == NULL) - return; - - lpSECONDARYBUFFER[no]->SetFrequency((rate * 10) + 100); + AudioBackend_SetSoundFrequency(lpSECONDARYBUFFER[no], (rate * 10) + 100); } void ChangeSoundVolume(int no, long volume) // 300がMAXで300がﾉｰﾏﾙ (300 is MAX and 300 is normal) { - if (lpDS == NULL) - return; - - lpSECONDARYBUFFER[no]->SetVolume((volume - 300) * 8); + AudioBackend_SetSoundVolume(lpSECONDARYBUFFER[no], (volume - 300) * 8); } void ChangeSoundPan(int no, long pan) // 512がMAXで256がﾉｰﾏﾙ (512 is MAX and 256 is normal) { - if (lpDS == NULL) - return; - - lpSECONDARYBUFFER[no]->SetPan((pan - 256) * 10); + AudioBackend_SetSoundPan(lpSECONDARYBUFFER[no], (pan - 256) * 10); } // TODO - The stack frame for this function is inaccurate int MakePixToneObject(const PIXTONEPARAMETER *ptp, int ptp_num, int no) { - // For some reason, this function creates an entire WAV file header, - // when it only needs a WAVEFORMATEX - typedef struct WavHeader - { - char riff[4]; - unsigned long wav_size; - char wave[4]; - char fmt[4]; - unsigned long fmt_chunk_size; - unsigned short audio_format; - unsigned short num_channels; - unsigned long sample_rate; - unsigned long byte_rate; - unsigned short sample_alignment; - unsigned short bit_depth; - char data[4]; - unsigned long data_bytes; - } WavHeader; - int i; int j; DSBUFFERDESC dsbd; - WavHeader wav_header; const PIXTONEPARAMETER *ptp_pointer; int sample_count; unsigned char *pcm_buffer; unsigned char *mixed_pcm_buffer; - if (lpDS == NULL) - return 0; - - const char *riff = "RIFF"; - const char *fmt = "fmt "; - const char *wave = "WAVE"; - const char *data = "data"; - - wav_header.bit_depth = 8; - wav_header.sample_rate = 22050; - wav_header.num_channels = 1; - wav_header.audio_format = WAVE_FORMAT_PCM; - wav_header.fmt_chunk_size = 16; - memcpy(wav_header.riff, riff, 4); - memcpy(wav_header.fmt, fmt, 4); - memcpy(wav_header.wave, wave, 4); - memcpy(wav_header.data, data, 4); - wav_header.sample_alignment = (wav_header.bit_depth / 8) * wav_header.num_channels; - wav_header.byte_rate = (wav_header.bit_depth / 8) * wav_header.num_channels * wav_header.sample_rate; - wav_header.data_bytes = wav_header.sample_alignment * ptp->size; - wav_header.wav_size = wav_header.data_bytes + 36; - ptp_pointer = ptp; sample_count = 0; @@ -334,13 +250,9 @@ int MakePixToneObject(const PIXTONEPARAMETER *ptp, int ptp_num, int no) ++ptp_pointer; } - ZeroMemory(&dsbd, sizeof(dsbd)); - dsbd.dwSize = sizeof(dsbd); - dsbd.dwFlags = DSBCAPS_STATIC | DSBCAPS_GLOBALFOCUS | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY; - dsbd.dwBufferBytes = sample_count; - dsbd.lpwfxFormat = (WAVEFORMATEX*)&wav_header.audio_format; + lpSECONDARYBUFFER[no] = AudioBackend_CreateSound(22050, ptp->size); - if (lpDS->CreateSoundBuffer(&dsbd, &lpSECONDARYBUFFER[no], 0) != DS_OK) + if (lpSECONDARYBUFFER[no] == NULL) return -1; pcm_buffer = mixed_pcm_buffer = NULL; @@ -394,17 +306,11 @@ int MakePixToneObject(const PIXTONEPARAMETER *ptp, int ptp_num, int no) mixed_pcm_buffer[0] = mixed_pcm_buffer[0]; mixed_pcm_buffer[sample_count - 1] = mixed_pcm_buffer[sample_count - 1]; - LPVOID lpbuf1, lpbuf2; - DWORD dwbuf1, dwbuf2; + unsigned char *buffer = AudioBackend_LockSound(lpSECONDARYBUFFER[no], NULL); - lpSECONDARYBUFFER[no]->Lock(0, sample_count, &lpbuf1, &dwbuf1, &lpbuf2, &dwbuf2, 0); + memcpy(buffer, mixed_pcm_buffer, ptp->size); - CopyMemory(lpbuf1, mixed_pcm_buffer, dwbuf1); - - if (dwbuf2 != 0) - CopyMemory(lpbuf2, mixed_pcm_buffer + dwbuf1, dwbuf2); - - lpSECONDARYBUFFER[no]->Unlock(lpbuf1, dwbuf1, lpbuf2, dwbuf2); + AudioBackend_UnlockSound(lpSECONDARYBUFFER[no]); if (pcm_buffer != NULL) free(pcm_buffer); diff --git a/src/Sound.h b/src/Sound.h index 26e0fa0d..e9a7fc64 100644 --- a/src/Sound.h +++ b/src/Sound.h @@ -2,21 +2,16 @@ #include -#ifndef DIRECTSOUND_VERSION -#define DIRECTSOUND_VERSION 0x500 -#endif -#include - #include "WindowsWrapper.h" +#include "Backends/Audio.h" #include "PixTone.h" #define SE_MAX 160 // According to the Organya source code release, this is the real name for this constant -extern LPDIRECTSOUND lpDS; -extern LPDIRECTSOUNDBUFFER lpSECONDARYBUFFER[SE_MAX]; +extern AudioBackend_Sound *lpSECONDARYBUFFER[SE_MAX]; -BOOL InitDirectSound(HWND hwnd); +BOOL InitDirectSound(void); void EndDirectSound(void); void PlaySoundObject(int no, int mode); void ChangeSoundFrequency(int no, unsigned long rate);