Browse Source

Make backend LV2 URIDs into an enum

tags/1.9.8
falkTX 8 years ago
parent
commit
479094fa5d
2 changed files with 268 additions and 271 deletions
  1. +265
    -261
      source/backend/plugin/CarlaPluginLV2.cpp
  2. +3
    -10
      source/bridges-ui/CarlaBridgeUI-LV2.cpp

+ 265
- 261
source/backend/plugin/CarlaPluginLV2.cpp
File diff suppressed because it is too large
View File


+ 3
- 10
source/bridges-ui/CarlaBridgeUI-LV2.cpp View File

@@ -34,7 +34,7 @@ CARLA_BRIDGE_START_NAMESPACE

// -----------------------------------------------------

static double gSampleRate = 44100.0;
static double gInitialSampleRate = 44100.0;

// LV2 URI Map Ids
const uint32_t CARLA_URI_MAP_ID_NULL = 0;
@@ -128,7 +128,7 @@ struct Lv2PluginOptions {
LV2_Options_Option opts[Count];

Lv2PluginOptions() noexcept
: sampleRate(0.0),
: sampleRate(gInitialSampleRate),
transientWinId(0),
windowTitle(nullptr)
{
@@ -187,11 +187,6 @@ public:

carla_zeroPointers(fFeatures, kFeatureCount+1);

// ---------------------------------------------------------------
// initialize options

fLv2Options.sampleRate = gSampleRate;

// ---------------------------------------------------------------
// initialize features (part 1)

@@ -576,8 +571,6 @@ public:

delete[] fLv2Options.windowTitle;

gSampleRate = sampleRate;

fLv2Options.sampleRate = sampleRate;
fLv2Options.transientWinId = static_cast<int64_t>(transientWindowId);
fLv2Options.windowTitle = carla_strdup_safe(windowTitle);
@@ -1160,7 +1153,7 @@ int main(int argc, const char* argv[])

// try to get sampleRate value
if (const char* const sampleRateStr = std::getenv("CARLA_SAMPLE_RATE"))
gSampleRate = std::atof(sampleRateStr);
gInitialSampleRate = std::atof(sampleRateStr);

// Init LV2 client
CarlaLv2Client client;


Loading…
Cancel
Save