Audioadapter factory code moved back in JackAudioAdapterFactory.cpp file.

common/JackAudioAdapterFactory.cpp

@@ -25,6 +25,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <stdlib.h>
 #include <assert.h>
 
+#ifdef __APPLE__
+#include "JackCoreAudioAdapter.h"
+#define JackPlatformAdapter JackCoreAudioAdapter
+#endif
+
+#ifdef __linux__
+#include "JackAlsaAdapter.h"
+#define JackPlatformAdapter JackAlsaAdapter
+#endif
+
+#if defined(__sun__) || defined(sun)
+#include "JackOSSAdapter.h"
+#define JackPlatformAdapter JackOSSAdapter
+#endif
+
+#ifdef WIN32
+#include "JackPortAudioAdapter.h"
+#define JackPlatformAdapter JackPortAudioAdapter
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {

linux/JackPlatformPlug_os.h

@@ -40,10 +40,6 @@ namespace Jack
     class JackNetUnixSocket;
 }
 
-/* __JackPlatformAdapter__ */
-#include "JackAlsaAdapter.h"
-namespace Jack { typedef JackAlsaAdapter JackPlatformAdapter; }
-
 /* __JackPlatformMutex__ */
 #include "JackPosixMutex.h"
 namespace Jack {typedef JackPosixMutex JackMutex; }

macosx/JackPlatformPlug_os.h

@@ -50,10 +50,6 @@ namespace Jack
 #endif
 }
 
-/* __JackPlatformAdapter__ */
-#include "JackCoreAudioAdapter.h"
-namespace Jack { typedef JackCoreAudioAdapter JackPlatformAdapter; }
-
 /* __JackPlatformMutex__ */
 #include "JackPosixMutex.h"
 namespace Jack { typedef JackPosixMutex JackMutex; }

solaris/JackPlatformPlug_os.h

@@ -41,10 +41,6 @@ namespace Jack
 	class JackNetUnixSocket;
 }
 
-/* __JackPlatformAdapter__ */
-#include "JackOSSAdapter.h"
-namespace Jack { typedef JackOSSAdapter JackPlatformAdapter; }
-
 /* __JackPlatformMutex__ */
 #include "JackPosixMutex.h"
 namespace Jack {typedef JackPosixMutex JackMutex; }

windows/JackPlatformPlug_os.h

@@ -47,10 +47,6 @@ namespace Jack
 	class JackNetWinSocket;
 }
 
-/* __JackPlatformAdapter__ */
-#include "JackPortAudioAdapter.h"
-namespace Jack { typedef JackPortAudioAdapter JackPlatformAdapter; }
-
 /* __JackPlatformMutex__ */
 #include "JackWinMutex.h"
 namespace Jack {typedef JackWinMutex JackMutex; }