Browse Source

Misc

tags/1.9.4
falkTX 10 years ago
parent
commit
c6886f777e
6 changed files with 18 additions and 7 deletions
  1. +12
    -1
      source/backend/engine/CarlaEngineBridge.cpp
  2. +1
    -1
      source/backend/engine/CarlaEngineJack.cpp
  3. +1
    -1
      source/backend/standalone/CarlaStandalone.cpp
  4. +2
    -2
      source/bridges/CarlaBridgePlugin.cpp
  5. +1
    -1
      source/utils/CarlaLibUtils.hpp
  6. +1
    -1
      source/utils/CarlaUtils.hpp

+ 12
- 1
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -31,6 +31,17 @@
#include <cerrno> #include <cerrno>
#include <ctime> #include <ctime>


#ifdef JACKBRIDGE_EXPORT
// -------------------------------------------------------------------

bool jackbridge_is_ok() noexcept
{
return true;
}
#endif

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

CARLA_BACKEND_START_NAMESPACE CARLA_BACKEND_START_NAMESPACE


#if 0 #if 0
@@ -215,7 +226,7 @@ public:
fShmTime.filename += timeBaseName; fShmTime.filename += timeBaseName;
} }


~CarlaEngineBridge() override
~CarlaEngineBridge() noexcept override
{ {
carla_debug("CarlaEngineBridge::~CarlaEngineBridge()"); carla_debug("CarlaEngineBridge::~CarlaEngineBridge()");
} }


+ 1
- 1
source/backend/engine/CarlaEngineJack.cpp View File

@@ -658,7 +658,7 @@ public:
carla_zeroStruct<jack_position_t>(fTransportPos); carla_zeroStruct<jack_position_t>(fTransportPos);
} }


~CarlaEngineJack() override
~CarlaEngineJack() noexcept override
{ {
carla_debug("CarlaEngineJack::~CarlaEngineJack()"); carla_debug("CarlaEngineJack::~CarlaEngineJack()");
CARLA_SAFE_ASSERT(fClient == nullptr); CARLA_SAFE_ASSERT(fClient == nullptr);


+ 1
- 1
source/backend/standalone/CarlaStandalone.cpp View File

@@ -1032,7 +1032,7 @@ const CarlaTransportInfo* carla_get_transport_info()


bool carla_add_plugin(BinaryType btype, PluginType ptype, const char* filename, const char* name, const char* label, int64_t uniqueId, const void* extraPtr) bool carla_add_plugin(BinaryType btype, PluginType ptype, const char* filename, const char* name, const char* label, int64_t uniqueId, const void* extraPtr)
{ {
CARLA_SAFE_ASSERT_RETURN(label != nullptr && label[0] != '\0', false);
CARLA_SAFE_ASSERT_RETURN(label != nullptr /*&& label[0] != '\0'*/, false);
carla_debug("carla_add_plugin(%i:%s, %i:%s, \"%s\", \"%s\", \"%s\", " P_INT64 ", %p)", btype, CB::BinaryType2Str(btype), ptype, CB::PluginType2Str(ptype), filename, name, label, uniqueId, extraPtr); carla_debug("carla_add_plugin(%i:%s, %i:%s, \"%s\", \"%s\", \"%s\", " P_INT64 ", %p)", btype, CB::BinaryType2Str(btype), ptype, CB::PluginType2Str(ptype), filename, name, label, uniqueId, extraPtr);


if (gStandalone.engine != nullptr) if (gStandalone.engine != nullptr)


+ 2
- 2
source/bridges/CarlaBridgePlugin.cpp View File

@@ -580,8 +580,8 @@ int main(int argc, char* argv[])
if (std::strcmp(name, "(none)") == 0) if (std::strcmp(name, "(none)") == 0)
name = nullptr; name = nullptr;


if (std::strlen(label) == 0)
label = nullptr;
//if (std::strlen(label) == 0)
// label = nullptr;


char bridgeBaseAudioName[6+1]; char bridgeBaseAudioName[6+1];
char bridgeBaseControlName[6+1]; char bridgeBaseControlName[6+1];


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

@@ -82,7 +82,7 @@ void* lib_symbol(void* const lib, const char* const symbol) noexcept
CARLA_SAFE_ASSERT_RETURN(symbol != nullptr && symbol[0] != '\0', nullptr); CARLA_SAFE_ASSERT_RETURN(symbol != nullptr && symbol[0] != '\0', nullptr);


#ifdef CARLA_OS_WIN #ifdef CARLA_OS_WIN
return (void*)GetProcAddressA((HMODULE)lib, symbol);
return (void*)GetProcAddress((HMODULE)lib, symbol);
#else #else
return dlsym(lib, symbol); return dlsym(lib, symbol);
#endif #endif


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

@@ -231,7 +231,7 @@ void carla_setenv(const char* const key, const char* const value) noexcept
#ifdef CARLA_OS_WIN #ifdef CARLA_OS_WIN
try { try {
::SetEnvironmentVariableA(key, value); ::SetEnvironmentVariableA(key, value);
} CARLA_SAFE_EXCEPTION("carla_setenv",);
} CARLA_SAFE_EXCEPTION("carla_setenv");
#else #else
::setenv(key, value, 1); ::setenv(key, value, 1);
#endif #endif


Loading…
Cancel
Save