Browse Source

BridgePlugin is now qt free

tags/1.9.4
falkTX 10 years ago
parent
commit
2cb7821f4c
2 changed files with 6 additions and 9 deletions
  1. +5
    -8
      source/backend/plugin/BridgePlugin.cpp
  2. +1
    -1
      source/backend/plugin/Makefile

+ 5
- 8
source/backend/plugin/BridgePlugin.cpp View File

@@ -31,9 +31,6 @@
#include <cmath>
#include <ctime>

// FIXME
#include <QtCore/QString>

#define CARLA_BRIDGE_CHECK_OSC_TYPES(/* argc, types, */ argcToCompare, typesToCompare) \
/* check argument count */ \
if (argc != argcToCompare) \
@@ -288,10 +285,10 @@ struct BridgeTime {
// FIXME - use CarlaString
struct BridgeParamInfo {
float value;
QString name;
QString unit;
CarlaString name;
CarlaString unit;

BridgeParamInfo()
BridgeParamInfo() noexcept
: value(0.0f) {}

CARLA_DECLARE_NON_COPY_STRUCT(BridgeParamInfo)
@@ -478,14 +475,14 @@ public:
{
CARLA_ASSERT(parameterId < pData->param.count);

std::strncpy(strBuf, fParams[parameterId].name.toUtf8().constData(), STR_MAX);
std::strncpy(strBuf, fParams[parameterId].name.buffer(), STR_MAX);
}

void getParameterUnit(const uint32_t parameterId, char* const strBuf) const noexcept override
{
CARLA_ASSERT(parameterId < pData->param.count);

std::strncpy(strBuf, fParams[parameterId].unit.toUtf8().constData(), STR_MAX);
std::strncpy(strBuf, fParams[parameterId].unit.buffer(), STR_MAX);
}

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


+ 1
- 1
source/backend/plugin/Makefile View File

@@ -65,7 +65,7 @@ NativePlugin.cpp.o: NativePlugin.cpp $(NATIVE_PLUGIN_CPP_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@

BridgePlugin.cpp.o: BridgePlugin.cpp $(BRIDGE_PLUGIN_CPP_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

LadspaPlugin.cpp.o: LadspaPlugin.cpp $(LADSPA_PLUGIN_CPP_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@


Loading…
Cancel
Save