From 10fd03e222dfd78abd7e9c78a215d4b8bc36cf3b Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 23 Jul 2005 15:48:00 +0000 Subject: (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my... --- sound/null.c | 11 -------- sound/null.h | 8 ------ sound/null_s.c | 11 ++++++++ sound/null_s.h | 8 ++++++ sound/sdl.c | 40 --------------------------- sound/sdl.h | 8 ------ sound/sdl_s.c | 40 +++++++++++++++++++++++++++ sound/sdl_s.h | 8 ++++++ sound/win32.c | 84 --------------------------------------------------------- sound/win32.h | 8 ------ sound/win32_s.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/win32_s.h | 8 ++++++ 12 files changed, 159 insertions(+), 159 deletions(-) delete mode 100644 sound/null.c delete mode 100644 sound/null.h create mode 100644 sound/null_s.c create mode 100644 sound/null_s.h delete mode 100644 sound/sdl.c delete mode 100644 sound/sdl.h create mode 100644 sound/sdl_s.c create mode 100644 sound/sdl_s.h delete mode 100644 sound/win32.c delete mode 100644 sound/win32.h create mode 100644 sound/win32_s.c create mode 100644 sound/win32_s.h (limited to 'sound') diff --git a/sound/null.c b/sound/null.c deleted file mode 100644 index e7d0c8c10..000000000 --- a/sound/null.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "stdafx.h" -#include "openttd.h" -#include "sound/null.h" - -static const char *NullSoundStart(const char * const *parm) { return NULL; } -static void NullSoundStop(void) {} - -const HalSoundDriver _null_sound_driver = { - NullSoundStart, - NullSoundStop, -}; diff --git a/sound/null.h b/sound/null.h deleted file mode 100644 index 63cc5ef8f..000000000 --- a/sound/null.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef SOUND_NULL_H -#define SOUND_NULL_H - -#include "hal.h" - -extern const HalSoundDriver _null_sound_driver; - -#endif diff --git a/sound/null_s.c b/sound/null_s.c new file mode 100644 index 000000000..744a209bd --- /dev/null +++ b/sound/null_s.c @@ -0,0 +1,11 @@ +#include "stdafx.h" +#include "openttd.h" +#include "sound/null_s.h" + +static const char *NullSoundStart(const char * const *parm) { return NULL; } +static void NullSoundStop(void) {} + +const HalSoundDriver _null_sound_driver = { + NullSoundStart, + NullSoundStop, +}; diff --git a/sound/null_s.h b/sound/null_s.h new file mode 100644 index 000000000..63cc5ef8f --- /dev/null +++ b/sound/null_s.h @@ -0,0 +1,8 @@ +#ifndef SOUND_NULL_H +#define SOUND_NULL_H + +#include "hal.h" + +extern const HalSoundDriver _null_sound_driver; + +#endif diff --git a/sound/sdl.c b/sound/sdl.c deleted file mode 100644 index 2f227ad39..000000000 --- a/sound/sdl.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "stdafx.h" -#include "openttd.h" -#include "driver.h" -#include "mixer.h" -#include "sdl.h" -#include "sound/sdl.h" -#include - -static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) -{ - MxMixSamples(_mixer, stream, len / 4); -} - -static const char *SdlSoundStart(const char * const *parm) -{ - SDL_AudioSpec spec; - - const char *s = SdlOpen(SDL_INIT_AUDIO); - if (s != NULL) return s; - - spec.freq = GetDriverParamInt(parm, "hz", 11025); - spec.format = AUDIO_S16SYS; - spec.channels = 2; - spec.samples = 512; - spec.callback = fill_sound_buffer; - SDL_CALL SDL_OpenAudio(&spec, &spec); - SDL_CALL SDL_PauseAudio(0); - return NULL; -} - -static void SdlSoundStop(void) -{ - SDL_CALL SDL_CloseAudio(); - SdlClose(SDL_INIT_AUDIO); -} - -const HalSoundDriver _sdl_sound_driver = { - SdlSoundStart, - SdlSoundStop, -}; diff --git a/sound/sdl.h b/sound/sdl.h deleted file mode 100644 index 9e593991a..000000000 --- a/sound/sdl.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef SOUND_SDL_H -#define SOUND_SDL_H - -#include "hal.h" - -extern const HalSoundDriver _sdl_sound_driver; - -#endif diff --git a/sound/sdl_s.c b/sound/sdl_s.c new file mode 100644 index 000000000..9ff1ca5cb --- /dev/null +++ b/sound/sdl_s.c @@ -0,0 +1,40 @@ +#include "stdafx.h" +#include "openttd.h" +#include "driver.h" +#include "mixer.h" +#include "sdl.h" +#include "sound/sdl_s.h" +#include + +static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) +{ + MxMixSamples(_mixer, stream, len / 4); +} + +static const char *SdlSoundStart(const char * const *parm) +{ + SDL_AudioSpec spec; + + const char *s = SdlOpen(SDL_INIT_AUDIO); + if (s != NULL) return s; + + spec.freq = GetDriverParamInt(parm, "hz", 11025); + spec.format = AUDIO_S16SYS; + spec.channels = 2; + spec.samples = 512; + spec.callback = fill_sound_buffer; + SDL_CALL SDL_OpenAudio(&spec, &spec); + SDL_CALL SDL_PauseAudio(0); + return NULL; +} + +static void SdlSoundStop(void) +{ + SDL_CALL SDL_CloseAudio(); + SdlClose(SDL_INIT_AUDIO); +} + +const HalSoundDriver _sdl_sound_driver = { + SdlSoundStart, + SdlSoundStop, +}; diff --git a/sound/sdl_s.h b/sound/sdl_s.h new file mode 100644 index 000000000..9e593991a --- /dev/null +++ b/sound/sdl_s.h @@ -0,0 +1,8 @@ +#ifndef SOUND_SDL_H +#define SOUND_SDL_H + +#include "hal.h" + +extern const HalSoundDriver _sdl_sound_driver; + +#endif diff --git a/sound/win32.c b/sound/win32.c deleted file mode 100644 index 9d58515a3..000000000 --- a/sound/win32.c +++ /dev/null @@ -1,84 +0,0 @@ -#include "stdafx.h" -#include "openttd.h" -#include "driver.h" -#include "functions.h" -#include "mixer.h" -#include "sound/win32.h" -#include - -static HWAVEOUT _waveout; -static WAVEHDR _wave_hdr[2]; -static int _bufsize; - -static void PrepareHeader(WAVEHDR *hdr) -{ - hdr->dwBufferLength = _bufsize * 4; - hdr->dwFlags = 0; - hdr->lpData = malloc(_bufsize * 4); - if (hdr->lpData == NULL || - waveOutPrepareHeader(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) - error("waveOutPrepareHeader failed"); -} - -static void FillHeaders(void) -{ - WAVEHDR *hdr; - - for (hdr = _wave_hdr; hdr != endof(_wave_hdr); hdr++) { - if (!(hdr->dwFlags & WHDR_INQUEUE)) { - MxMixSamples(_mixer, hdr->lpData, hdr->dwBufferLength / 4); - if (waveOutWrite(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) - error("waveOutWrite failed"); - } - } -} - -static void CALLBACK waveOutProc(HWAVEOUT hwo, UINT uMsg, DWORD dwInstance, - DWORD dwParam1, DWORD dwParam2) -{ - switch (uMsg) { - case WOM_DONE: - if (_waveout) FillHeaders(); - break; - - default: - break; - } -} - -static const char *Win32SoundStart(const char* const* parm) -{ - WAVEFORMATEX wfex; - int hz; - - _bufsize = GetDriverParamInt(parm, "bufsize", 1024); - hz = GetDriverParamInt(parm, "hz", 11025); - wfex.wFormatTag = WAVE_FORMAT_PCM; - wfex.nChannels = 2; - wfex.nSamplesPerSec = hz; - wfex.nAvgBytesPerSec = hz * 2 * 2; - wfex.nBlockAlign = 4; - wfex.wBitsPerSample = 16; - if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD)&waveOutProc, 0, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) - return "waveOutOpen failed"; - PrepareHeader(&_wave_hdr[0]); - PrepareHeader(&_wave_hdr[1]); - FillHeaders(); - return NULL; -} - -static void Win32SoundStop(void) -{ - HWAVEOUT waveout = _waveout; - - _waveout = NULL; - waveOutReset(waveout); - waveOutUnprepareHeader(waveout, &_wave_hdr[0], sizeof(WAVEHDR)); - waveOutUnprepareHeader(waveout, &_wave_hdr[1], sizeof(WAVEHDR)); - waveOutClose(waveout); -} - -const HalSoundDriver _win32_sound_driver = { - Win32SoundStart, - Win32SoundStop, -}; diff --git a/sound/win32.h b/sound/win32.h deleted file mode 100644 index 1f7b82b27..000000000 --- a/sound/win32.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef SOUND_WIN32_H -#define SOUND_WIN32_H - -#include "hal.h" - -extern const HalSoundDriver _win32_sound_driver; - -#endif diff --git a/sound/win32_s.c b/sound/win32_s.c new file mode 100644 index 000000000..a67249fa5 --- /dev/null +++ b/sound/win32_s.c @@ -0,0 +1,84 @@ +#include "stdafx.h" +#include "openttd.h" +#include "driver.h" +#include "functions.h" +#include "mixer.h" +#include "sound/win32_s.h" +#include + +static HWAVEOUT _waveout; +static WAVEHDR _wave_hdr[2]; +static int _bufsize; + +static void PrepareHeader(WAVEHDR *hdr) +{ + hdr->dwBufferLength = _bufsize * 4; + hdr->dwFlags = 0; + hdr->lpData = malloc(_bufsize * 4); + if (hdr->lpData == NULL || + waveOutPrepareHeader(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) + error("waveOutPrepareHeader failed"); +} + +static void FillHeaders(void) +{ + WAVEHDR *hdr; + + for (hdr = _wave_hdr; hdr != endof(_wave_hdr); hdr++) { + if (!(hdr->dwFlags & WHDR_INQUEUE)) { + MxMixSamples(_mixer, hdr->lpData, hdr->dwBufferLength / 4); + if (waveOutWrite(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) + error("waveOutWrite failed"); + } + } +} + +static void CALLBACK waveOutProc(HWAVEOUT hwo, UINT uMsg, DWORD dwInstance, + DWORD dwParam1, DWORD dwParam2) +{ + switch (uMsg) { + case WOM_DONE: + if (_waveout) FillHeaders(); + break; + + default: + break; + } +} + +static const char *Win32SoundStart(const char* const* parm) +{ + WAVEFORMATEX wfex; + int hz; + + _bufsize = GetDriverParamInt(parm, "bufsize", 1024); + hz = GetDriverParamInt(parm, "hz", 11025); + wfex.wFormatTag = WAVE_FORMAT_PCM; + wfex.nChannels = 2; + wfex.nSamplesPerSec = hz; + wfex.nAvgBytesPerSec = hz * 2 * 2; + wfex.nBlockAlign = 4; + wfex.wBitsPerSample = 16; + if (waveOutOpen(&_waveout, WAVE_MAPPER, &wfex, (DWORD)&waveOutProc, 0, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) + return "waveOutOpen failed"; + PrepareHeader(&_wave_hdr[0]); + PrepareHeader(&_wave_hdr[1]); + FillHeaders(); + return NULL; +} + +static void Win32SoundStop(void) +{ + HWAVEOUT waveout = _waveout; + + _waveout = NULL; + waveOutReset(waveout); + waveOutUnprepareHeader(waveout, &_wave_hdr[0], sizeof(WAVEHDR)); + waveOutUnprepareHeader(waveout, &_wave_hdr[1], sizeof(WAVEHDR)); + waveOutClose(waveout); +} + +const HalSoundDriver _win32_sound_driver = { + Win32SoundStart, + Win32SoundStop, +}; diff --git a/sound/win32_s.h b/sound/win32_s.h new file mode 100644 index 000000000..1f7b82b27 --- /dev/null +++ b/sound/win32_s.h @@ -0,0 +1,8 @@ +#ifndef SOUND_WIN32_H +#define SOUND_WIN32_H + +#include "hal.h" + +extern const HalSoundDriver _win32_sound_driver; + +#endif -- cgit v1.2.3-54-g00ecf