Split error macro into two versions (format vs non-formating) to allow format checking at compile-time

This commit is contained in:
SirLynix
2023-11-02 15:18:03 +01:00
parent 8fb53f467b
commit 4b8a475bbd
133 changed files with 570 additions and 557 deletions

View File

@@ -72,7 +72,7 @@ namespace Nz
if (!config.allowDummyDevice)
throw;
NazaraError("failed to open default OpenAL device: {0}", e.what());
NazaraErrorFmt("failed to open default OpenAL device: {0}", e.what());
}
}

View File

@@ -65,7 +65,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(wav.channels);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", wav.channels);
NazaraErrorFmt("unexpected channel count: {0}", wav.channels);
return Err(ResourceLoadingError::Unsupported);
}
@@ -138,7 +138,7 @@ namespace Nz
std::unique_ptr<File> file = std::make_unique<File>();
if (!file->Open(filePath, OpenMode::ReadOnly))
{
NazaraError("failed to open stream from file: {0}", Error::GetLastError());
NazaraErrorFmt("failed to open stream from file: {0}", Error::GetLastError());
return Err(ResourceLoadingError::FailedToOpenFile);
}
@@ -166,7 +166,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(m_decoder.channels);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", m_decoder.channels);
NazaraErrorFmt("unexpected channel count: {0}", m_decoder.channels);
return Err(ResourceLoadingError::Unsupported);
}

View File

@@ -229,7 +229,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(channelCount);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", channelCount);
NazaraErrorFmt("unexpected channel count: {0}", channelCount);
return Err(ResourceLoadingError::Unsupported);
}
@@ -298,7 +298,7 @@ namespace Nz
std::unique_ptr<File> file = std::make_unique<File>();
if (!file->Open(filePath, OpenMode::ReadOnly))
{
NazaraError("failed to open stream from file: {0}", Error::GetLastError());
NazaraErrorFmt("failed to open stream from file: {0}", Error::GetLastError());
return Err(ResourceLoadingError::FailedToOpenFile);
}
@@ -351,7 +351,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(m_channelCount);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", m_channelCount);
NazaraErrorFmt("unexpected channel count: {0}", m_channelCount);
return Err(ResourceLoadingError::Unrecognized);
}

View File

@@ -103,7 +103,7 @@ namespace Nz
if (readBytes < 0)
{
NazaraError("an error occurred while reading file: {0}", VorbisErrToString(readBytes));
NazaraErrorFmt("an error occurred while reading file: {0}", VorbisErrToString(readBytes));
return 0;
}
@@ -139,7 +139,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(info->channels);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", info->channels);
NazaraErrorFmt("unexpected channel count: {0}", info->channels);
return Err(ResourceLoadingError::Unsupported);
}
@@ -217,7 +217,7 @@ namespace Nz
std::unique_ptr<File> file = std::make_unique<File>();
if (!file->Open(filePath, OpenMode::ReadOnly))
{
NazaraError("failed to open stream from file: {0}", Error::GetLastError());
NazaraErrorFmt("failed to open stream from file: {0}", Error::GetLastError());
return Err(ResourceLoadingError::FailedToOpenFile);
}
@@ -249,7 +249,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(info->channels);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", info->channels);
NazaraErrorFmt("unexpected channel count: {0}", info->channels);
return Err(ResourceLoadingError::Unsupported);
}

View File

@@ -96,7 +96,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(info.channels);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", info.channels);
NazaraErrorFmt("unexpected channel count: {0}", info.channels);
return Err(ResourceLoadingError::Unsupported);
}
@@ -163,7 +163,7 @@ namespace Nz
std::unique_ptr<File> file = std::make_unique<File>();
if (!file->Open(filePath, OpenMode::ReadOnly))
{
NazaraError("failed to open stream from file: {0}", Error::GetLastError());
NazaraErrorFmt("failed to open stream from file: {0}", Error::GetLastError());
return Err(ResourceLoadingError::FailedToOpenFile);
}
@@ -208,7 +208,7 @@ namespace Nz
std::optional<AudioFormat> formatOpt = GuessAudioFormat(m_decoder.info.channels);
if (!formatOpt)
{
NazaraError("unexpected channel count: {0}", m_decoder.info.channels);
NazaraErrorFmt("unexpected channel count: {0}", m_decoder.info.channels);
return Err(ResourceLoadingError::Unsupported);
}

View File

@@ -78,7 +78,7 @@ namespace Nz
if (ALenum lastError = m_library.alGetError(); lastError != AL_NO_ERROR)
{
NazaraError("failed to reset OpenAL buffer: {0}", std::to_string(lastError));
NazaraErrorFmt("failed to reset OpenAL buffer: {0}", std::to_string(lastError));
return false;
}

View File

@@ -147,7 +147,7 @@ namespace Nz
std::shared_ptr<SoundBuffer> buffer = SoundBuffer::LoadFromFile(filePath, params);
if (!buffer)
{
NazaraError("Failed to load buffer from file ({0})", filePath);
NazaraErrorFmt("failed to load buffer from file ({0})", filePath);
return false;
}
@@ -170,7 +170,7 @@ namespace Nz
std::shared_ptr<SoundBuffer> buffer = SoundBuffer::LoadFromMemory(data, size, params);
if (!buffer)
{
NazaraError("failed to load buffer from memory ({0})", PointerToString(data));
NazaraErrorFmt("failed to load buffer from memory ({0})", PointerToString(data));
return false;
}
@@ -192,7 +192,7 @@ namespace Nz
std::shared_ptr<SoundBuffer> buffer = SoundBuffer::LoadFromStream(stream, params);
if (!buffer)
{
NazaraError("Failed to load buffer from stream");
NazaraError("failed to load buffer from stream");
return false;
}