From f6166143aa6059ae211bf608b1d9f71f4df813ec Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 15 Feb 2014 18:53:33 +0000
Subject: [PATCH] Use only rtaudio for native audio for now

---
 source/backend/engine/CarlaEngine.cpp        |  6 +++---
 source/backend/engine/CarlaEngineJuce.cpp    |  2 ++
 source/backend/engine/CarlaEngineRtAudio.cpp |  2 +-
 source/carla_skin.py                         | 12 +++++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index 35d849c86..d4f123ab7 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -496,7 +496,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName)
         return newRtAudio(AUDIO_API_JACK);
 
     // linux
-#ifdef HAVE_JUCE
+#if 0//def HAVE_JUCE
     if (std::strcmp(driverName, "ALSA") == 0)
         return newJuce(AUDIO_API_ALSA);
 #else
@@ -509,7 +509,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName)
         return newRtAudio(AUDIO_API_PULSE);
 
     // macos
-#ifdef HAVE_JUCE
+#if 0//def HAVE_JUCE
     if (std::strcmp(driverName, "CoreAudio") == 0)
         return newJuce(AUDIO_API_CORE);
 #else
@@ -518,7 +518,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName)
 #endif
 
     // windows
-#ifdef HAVE_JUCE
+#if 0//def HAVE_JUCE
     if (std::strcmp(driverName, "ASIO") == 0)
         return newJuce(AUDIO_API_ASIO);
     if (std::strcmp(driverName, "DirectSound") == 0)
diff --git a/source/backend/engine/CarlaEngineJuce.cpp b/source/backend/engine/CarlaEngineJuce.cpp
index 60b88ffe2..e45e7d474 100644
--- a/source/backend/engine/CarlaEngineJuce.cpp
+++ b/source/backend/engine/CarlaEngineJuce.cpp
@@ -574,6 +574,8 @@ CarlaEngine* CarlaEngine::newJuce(const AudioApi api)
 
 unsigned int CarlaEngine::getJuceApiCount()
 {
+    return 0; // TODO
+
     initJuceDevices();
 
     return static_cast<unsigned int>(gJuceDeviceTypes.size());
diff --git a/source/backend/engine/CarlaEngineRtAudio.cpp b/source/backend/engine/CarlaEngineRtAudio.cpp
index 4869afe41..7a4fa1721 100644
--- a/source/backend/engine/CarlaEngineRtAudio.cpp
+++ b/source/backend/engine/CarlaEngineRtAudio.cpp
@@ -41,7 +41,7 @@ static void initRtApis()
     {
         RtAudio::getCompiledApi(gRtAudioApis);
 
-#ifdef HAVE_JUCE
+#if 0//def HAVE_JUCE
         // prefer juce to handle some APIs
         std::vector<RtAudio::Api>::iterator it = std::find(gRtAudioApis.begin(), gRtAudioApis.end(), RtAudio::LINUX_ALSA);
         if (it != gRtAudioApis.end()) gRtAudioApis.erase(it);
diff --git a/source/carla_skin.py b/source/carla_skin.py
index d28dfdd39..4a8f01c68 100644
--- a/source/carla_skin.py
+++ b/source/carla_skin.py
@@ -734,11 +734,13 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
             g += 10
 
         self.setStyleSheet("""
-        AbstractPluginSlot#PluginWidget {
-            background-color: rgb(%i, %i, %i);
-            background-image: url(:/bitmaps/background_noise1.png);
-            background-repeat: repeat-xy;
-        }""" % (r, g, b))
+          AbstractPluginSlot#PluginWidget {
+              color: white;
+              background-color: rgb(%i, %i, %i);
+              background-image: url(:/bitmaps/background_noise1.png);
+              background-repeat: repeat-xy;
+          }
+        """ % (r, g, b))
 
         self.ui.b_enable.setPixmaps(":/bitmaps/button_off.png", ":/bitmaps/button_on.png", ":/bitmaps/button_off.png")
         self.ui.b_edit.setPixmaps(":/bitmaps/button_edit.png", ":/bitmaps/button_edit_down.png", ":/bitmaps/button_edit_hover.png")