kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more casts for MSVC

Browse Source
This commit is contained in:
Chris Robinson 2018-12-12 21:58:41 -08:00
parent b779ebb512
commit 0d73b13f59
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Alc/alc.cpp
View File

@ -171,7 +171,7 @@ struct BackendInfo BackendList[] = {
{ "wave", WaveBackendFactory::getFactory },
#endif
};
ALsizei BackendListSize = COUNTOF(BackendList);
ALsizei BackendListSize = static_cast<ALsizei>(COUNTOF(BackendList));
struct BackendInfo PlaybackBackend;
struct BackendInfo CaptureBackend;

23
Alc/ambdec.cpp
View File

@ -142,7 +142,8 @@ bool load_ambdec_matrix(ALfloat *gains, ALfloat (*matrix)[MAX_AMBI_COEFFS], ALsi
if(istr.fail()) break;
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk on gain %u: %s\n", curgain+1, buffer.c_str()+istr.tellg());
ERR("Extra junk on gain %u: %s\n", curgain+1,
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return false;
}
if(curgain < MAX_AMBI_ORDER+1)
@ -163,7 +164,7 @@ bool load_ambdec_matrix(ALfloat *gains, ALfloat (*matrix)[MAX_AMBI_COEFFS], ALsi
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk on matrix element %ux%u: %s\n", cur, curidx,
buffer.c_str()+istr.tellg());
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return false;
}
if(curidx < MAX_AMBI_COEFFS)
@ -228,7 +229,8 @@ int AmbDecConf::load(const char *fname) noexcept
istr >> Version;
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk after version: %s\n", buffer.c_str()+istr.tellg());
ERR("Extra junk after version: %s\n",
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return 0;
}
if(Version != 3)
@ -242,7 +244,8 @@ int AmbDecConf::load(const char *fname) noexcept
istr >> std::hex >> ChanMask >> std::dec;
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk after mask: %s\n", buffer.c_str()+istr.tellg());
ERR("Extra junk after mask: %s\n",
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return 0;
}
}
@ -251,7 +254,8 @@ int AmbDecConf::load(const char *fname) noexcept
istr >> FreqBands;
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk after freq_bands: %s\n", buffer.c_str()+istr.tellg());
ERR("Extra junk after freq_bands: %s\n",
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return 0;
}
if(FreqBands != 1 && FreqBands != 2)
@ -265,7 +269,8 @@ int AmbDecConf::load(const char *fname) noexcept
istr >> NumSpeakers;
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk after speakers: %s\n", buffer.c_str()+istr.tellg());
ERR("Extra junk after speakers: %s\n",
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return 0;
}
if(NumSpeakers > MAX_OUTPUT_CHANNELS)
@ -291,7 +296,8 @@ int AmbDecConf::load(const char *fname) noexcept
istr >> XOverFreq;
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk after xover_freq: %s\n", buffer.c_str()+istr.tellg());
ERR("Extra junk after xover_freq: %s\n",
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return 0;
}
}
@ -300,7 +306,8 @@ int AmbDecConf::load(const char *fname) noexcept
istr >> XOverRatio;
if(!istr.eof() && !std::isspace(istr.peek()))
{
ERR("Extra junk after xover_ratio: %s\n", buffer.c_str()+istr.tellg());
ERR("Extra junk after xover_ratio: %s\n",
buffer.c_str()+static_cast<std::size_t>(istr.tellg()));
return 0;
}
}

3
Alc/backends/winmm.cpp
View File

@ -363,7 +363,8 @@ ALCboolean ALCwinmmPlayback_start(ALCwinmmPlayback *self)
[self](WAVEHDR &waveHdr) -> void
{ waveOutPrepareHeader(self->OutHdl, &waveHdr, static_cast<UINT>(sizeof(WAVEHDR))); }
);
self->Writable.store(self->WaveBuffer.size(), std::memory_order_release);
self->Writable.store(static_cast<ALuint>(self->WaveBuffer.size()),
std::memory_order_release);
self->mKillNow.store(AL_FALSE, std::memory_order_release);
self->mThread = std::thread(ALCwinmmPlayback_mixerProc, self);

2
Alc/helpers.cpp
View File

@ -316,7 +316,7 @@ PathNamePair GetProcBinary()
al::vector<WCHAR> fullpath(256);
DWORD len;
while((len=GetModuleFileNameW(nullptr, fullpath.data(), fullpath.size())) == fullpath.size())
while((len=GetModuleFileNameW(nullptr, fullpath.data(), static_cast<DWORD>(fullpath.size()))) == fullpath.size())
fullpath.resize(fullpath.size() << 1);
if(len == 0)
{

2
Alc/hrtf.cpp
View File

@ -133,7 +133,7 @@ class databuf final : public std::streambuf {
if(pos < 0 || pos > egptr()-eback())
return traits_type::eof();
setg(eback(), eback() + pos, egptr());
setg(eback(), eback() + static_cast<size_t>(pos), egptr());
return pos;
}