Skip to content

Commit 30ac67d

Browse files
committed
sound_module: remove 'internal' param from get()
1 parent 0ed8f02 commit 30ac67d

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/osd/modules/sound/sound_module.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void sound_module::abuffer::set_latency(float latency)
3535

3636
void sound_module::abuffer::clear()
3737
{
38-
get(m_last_sample.data(), 1, false);
38+
get(m_last_sample.data(), 1);
3939
m_used_buffers = 0;
4040
m_used_buffers_prev = 0;
4141
m_overrun = false;
@@ -47,7 +47,7 @@ void sound_module::abuffer::clear()
4747
m_overruns = 0;
4848
}
4949

50-
void sound_module::abuffer::get(int16_t *data, uint32_t samples, bool internal) noexcept
50+
void sound_module::abuffer::get(int16_t *data, uint32_t samples) noexcept
5151
{
5252
m_delta -= samples;
5353
m_delta2 -= samples;
@@ -84,7 +84,7 @@ void sound_module::abuffer::get(int16_t *data, uint32_t samples, bool internal)
8484
pos += avail;
8585
data += avail * m_channels;
8686
}
87-
m_internal_get = internal;
87+
m_internal_get = false;
8888
//printf("%d -%d +%d # %d %d\n", m_used_buffers, m_underruns, m_overruns, m_delta, m_delta2);
8989
}
9090

@@ -101,7 +101,8 @@ void sound_module::abuffer::flush_buffers(uint32_t remain)
101101
// get crossfade source chunk
102102
if(!m_internal_get || m_last_fade.size() != samples * m_channels) {
103103
m_last_fade.resize(samples * m_channels);
104-
get(m_last_fade.data(), samples, true);
104+
get(m_last_fade.data(), samples);
105+
m_internal_get = true;
105106
m_delta += samples;
106107
m_delta2 += samples;
107108
}

src/osd/modules/sound/sound_module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class sound_module
4141
abuffer(uint32_t channels, uint32_t rate) noexcept;
4242
void set_latency(float latency);
4343
void clear();
44-
void get(int16_t *data, uint32_t samples, bool internal = false) noexcept;
44+
void get(int16_t *data, uint32_t samples) noexcept;
4545
void push(const int16_t *data, uint32_t samples);
4646
uint32_t channels() const noexcept { return m_channels; }
4747
uint32_t available() const noexcept;

0 commit comments

Comments
 (0)