Browse Source

Fix RtAudio-related windows build

Signed-off-by: falkTX <falktx@falktx.com>
pull/302/head
falkTX 4 years ago
parent
commit
20c2fce832
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 6 additions and 7 deletions
  1. +1
    -2
      Makefile.plugins.mk
  2. +2
    -2
      dgl/src/ApplicationPrivateData.cpp
  3. +3
    -3
      dgl/src/ApplicationPrivateData.hpp

+ 1
- 2
Makefile.plugins.mk View File

@@ -49,8 +49,7 @@ endif
ifeq ($(MACOS),true) ifeq ($(MACOS),true)
JACK_LIBS += -framework CoreAudio -framework CoreFoundation JACK_LIBS += -framework CoreAudio -framework CoreFoundation
else ifeq ($(WINDOWS),true) else ifeq ($(WINDOWS),true)
# TODO
JACK_LIBS +=
JACK_LIBS += -lksuser -lmfplat -lmfuuid -lole32 -lwinmm -lwmcodecdspuuid
else ifneq ($(HAIKU),true) else ifneq ($(HAIKU),true)
JACK_LIBS = -ldl JACK_LIBS = -ldl
ifeq ($(HAVE_ALSA),true) ifeq ($(HAVE_ALSA),true)


+ 2
- 2
dgl/src/ApplicationPrivateData.cpp View File

@@ -25,7 +25,7 @@ START_NAMESPACE_DGL


typedef std::list<DGL_NAMESPACE::Window*>::reverse_iterator WindowListReverseIterator; typedef std::list<DGL_NAMESPACE::Window*>::reverse_iterator WindowListReverseIterator;


static ThreadHandle getCurrentThreadHandle() noexcept
static d_ThreadHandle getCurrentThreadHandle() noexcept
{ {
#ifdef DISTRHO_OS_WINDOWS #ifdef DISTRHO_OS_WINDOWS
return GetCurrentThread(); return GetCurrentThread();
@@ -34,7 +34,7 @@ static ThreadHandle getCurrentThreadHandle() noexcept
#endif #endif
} }


static bool isThisTheMainThread(const ThreadHandle mainThreadHandle) noexcept
static bool isThisTheMainThread(const d_ThreadHandle mainThreadHandle) noexcept
{ {
#ifdef DISTRHO_OS_WINDOWS #ifdef DISTRHO_OS_WINDOWS
return GetCurrentThread() == mainThreadHandle; // IsGUIThread ? return GetCurrentThread() == mainThreadHandle; // IsGUIThread ?


+ 3
- 3
dgl/src/ApplicationPrivateData.hpp View File

@@ -24,10 +24,10 @@
#ifdef DISTRHO_OS_WINDOWS #ifdef DISTRHO_OS_WINDOWS
# include <winsock2.h> # include <winsock2.h>
# include <windows.h> # include <windows.h>
typedef HANDLE ThreadHandle;
typedef HANDLE d_ThreadHandle;
#else #else
# include <pthread.h> # include <pthread.h>
typedef pthread_t ThreadHandle;
typedef pthread_t d_ThreadHandle;
#endif #endif


typedef struct PuglWorldImpl PuglWorld; typedef struct PuglWorldImpl PuglWorld;
@@ -59,7 +59,7 @@ struct Application::PrivateData {
uint visibleWindows; uint visibleWindows;


/** Handle that identifies the main thread. Used to check if calls belong to current thread or not. */ /** Handle that identifies the main thread. Used to check if calls belong to current thread or not. */
ThreadHandle mainThreadHandle;
d_ThreadHandle mainThreadHandle;


/** List of windows for this application. Only used during `close`. */ /** List of windows for this application. Only used during `close`. */
std::list<DGL_NAMESPACE::Window*> windows; std::list<DGL_NAMESPACE::Window*> windows;


Loading…
Cancel
Save