[ci] Fix windows u16 issue

celtera · Jul 6, 2024 · c9124bf · c9124bf
1 parent 10243f4
commit c9124bf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -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<T>
     if(index == 0)
     {
       info.channelCount = avnd::input_channels<T>(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<T>
     if(index == 0)
     {
       info.channelCount = avnd::output_channels<T>(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<T>
     if(index == 0)
     {
       info.channelCount = avnd::input_channels<T>(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<T>
     if(index == 0)
     {
       info.channelCount = avnd::output_channels<T>(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<T>
     if(index == 0)
     {
       info.channelCount = avnd::input_channels<T>(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<T>
     if(index == 0)
     {
       info.channelCount = avnd::output_channels<T>(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<T>
     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<T>
     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<T>
     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<T>
     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<T>
     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<T>
     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
@@ -16,15 +16,15 @@
 namespace stv3
 {
 #if defined(_WIN32)
-#define u16 L""
+#define u16_str L""
 template <std::size_t M>
 auto setStr(TChar (&field)[M], std::wstring_view text)
 {
   std::copy_n(text.data(), text.size(), field);
   field[text.size()] = 0;
 }
 #else
-#define u16 u""
+#define u16_str u""
 template <std::size_t M>
 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
@@ -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;
   }