Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 09:30:17 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes to try and make direct_sound work minus WinOSD (nw)

Browse Source
This commit is contained in:
R. Belmont 2014-09-12 02:07:46 +00:00
parent d488f52c17
commit 0ebffa0620
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osd/modules/sound/direct_sound.c
View File

@ -23,8 +23,13 @@
// MAMEOS headers // MAMEOS headers
#include "direct_sound.h" #include "direct_sound.h"
#ifdef SDLMAME_WIN32
#include "../../sdl/osdsdl.h"
#else
#include "winmain.h" #include "winmain.h"
#include "window.h" #include "window.h"
#endif
//============================================================ //============================================================
// DEBUGGING // DEBUGGING
@ -234,12 +239,14 @@ HRESULT sound_direct_sound::dsound_init()
} }
// set the cooperative level // set the cooperative level
#ifndef SDLMAME_WIN32
result = IDirectSound_SetCooperativeLevel(dsound, win_window_list->m_hwnd, DSSCL_PRIORITY); result = IDirectSound_SetCooperativeLevel(dsound, win_window_list->m_hwnd, DSSCL_PRIORITY);
if (result != DS_OK) if (result != DS_OK)
{ {
osd_printf_error("Error setting DirectSound cooperative level: %08x\n", (UINT32)result); osd_printf_error("Error setting DirectSound cooperative level: %08x\n", (UINT32)result);
goto error; goto error;
} }
#endif
// make a format description for what we want // make a format description for what we want
stream_format.wBitsPerSample = 16; stream_format.wBitsPerSample = 16;
@ -249,8 +256,15 @@ HRESULT sound_direct_sound::dsound_init()
stream_format.nBlockAlign = stream_format.wBitsPerSample * stream_format.nChannels / 8; stream_format.nBlockAlign = stream_format.wBitsPerSample * stream_format.nChannels / 8;
stream_format.nAvgBytesPerSec = stream_format.nSamplesPerSec * stream_format.nBlockAlign; stream_format.nAvgBytesPerSec = stream_format.nSamplesPerSec * stream_format.nBlockAlign;
// compute the buffer size based on the output sample rate // compute the buffer size based on the output sample rate
stream_buffer_size = stream_format.nSamplesPerSec * stream_format.nBlockAlign * downcast<windows_options &>(m_osd.machine().options()).audio_latency() / 10; int audio_latency;
#ifdef SDLMAME_WIN32
audio_latency = downcast<sdl_options &>(machine.options()).audio_latency();
#else
audio_latency = downcast<windows_options &>(m_osd.machine().options()).audio_latency();
#endif
stream_buffer_size = stream_format.nSamplesPerSec * stream_format.nBlockAlign * audio_latency / 10;
stream_buffer_size = (stream_buffer_size / 1024) * 1024; stream_buffer_size = (stream_buffer_size / 1024) * 1024;
if (stream_buffer_size < 1024) if (stream_buffer_size < 1024)
stream_buffer_size = 1024; stream_buffer_size = 1024;

2
src/osd/sdl/sdl.mak
View File

@ -410,7 +410,7 @@ OSDOBJS = \
$(SDLOBJ)/watchdog.o \ $(SDLOBJ)/watchdog.o \
ifeq ($(BASE_TARGETOS),win32) ifeq ($(BASE_TARGETOS),win32)
$(OSDOBJ)/modules/sound/direct_sound.o OSDOBJS += $(OSDOBJ)/modules/sound/direct_sound.o
endif endif
ifdef NO_USE_MIDI ifdef NO_USE_MIDI