Move rtaudio/midi to modules folder; Start some makefile rework

source/Makefile.mk

@@ -124,15 +124,22 @@ HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true)
 endif
 
 # --------------------------------------------------------------
-# Check for optional libs (required by internal plugins)
+# Check for optional libs (needed by internal plugins)
 
-HAVE_AF_DEPS       = $(shell pkg-config --exists sndfile && echo true)
-HAVE_MF_DEPS       = $(shell pkg-config --exists smf && echo true)
-HAVE_ZYN_DEPS      = $(shell pkg-config --exists fftw3 mxml zlib && echo true)
-HAVE_ZYN_UI_DEPS   = $(shell pkg-config --exists ntk ntk_images && echo true)
+HAVE_AF_DEPS      = $(shell pkg-config --exists sndfile && echo true)
+HAVE_MF_DEPS      = $(shell pkg-config --exists smf && echo true)
+HAVE_ZYN_DEPS     = $(shell pkg-config --exists fftw3 mxml zlib && echo true)
+HAVE_ZYN_UI_DEPS  = $(shell pkg-config --exists ntk ntk_images && echo true)
 
 # --------------------------------------------------------------
-# Set Juce flags
+# Set libs stuff
+
+RTAUDIO_FLAGS  = -DHAVE_GETTIMEOFDAY -D__UNIX_JACK__
+
+ifeq ($(DEBUG),true)
+RTAUDIO_FLAGS += -D__RTAUDIO_DEBUG__
+RTMIDI_FLAGS  += -D__RTMIDI_DEBUG__
+endif
 
 ifeq ($(HAIKU),true)
 endif
@@ -142,34 +149,53 @@ ifeq ($(HAVE_OPENGL),true)
 DGL_FLAGS                = $(shell pkg-config --cflags gl x11)
 DGL_LIBS                 = $(shell pkg-config --libs gl x11)
 endif
-LILV_LIBS                = -lrt -ldl
-JUCE_CORE_LIBS           = -lrt -ldl -lpthread
+JACKBRIDGE_LIBS          = -ldl -lpthread -lrt
+JUCE_CORE_LIBS           = -ldl -lpthread -lrt
 JUCE_EVENTS_FLAGS        = $(shell pkg-config --cflags x11)
 JUCE_EVENTS_LIBS         = $(shell pkg-config --libs x11)
 JUCE_GRAPHICS_FLAGS      = $(shell pkg-config --cflags x11 xinerama xext freetype2)
 JUCE_GRAPHICS_LIBS       = $(shell pkg-config --libs x11 xinerama xext freetype2)
 JUCE_GUI_BASICS_FLAGS    = $(shell pkg-config --cflags x11 xinerama xext xcursor)
 JUCE_GUI_BASICS_LIBS     = $(shell pkg-config --libs x11 xinerama xext xcursor) -ldl
+LILV_LIBS                = -ldl -lrt
+ifeq ($(HAVE_ALSA),true)
+RTAUDIO_FLAGS           += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
+RTAUDIO_LIBS            += $(shell pkg-config --libs alsa) -lpthread
+RTMIDI_FLAGS            += $(shell pkg-config --cflags alsa) -D__LINUX_ALSASEQ__
+RTMIDI_LIBS             += $(shell pkg-config --libs alsa)
+endif
+ifeq ($(HAVE_PULSEAUDIO),true)
+RTAUDIO_FLAGS += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE__
+RTAUDIO_LIBS  += $(shell pkg-config --libs libpulse-simple)
+endif
 endif
 
 ifeq ($(MACOS),true)
 DGL_LIBS                = -framework OpenGL -framework Cocoa
-LILV_LIBS               = -ldl
+JACKBRIDGE_LIBS         = -ldl -lpthread
 JUCE_AUDIO_BASICS_LIBS  = -framework Accelerate
 JUCE_AUDIO_DEVICES_LIBS = -framework CoreAudio -framework CoreMIDI -framework DiscRecording
 JUCE_AUDIO_FORMATS_LIBS = -framework CoreAudio -framework CoreMIDI -framework QuartzCore -framework AudioToolbox
 JUCE_CORE_LIBS          = -framework Cocoa -framework IOKit
 JUCE_GRAPHICS_LIBS      = -framework Cocoa -framework QuartzCore
 JUCE_GUI_BASICS_LIBS    = -framework Cocoa -framework Carbon -framework QuartzCore
+LILV_LIBS               = -ldl
+RTAUDIO_FLAGS          += -D__MACOSX_CORE__
+RTAUDIO_LIBS           += -lpthread
+RTMIDI_FLAGS           += -D__MACOSX_CORE__
 endif
 
 ifeq ($(WIN32),true)
 DGL_LIBS                = -lopengl32 -lgdi32
+JACKBRIDGE_LIBS         = -lpthread
 JUCE_AUDIO_DEVICES_LIBS = -lwinmm -lole32
 JUCE_CORE_LIBS          = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
 JUCE_EVENTS_LIBS        = -lole32
 JUCE_GRAPHICS_LIBS      = -lgdi32
 JUCE_GUI_BASICS_LIBS    = -lgdi32 -limm32 -lcomdlg32 -lole32
+RTAUDIO_FLAGS          += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__
+RTAUDIO_LIBS           += -lpthread
+RTMIDI_FLAGS           += -D__WINDOWS_MM__
 endif
 
 # --------------------------------------------------------------

source/backend/engine/Makefile

@@ -50,14 +50,6 @@ OBJS += \
 	rtaudio-4.0.12/RtAudio.cpp.o \
 	rtmidi-2.0.1/RtMidi.cpp.o
 
-# ifeq ($(WIN32),true)
-# OBJS += \
-# 	rtaudio-4.0.12/include/asio.cpp.o \
-# 	rtaudio-4.0.12/include/asiodrivers.cpp.o \
-# 	rtaudio-4.0.12/include/asiolist.cpp.o \
-# 	rtaudio-4.0.12/include/iasiothiscallresolver.cpp.o
-# endif
-
 TARGET  = ../libcarla_engine.a
 TARGETp = ../libcarla_engine_plugin.a
 

source/modules/Makefile

@@ -101,6 +101,11 @@ lilv_%:
 
 # --------------------------------------------------------------
 
+rtaudio:
+	$(MAKE) -C rtaudio
+
+# --------------------------------------------------------------
+
 rtmempool:
 	$(MAKE) -C rtmempool
 
@@ -117,6 +122,9 @@ theme_%:
 
 # --------------------------------------------------------------
 
+jackbridge:
+	$(MAKE) -C jackbridge
+
 jackbridge-win32:
 	$(MAKE) -C jackbridge win32
 
@@ -157,12 +165,15 @@ clean:
 	$(MAKE) clean -C juce_graphics
 	$(MAKE) clean -C juce_gui_basics
 	$(MAKE) clean -C lilv
+	$(MAKE) clean -C rtaudio
 	$(MAKE) clean -C rtmempool
 	$(MAKE) clean -C theme
 	$(MAKE) clean -C widgets
 
 # --------------------------------------------------------------
 
-.PHONY: carla_native juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics lilv rtmempool theme
+.PHONY: \
+	carla_native lilv rtaudio rtmidi rtmempool theme \
+	juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics
 
 # --------------------------------------------------------------

source/modules/carla_native/resources/externalui.py

@@ -0,0 +1 @@
+/home/falktx/Personal/FOSS/GIT/Carla/source/externalui.py

source/modules/jackbridge/JackBridge1.cpp

@@ -157,7 +157,7 @@ struct JackBridge {
     jacksym_set_buffer_size_callback set_buffer_size_callback_ptr;
     jacksym_set_sample_rate_callback set_sample_rate_callback_ptr;
     jacksym_set_client_registration_callback set_client_registration_callback_ptr;
-    jacksym_set_client_rename_callback set_client_rename_callback_ptr;
+    //jacksym_set_client_rename_callback set_client_rename_callback_ptr;
     jacksym_set_port_registration_callback set_port_registration_callback_ptr;
     jacksym_set_port_connect_callback set_port_connect_callback_ptr;
     jacksym_set_port_rename_callback set_port_rename_callback_ptr;
@@ -259,7 +259,7 @@ struct JackBridge {
           set_buffer_size_callback_ptr(nullptr),
           set_sample_rate_callback_ptr(nullptr),
           set_client_registration_callback_ptr(nullptr),
-          set_client_rename_callback_ptr(nullptr),
+          //set_client_rename_callback_ptr(nullptr),
           set_port_registration_callback_ptr(nullptr),
           set_port_connect_callback_ptr(nullptr),
           set_port_rename_callback_ptr(nullptr),
@@ -371,7 +371,7 @@ struct JackBridge {
         LIB_SYMBOL(set_buffer_size_callback)
         LIB_SYMBOL(set_sample_rate_callback)
         LIB_SYMBOL(set_client_registration_callback)
-        LIB_SYMBOL(set_client_rename_callback)
+        //LIB_SYMBOL(set_client_rename_callback)
         LIB_SYMBOL(set_port_registration_callback)
         LIB_SYMBOL(set_port_connect_callback)
         LIB_SYMBOL(set_port_rename_callback)

source/modules/jackbridge/JackBridge2.cpp

@@ -46,11 +46,11 @@ bool jackbridge_sem_timedwait(void*, int)
 {
     return false;
 }
-#else
-
+#else //JACKBRIDGE_DUMMY
 #include <ctime>
-#include <semaphore.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <semaphore.h>
 
 bool jackbridge_sem_init(void* sem)
 {
@@ -85,10 +85,9 @@ bool jackbridge_sem_timedwait(void* sem, int secs)
 #  endif
 
         timeout.tv_sec += secs;
-
         return (sem_timedwait((sem_t*)sem, &timeout) == 0);
 # endif
 }
-#endif
+#endif // JACKBRIDGE_DUMMY
 
 // -----------------------------------------------------------------------------

source/modules/jackbridge/Makefile

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # Makefile for jackbridge #
-# ------------------------------------- #
+# ----------------------- #
 # Created by falkTX
 #
 
@@ -10,61 +10,119 @@ include ../../Makefile.mk
 
 WINECXX ?= wineg++
 
-BUILD_CXX_FLAGS += -DJACKBRIDGE_EXPORT
-BUILD_CXX_FLAGS += -I. -I../../includes -I../../utils
+BUILD_CXX_FLAGS += $(JACKBRIDGE_FLAGS) -I. -I../../includes -I../../utils
+LINK_FLAGS      += $(JACKBRIDGE_LIBS)
+# linux: -ldl -lpthread -lrt
+# mac: -ldl -lpthread
+# win: -lpthread
 
-ifeq ($(MACOS),true)
-LINK_FLAGS += -dynamiclib
-else
-LINK_FLAGS += -shared
-endif
+OBJS         = JackBridge1.cpp.o         JackBridge2.cpp.o
+OBJS_posix32 = JackBridge1.cpp.posix32.o JackBridge2.cpp.posix32.o
+OBJS_posix64 = JackBridge1.cpp.posix64.o JackBridge2.cpp.posix64.o
+OBJS_win32   = JackBridge1.cpp.win32.o   JackBridge2.cpp.win32.o
+OBJS_win64   = JackBridge1.cpp.win64.o   JackBridge2.cpp.win64.o
 
-WIN_BUILD_FLAGS  = $(BUILD_CXX_FLAGS) -DJACKBRIDGE_DUMMY=1 -w
-WIN_32BIT_FLAGS  = $(32BIT_FLAGS)
-WIN_64BIT_FLAGS  = $(64BIT_FLAGS)
-WIN_LINK_FLAGS   = $(LINK_FLAGS)
+# --------------------------------------------------------------
 
-WINE_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -fPIC
-WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine
-WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
-WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread
+all: ../jackbridge.a
 
-OBJS    = JackBridge1.cpp   JackBridge2.cpp
-OBJSw32 = JackBridge1.w32.o JackBridge2.w32.o
-OBJSw64 = JackBridge1.w64.o JackBridge2.w64.o
+posix32: ../jackbridge.posix32.a
+posix64: ../jackbridge.posix64.a
+win32:   ../jackbridge.win32.a
+win64:   ../jackbridge.win64.a
 
 # --------------------------------------------------------------
 
-all:
+../jackbridge.a: $(OBJS)
+	rm -f $@
+	$(AR) crs $@ $^
 
-win32:  ../jackbridge-win32.dll
-win64:  ../jackbridge-win64.dll
-wine32: ../jackbridge-win32.dll.so
-wine64: ../jackbridge-win64.dll.so
+../jackbridge.posix32.a: $(OBJS_posix32)
+	rm -f $@
+	$(AR) crs $@ $^
 
-# --------------------------------------------------------------
+../jackbridge.posix64.a: $(OBJS_posix64)
+	rm -f $@
+	$(AR) crs $@ $^
+
+../jackbridge.win32.a: $(OBJS_win32)
+	rm -f $@
+	$(AR) crs $@ $^
+
+../jackbridge.win64.a: $(OBJS_win64)
+	rm -f $@
+	$(AR) crs $@ $^
+
+../libjackbridge.dll: $(OBJS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-JackBridge%.w32.o: JackBridge%.cpp
-	$(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) -c -o $@
+../libjackbridge.dylib: $(OBJS)
+	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-JackBridge%.w64.o: JackBridge%.cpp
-	$(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) -c -o $@
+../libjackbridge.so: $(OBJS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
 
-../jackbridge-win32.dll: $(OBJS)
-	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@
+%.cpp.o: %.cpp
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-../jackbridge-win64.dll: $(OBJS)
-	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@
+%.posix32.o: %
+	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-../jackbridge-win32.dll.so: $(OBJSw32) ../jackbridge-win32.dll.def
-	$(WINECXX) $^ $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@
+%.posix64.o: %
+	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-../jackbridge-win64.dll.so: $(OBJS) ../jackbridge-win64.dll.def
-	$(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@
+%.win32.o: %
+	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+
+%.win64.o: %
+	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../jackbridge-*.*
+	rm -f *.o ../jackbridge*.a ../libjackbridge.*
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
+# win32:  ../jackbridge-win32.dll
+# win64:  ../jackbridge-win64.dll
+# wine32: ../jackbridge-win32.dll.so
+# wine64: ../jackbridge-win64.dll.so
+
+# BUILD_CXX_FLAGS += -DJACKBRIDGE_EXPORT
+
+# WIN_BUILD_FLAGS  = $(BUILD_CXX_FLAGS) -DJACKBRIDGE_DUMMY=1
+# WIN_32BIT_FLAGS  = $(32BIT_FLAGS)
+# WIN_64BIT_FLAGS  = $(64BIT_FLAGS)
+# WIN_LINK_FLAGS   = $(LINK_FLAGS)
+#
+# WINE_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -fPIC
+# WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine
+# WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
+# WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread
+
+# OBJSw32 = JackBridge1.w32.o JackBridge2.w32.o
+# OBJSw64 = JackBridge1.w64.o JackBridge2.w64.o
+
+# JackBridge%.w32.o: JackBridge%.cpp
+# 	$(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) -c -o $@
+#
+# JackBridge%.w64.o: JackBridge%.cpp
+# 	$(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) -c -o $@
+
+# ../jackbridge-win32.dll: $(OBJS)
+# 	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@
+#
+# ../jackbridge-win64.dll: $(OBJS)
+# 	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@
+#
+# ../jackbridge-win32.dll.so: $(OBJSw32) ../jackbridge-win32.dll.def
+# 	$(WINECXX) $^ $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@
+#
+# ../jackbridge-win64.dll.so: $(OBJS) ../jackbridge-win64.dll.def
+# 	$(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@

source/modules/rtaudio/Makefile

@@ -0,0 +1,83 @@
+#!/usr/bin/make -f
+# Makefile for rtaudio #
+# -------------------- #
+# Created by falkTX
+#
+
+include ../../Makefile.mk
+
+# --------------------------------------------------------------
+
+BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -DHAVE_GETTIMEOFDAY -D__UNIX_JACK__ -I. -Iinclude -I.. -I../../includes
+LINK_FLAGS      += $(RTAUDIO_LIBS) -L.. -ljackbridge
+
+OBJS = RtAudio.cpp.o
+
+ifeq ($(WIN32),true)
+OBJS += \
+	include/asio.cpp.o \
+	include/asiodrivers.cpp.o \
+	include/asiolist.cpp.o \
+	include/iasiothiscallresolver.cpp.o
+endif
+
+# --------------------------------------------------------------
+
+ifeq ($(DEBUG),true)
+BUILD_CXX_FLAGS += -D__RTAUDIO_DEBUG__
+endif
+
+ifeq ($(HAVE_ALSA),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
+endif
+
+ifeq ($(HAVE_PULSEAUDIO),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE__
+endif
+
+ifeq ($(MACOS),true)
+BUILD_CXX_FLAGS += -D__MACOSX_CORE__
+endif
+
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__
+endif
+
+# --------------------------------------------------------------
+
+all: ../rtaudio.a
+
+posix32: ../rtaudio.posix32.a
+posix64: ../rtaudio.posix64.a
+win32:   ../rtaudio.win32.a
+win64:   ../rtaudio.win64.a
+
+# --------------------------------------------------------------
+
+../rtaudio.a: $(OBJS)
+	rm -f $@
+	$(AR) crs $@ $^
+
+../librtaudio.dll: $(OBJS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+
+../librtaudio.dylib: $(OBJS)
+	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+
+../librtaudio.so: $(OBJS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+
+# --------------------------------------------------------------
+
+%.cpp.o: %.cpp
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+
+# --------------------------------------------------------------
+
+clean:
+	rm -f *.o ../rtaudio*.a ../librtaudio.*
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/backend/engine/rtaudio-4.0.12/RtAudio.cpp → source/modules/rtaudio/RtAudio.cpp

@@ -381,7 +381,7 @@ double RtApi :: getStreamTime( void )
   then = stream_.lastTickTimestamp;
   return stream_.streamTime +
     ((now.tv_sec + 0.000001 * now.tv_usec) -
-     (then.tv_sec + 0.000001 * then.tv_usec));
+     (then.tv_sec + 0.000001 * then.tv_usec));     
 #else
   return stream_.streamTime;
 #endif
@@ -1728,7 +1728,7 @@ bool RtApiCore :: callbackEvent( AudioDeviceID deviceId,
           channelsLeft -= streamChannels;
         }
       }
-
+      
       if ( stream_.doConvertBuffer[1] ) { // convert from our internal "device" buffer
         convertBuffer( stream_.userBuffer[1],
                        stream_.deviceBuffer,
@@ -1840,15 +1840,9 @@ struct JackHandle {
     :client(0), drainCounter(0), internalDrain(false) { ports[0] = 0; ports[1] = 0; xrun[0] = false; xrun[1] = false; }
 };
 
-static void jackSilentError( const char * ) {};
-
 RtApiJack :: RtApiJack()
 {
   // Nothing to do here.
-#if 0
-  // Turn off Jack's internal error reporting.
-  jack_set_error_function( &jackSilentError );
-#endif
 }
 
 RtApiJack :: ~RtApiJack()
@@ -2623,7 +2617,7 @@ RtApiAsio :: RtApiAsio()
   // CoInitialize beforehand, but it must be for appartment threading
   // (in which case, CoInitilialize will return S_FALSE here).
   coInitialized_ = false;
-  HRESULT hr = CoInitialize( NULL );
+  HRESULT hr = CoInitialize( NULL ); 
   if ( FAILED(hr) ) {
     errorText_ = "RtApiAsio::ASIO requires a single-threaded appartment. Call CoInitializeEx(0,COINIT_APARTMENTTHREADED)";
     error( RtError::WARNING );
@@ -2982,7 +2976,7 @@ bool RtApiAsio :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
       handle = new AsioHandle;
     }
     catch ( std::bad_alloc& ) {
-      //if ( handle == NULL ) {
+      //if ( handle == NULL ) {    
       drivers.removeCurrentDriver();
       errorText_ = "RtApiAsio::probeDeviceOpen: error allocating AsioHandle memory.";
       return FAILURE;
@@ -3518,13 +3512,13 @@ static long asioMessages( long selector, long value, void* message, double* opt
 
 static const char* getAsioErrorString( ASIOError result )
 {
-  struct Messages
+  struct Messages 
   {
     ASIOError value;
     const char*message;
   };
 
-  static const Messages m[] =
+  static const Messages m[] = 
     {
       {   ASE_NotPresent,    "Hardware input or output is not present or available." },
       {   ASE_HWMalfunction,  "Hardware is malfunctioning." },
@@ -3547,7 +3541,7 @@ static const char* getAsioErrorString( ASIOError result )
 #if defined(__WINDOWS_DS__) // Windows DirectSound API
 
 // Modified by Robin Davies, October 2005
-// - Improvements to DirectX pointer chasing.
+// - Improvements to DirectX pointer chasing. 
 // - Bug fix for non-power-of-two Asio granularity used by Edirol PCR-A30.
 // - Auto-call CoInitialize for DSOUND and ASIO platforms.
 // Various revisions for RtAudio 4.0 by Gary Scavone, April 2007
@@ -3587,7 +3581,7 @@ struct DsHandle {
   void *id[2];
   void *buffer[2];
   bool xrun[2];
-  UINT bufferPointer[2];
+  UINT bufferPointer[2];  
   DWORD dsBufferSize[2];
   DWORD dsPointerLeadTime[2]; // the number of bytes ahead of the safe pointer to lead by.
   HANDLE condition;
@@ -4433,7 +4427,7 @@ void RtApiDs :: startStream()
   // Increase scheduler frequency on lesser windows (a side-effect of
   // increasing timer accuracy).  On greater windows (Win2K or later),
   // this is already in effect.
-  timeBeginPeriod( 1 );
+  timeBeginPeriod( 1 ); 
 
   buffersRolling = false;
   duplexPrerollBytes = 0;
@@ -4736,7 +4730,7 @@ void RtApiDs :: callbackEvent()
   }
 
   if ( stream_.mode == OUTPUT || stream_.mode == DUPLEX ) {
-
+    
     LPDIRECTSOUNDBUFFER dsBuffer = (LPDIRECTSOUNDBUFFER) handle->buffer[0];
 
     if ( handle->drainCounter > 1 ) { // write zeros to the output stream
@@ -4802,7 +4796,7 @@ void RtApiDs :: callbackEvent()
     }
 
     if ( dsPointerBetween( nextWritePointer, safeWritePointer, currentWritePointer, dsBufferSize )
-         || dsPointerBetween( endWrite, safeWritePointer, currentWritePointer, dsBufferSize ) ) {
+         || dsPointerBetween( endWrite, safeWritePointer, currentWritePointer, dsBufferSize ) ) { 
       // We've strayed into the forbidden zone ... resync the read pointer.
       handle->xrun[0] = true;
       nextWritePointer = safeWritePointer + handle->dsPointerLeadTime[0] - bufferBytes;
@@ -4872,14 +4866,14 @@ void RtApiDs :: callbackEvent()
     if ( safeReadPointer < (DWORD)nextReadPointer ) safeReadPointer += dsBufferSize; // unwrap offset
     DWORD endRead = nextReadPointer + bufferBytes;
 
-    // Handling depends on whether we are INPUT or DUPLEX.
+    // Handling depends on whether we are INPUT or DUPLEX. 
     // If we're in INPUT mode then waiting is a good thing. If we're in DUPLEX mode,
     // then a wait here will drag the write pointers into the forbidden zone.
-    //
-    // In DUPLEX mode, rather than wait, we will back off the read pointer until
-    // it's in a safe position. This causes dropouts, but it seems to be the only
-    // practical way to sync up the read and write pointers reliably, given the
-    // the very complex relationship between phase and increment of the read and write
+    // 
+    // In DUPLEX mode, rather than wait, we will back off the read pointer until 
+    // it's in a safe position. This causes dropouts, but it seems to be the only 
+    // practical way to sync up the read and write pointers reliably, given the 
+    // the very complex relationship between phase and increment of the read and write 
     // pointers.
     //
     // In order to minimize audible dropouts in DUPLEX mode, we will
@@ -4929,7 +4923,7 @@ void RtApiDs :: callbackEvent()
           error( RtError::SYSTEM_ERROR );
           return;
         }
-
+      
         if ( safeReadPointer < (DWORD)nextReadPointer ) safeReadPointer += dsBufferSize; // unwrap offset
       }
     }
@@ -6140,7 +6134,7 @@ void RtApiAlsa :: stopStream()
   AlsaHandle *apiInfo = (AlsaHandle *) stream_.apiHandle;
   snd_pcm_t **handle = (snd_pcm_t **) apiInfo->handles;
   if ( stream_.mode == OUTPUT || stream_.mode == DUPLEX ) {
-    if ( apiInfo->synchronized )
+    if ( apiInfo->synchronized ) 
       result = snd_pcm_drop( handle[0] );
     else
       result = snd_pcm_drain( handle[0] );
@@ -6461,7 +6455,7 @@ unsigned int RtApiPulse::getDeviceCount( void )
   return 1;
 }
 
-RtAudio::DeviceInfo RtApiPulse::getDeviceInfo( unsigned int device )
+RtAudio::DeviceInfo RtApiPulse::getDeviceInfo( unsigned int /*device*/ )
 {
   RtAudio::DeviceInfo info;
   info.probed = true;
@@ -6603,7 +6597,7 @@ void RtApiPulse::callbackEvent( void )
     else
       bytes = stream_.nUserChannels[INPUT] * stream_.bufferSize *
         formatBytes( stream_.userFormat );
-
+            
     if ( pa_simple_read( pah->s_rec, pulse_in, bytes, &pa_error ) < 0 ) {
       errorStream_ << "RtApiPulse::callbackEvent: audio read error, " <<
         pa_strerror( pa_error ) << ".";
@@ -6866,7 +6860,7 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode,
 
   stream_.state = STREAM_STOPPED;
   return true;
-
+ 
  error:
   if ( pah && stream_.callbackInfo.isRunning ) {
     pthread_cond_destroy( &pah->runnable_cv );

source/backend/engine/rtaudio-4.0.12/RtAudio.h → source/modules/rtaudio/RtAudio.h

@@ -516,6 +516,7 @@ class RtAudio
 
 // Operating system dependent thread functionality.
 #if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__)
+  #include <winsock2.h>
   #include <windows.h>
   #include <process.h>