summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/sound/sdl_sound.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
committer Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
commit97b67170277437131adf6ed4d60139c172529e4f (patch)
tree7a5cbf608f191075f1612b1af15832c206a3fe2d /src/osd/modules/sound/sdl_sound.cpp
parentb380514764cf857469bae61c11143a19f79a74c5 (diff)
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release.
Diffstat (limited to 'src/osd/modules/sound/sdl_sound.cpp')
-rw-r--r--src/osd/modules/sound/sdl_sound.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/osd/modules/sound/sdl_sound.cpp b/src/osd/modules/sound/sdl_sound.cpp
index a04a44c0298..5ff8f2e6821 100644
--- a/src/osd/modules/sound/sdl_sound.cpp
+++ b/src/osd/modules/sound/sdl_sound.cpp
@@ -46,7 +46,6 @@ public:
sound_sdl() :
osd_module(OSD_SOUND_PROVIDER, "sdl"), sound_module(),
stream_in_initialized(0),
- stream_loop(0),
attenuation(0), buf_locked(0), stream_buffer(nullptr), stream_buffer_size(0), buffer_underflows(0), buffer_overflows(0)
{
sdl_xfer_samples = SDL_XFER_SAMPLES;
@@ -80,7 +79,7 @@ private:
static void sdl_callback(void *userdata, Uint8 *stream, int len);
- int lock_buffer();
+ void lock_buffer();
void unlock_buffer();
void attenuate(int16_t *data, int bytes);
void copy_sample_data(bool is_throttled, const int16_t *data, int bytes_to_copy);
@@ -89,7 +88,6 @@ private:
int sdl_xfer_samples;
int stream_in_initialized;
- int stream_loop;
int attenuation;
int buf_locked;
@@ -179,7 +177,7 @@ int sound_sdl::ring_buffer::pop(void *data, size_t size)
//============================================================
// lock_buffer
//============================================================
-int sound_sdl::lock_buffer()
+void sound_sdl::lock_buffer()
{
if (!buf_locked)
SDL_LockAudio();
@@ -187,8 +185,6 @@ int sound_sdl::lock_buffer()
if (LOG_SOUND)
*sound_log << "locking\n";
-
- return 0;
}
//============================================================
@@ -359,7 +355,6 @@ int sound_sdl::init(const osd_options &options)
sdl_xfer_samples = SDL_XFER_SAMPLES;
stream_in_initialized = 0;
- stream_loop = 0;
// set up the audio specs
aspec.freq = sample_rate();