From d5c27a756b746fdd382d81cb59c03fe8168b4d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 30 May 2021 03:21:30 +0200 Subject: [PATCH] Audio: Fix AudioFormat names (U16 -> I16) --- include/Nazara/Audio/Algorithm.inl | 12 ++++++------ include/Nazara/Audio/Enums.hpp | 14 +++++++------- src/Nazara/Audio/Formats/drwavLoader.cpp | 20 ++++++++++---------- src/Nazara/Audio/Formats/libvorbisLoader.cpp | 20 ++++++++++---------- src/Nazara/Audio/Formats/minimp3Loader.cpp | 20 ++++++++++---------- src/Nazara/Audio/Formats/sndfileLoader.cpp | 20 ++++++++++---------- src/Nazara/Audio/OpenAL.cpp | 14 +++++++------- tests/Engine/Audio/Music.cpp | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/include/Nazara/Audio/Algorithm.inl b/include/Nazara/Audio/Algorithm.inl index 1d1932e47..858195ef6 100644 --- a/include/Nazara/Audio/Algorithm.inl +++ b/include/Nazara/Audio/Algorithm.inl @@ -26,22 +26,22 @@ namespace Nz case AudioFormat::Unknown: //< Just to make the compiler stop complaining break; - case AudioFormat::U16_Mono: + case AudioFormat::I16_Mono: return 1; - case AudioFormat::U16_Stereo: + case AudioFormat::I16_Stereo: return 2; - case AudioFormat::U16_Quad: + case AudioFormat::I16_Quad: return 4; - case AudioFormat::U16_5_1: + case AudioFormat::I16_5_1: return 6; - case AudioFormat::U16_6_1: + case AudioFormat::I16_6_1: return 7; - case AudioFormat::U16_7_1: + case AudioFormat::I16_7_1: return 8; } diff --git a/include/Nazara/Audio/Enums.hpp b/include/Nazara/Audio/Enums.hpp index 71c338de1..ce084c67a 100644 --- a/include/Nazara/Audio/Enums.hpp +++ b/include/Nazara/Audio/Enums.hpp @@ -13,14 +13,14 @@ namespace Nz { Unknown = -1, - U16_Mono, - U16_Stereo, - U16_Quad, - U16_5_1, - U16_6_1, - U16_7_1, + I16_Mono, + I16_Stereo, + I16_Quad, + I16_5_1, + I16_6_1, + I16_7_1, - Max = U16_7_1 + Max = I16_7_1 }; constexpr std::size_t AudioFormatCount = static_cast(AudioFormat::Max) + 1; diff --git a/src/Nazara/Audio/Formats/drwavLoader.cpp b/src/Nazara/Audio/Formats/drwavLoader.cpp index 5d35c5206..588023d93 100644 --- a/src/Nazara/Audio/Formats/drwavLoader.cpp +++ b/src/Nazara/Audio/Formats/drwavLoader.cpp @@ -31,22 +31,22 @@ namespace Nz switch (channelCount) { case 1: - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; case 2: - return AudioFormat::U16_Stereo; + return AudioFormat::I16_Stereo; case 4: - return AudioFormat::U16_Quad; + return AudioFormat::I16_Quad; case 6: - return AudioFormat::U16_5_1; + return AudioFormat::I16_5_1; case 7: - return AudioFormat::U16_6_1; + return AudioFormat::I16_6_1; case 8: - return AudioFormat::U16_7_1; + return AudioFormat::I16_7_1; default: return std::nullopt; @@ -120,11 +120,11 @@ namespace Nz return {}; } - if (parameters.forceMono && format != AudioFormat::U16_Mono) + if (parameters.forceMono && format != AudioFormat::I16_Mono) { MixToMono(samples.get(), samples.get(), static_cast(wav.channels), wav.totalPCMFrameCount); - format = AudioFormat::U16_Mono; + format = AudioFormat::I16_Mono; sampleCount = wav.totalPCMFrameCount; } @@ -153,7 +153,7 @@ namespace Nz AudioFormat GetFormat() const override { if (m_mixToMono) - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; else return m_format; } @@ -220,7 +220,7 @@ namespace Nz m_sampleRate = m_decoder.sampleRate; // Mixing to mono will be done on the fly - if (forceMono && m_format != AudioFormat::U16_Mono) + if (forceMono && m_format != AudioFormat::I16_Mono) { m_mixToMono = true; m_sampleCount = m_decoder.totalPCMFrameCount; diff --git a/src/Nazara/Audio/Formats/libvorbisLoader.cpp b/src/Nazara/Audio/Formats/libvorbisLoader.cpp index 7d9ca80e5..d1540bbe3 100644 --- a/src/Nazara/Audio/Formats/libvorbisLoader.cpp +++ b/src/Nazara/Audio/Formats/libvorbisLoader.cpp @@ -28,22 +28,22 @@ namespace Nz switch (channelCount) { case 1: - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; case 2: - return AudioFormat::U16_Stereo; + return AudioFormat::I16_Stereo; case 4: - return AudioFormat::U16_Quad; + return AudioFormat::I16_Quad; case 6: - return AudioFormat::U16_5_1; + return AudioFormat::I16_5_1; case 7: - return AudioFormat::U16_6_1; + return AudioFormat::I16_6_1; case 8: - return AudioFormat::U16_7_1; + return AudioFormat::I16_7_1; default: return std::nullopt; @@ -193,11 +193,11 @@ namespace Nz return {}; } - if (parameters.forceMono && format != AudioFormat::U16_Mono) + if (parameters.forceMono && format != AudioFormat::I16_Mono) { MixToMono(samples.get(), samples.get(), static_cast(info->channels), frameCount); - format = AudioFormat::U16_Mono; + format = AudioFormat::I16_Mono; sampleCount = frameCount; } @@ -226,7 +226,7 @@ namespace Nz AudioFormat GetFormat() const override { if (m_mixToMono) - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; else return m_format; } @@ -300,7 +300,7 @@ namespace Nz m_sampleRate = info->rate; // Mixing to mono will be done on the fly - if (forceMono && m_format != AudioFormat::U16_Mono) + if (forceMono && m_format != AudioFormat::I16_Mono) { m_mixToMono = true; m_sampleCount = frameCount; diff --git a/src/Nazara/Audio/Formats/minimp3Loader.cpp b/src/Nazara/Audio/Formats/minimp3Loader.cpp index 43e545d54..2d959fa03 100644 --- a/src/Nazara/Audio/Formats/minimp3Loader.cpp +++ b/src/Nazara/Audio/Formats/minimp3Loader.cpp @@ -30,22 +30,22 @@ namespace Nz switch (channelCount) { case 1: - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; case 2: - return AudioFormat::U16_Stereo; + return AudioFormat::I16_Stereo; case 4: - return AudioFormat::U16_Quad; + return AudioFormat::I16_Quad; case 6: - return AudioFormat::U16_5_1; + return AudioFormat::I16_5_1; case 7: - return AudioFormat::U16_6_1; + return AudioFormat::I16_6_1; case 8: - return AudioFormat::U16_7_1; + return AudioFormat::I16_7_1; default: return std::nullopt; @@ -135,12 +135,12 @@ namespace Nz UInt32 sampleCount = static_cast(info.samples); - if (parameters.forceMono && format != AudioFormat::U16_Mono) + if (parameters.forceMono && format != AudioFormat::I16_Mono) { UInt64 frameCount = UInt64(info.samples / info.channels); MixToMono(info.buffer, info.buffer, static_cast(info.channels), frameCount); - format = AudioFormat::U16_Mono; + format = AudioFormat::I16_Mono; sampleCount = frameCount; } @@ -169,7 +169,7 @@ namespace Nz AudioFormat GetFormat() const override { if (m_mixToMono) - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; else return m_format; } @@ -242,7 +242,7 @@ namespace Nz m_sampleRate = m_decoder.info.hz; // Mixing to mono will be done on the fly - if (forceMono && m_format != AudioFormat::U16_Mono) + if (forceMono && m_format != AudioFormat::I16_Mono) { m_mixToMono = true; m_sampleCount = static_cast(m_decoder.samples / m_decoder.info.channels); diff --git a/src/Nazara/Audio/Formats/sndfileLoader.cpp b/src/Nazara/Audio/Formats/sndfileLoader.cpp index 38c2b4c67..0cae34606 100644 --- a/src/Nazara/Audio/Formats/sndfileLoader.cpp +++ b/src/Nazara/Audio/Formats/sndfileLoader.cpp @@ -32,22 +32,22 @@ namespace Nz switch (channelCount) { case 1: - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; case 2: - return AudioFormat::U16_Stereo; + return AudioFormat::I16_Stereo; case 4: - return AudioFormat::U16_Quad; + return AudioFormat::I16_Quad; case 6: - return AudioFormat::U16_5_1; + return AudioFormat::I16_5_1; case 7: - return AudioFormat::U16_6_1; + return AudioFormat::I16_6_1; case 8: - return AudioFormat::U16_7_1; + return AudioFormat::I16_7_1; default: return std::nullopt; @@ -121,7 +121,7 @@ namespace Nz { // Nous avons besoin du nombre de canaux d'origine pour convertir en mono, nous trichons donc un peu... if (m_mixToMono) - return AudioFormat::U16_Mono; + return AudioFormat::I16_Mono; else return m_format; } @@ -201,7 +201,7 @@ namespace Nz sf_command(m_handle, SFC_SET_SCALE_FLOAT_INT_READ, nullptr, SF_TRUE); // On mixera en mono lors de la lecture - if (forceMono && m_format != AudioFormat::U16_Mono) + if (forceMono && m_format != AudioFormat::I16_Mono) { m_mixToMono = true; m_sampleCount = static_cast(info.frames); @@ -377,11 +377,11 @@ namespace Nz } // Convert to mono if required - if (parameters.forceMono && format != AudioFormat::U16_Mono) + if (parameters.forceMono && format != AudioFormat::I16_Mono) { MixToMono(samples.get(), samples.get(), static_cast(info.channels), static_cast(info.frames)); - format = AudioFormat::U16_Mono; + format = AudioFormat::I16_Mono; sampleCount = static_cast(info.frames); } diff --git a/src/Nazara/Audio/OpenAL.cpp b/src/Nazara/Audio/OpenAL.cpp index 5e579634f..1a41a18f8 100644 --- a/src/Nazara/Audio/OpenAL.cpp +++ b/src/Nazara/Audio/OpenAL.cpp @@ -440,19 +440,19 @@ namespace Nz } // We complete the formats table - AudioFormat[UnderlyingCast(AudioFormat::U16_Mono)] = AL_FORMAT_MONO16; - AudioFormat[UnderlyingCast(AudioFormat::U16_Stereo)] = AL_FORMAT_STEREO16; + AudioFormat[UnderlyingCast(AudioFormat::I16_Mono)] = AL_FORMAT_MONO16; + AudioFormat[UnderlyingCast(AudioFormat::I16_Stereo)] = AL_FORMAT_STEREO16; // "The presence of an enum value does not guarantee the applicability of an extension to the current context." if (alIsExtensionPresent("AL_EXT_MCFORMATS")) { - AudioFormat[UnderlyingCast(AudioFormat::U16_Quad)] = alGetEnumValue("AL_FORMAT_QUAD16"); - AudioFormat[UnderlyingCast(AudioFormat::U16_5_1)] = alGetEnumValue("AL_FORMAT_51CHN16"); - AudioFormat[UnderlyingCast(AudioFormat::U16_6_1)] = alGetEnumValue("AL_FORMAT_61CHN16"); - AudioFormat[UnderlyingCast(AudioFormat::U16_7_1)] = alGetEnumValue("AL_FORMAT_71CHN16"); + AudioFormat[UnderlyingCast(AudioFormat::I16_Quad)] = alGetEnumValue("AL_FORMAT_QUAD16"); + AudioFormat[UnderlyingCast(AudioFormat::I16_5_1)] = alGetEnumValue("AL_FORMAT_51CHN16"); + AudioFormat[UnderlyingCast(AudioFormat::I16_6_1)] = alGetEnumValue("AL_FORMAT_61CHN16"); + AudioFormat[UnderlyingCast(AudioFormat::I16_7_1)] = alGetEnumValue("AL_FORMAT_71CHN16"); } else if (alIsExtensionPresent("AL_LOKI_quadriphonic")) - AudioFormat[UnderlyingCast(AudioFormat::U16_Quad)] = alGetEnumValue("AL_FORMAT_QUAD16_LOKI"); + AudioFormat[UnderlyingCast(AudioFormat::I16_Quad)] = alGetEnumValue("AL_FORMAT_QUAD16_LOKI"); return true; } diff --git a/tests/Engine/Audio/Music.cpp b/tests/Engine/Audio/Music.cpp index 9df9f2989..a67d6d441 100644 --- a/tests/Engine/Audio/Music.cpp +++ b/tests/Engine/Audio/Music.cpp @@ -20,7 +20,7 @@ SCENARIO("Music", "[AUDIO][MUSIC]") { CHECK(music.GetDuration() <= 64000); // 1 min 03 = 63s = 63000ms CHECK(music.GetDuration() >= 63000); - CHECK(music.GetFormat() == Nz::AudioFormat::U16_Stereo); + CHECK(music.GetFormat() == Nz::AudioFormat::I16_Stereo); CHECK(music.GetPlayingOffset() == 0); CHECK(music.GetSampleCount() <= 5644800); // 64s * 44100 Hz * 2 (stereo) CHECK(music.GetSampleCount() >= 5556600); // 63s * 44100 Hz * 2 (stereo)