| @@ -496,7 +496,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName) | |||||
| return newRtAudio(AUDIO_API_JACK); | return newRtAudio(AUDIO_API_JACK); | ||||
| // linux | // linux | ||||
| #ifdef HAVE_JUCE | |||||
| #if 0//def HAVE_JUCE | |||||
| if (std::strcmp(driverName, "ALSA") == 0) | if (std::strcmp(driverName, "ALSA") == 0) | ||||
| return newJuce(AUDIO_API_ALSA); | return newJuce(AUDIO_API_ALSA); | ||||
| #else | #else | ||||
| @@ -509,7 +509,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName) | |||||
| return newRtAudio(AUDIO_API_PULSE); | return newRtAudio(AUDIO_API_PULSE); | ||||
| // macos | // macos | ||||
| #ifdef HAVE_JUCE | |||||
| #if 0//def HAVE_JUCE | |||||
| if (std::strcmp(driverName, "CoreAudio") == 0) | if (std::strcmp(driverName, "CoreAudio") == 0) | ||||
| return newJuce(AUDIO_API_CORE); | return newJuce(AUDIO_API_CORE); | ||||
| #else | #else | ||||
| @@ -518,7 +518,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName) | |||||
| #endif | #endif | ||||
| // windows | // windows | ||||
| #ifdef HAVE_JUCE | |||||
| #if 0//def HAVE_JUCE | |||||
| if (std::strcmp(driverName, "ASIO") == 0) | if (std::strcmp(driverName, "ASIO") == 0) | ||||
| return newJuce(AUDIO_API_ASIO); | return newJuce(AUDIO_API_ASIO); | ||||
| if (std::strcmp(driverName, "DirectSound") == 0) | if (std::strcmp(driverName, "DirectSound") == 0) | ||||
| @@ -574,6 +574,8 @@ CarlaEngine* CarlaEngine::newJuce(const AudioApi api) | |||||
| unsigned int CarlaEngine::getJuceApiCount() | unsigned int CarlaEngine::getJuceApiCount() | ||||
| { | { | ||||
| return 0; // TODO | |||||
| initJuceDevices(); | initJuceDevices(); | ||||
| return static_cast<unsigned int>(gJuceDeviceTypes.size()); | return static_cast<unsigned int>(gJuceDeviceTypes.size()); | ||||
| @@ -41,7 +41,7 @@ static void initRtApis() | |||||
| { | { | ||||
| RtAudio::getCompiledApi(gRtAudioApis); | RtAudio::getCompiledApi(gRtAudioApis); | ||||
| #ifdef HAVE_JUCE | |||||
| #if 0//def HAVE_JUCE | |||||
| // prefer juce to handle some APIs | // prefer juce to handle some APIs | ||||
| std::vector<RtAudio::Api>::iterator it = std::find(gRtAudioApis.begin(), gRtAudioApis.end(), RtAudio::LINUX_ALSA); | std::vector<RtAudio::Api>::iterator it = std::find(gRtAudioApis.begin(), gRtAudioApis.end(), RtAudio::LINUX_ALSA); | ||||
| if (it != gRtAudioApis.end()) gRtAudioApis.erase(it); | if (it != gRtAudioApis.end()) gRtAudioApis.erase(it); | ||||
| @@ -734,11 +734,13 @@ class PluginSlot_BasicFX(AbstractPluginSlot): | |||||
| g += 10 | g += 10 | ||||
| self.setStyleSheet(""" | 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_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") | self.ui.b_edit.setPixmaps(":/bitmaps/button_edit.png", ":/bitmaps/button_edit_down.png", ":/bitmaps/button_edit_hover.png") | ||||