aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alc/backends/alsa.cpp93
-rw-r--r--alc/backends/dsound.cpp20
-rw-r--r--alc/backends/oss.cpp4
-rw-r--r--alc/backends/pulseaudio.cpp47
-rw-r--r--alc/backends/wasapi.cpp12
-rw-r--r--alc/backends/winmm.cpp8
6 files changed, 98 insertions, 86 deletions
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index 766ff167..cd85afaf 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -303,7 +303,7 @@ al::vector<DevMap> probe_devices(snd_pcm_stream_t stream)
ERR("snd_ctl_pcm_next_device failed\n");
if(dev < 0) break;
- snd_pcm_info_set_device(pcminfo, dev);
+ snd_pcm_info_set_device(pcminfo, static_cast<ALuint>(dev));
snd_pcm_info_set_subdevice(pcminfo, 0);
snd_pcm_info_set_stream(pcminfo, stream);
if((err=snd_ctl_pcm_info(handle, pcminfo)) < 0)
@@ -425,7 +425,7 @@ int AlsaPlayback::mixerProc()
althrd_setname(MIXER_THREAD_NAME);
const snd_pcm_uframes_t update_size{mDevice->UpdateSize};
- const snd_pcm_uframes_t num_updates{mDevice->BufferSize / update_size};
+ const snd_pcm_uframes_t buffer_size{mDevice->BufferSize};
while(!mKillNow.load(std::memory_order_acquire))
{
int state{verify_state(mPcmHandle)};
@@ -436,14 +436,15 @@ int AlsaPlayback::mixerProc()
break;
}
- snd_pcm_sframes_t avail{snd_pcm_avail_update(mPcmHandle)};
- if(avail < 0)
+ snd_pcm_sframes_t avails{snd_pcm_avail_update(mPcmHandle)};
+ if(avails < 0)
{
- ERR("available update failed: %s\n", snd_strerror(avail));
+ ERR("available update failed: %s\n", snd_strerror(static_cast<int>(avails)));
continue;
}
+ snd_pcm_uframes_t avail{static_cast<snd_pcm_uframes_t>(avails)};
- if(static_cast<snd_pcm_uframes_t>(avail) > update_size*(num_updates+1))
+ if(avail > buffer_size)
{
WARN("available samples exceeds the buffer size\n");
snd_pcm_reset(mPcmHandle);
@@ -451,7 +452,7 @@ int AlsaPlayback::mixerProc()
}
// make sure there's frames to process
- if(static_cast<snd_pcm_uframes_t>(avail) < update_size)
+ if(avail < update_size)
{
if(state != SND_PCM_STATE_RUNNING)
{
@@ -472,7 +473,7 @@ int AlsaPlayback::mixerProc()
lock();
while(avail > 0)
{
- snd_pcm_uframes_t frames{static_cast<snd_pcm_uframes_t>(avail)};
+ snd_pcm_uframes_t frames{avail};
const snd_pcm_channel_area_t *areas{};
snd_pcm_uframes_t offset{};
@@ -484,13 +485,13 @@ int AlsaPlayback::mixerProc()
}
char *WritePtr{static_cast<char*>(areas->addr) + (offset * areas->step / 8)};
- aluMixData(mDevice, WritePtr, frames);
+ aluMixData(mDevice, WritePtr, static_cast<ALuint>(frames));
snd_pcm_sframes_t commitres{snd_pcm_mmap_commit(mPcmHandle, offset, frames)};
- if(commitres < 0 || (commitres-frames) != 0)
+ if(commitres < 0 || (static_cast<snd_pcm_uframes_t>(commitres)-frames) != 0)
{
ERR("mmap commit error: %s\n",
- snd_strerror(commitres >= 0 ? -EPIPE : commitres));
+ snd_strerror(commitres >= 0 ? -EPIPE : static_cast<int>(commitres)));
break;
}
@@ -522,7 +523,7 @@ int AlsaPlayback::mixerNoMMapProc()
snd_pcm_sframes_t avail{snd_pcm_avail_update(mPcmHandle)};
if(avail < 0)
{
- ERR("available update failed: %s\n", snd_strerror(avail));
+ ERR("available update failed: %s\n", snd_strerror(static_cast<int>(avail)));
continue;
}
@@ -551,11 +552,12 @@ int AlsaPlayback::mixerNoMMapProc()
lock();
al::byte *WritePtr{mBuffer.data()};
- avail = snd_pcm_bytes_to_frames(mPcmHandle, mBuffer.size());
- aluMixData(mDevice, WritePtr, avail);
+ avail = snd_pcm_bytes_to_frames(mPcmHandle, static_cast<ssize_t>(mBuffer.size()));
+ aluMixData(mDevice, WritePtr, static_cast<ALuint>(avail));
while(avail > 0)
{
- snd_pcm_sframes_t ret{snd_pcm_writei(mPcmHandle, WritePtr, avail)};
+ snd_pcm_sframes_t ret{snd_pcm_writei(mPcmHandle, WritePtr,
+ static_cast<snd_pcm_uframes_t>(avail))};
switch(ret)
{
case -EAGAIN:
@@ -565,7 +567,7 @@ int AlsaPlayback::mixerNoMMapProc()
#endif
case -EPIPE:
case -EINTR:
- ret = snd_pcm_recover(mPcmHandle, ret, 1);
+ ret = snd_pcm_recover(mPcmHandle, static_cast<int>(ret), 1);
if(ret < 0)
avail = 0;
break;
@@ -762,8 +764,8 @@ ALCboolean AlsaPlayback::reset()
snd_pcm_sw_params_free(sp);
sp = nullptr;
- mDevice->BufferSize = bufferSizeInFrames;
- mDevice->UpdateSize = periodSizeInFrames;
+ mDevice->BufferSize = static_cast<ALuint>(bufferSizeInFrames);
+ mDevice->UpdateSize = static_cast<ALuint>(periodSizeInFrames);
mDevice->Frequency = rate;
SetDefaultChannelOrder(mDevice);
@@ -803,7 +805,8 @@ ALCboolean AlsaPlayback::start()
int (AlsaPlayback::*thread_func)(){};
if(access == SND_PCM_ACCESS_RW_INTERLEAVED)
{
- mBuffer.resize(snd_pcm_frames_to_bytes(mPcmHandle, mDevice->UpdateSize));
+ mBuffer.resize(
+ static_cast<size_t>(snd_pcm_frames_to_bytes(mPcmHandle, mDevice->UpdateSize)));
thread_func = &AlsaPlayback::mixerNoMMapProc;
}
else
@@ -952,7 +955,7 @@ ALCenum AlsaCapture::open(const ALCchar *name)
}
snd_pcm_uframes_t bufferSizeInFrames{maxu(mDevice->BufferSize, 100*mDevice->Frequency/1000)};
- snd_pcm_uframes_t periodSizeInFrames{minu(bufferSizeInFrames, 25*mDevice->Frequency/1000)};
+ snd_pcm_uframes_t periodSizeInFrames{minu(mDevice->BufferSize, 25*mDevice->Frequency/1000)};
bool needring{false};
const char *funcerr{};
@@ -1044,7 +1047,8 @@ void AlsaCapture::stop()
{
/* The ring buffer implicitly captures when checking availability.
* Direct access needs to explicitly capture it into temp storage. */
- auto temp = al::vector<al::byte>(snd_pcm_frames_to_bytes(mPcmHandle, avail));
+ auto temp = al::vector<al::byte>(
+ static_cast<size_t>(snd_pcm_frames_to_bytes(mPcmHandle, avail)));
captureSamples(temp.data(), avail);
mBuffer = std::move(temp);
}
@@ -1070,11 +1074,11 @@ ALCenum AlsaCapture::captureSamples(ALCvoid *buffer, ALCuint samples)
if(!mBuffer.empty())
{
/* First get any data stored from the last stop */
- amt = snd_pcm_bytes_to_frames(mPcmHandle, mBuffer.size());
+ amt = snd_pcm_bytes_to_frames(mPcmHandle, static_cast<ssize_t>(mBuffer.size()));
if(static_cast<snd_pcm_uframes_t>(amt) > samples) amt = samples;
amt = snd_pcm_frames_to_bytes(mPcmHandle, amt);
- memcpy(buffer, mBuffer.data(), amt);
+ std::copy_n(mBuffer.begin(), amt, static_cast<al::byte*>(buffer));
mBuffer.erase(mBuffer.begin(), mBuffer.begin()+amt);
amt = snd_pcm_bytes_to_frames(mPcmHandle, amt);
@@ -1083,11 +1087,11 @@ ALCenum AlsaCapture::captureSamples(ALCvoid *buffer, ALCuint samples)
amt = snd_pcm_readi(mPcmHandle, buffer, samples);
if(amt < 0)
{
- ERR("read error: %s\n", snd_strerror(amt));
+ ERR("read error: %s\n", snd_strerror(static_cast<int>(amt)));
if(amt == -EAGAIN)
continue;
- if((amt=snd_pcm_recover(mPcmHandle, amt, 1)) >= 0)
+ if((amt=snd_pcm_recover(mPcmHandle, static_cast<int>(amt), 1)) >= 0)
{
amt = snd_pcm_start(mPcmHandle);
if(amt >= 0)
@@ -1095,8 +1099,9 @@ ALCenum AlsaCapture::captureSamples(ALCvoid *buffer, ALCuint samples)
}
if(amt < 0)
{
- ERR("restore error: %s\n", snd_strerror(amt));
- aluHandleDisconnect(mDevice, "Capture recovery failure: %s", snd_strerror(amt));
+ const char *err{snd_strerror(static_cast<int>(amt))};
+ ERR("restore error: %s\n", err);
+ aluHandleDisconnect(mDevice, "Capture recovery failure: %s", err);
break;
}
/* If the amount available is less than what's asked, we lost it
@@ -1110,8 +1115,8 @@ ALCenum AlsaCapture::captureSamples(ALCvoid *buffer, ALCuint samples)
samples -= amt;
}
if(samples > 0)
- memset(buffer, ((mDevice->FmtType == DevFmtUByte) ? 0x80 : 0),
- snd_pcm_frames_to_bytes(mPcmHandle, samples));
+ std::fill_n(static_cast<al::byte*>(buffer), snd_pcm_frames_to_bytes(mPcmHandle, samples),
+ al::byte((mDevice->FmtType == DevFmtUByte) ? 0x80 : 0));
return ALC_NO_ERROR;
}
@@ -1123,9 +1128,9 @@ ALCuint AlsaCapture::availableSamples()
avail = snd_pcm_avail_update(mPcmHandle);
if(avail < 0)
{
- ERR("avail update failed: %s\n", snd_strerror(avail));
+ ERR("avail update failed: %s\n", snd_strerror(static_cast<int>(avail)));
- if((avail=snd_pcm_recover(mPcmHandle, avail, 1)) >= 0)
+ if((avail=snd_pcm_recover(mPcmHandle, static_cast<int>(avail), 1)) >= 0)
{
if(mDoCapture)
avail = snd_pcm_start(mPcmHandle);
@@ -1134,17 +1139,18 @@ ALCuint AlsaCapture::availableSamples()
}
if(avail < 0)
{
- ERR("restore error: %s\n", snd_strerror(avail));
- aluHandleDisconnect(mDevice, "Capture recovery failure: %s", snd_strerror(avail));
+ const char *err{snd_strerror(static_cast<int>(avail))};
+ ERR("restore error: %s\n", err);
+ aluHandleDisconnect(mDevice, "Capture recovery failure: %s", err);
}
}
if(!mRing)
{
if(avail < 0) avail = 0;
- avail += snd_pcm_bytes_to_frames(mPcmHandle, mBuffer.size());
+ avail += snd_pcm_bytes_to_frames(mPcmHandle, static_cast<ssize_t>(mBuffer.size()));
if(avail > mLastAvail) mLastAvail = avail;
- return mLastAvail;
+ return static_cast<ALCuint>(mLastAvail);
}
while(avail > 0)
@@ -1152,15 +1158,15 @@ ALCuint AlsaCapture::availableSamples()
auto vec = mRing->getWriteVector();
if(vec.first.len == 0) break;
- snd_pcm_sframes_t amt{std::min<snd_pcm_sframes_t>(vec.first.len, avail)};
- amt = snd_pcm_readi(mPcmHandle, vec.first.buf, amt);
+ snd_pcm_sframes_t amt{std::min(static_cast<snd_pcm_sframes_t>(vec.first.len), avail)};
+ amt = snd_pcm_readi(mPcmHandle, vec.first.buf, static_cast<snd_pcm_uframes_t>(amt));
if(amt < 0)
{
- ERR("read error: %s\n", snd_strerror(amt));
+ ERR("read error: %s\n", snd_strerror(static_cast<int>(amt)));
if(amt == -EAGAIN)
continue;
- if((amt=snd_pcm_recover(mPcmHandle, amt, 1)) >= 0)
+ if((amt=snd_pcm_recover(mPcmHandle, static_cast<int>(amt), 1)) >= 0)
{
if(mDoCapture)
amt = snd_pcm_start(mPcmHandle);
@@ -1169,19 +1175,20 @@ ALCuint AlsaCapture::availableSamples()
}
if(amt < 0)
{
- ERR("restore error: %s\n", snd_strerror(amt));
- aluHandleDisconnect(mDevice, "Capture recovery failure: %s", snd_strerror(amt));
+ const char *err{snd_strerror(static_cast<int>(amt))};
+ ERR("restore error: %s\n", err);
+ aluHandleDisconnect(mDevice, "Capture recovery failure: %s", err);
break;
}
avail = amt;
continue;
}
- mRing->writeAdvance(amt);
+ mRing->writeAdvance(static_cast<snd_pcm_uframes_t>(amt));
avail -= amt;
}
- return mRing->readSpace();
+ return static_cast<ALCuint>(mRing->readSpace());
}
ClockLatency AlsaCapture::getClockLatency()
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp
index 1c44c2ec..f9184968 100644
--- a/alc/backends/dsound.cpp
+++ b/alc/backends/dsound.cpp
@@ -465,11 +465,13 @@ ALCboolean DSoundPlayback::reset()
retry_open:
hr = S_OK;
OutputType.Format.wFormatTag = WAVE_FORMAT_PCM;
- OutputType.Format.nChannels = mDevice->channelsFromFmt();
- OutputType.Format.wBitsPerSample = mDevice->bytesFromFmt() * 8;
- OutputType.Format.nBlockAlign = OutputType.Format.nChannels*OutputType.Format.wBitsPerSample/8;
+ OutputType.Format.nChannels = static_cast<WORD>(mDevice->channelsFromFmt());
+ OutputType.Format.wBitsPerSample = static_cast<WORD>(mDevice->bytesFromFmt() * 8);
+ OutputType.Format.nBlockAlign = static_cast<WORD>(OutputType.Format.nChannels *
+ OutputType.Format.wBitsPerSample / 8);
OutputType.Format.nSamplesPerSec = mDevice->Frequency;
- OutputType.Format.nAvgBytesPerSec = OutputType.Format.nSamplesPerSec*OutputType.Format.nBlockAlign;
+ OutputType.Format.nAvgBytesPerSec = OutputType.Format.nSamplesPerSec *
+ OutputType.Format.nBlockAlign;
OutputType.Format.cbSize = 0;
}
@@ -728,11 +730,13 @@ ALCenum DSoundCapture::open(const ALCchar *name)
}
InputType.Format.wFormatTag = WAVE_FORMAT_PCM;
- InputType.Format.nChannels = mDevice->channelsFromFmt();
- InputType.Format.wBitsPerSample = mDevice->bytesFromFmt() * 8;
- InputType.Format.nBlockAlign = InputType.Format.nChannels*InputType.Format.wBitsPerSample/8;
+ InputType.Format.nChannels = static_cast<WORD>(mDevice->channelsFromFmt());
+ InputType.Format.wBitsPerSample = static_cast<WORD>(mDevice->bytesFromFmt() * 8);
+ InputType.Format.nBlockAlign = static_cast<WORD>(InputType.Format.nChannels *
+ InputType.Format.wBitsPerSample / 8);
InputType.Format.nSamplesPerSec = mDevice->Frequency;
- InputType.Format.nAvgBytesPerSec = InputType.Format.nSamplesPerSec*InputType.Format.nBlockAlign;
+ InputType.Format.nAvgBytesPerSec = InputType.Format.nSamplesPerSec *
+ InputType.Format.nBlockAlign;
InputType.Format.cbSize = 0;
InputType.Samples.wValidBitsPerSample = InputType.Format.wBitsPerSample;
if(mDevice->FmtType == DevFmtFloat)
diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp
index 48794a50..ffdf3c23 100644
--- a/alc/backends/oss.cpp
+++ b/alc/backends/oss.cpp
@@ -305,7 +305,7 @@ int OSSPlayback::mixerProc()
ALubyte *write_ptr{mMixData.data()};
size_t to_write{mMixData.size()};
- aluMixData(mDevice, write_ptr, to_write/frame_size);
+ aluMixData(mDevice, write_ptr, static_cast<ALuint>(to_write/frame_size));
while(to_write > 0 && !mKillNow.load(std::memory_order_acquire))
{
ssize_t wrote{write(mFd, write_ptr, to_write)};
@@ -531,7 +531,7 @@ int OSScapture::recordProc()
strerror(errno));
break;
}
- mRing->writeAdvance(amt/frame_size);
+ mRing->writeAdvance(static_cast<ALuint>(amt)/frame_size);
}
}
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index c1e615ae..08420748 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -743,7 +743,7 @@ void PulsePlayback::streamWriteCallbackC(pa_stream *stream, size_t nbytes, void
void PulsePlayback::streamWriteCallback(pa_stream *stream, size_t nbytes)
{
void *buf{pa_xmalloc(nbytes)};
- aluMixData(mDevice, buf, nbytes/mFrameSize);
+ aluMixData(mDevice, buf, static_cast<ALuint>(nbytes/mFrameSize));
int ret{pa_stream_write(stream, buf, nbytes, pa_xfree, 0, PA_SEEK_RELATIVE)};
if UNLIKELY(ret != PA_OK)
@@ -864,7 +864,7 @@ ALCenum PulsePlayback::open(const ALCchar *name)
BackendType::Playback);
pa_stream_set_moved_callback(mStream, &PulsePlayback::streamMovedCallbackC, this);
- mFrameSize = pa_frame_size(pa_stream_get_sample_spec(mStream));
+ mFrameSize = static_cast<ALuint>(pa_frame_size(pa_stream_get_sample_spec(mStream)));
mDeviceName = pa_stream_get_device_name(mStream);
if(!dev_name)
@@ -970,15 +970,16 @@ ALCboolean PulsePlayback::reset()
break;
}
mSpec.rate = mDevice->Frequency;
- mSpec.channels = mDevice->channelsFromFmt();
+ mSpec.channels = static_cast<uint8_t>(mDevice->channelsFromFmt());
if(pa_sample_spec_valid(&mSpec) == 0)
throw al::backend_exception{ALC_INVALID_VALUE, "Invalid sample spec"};
- mAttr.maxlength = -1;
- mAttr.tlength = mDevice->BufferSize * pa_frame_size(&mSpec);
- mAttr.prebuf = 0;
- mAttr.minreq = mDevice->UpdateSize * pa_frame_size(&mSpec);
- mAttr.fragsize = -1;
+ const ALuint frame_size{static_cast<ALuint>(pa_frame_size(&mSpec))};
+ mAttr.maxlength = ~0u;
+ mAttr.tlength = mDevice->BufferSize * frame_size;
+ mAttr.prebuf = 0u;
+ mAttr.minreq = mDevice->UpdateSize * frame_size;
+ mAttr.fragsize = ~0u;
mStream = pulse_connect_stream(mDeviceName.c_str(), plock, mContext, flags, &mAttr, &mSpec,
&chanmap, BackendType::Playback);
@@ -987,7 +988,7 @@ ALCboolean PulsePlayback::reset()
pa_stream_set_moved_callback(mStream, &PulsePlayback::streamMovedCallbackC, this);
mSpec = *(pa_stream_get_sample_spec(mStream));
- mFrameSize = pa_frame_size(&mSpec);
+ mFrameSize = static_cast<ALuint>(pa_frame_size(&mSpec));
if(mDevice->Frequency != mSpec.rate)
{
@@ -1000,9 +1001,9 @@ ALCboolean PulsePlayback::reset()
const ALuint buflen{static_cast<ALuint>(clampd(scale*mDevice->BufferSize + 0.5, perlen*2,
std::numeric_limits<int>::max()/mFrameSize))};
- mAttr.maxlength = -1;
+ mAttr.maxlength = ~0u;
mAttr.tlength = buflen * mFrameSize;
- mAttr.prebuf = 0;
+ mAttr.prebuf = 0u;
mAttr.minreq = perlen * mFrameSize;
op = pa_stream_set_buffer_attr(mStream, &mAttr, stream_success_callback, nullptr);
@@ -1268,18 +1269,17 @@ ALCenum PulseCapture::open(const ALCchar *name)
DevFmtTypeString(mDevice->FmtType)};
}
mSpec.rate = mDevice->Frequency;
- mSpec.channels = mDevice->channelsFromFmt();
+ mSpec.channels = static_cast<uint8_t>(mDevice->channelsFromFmt());
if(pa_sample_spec_valid(&mSpec) == 0)
throw al::backend_exception{ALC_INVALID_VALUE, "Invalid sample format"};
- ALuint samples{mDevice->BufferSize};
- samples = maxu(samples, 100 * mDevice->Frequency / 1000);
-
- mAttr.minreq = -1;
- mAttr.prebuf = -1;
- mAttr.maxlength = samples * pa_frame_size(&mSpec);
- mAttr.tlength = -1;
- mAttr.fragsize = minu(samples, 50*mDevice->Frequency/1000) * pa_frame_size(&mSpec);
+ const ALuint frame_size{static_cast<ALuint>(pa_frame_size(&mSpec))};
+ const ALuint samples{maxu(mDevice->BufferSize, 100 * mDevice->Frequency / 1000)};
+ mAttr.minreq = ~0u;
+ mAttr.prebuf = ~0u;
+ mAttr.maxlength = samples * frame_size;
+ mAttr.tlength = ~0u;
+ mAttr.fragsize = minu(samples, 50*mDevice->Frequency/1000) * frame_size;
pa_stream_flags_t flags{PA_STREAM_START_CORKED | PA_STREAM_ADJUST_LATENCY};
if(!GetConfigValueBool(nullptr, "pulse", "allow-moves", 1))
@@ -1384,8 +1384,9 @@ ALCuint PulseCapture::availableSamples()
size_t got{pa_stream_readable_size(mStream)};
if(static_cast<ssize_t>(got) < 0)
{
- ERR("pa_stream_readable_size() failed: %s\n", pa_strerror(got));
- aluHandleDisconnect(mDevice, "Failed getting readable size: %s", pa_strerror(got));
+ const char *err{pa_strerror(static_cast<int>(got))};
+ ERR("pa_stream_readable_size() failed: %s\n", err);
+ aluHandleDisconnect(mDevice, "Failed getting readable size: %s", err);
}
else
{
@@ -1396,7 +1397,7 @@ ALCuint PulseCapture::availableSamples()
readable = std::min<size_t>(readable, std::numeric_limits<ALCuint>::max());
mLastReadable = std::max(mLastReadable, static_cast<ALCuint>(readable));
- return mLastReadable / pa_frame_size(&mSpec);
+ return mLastReadable / static_cast<ALCuint>(pa_frame_size(&mSpec));
}
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index 55c95146..b762da76 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -942,10 +942,10 @@ HRESULT WasapiPlayback::resetProxy()
}
OutputType.Format.nSamplesPerSec = mDevice->Frequency;
- OutputType.Format.nBlockAlign = OutputType.Format.nChannels *
- OutputType.Format.wBitsPerSample / 8;
+ OutputType.Format.nBlockAlign = static_cast<WORD>(OutputType.Format.nChannels *
+ OutputType.Format.wBitsPerSample / 8);
OutputType.Format.nAvgBytesPerSec = OutputType.Format.nSamplesPerSec *
- OutputType.Format.nBlockAlign;
+ OutputType.Format.nBlockAlign;
TraceFormat("Requesting playback format", &OutputType.Format);
hr = mClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, &OutputType.Format, &wfx);
@@ -1474,10 +1474,10 @@ HRESULT WasapiCapture::resetProxy()
OutputType.Samples.wValidBitsPerSample = OutputType.Format.wBitsPerSample;
OutputType.Format.nSamplesPerSec = mDevice->Frequency;
- OutputType.Format.nBlockAlign = OutputType.Format.nChannels *
- OutputType.Format.wBitsPerSample / 8;
+ OutputType.Format.nBlockAlign = static_cast<WORD>(OutputType.Format.nChannels *
+ OutputType.Format.wBitsPerSample / 8);
OutputType.Format.nAvgBytesPerSec = OutputType.Format.nSamplesPerSec *
- OutputType.Format.nBlockAlign;
+ OutputType.Format.nBlockAlign;
OutputType.Format.cbSize = sizeof(OutputType) - sizeof(OutputType.Format);
TraceFormat("Requesting capture format", &OutputType.Format);
diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp
index 76e6fe3b..30a19e13 100644
--- a/alc/backends/winmm.cpp
+++ b/alc/backends/winmm.cpp
@@ -240,7 +240,7 @@ retry_open:
mFormat.wBitsPerSample = 16;
}
mFormat.nChannels = ((mDevice->FmtChans == DevFmtMono) ? 1 : 2);
- mFormat.nBlockAlign = mFormat.wBitsPerSample * mFormat.nChannels / 8;
+ mFormat.nBlockAlign = static_cast<WORD>(mFormat.wBitsPerSample * mFormat.nChannels / 8);
mFormat.nSamplesPerSec = mDevice->Frequency;
mFormat.nAvgBytesPerSec = mFormat.nSamplesPerSec * mFormat.nBlockAlign;
mFormat.cbSize = 0;
@@ -500,9 +500,9 @@ ALCenum WinMMCapture::open(const ALCchar *name)
mFormat = WAVEFORMATEX{};
mFormat.wFormatTag = (mDevice->FmtType == DevFmtFloat) ?
WAVE_FORMAT_IEEE_FLOAT : WAVE_FORMAT_PCM;
- mFormat.nChannels = mDevice->channelsFromFmt();
- mFormat.wBitsPerSample = mDevice->bytesFromFmt() * 8;
- mFormat.nBlockAlign = mFormat.wBitsPerSample * mFormat.nChannels / 8;
+ mFormat.nChannels = static_cast<WORD>(mDevice->channelsFromFmt());
+ mFormat.wBitsPerSample = static_cast<WORD>(mDevice->bytesFromFmt() * 8);
+ mFormat.nBlockAlign = static_cast<WORD>(mFormat.wBitsPerSample * mFormat.nChannels / 8);
mFormat.nSamplesPerSec = mDevice->Frequency;
mFormat.nAvgBytesPerSec = mFormat.nSamplesPerSec * mFormat.nBlockAlign;
mFormat.cbSize = 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 00:42:00 +0000