Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replacing insufficient VST3 SDK conversion with proper version. #312

Merged
merged 6 commits into from
Sep 26, 2024
Merged

replacing insufficient VST3 SDK conversion with proper version. #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16f1a8e
converting utf8 to utf16 correctly
Sep 25, 2024
ea80469
removing unused variables
Sep 25, 2024
26b5618
formatting
Sep 25, 2024
0a057dc
prevent overflow
Sep 25, 2024
3de9651
converting param values and bus names from utf8 instead of ASCII, too
Sep 26, 2024
cea8b13
do the formatting dance
Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/detail/vst3/parameter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@ Vst3Parameter* Vst3Parameter::create(
}
}

str8ToStr16(v.title, fullname.c_str(), str16BufferSize(v.title));
// str8ToStr16(v.title, fullname.c_str(), str16BufferSize(v.title));
utf8_to_utf16l(fullname.c_str(), (uint16_t*)(v.title), str16BufferSize(v.title));
// TODO: string shrink algorithm shortening the string a bit
str8ToStr16(v.shortTitle, info->name, str16BufferSize(v.shortTitle));
// str8ToStr16(v.shortTitle, info->name, str16BufferSize(v.shortTitle));
utf8_to_utf16l(info->name, (uint16_t*)v.shortTitle, str16BufferSize(v.shortTitle));
v.units[0] = 0; // unfortunately, CLAP has no unit for parameter values
v.unitId = unit;

Expand Down Expand Up @@ -153,9 +155,13 @@ Vst3Parameter* Vst3Parameter::create(uint8_t bus, uint8_t channel, uint8_t cc, V
{
fullname = "controller";
}
str8ToStr16(v.title, fullname.c_str(), str16BufferSize(v.title));

utf8_to_utf16l(fullname.c_str(), (uint16_t*)(v.title), str16BufferSize(v.title));
utf8_to_utf16l(name, (uint16_t*)v.shortTitle, str16BufferSize(v.shortTitle));

// str8ToStr16(v.title, fullname.c_str(), str16BufferSize(v.title));
// TODO: string shrink algorithm shortening the string a bit
str8ToStr16(v.shortTitle, name, str16BufferSize(v.shortTitle));
// str8ToStr16(v.shortTitle, name, str16BufferSize(v.shortTitle));

v.units[0] = 0; // nothing in the "unit" field
// the unit will not be set here, but outside
Expand Down
2 changes: 2 additions & 0 deletions src/detail/vst3/parameter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <functional>
#include <cmath>

void utf8_to_utf16l(const char* utf8string, uint16_t* target, size_t targetsize);

class Vst3Parameter : public Steinberg::Vst::Parameter
{
using super = Steinberg::Vst::Parameter;
Expand Down
95 changes: 89 additions & 6 deletions src/wrapasvst3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,82 @@ struct ClapHostExtensions
};
#endif

void utf8_to_utf16l(const char* utf8string, uint16_t* target, size_t targetsize)
{
uint32_t codepoint = 0;
size_t targetpos = 0;

auto src = reinterpret_cast<const uint8_t*>(utf8string);
size_t pos = 0;
while (src[pos] && (targetpos < (targetsize - 2)))
{
auto byte = src[pos];

if ((byte & 0b10000000) == 0b00000000)
{
codepoint = byte;
pos += 1;
}
else
{
if (((byte & 0b11100000) == 0b11000000) && src[1])
{
codepoint = byte & 0b00011111;
codepoint = (codepoint << 6) | ((src[pos + 1]) & 0b00111111);
pos += 2;
}
else if (((byte & 0b11110000) == 0b11100000) && src[1] && src[2])
{
codepoint = byte & 0b00001111;
codepoint = (codepoint << 6) | ((src[pos + 1] & 0b00111111));
codepoint = (codepoint << 6) | ((src[pos + 2] & 0b00111111));
pos += 3;
}
else if (((byte & 0b11111000) == 0b11110000) && src[1] && src[2] && src[3])
{
codepoint = byte & 0b00000111;
codepoint = (codepoint << 6) | ((src[pos + 1] & 0b00111111));
codepoint = (codepoint << 6) | ((src[pos + 2] & 0b00111111));
codepoint = (codepoint << 6) | ((src[pos + 3] & 0b00111111));
pos += 4;
}
else
{
return;
}
}
{
if (codepoint >= 0xD800 && codepoint <= 0xDFFF)
{
target[targetpos] = 0;
return;
// throw conversion_error("illegal UTF-32 codepoint (surrogat area)");
}
if (codepoint <= 0xFFFF)
{
target[targetpos++] = codepoint;
}
else
{
if (codepoint <= 0x10FFFF && (targetpos < (targetsize - 3)))
{
codepoint -= 0x10000;
uint16_t highsurr = static_cast<uint16_t>((codepoint >> 10) + 0xD800);
uint16_t lowsurr = static_cast<uint16_t>((codepoint & 0x3FF) + 0xDC00);
target[targetpos++] = highsurr;
target[targetpos++] = lowsurr;
}
else
{
target[targetpos] = 0;
return;
}
}
}
}
target[targetpos] = 0;
}

tresult PLUGIN_API ClapAsVst3::initialize(FUnknown* context)
{
auto result = super::initialize(context);
Expand Down Expand Up @@ -309,6 +385,8 @@ tresult PLUGIN_API ClapAsVst3::getParamStringByValue(Vst::ParamID id, Vst::Param
if (param->isMidi)
{
auto r = std::to_string((int)val);

// usually we try to avoid UString assignment, but here it is okay.
UString wrapper(&string[0], str16BufferSize(Steinberg::Vst::String128));

wrapper.assign(r.c_str(), (Steinberg::int32)(r.size() + 1));
Expand All @@ -321,9 +399,8 @@ tresult PLUGIN_API ClapAsVst3::getParamStringByValue(Vst::ParamID id, Vst::Param

if (this->_plugin->_ext._params->value_to_text(_plugin->_plugin, param->id, val, outbuf, 127))
{
UString wrapper(&string[0], str16BufferSize(Steinberg::Vst::String128));
utf8_to_utf16l(outbuf, (uint16_t*)&string[0], str16BufferSize(Steinberg::Vst::String128));

wrapper.assign(outbuf, sizeof(outbuf));
return kResultOk;
}
return super::getParamStringByValue(id, valueNormalized, string);
Expand All @@ -337,6 +414,10 @@ tresult PLUGIN_API ClapAsVst3::getParamValueByString(Vst::ParamID id, Vst::TChar
char inbuf[128];
m.copyTo8(inbuf, 0, 128);
double out = 0.;
if (param->isMidi)
{
return Steinberg::kResultFalse;
}
if (this->_plugin->_ext._params->text_to_value(_plugin->_plugin, param->id, inbuf, &out))
{
valueNormalized = param->asVst3Value(out);
Expand Down Expand Up @@ -545,7 +626,9 @@ void ClapAsVst3::addAudioBusFrom(const clap_audio_port_info_t* info, bool is_inp
// bool supports64bit = (info->flags & CLAP_AUDIO_PORT_SUPPORTS_64BITS);
Steinberg::char16 name16[256];
// str8tostr16 writes to position n to terminate, so don't overflow
Steinberg::str8ToStr16(&name16[0], info->name, 255);

// Steinberg::str8ToStr16(&name16[0], info->name, 255);
utf8_to_utf16l(info->name, (uint16_t*)name16, 255);
if (is_input)
{
addAudioInput(name16, spk, bustype, Vst::BusInfo::kDefaultActive);
Expand All @@ -569,7 +652,8 @@ void ClapAsVst3::addMIDIBusFrom(const clap_note_port_info_t* info, uint32_t inde

Steinberg::char16 name16[256];
// str8tostr16 writes to position n to terminate, so don't overflow
Steinberg::str8ToStr16(&name16[0], info->name, 255);
// Steinberg::str8ToStr16(&name16[0], info->name, 255);
utf8_to_utf16l(info->name, (uint16_t*)name16, 255);
if (is_input)
{
addEventInput(name16, numchannels, Vst::BusTypes::kMain, Vst::BusInfo::kDefaultActive);
Expand Down Expand Up @@ -1503,8 +1587,7 @@ tresult ClapAsVst3::getBusInfo(Vst::MediaType type, Vst::BusDirection dir, int32
bus.busType = (info.flags & CLAP_AUDIO_PORT_IS_MAIN) ? Vst::kMain : Vst::kAux;
bus.flags = Vst::BusInfo::kDefaultActive;

UString wrapper(&bus.name[0], str16BufferSize(Steinberg::Vst::String128));
wrapper.assign(info.name, (Steinberg::int32)CLAP_NAME_SIZE);
utf8_to_utf16l(info.name, (uint16_t*)&bus.name[0], str16BufferSize(Steinberg::Vst::String128));

return kResultOk;
}
Expand Down
Loading