Browse Source

Better name; build fix

tags/1.9.4
falkTX 11 years ago
parent
commit
65161ec86d
3 changed files with 8 additions and 8 deletions
  1. +3
    -3
      source/backend/plugin/BridgePlugin.cpp
  2. +3
    -3
      source/utils/CarlaRingBuffer.hpp
  3. +2
    -2
      source/utils/Lv2AtomQueue.hpp

+ 3
- 3
source/backend/plugin/BridgePlugin.cpp View File

@@ -58,7 +58,7 @@ CARLA_BACKEND_START_NAMESPACE

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

shm_t shm_mkstemp(char* const fileBase)
static shm_t shm_mkstemp(char* const fileBase)
{
static const char charSet[] = "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -151,13 +151,13 @@ struct BridgeAudioPool {
}
};

struct BridgeControl : public RingBufferControlTemplate<StackRingBuffer> {
struct BridgeControl : public RingBufferControl<StackRingBuffer> {
CarlaString filename;
BridgeShmControl* data;
shm_t shm;

BridgeControl()
: RingBufferControlTemplate(nullptr),
: RingBufferControl(nullptr),
data(nullptr)
{
carla_shm_init(shm);


+ 3
- 3
source/utils/CarlaRingBuffer.hpp View File

@@ -55,10 +55,10 @@ struct StackRingBuffer {
// RingBufferControl templated class

template <class RingBufferStruct>
class RingBufferControlTemplate
class RingBufferControl
{
public:
RingBufferControlTemplate(RingBufferStruct* const ringBuf) noexcept
RingBufferControl(RingBufferStruct* const ringBuf) noexcept
: fRingBuf(ringBuf)
{
if (ringBuf != nullptr)
@@ -261,7 +261,7 @@ private:
RingBufferStruct* fRingBuf;

CARLA_PREVENT_HEAP_ALLOCATION
CARLA_DECLARE_NON_COPY_CLASS(RingBufferControlTemplate)
CARLA_DECLARE_NON_COPY_CLASS(RingBufferControl)
};

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


+ 2
- 2
source/utils/Lv2AtomQueue.hpp View File

@@ -25,11 +25,11 @@

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

class Lv2AtomRingBufferControl : public RingBufferControlTemplate<HeapRingBuffer>
class Lv2AtomRingBufferControl : public RingBufferControl<HeapRingBuffer>
{
public:
Lv2AtomRingBufferControl()
: RingBufferControlTemplate(nullptr),
: RingBufferControl(nullptr),
fIsDummy(false)
{
fBuffer.size = 0;


Loading…
Cancel
Save