Browse Source

Small tweaks for a stoat test build

tags/1.9.8
falkTX 8 years ago
parent
commit
f188574545
2 changed files with 6 additions and 4 deletions
  1. +3
    -1
      source/backend/plugin/CarlaPlugin.cpp
  2. +3
    -3
      source/utils/CarlaSemUtils.hpp

+ 3
- 1
source/backend/plugin/CarlaPlugin.cpp View File

@@ -1,6 +1,6 @@
/* /*
* Carla Plugin * Carla Plugin
* Copyright (C) 2011-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2011-2018 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -1909,8 +1909,10 @@ bool CarlaPlugin::tryLock(const bool forcedOffline) noexcept
{ {
if (forcedOffline) if (forcedOffline)
{ {
#ifndef STOAT_TEST_BUILD
pData->masterMutex.lock(); pData->masterMutex.lock();
return true; return true;
#endif
} }


return pData->masterMutex.tryLock(); return pData->masterMutex.tryLock();


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

@@ -1,6 +1,6 @@
/* /*
* Carla semaphore utils * Carla semaphore utils
* Copyright (C) 2013-2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2013-2018 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -22,8 +22,8 @@


#include <ctime> #include <ctime>


#ifdef CARLA_OS_LINUX
# define CARLA_USE_FUTEXES
#if defined(CARLA_OS_LINUX) && ! defined(STOAT_TEST_BUILD)
# define CARLA_USE_FUTEXES 1
#endif #endif


#if defined(CARLA_OS_WIN) #if defined(CARLA_OS_WIN)


Loading…
Cancel
Save