| @@ -22,7 +22,7 @@ | |||||
| #include "CarlaBackendUtils.hpp" | #include "CarlaBackendUtils.hpp" | ||||
| #include "CarlaMathUtils.hpp" | #include "CarlaMathUtils.hpp" | ||||
| #include "CarlaPluginJuceWindow.hpp" | |||||
| #include "JucePluginWindow.hpp" | |||||
| #include "juce_audio_processors.h" | #include "juce_audio_processors.h" | ||||
| @@ -302,7 +302,7 @@ public: | |||||
| String uiName(pData->name); | String uiName(pData->name); | ||||
| uiName += " (GUI)"; | uiName += " (GUI)"; | ||||
| fWindow = new CarlaPluginJuceWindow(); | |||||
| fWindow = new JucePluginWindow(); | |||||
| fWindow->setName(uiName); | fWindow->setName(uiName); | ||||
| } | } | ||||
| @@ -1249,7 +1249,7 @@ private: | |||||
| const char* fUniqueId; | const char* fUniqueId; | ||||
| ScopedPointer<CarlaPluginJuceWindow> fWindow; | |||||
| ScopedPointer<JucePluginWindow> fWindow; | |||||
| CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginJuce) | CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginJuce) | ||||
| }; | }; | ||||
| @@ -39,7 +39,7 @@ LIBS_native = $(MODULEDIR)/jackbridge.a | |||||
| LIBS_posix32 = $(MODULEDIR)/jackbridge.posix32.a | LIBS_posix32 = $(MODULEDIR)/jackbridge.posix32.a | ||||
| LIBS_posix64 = $(MODULEDIR)/jackbridge.posix64.a | LIBS_posix64 = $(MODULEDIR)/jackbridge.posix64.a | ||||
| LIBS_win32 = $(MODULEDIR)/jackbridge.win32e.a | LIBS_win32 = $(MODULEDIR)/jackbridge.win32e.a | ||||
| LIBS_win64 = $(MODULEDIR)/jackbridge.win364e.a | |||||
| LIBS_win64 = $(MODULEDIR)/jackbridge.win64e.a | |||||
| LINK_FLAGS += $(JACKBRIDGE_LIBS) | LINK_FLAGS += $(JACKBRIDGE_LIBS) | ||||
| LIBS_native += $(MODULEDIR)/juce_audio_basics.a | LIBS_native += $(MODULEDIR)/juce_audio_basics.a | ||||
| @@ -42,6 +42,7 @@ public: | |||||
| { | { | ||||
| if (lib == nullptr) | if (lib == nullptr) | ||||
| return; | return; | ||||
| lib_close(lib); | lib_close(lib); | ||||
| lib = nullptr; | lib = nullptr; | ||||
| func = nullptr; | func = nullptr; | ||||
| @@ -66,7 +67,7 @@ public: | |||||
| } | } | ||||
| private: | private: | ||||
| void* lib; | |||||
| lib_t lib; | |||||
| jackbridge_exported_function_type func; | jackbridge_exported_function_type func; | ||||
| CARLA_PREVENT_HEAP_ALLOCATION | CARLA_PREVENT_HEAP_ALLOCATION | ||||
| @@ -529,9 +530,9 @@ bool jackbridge_sem_init(void* sem) noexcept | |||||
| return getBridgeInstance().sem_init_ptr(sem); | return getBridgeInstance().sem_init_ptr(sem); | ||||
| } | } | ||||
| bool jackbridge_sem_destroy(void* sem) noexcept | |||||
| void jackbridge_sem_destroy(void* sem) noexcept | |||||
| { | { | ||||
| return getBridgeInstance().sem_destroy_ptr(sem); | |||||
| getBridgeInstance().sem_destroy_ptr(sem); | |||||
| } | } | ||||
| bool jackbridge_sem_post(void* sem) noexcept | bool jackbridge_sem_post(void* sem) noexcept | ||||
| @@ -539,7 +540,7 @@ bool jackbridge_sem_post(void* sem) noexcept | |||||
| return getBridgeInstance().sem_post_ptr(sem); | return getBridgeInstance().sem_post_ptr(sem); | ||||
| } | } | ||||
| bool jackbridge_sem_timedwait(void* sem, int secs) noexcept | |||||
| bool jackbridge_sem_timedwait(void* sem, uint secs) noexcept | |||||
| { | { | ||||
| return getBridgeInstance().sem_timedwait_ptr(sem, secs); | return getBridgeInstance().sem_timedwait_ptr(sem, secs); | ||||
| } | } | ||||
| @@ -1195,10 +1195,10 @@ bool CarlaPipeClient::init(const char* argv[]) noexcept | |||||
| // read arguments | // read arguments | ||||
| #ifdef CARLA_OS_WIN | #ifdef CARLA_OS_WIN | ||||
| HANDLE pipeRecvServer = (HANDLE)std::atol(argv[3]); // READ | |||||
| HANDLE pipeRecvClient = (HANDLE)std::atol(argv[4]); | |||||
| HANDLE pipeSendServer = (HANDLE)std::atol(argv[5]); // SEND | |||||
| HANDLE pipeSendClient = (HANDLE)std::atol(argv[6]); | |||||
| HANDLE pipeRecvServer = (HANDLE)std::atoll(argv[3]); // READ | |||||
| HANDLE pipeRecvClient = (HANDLE)std::atoll(argv[4]); | |||||
| HANDLE pipeSendServer = (HANDLE)std::atoll(argv[5]); // SEND | |||||
| HANDLE pipeSendClient = (HANDLE)std::atoll(argv[6]); | |||||
| CARLA_SAFE_ASSERT_RETURN(pipeRecvServer != INVALID_HANDLE_VALUE, false); | CARLA_SAFE_ASSERT_RETURN(pipeRecvServer != INVALID_HANDLE_VALUE, false); | ||||
| CARLA_SAFE_ASSERT_RETURN(pipeRecvClient != INVALID_HANDLE_VALUE, false); | CARLA_SAFE_ASSERT_RETURN(pipeRecvClient != INVALID_HANDLE_VALUE, false); | ||||