Browse Source

Use full parameter names in NSM

tags/1.9.6
falkTX 10 years ago
parent
commit
93aa5894f3
2 changed files with 16 additions and 8 deletions
  1. +2
    -2
      source/backend/CarlaStandaloneNSM.cpp
  2. +14
    -6
      source/utils/CarlaString.hpp

+ 2
- 2
source/backend/CarlaStandaloneNSM.cpp View File

@@ -419,7 +419,7 @@ protected:
const CarlaPluginInfo* const pluginInfo(carla_get_plugin_info(i)); const CarlaPluginInfo* const pluginInfo(carla_get_plugin_info(i));
CARLA_SAFE_ASSERT_CONTINUE(pluginInfo != nullptr); CARLA_SAFE_ASSERT_CONTINUE(pluginInfo != nullptr);


/*const*/ CarlaString pluginNameId(fClientNameId + "/" + CarlaString(pluginInfo->name).toBasic() + "/");
/*const*/ CarlaString pluginNameId(fClientNameId + "/" + CarlaString(pluginInfo->name).replace('/','_') + "/");


for (uint32_t j=0, paramCount = carla_get_parameter_count(i); j < paramCount; ++j) for (uint32_t j=0, paramCount = carla_get_parameter_count(i); j < paramCount; ++j)
{ {
@@ -442,7 +442,7 @@ protected:
continue; continue;


const char* const dir = paramData->type == CB::PARAMETER_INPUT ? "in" : "out"; const char* const dir = paramData->type == CB::PARAMETER_INPUT ? "in" : "out";
const CarlaString paramNameId = pluginNameId + CarlaString(paramInfo->name).toBasic();
const CarlaString paramNameId = pluginNameId + CarlaString(paramInfo->name).replace('/','_');


const float defNorm = paramRanges->getNormalizedValue(paramRanges->def); const float defNorm = paramRanges->getNormalizedValue(paramRanges->def);




+ 14
- 6
source/utils/CarlaString.hpp View File

@@ -472,29 +472,33 @@ public:
/* /*
* Replace all occurrences of character 'before' with character 'after'. * Replace all occurrences of character 'before' with character 'after'.
*/ */
void replace(const char before, const char after) noexcept
CarlaString& replace(const char before, const char after) noexcept
{ {
CARLA_SAFE_ASSERT_RETURN(before != '\0' && after != '\0',);
CARLA_SAFE_ASSERT_RETURN(before != '\0' && after != '\0', *this);


for (std::size_t i=0; i < fBufferLen; ++i) for (std::size_t i=0; i < fBufferLen; ++i)
{ {
if (fBuffer[i] == before) if (fBuffer[i] == before)
fBuffer[i] = after; fBuffer[i] = after;
} }

return *this;
} }


/* /*
* Truncate the string to size 'n'. * Truncate the string to size 'n'.
*/ */
void truncate(const std::size_t n) noexcept
CarlaString& truncate(const std::size_t n) noexcept
{ {
if (n >= fBufferLen) if (n >= fBufferLen)
return;
return *this;


for (std::size_t i=n; i < fBufferLen; ++i) for (std::size_t i=n; i < fBufferLen; ++i)
fBuffer[i] = '\0'; fBuffer[i] = '\0';


fBufferLen = n; fBufferLen = n;

return *this;
} }


/* /*
@@ -522,7 +526,7 @@ public:
/* /*
* Convert to all ascii characters to lowercase. * Convert to all ascii characters to lowercase.
*/ */
void toLower() noexcept
CarlaString& toLower() noexcept
{ {
static const char kCharDiff('a' - 'A'); static const char kCharDiff('a' - 'A');


@@ -531,12 +535,14 @@ public:
if (fBuffer[i] >= 'A' && fBuffer[i] <= 'Z') if (fBuffer[i] >= 'A' && fBuffer[i] <= 'Z')
fBuffer[i] = static_cast<char>(fBuffer[i] + kCharDiff); fBuffer[i] = static_cast<char>(fBuffer[i] + kCharDiff);
} }

return *this;
} }


/* /*
* Convert to all ascii characters to uppercase. * Convert to all ascii characters to uppercase.
*/ */
void toUpper() noexcept
CarlaString& toUpper() noexcept
{ {
static const char kCharDiff('a' - 'A'); static const char kCharDiff('a' - 'A');


@@ -545,6 +551,8 @@ public:
if (fBuffer[i] >= 'a' && fBuffer[i] <= 'z') if (fBuffer[i] >= 'a' && fBuffer[i] <= 'z')
fBuffer[i] = static_cast<char>(fBuffer[i] - kCharDiff); fBuffer[i] = static_cast<char>(fBuffer[i] - kCharDiff);
} }

return *this;
} }


/* /*


Loading…
Cancel
Save