Browse Source

Fix debug build (on linux)

tags/1.9.6
falkTX 9 years ago
parent
commit
2a6086d924
2 changed files with 11 additions and 3 deletions
  1. +1
    -1
      data/linux/make-binary.sh
  2. +10
    -2
      source/utils/CarlaJuceEvents.cpp

+ 1
- 1
data/linux/make-binary.sh View File

@@ -6,7 +6,7 @@ if [ -f Makefile ]; then
cd data/linux cd data/linux
fi fi


VERSION="1.9.5~git20150307"
VERSION="1.9.5~git20150308"


if [ ! -f carla-git-static_"$VERSION"_amd64.deb ]; then if [ ! -f carla-git-static_"$VERSION"_amd64.deb ]; then
wget -c https://launchpad.net/~kxstudio-debian/+archive/ubuntu/testing/+files/carla-git-static_"$VERSION"_amd64.deb wget -c https://launchpad.net/~kxstudio-debian/+archive/ubuntu/testing/+files/carla-git-static_"$VERSION"_amd64.deb


+ 10
- 2
source/utils/CarlaJuceEvents.cpp View File

@@ -85,7 +85,7 @@ protected:
} }


private: private:
bool fInitializing;
volatile bool fInitializing;
CriticalSection fLock; CriticalSection fLock;
ReferenceCountedArray<MessageManager::MessageBase> fQueue; ReferenceCountedArray<MessageManager::MessageBase> fQueue;


@@ -133,7 +133,9 @@ void MessageManager::doPlatformSpecificShutdown()
{ {
JuceEventsThread& juceEventsThread(getJuceEventsThreadInstance()); JuceEventsThread& juceEventsThread(getJuceEventsThreadInstance());


if (! juceEventsThread.isInitializing())
if (juceEventsThread.isInitializing())
juceEventsThread.signalThreadShouldExit();
else
juceEventsThread.stopThread(-1); juceEventsThread.stopThread(-1);
} }


@@ -143,6 +145,12 @@ bool MessageManager::postMessageToSystemQueue(MessageManager::MessageBase* const
return juceEventsThread.postMessage(message); return juceEventsThread.postMessage(message);
} }


bool MessageManager::dispatchNextMessageOnSystemQueue(bool)
{
carla_stderr2("MessageManager::dispatchNextMessageOnSystemQueue() unsupported");
return false;
}

} // namespace juce } // namespace juce


#endif // ! CARLA_OS_MAC || CARLA_OS_WIN #endif // ! CARLA_OS_MAC || CARLA_OS_WIN

Loading…
Cancel
Save