diff options
| author | rubidium <rubidium@openttd.org> | 2009-08-09 23:04:08 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-08-09 23:04:08 +0000 |
| commit | 8e058c2d27961bdd1db883679b5743f418e8b854 (patch) | |
| tree | 2f662623f2b81ae0cf44c9bb9366ac62139dd118 /src/sound | |
| parent | 9ee2a66c8620d2f47c0d7792847c90146dfc4f8e (diff) | |
| download | openttd-8e058c2d27961bdd1db883679b5743f418e8b854.tar.xz | |
(svn r17140) -Change: allow higher sample rate and higher quality samples. Based on work by orudge.
Diffstat (limited to 'src/sound')
| -rw-r--r-- | src/sound/allegro_s.cpp | 2 | ||||
| -rw-r--r-- | src/sound/cocoa_s.cpp | 2 | ||||
| -rw-r--r-- | src/sound/sdl_s.cpp | 2 | ||||
| -rw-r--r-- | src/sound/win32_s.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/sound/allegro_s.cpp b/src/sound/allegro_s.cpp index a94f6d238..26d184ab5 100644 --- a/src/sound/allegro_s.cpp +++ b/src/sound/allegro_s.cpp @@ -57,7 +57,7 @@ const char *SoundDriver_Allegro::Start(const char * const *parm) return "No sound card found"; } - _stream = play_audio_stream(BUFFER_SIZE, 16, true, 11025, 255, 128); + _stream = play_audio_stream(BUFFER_SIZE, 16, true, 44100, 255, 128); MxInitialize(11025); return NULL; } diff --git a/src/sound/cocoa_s.cpp b/src/sound/cocoa_s.cpp index f50b6bd94..4e4fdd20a 100644 --- a/src/sound/cocoa_s.cpp +++ b/src/sound/cocoa_s.cpp @@ -47,7 +47,7 @@ const char *SoundDriver_Cocoa::Start(const char * const *parm) requestedDesc.mFormatID = kAudioFormatLinearPCM; requestedDesc.mFormatFlags = kLinearPCMFormatFlagIsPacked; requestedDesc.mChannelsPerFrame = 2; - requestedDesc.mSampleRate = GetDriverParamInt(parm, "hz", 11025); + requestedDesc.mSampleRate = GetDriverParamInt(parm, "hz", 44100); requestedDesc.mBitsPerChannel = 16; requestedDesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; diff --git a/src/sound/sdl_s.cpp b/src/sound/sdl_s.cpp index 7c89331f7..df7673da0 100644 --- a/src/sound/sdl_s.cpp +++ b/src/sound/sdl_s.cpp @@ -25,7 +25,7 @@ const char *SoundDriver_SDL::Start(const char * const *parm) const char *s = SdlOpen(SDL_INIT_AUDIO); if (s != NULL) return s; - spec.freq = GetDriverParamInt(parm, "hz", 11025); + spec.freq = GetDriverParamInt(parm, "hz", 44100); spec.format = AUDIO_S16SYS; spec.channels = 2; spec.samples = 512; diff --git a/src/sound/win32_s.cpp b/src/sound/win32_s.cpp index 776158adf..a7327863e 100644 --- a/src/sound/win32_s.cpp +++ b/src/sound/win32_s.cpp @@ -56,11 +56,11 @@ const char *SoundDriver_Win32::Start(const char * const *parm) wfex.wFormatTag = WAVE_FORMAT_PCM; wfex.nChannels = 2; wfex.wBitsPerSample = 16; - wfex.nSamplesPerSec = GetDriverParamInt(parm, "hz", 11025); + wfex.nSamplesPerSec = GetDriverParamInt(parm, "hz", 44100); wfex.nBlockAlign = (wfex.nChannels * wfex.wBitsPerSample) / 8; wfex.nAvgBytesPerSec = wfex.nSamplesPerSec * wfex.nBlockAlign; - _bufsize = GetDriverParamInt(parm, "bufsize", (GB(GetVersion(), 0, 8) > 5) ? 2048 : 1024); + _bufsize = GetDriverParamInt(parm, "bufsize", (GB(GetVersion(), 0, 8) > 5) ? 8192 : 4096); if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD_PTR)&waveOutProc, 0, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) return "waveOutOpen failed"; |