Browse Source

Misc

tags/1.9.4
falkTX 12 years ago
parent
commit
e3f1219750
4 changed files with 11 additions and 9 deletions
  1. +5
    -3
      source/bridges/qtcreator/carla-bridge-plugin.pro
  2. +3
    -3
      source/includes/lv2_rdf.hpp
  3. +1
    -1
      source/utils/Lv2AtomQueue.hpp
  4. +2
    -2
      source/utils/RtList.hpp

+ 5
- 3
source/bridges/qtcreator/carla-bridge-plugin.pro View File

@@ -127,6 +127,7 @@ HEADERS += \

# utils
HEADERS += \
../../utils/CarlaUtils.hpp \
../../utils/CarlaBackendUtils.hpp \
../../utils/CarlaBridgeUtils.hpp \
../../utils/CarlaJuceUtils.hpp \
@@ -137,8 +138,8 @@ HEADERS += \
../../utils/CarlaShmUtils.hpp \
../../utils/CarlaStateUtils.hpp \
../../utils/CarlaVstUtils.hpp \
../../utils/CarlaUtils.hpp \
../../utils/CarlaMutex.hpp \
../../utils/CarlaRingBuffer.hpp \
../../utils/CarlaString.hpp \
../../utils/Lv2AtomQueue.hpp \
../../utils/RtList.hpp
@@ -157,10 +158,11 @@ INCLUDEPATH = .. \
LIBS = -ldl
LIBS += ../../backend/libcarla_native.a
LIBS += ../../modules/juce_core.a
LIBS += ../../modules/dgl.a
LIBS += ../../modules/lilv.a
LIBS += ../../modules/rtmempool.a
LIBS += ../../modules/theme.a
LIBS += ../../modules/widgets.a

LIBS += ../../modules/dgl.a
LIBS += ../../modules/lilv.a

QMAKE_CXXFLAGS *= -std=gnu++0x

+ 3
- 3
source/includes/lv2_rdf.hpp View File

@@ -575,11 +575,11 @@ struct LV2_RDF_Descriptor {
Extensions(nullptr),
UICount(0),
UIs(nullptr)
{
{
#ifndef CARLA_PROPER_CPP11_SUPPORT
Type[0] = Type[1] = 0x0;
Type[0] = Type[1] = 0x0;
#endif
}
}

~LV2_RDF_Descriptor()
{


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

@@ -44,7 +44,7 @@ public:
if (fRetAtom.atom.size == 0 || fRetAtom.atom.type == 0)
return nullptr;

CARLA_SAFE_ASSERT_RETURN(fRetAtom.atom.size < RING_BUFFER_SIZE, nullptr)
CARLA_SAFE_ASSERT_RETURN(fRetAtom.atom.size < RING_BUFFER_SIZE, nullptr);

int32_t index = -1;
tryRead(&index, sizeof(int32_t));


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

@@ -267,7 +267,7 @@ public:
{
data = list_entry(entry, Data, siblings);

CARLA_SAFE_ASSERT_CONTINUE(data != nullptr)
CARLA_SAFE_ASSERT_CONTINUE(data != nullptr);

if (data->value == value)
{
@@ -293,7 +293,7 @@ public:
{
data = list_entry(entry, Data, siblings);

CARLA_SAFE_ASSERT_CONTINUE(data != nullptr)
CARLA_SAFE_ASSERT_CONTINUE(data != nullptr);

if (data->value == value)
{


Loading…
Cancel
Save