Browse Source

Carla: Don't set peaks on the plugin-side if under rack mode

tags/v0.9.0
falkTX 13 years ago
parent
commit
8ea102b964
8 changed files with 76 additions and 22 deletions
  1. +0
    -1
      c++/carla-backend/carla_engine_jack.cpp
  2. +12
    -3
      c++/carla-backend/carla_native.cpp
  3. +12
    -3
      c++/carla-backend/dssi.cpp
  4. +8
    -3
      c++/carla-backend/fluidsynth.cpp
  5. +12
    -3
      c++/carla-backend/ladspa.cpp
  6. +8
    -3
      c++/carla-backend/linuxsampler.cpp
  7. +12
    -3
      c++/carla-backend/lv2.cpp
  8. +12
    -3
      c++/carla-backend/vst.cpp

+ 0
- 1
c++/carla-backend/carla_engine_jack.cpp View File

@@ -285,7 +285,6 @@ protected:
processPluginNOT(plugin, nframes); processPluginNOT(plugin, nframes);


plugin->engineProcessUnlock(); plugin->engineProcessUnlock();

} }
} }
else if (carlaOptions.processMode == PROCESS_MODE_CONTINUOUS_RACK) else if (carlaOptions.processMode == PROCESS_MODE_CONTINUOUS_RACK)


+ 12
- 3
c++/carla-backend/carla_native.cpp View File

@@ -885,7 +885,11 @@ public:
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
// Input VU // Input VU


#ifndef BUILD_BRIDGE
if (aIn.count > 0 && carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#else
if (aIn.count > 0) if (aIn.count > 0)
#endif
{ {
if (aIn.count == 1) if (aIn.count == 1)
{ {
@@ -1334,10 +1338,15 @@ public:
} }


// Output VU // Output VU
for (k=0; i < 2 && k < frames; k++)
#ifndef BUILD_BRIDGE
if (carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#endif
{ {
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
for (k=0; i < 2 && k < frames; k++)
{
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
}
} }
} }
} }


+ 12
- 3
c++/carla-backend/dssi.cpp View File

@@ -864,7 +864,11 @@ public:
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
// Input VU // Input VU


#ifndef BUILD_BRIDGE
if (aIn.count > 0 && carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#else
if (aIn.count > 0) if (aIn.count > 0)
#endif
{ {
if (aIn.count == 1) if (aIn.count == 1)
{ {
@@ -1351,10 +1355,15 @@ public:
} }


// Output VU // Output VU
for (k=0; i < 2 && k < frames; k++)
#ifndef BUILD_BRIDGE
if (carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#endif
{ {
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
for (k=0; i < 2 && k < frames; k++)
{
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
}
} }
} }




+ 8
- 3
c++/carla-backend/fluidsynth.cpp View File

@@ -1182,10 +1182,15 @@ public:
fluid_synth_set_gain(f_synth, x_volume); fluid_synth_set_gain(f_synth, x_volume);


// Output VU // Output VU
for (k=0; i < 2 && k < frames; k++)
#ifndef BUILD_BRIDGE
if (carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#endif
{ {
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
for (k=0; i < 2 && k < frames; k++)
{
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
}
} }
} }
} }


+ 12
- 3
c++/carla-backend/ladspa.cpp View File

@@ -734,7 +734,11 @@ public:
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
// Input VU // Input VU


#ifndef BUILD_BRIDGE
if (aIn.count > 0 && carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#else
if (aIn.count > 0) if (aIn.count > 0)
#endif
{ {
if (aIn.count == 1) if (aIn.count == 1)
{ {
@@ -1027,10 +1031,15 @@ public:
} }


// Output VU // Output VU
for (k=0; i < 2 && k < frames; k++)
#ifndef BUILD_BRIDGE
if (carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#endif
{ {
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
for (k=0; i < 2 && k < frames; k++)
{
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
}
} }
} }




+ 8
- 3
c++/carla-backend/linuxsampler.cpp View File

@@ -646,10 +646,15 @@ public:
} }


// Output VU // Output VU
for (k=0; i < 2 && k < frames; k++)
#ifndef BUILD_BRIDGE
if (carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#endif
{ {
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
for (k=0; i < 2 && k < frames; k++)
{
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
}
} }
} }
} }


+ 12
- 3
c++/carla-backend/lv2.cpp View File

@@ -1993,7 +1993,11 @@ public:
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
// Input VU // Input VU


#ifndef BUILD_BRIDGE
if (aIn.count > 0 && carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#else
if (aIn.count > 0) if (aIn.count > 0)
#endif
{ {
if (aIn.count == 1) if (aIn.count == 1)
{ {
@@ -2667,10 +2671,15 @@ public:
} }


// Output VU // Output VU
for (k=0; i < 2 && k < frames; k++)
#ifndef BUILD_BRIDGE
if (carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#endif
{ {
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
for (k=0; i < 2 && k < frames; k++)
{
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
}
} }
} }




+ 12
- 3
c++/carla-backend/vst.cpp View File

@@ -873,7 +873,11 @@ public:
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
// Input VU // Input VU


#ifndef BUILD_BRIDGE
if (aIn.count > 0 && carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#else
if (aIn.count > 0) if (aIn.count > 0)
#endif
{ {
if (aIn.count == 1) if (aIn.count == 1)
{ {
@@ -1317,10 +1321,15 @@ public:
} }


// Output VU // Output VU
for (k=0; i < 2 && k < frames; k++)
#ifndef BUILD_BRIDGE
if (carlaOptions.processMode != PROCESS_MODE_CONTINUOUS_RACK)
#endif
{ {
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
for (k=0; i < 2 && k < frames; k++)
{
if (abs(outBuffer[i][k]) > aOutsPeak[i])
aOutsPeak[i] = abs(outBuffer[i][k]);
}
} }
} }




Loading…
Cancel
Save