From c9124bfa9c757f5596a91aba6c91e9b362a73a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Sat, 6 Jul 2024 13:53:37 -0400 Subject: [PATCH] [ci] Fix windows u16 issue --- cmake/avendish.dependencies.cmake | 2 +- include/avnd/binding/vst3/bus_info.hpp | 28 +++++++++++++------------- include/avnd/binding/vst3/helpers.hpp | 4 ++-- include/avnd/binding/vst3/programs.hpp | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmake/avendish.dependencies.cmake b/cmake/avendish.dependencies.cmake index 0ee124f3..7d526077 100644 --- a/cmake/avendish.dependencies.cmake +++ b/cmake/avendish.dependencies.cmake @@ -3,7 +3,7 @@ if(NOT TARGET fmt::fmt) FetchContent_Declare( fmt GIT_REPOSITORY "https://github.com/fmtlib/fmt" - GIT_TAG 10.1.1 + GIT_TAG 11.0.1 GIT_PROGRESS true ) FetchContent_MakeAvailable(fmt) diff --git a/include/avnd/binding/vst3/bus_info.hpp b/include/avnd/binding/vst3/bus_info.hpp index dbe64abc..a0df470c 100644 --- a/include/avnd/binding/vst3/bus_info.hpp +++ b/include/avnd/binding/vst3/bus_info.hpp @@ -36,7 +36,7 @@ struct event_bus_info info.mediaType = MediaTypes::kEvent; info.direction = BusDirections::kInput; info.channelCount = 1; - setStr(info.name, u16 "Event in"); + setStr(info.name, u16_str "Event in"); info.busType = BusTypes::kMain; info.flags = BusInfo::kDefaultActive; @@ -60,7 +60,7 @@ struct event_bus_info info.mediaType = MediaTypes::kEvent; info.direction = BusDirections::kOutput; info.channelCount = 1; - setStr(info.name, u16 "Event Out"); + setStr(info.name, u16_str "Event Out"); info.busType = BusTypes::kMain; info.flags = BusInfo::kDefaultActive; @@ -235,7 +235,7 @@ struct audio_bus_info if(index == 0) { info.channelCount = avnd::input_channels(2); - setStr(info.name, u16 "Stereo In"); + setStr(info.name, u16_str "Stereo In"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -250,7 +250,7 @@ struct audio_bus_info if(index == 0) { info.channelCount = avnd::output_channels(2); - setStr(info.name, u16 "Stereo Out"); + setStr(info.name, u16_str "Stereo Out"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -339,7 +339,7 @@ struct audio_bus_info if(index == 0) { info.channelCount = avnd::input_channels(2); - setStr(info.name, u16 "Mono In"); + setStr(info.name, u16_str "Mono In"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -354,7 +354,7 @@ struct audio_bus_info if(index == 0) { info.channelCount = avnd::output_channels(2); - setStr(info.name, u16 "Mono Out"); + setStr(info.name, u16_str "Mono Out"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -443,7 +443,7 @@ struct audio_bus_info if(index == 0) { info.channelCount = avnd::input_channels(2); - setStr(info.name, u16 "Mono In"); + setStr(info.name, u16_str "Mono In"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -458,7 +458,7 @@ struct audio_bus_info if(index == 0) { info.channelCount = avnd::output_channels(2); - setStr(info.name, u16 "Mono Out"); + setStr(info.name, u16_str "Mono Out"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -549,7 +549,7 @@ struct audio_bus_info if(index < input_refl::size) { info.channelCount = 2; - setStr(info.name, u16 "Stereo In"); + setStr(info.name, u16_str "Stereo In"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -564,7 +564,7 @@ struct audio_bus_info if(index < output_refl::size) { info.channelCount = 2; - setStr(info.name, u16 "Stereo Out"); + setStr(info.name, u16_str "Stereo Out"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -661,7 +661,7 @@ struct audio_bus_info if(index < inputCount()) { info.channelCount = 1; - setStr(info.name, u16 "Main In"); + setStr(info.name, u16_str "Main In"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -676,7 +676,7 @@ struct audio_bus_info if(index < outputCount()) { info.channelCount = 1; - setStr(info.name, u16 "Main Out"); + setStr(info.name, u16_str "Main Out"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -764,7 +764,7 @@ struct audio_bus_info if(index < inputCount()) { info.channelCount = 1; - setStr(info.name, u16 "Main In"); + setStr(info.name, u16_str "Main In"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; @@ -779,7 +779,7 @@ struct audio_bus_info if(index < outputCount()) { info.channelCount = 1; - setStr(info.name, u16 "Main Out"); + setStr(info.name, u16_str "Main Out"); info.busType = Steinberg::Vst::BusTypes::kMain; return Steinberg::kResultTrue; diff --git a/include/avnd/binding/vst3/helpers.hpp b/include/avnd/binding/vst3/helpers.hpp index f6a4fa34..16fbbded 100644 --- a/include/avnd/binding/vst3/helpers.hpp +++ b/include/avnd/binding/vst3/helpers.hpp @@ -16,7 +16,7 @@ namespace stv3 { #if defined(_WIN32) -#define u16 L"" +#define u16_str L"" template auto setStr(TChar (&field)[M], std::wstring_view text) { @@ -24,7 +24,7 @@ auto setStr(TChar (&field)[M], std::wstring_view text) field[text.size()] = 0; } #else -#define u16 u"" +#define u16_str u"" template auto setStr(TChar (&field)[M], std::u16string_view text) { diff --git a/include/avnd/binding/vst3/programs.hpp b/include/avnd/binding/vst3/programs.hpp index ca66c20b..55753027 100644 --- a/include/avnd/binding/vst3/programs.hpp +++ b/include/avnd/binding/vst3/programs.hpp @@ -19,7 +19,7 @@ class UnitInfo : public Steinberg::Vst::IUnitInfo { info.id = 1; info.parentUnitId = Steinberg::Vst::kRootUnitId; - setStr(info.name, u16 "Unit1"); + setStr(info.name, u16_str "Unit1"); info.programListId = Steinberg::Vst::kNoProgramListId; return Steinberg::kResultTrue; }