Browse Source

Don't use water namespace in CarlaDssiUtils.cpp

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
cac84277cc
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 9 additions and 10 deletions
  1. +9
    -10
      source/utils/CarlaDssiUtils.cpp

+ 9
- 10
source/utils/CarlaDssiUtils.cpp View File

@@ -28,13 +28,11 @@ const char* find_dssi_ui(const char* const filename, const char* const label) no
carla_debug("find_dssi_ui(\"%s\", \"%s\")", filename, label); carla_debug("find_dssi_ui(\"%s\", \"%s\")", filename, label);


try { try {
using namespace water;
water::String guiFilename;
water::String pluginDir(water::String(filename).upToLastOccurrenceOf(".", false, false));


String guiFilename;
String pluginDir(String(filename).upToLastOccurrenceOf(".", false, false));

String checkLabel(label);
String checkSName(File(pluginDir).getFileName());
water::String checkLabel(label);
water::String checkSName(water::File(pluginDir).getFileName());


if (checkSName.endsWithIgnoreCase("dssi")) if (checkSName.endsWithIgnoreCase("dssi"))
{ {
@@ -47,12 +45,13 @@ const char* find_dssi_ui(const char* const filename, const char* const label) no
if (! checkLabel.endsWithChar('_')) checkLabel += "_"; if (! checkLabel.endsWithChar('_')) checkLabel += "_";
if (! checkSName.endsWithChar('_')) checkSName += "_"; if (! checkSName.endsWithChar('_')) checkSName += "_";


Array<File> results;
water::Array<water::File> results;


for (int i=File(pluginDir).findChildFiles(results, File::findFiles|File::ignoreHiddenFiles, false); --i >= 0;)
for (int i=water::File(pluginDir).findChildFiles(results,
water::File::findFiles|water::File::ignoreHiddenFiles, false); --i >= 0;)
{ {
const File& gui(results[i]);
const String& guiShortName(gui.getFileName());
const water::File& gui(results[i]);
const water::String& guiShortName(gui.getFileName());


if (guiShortName.startsWith(checkLabel) || guiShortName.startsWith(checkSName)) if (guiShortName.startsWith(checkLabel) || guiShortName.startsWith(checkSName))
{ {


Loading…
Cancel
Save