diff --git a/common/JackAudioAdapterFactory.cpp b/common/JackAudioAdapterFactory.cpp index 3c7b0879..0fb21bc8 100644 --- a/common/JackAudioAdapterFactory.cpp +++ b/common/JackAudioAdapterFactory.cpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2008 Grame +Copyright (C) 2008-2012 Grame This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,27 +18,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "JackAudioAdapter.h" +#include "JackPlatformPlug.h" #include "JackArgParser.h" + #include #include #include -#ifdef __linux__ -#include "JackAlsaAdapter.h" -#endif - -#ifdef __APPLE__ -#include "JackCoreAudioAdapter.h" -#endif - -#ifdef WIN32 -#include "JackPortAudioAdapter.h" -#endif - -#if defined(__sun__) || defined(sun) -#include "JackOSSAdapter.h" -#endif - #ifdef __cplusplus extern "C" { @@ -56,22 +42,7 @@ extern "C" try { - #ifdef __linux__ - adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackAlsaAdapter(buffer_size, sample_rate, params)); - #endif - - #ifdef WIN32 - adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackPortAudioAdapter(buffer_size, sample_rate, params)); - #endif - - #ifdef __APPLE__ - adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackCoreAudioAdapter(buffer_size, sample_rate, params)); - #endif - - #if defined(__sun__) || defined(sun) - adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackOSSAdapter(buffer_size, sample_rate, params)); - #endif - + adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackPlatformAdapter(buffer_size, sample_rate, params)); assert(adapter); if (adapter->Open() == 0) { @@ -82,6 +53,7 @@ extern "C" } } catch (...) { + jack_info("audioadapter allocation error"); return 1; } } diff --git a/common/JackNetAdapter.cpp b/common/JackNetAdapter.cpp index 2f51d0f0..fc3a59b8 100644 --- a/common/JackNetAdapter.cpp +++ b/common/JackNetAdapter.cpp @@ -463,7 +463,7 @@ extern "C" } } catch (...) { - jack_info("NetAdapter allocation error"); + jack_info("netadapter allocation error"); return 1; } } diff --git a/linux/JackPlatformPlug_os.h b/linux/JackPlatformPlug_os.h index b480f453..290a02d4 100644 --- a/linux/JackPlatformPlug_os.h +++ b/linux/JackPlatformPlug_os.h @@ -40,6 +40,10 @@ namespace Jack class JackNetUnixSocket; } +/* __JackPlatformAdapter__ */ +#include "JackAlsaAdapter.h" +namespace Jack { typedef JackAlsaAdapter JackPlatformAdapter; } + /* __JackPlatformMutex__ */ #include "JackPosixMutex.h" namespace Jack {typedef JackPosixMutex JackMutex; } diff --git a/macosx/JackPlatformPlug_os.h b/macosx/JackPlatformPlug_os.h index 059b16e5..bf6cccc2 100644 --- a/macosx/JackPlatformPlug_os.h +++ b/macosx/JackPlatformPlug_os.h @@ -50,6 +50,10 @@ namespace Jack #endif } +/* __JackPlatformAdapter__ */ +#include "JackCoreAudioAdapter.h" +namespace Jack { typedef JackCoreAudioAdapter JackPlatformAdapter; } + /* __JackPlatformMutex__ */ #include "JackPosixMutex.h" namespace Jack { typedef JackPosixMutex JackMutex; } diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index 6f9ccf4c..9ba8e5f4 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -8737,6 +8737,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ""; HEADER_SEARCH_PATHS = ( + ../macosx, /opt/local/include, ., ../posix, @@ -8787,6 +8788,7 @@ GCC_MODEL_TUNING = G4; GCC_PREPROCESSOR_DEFINITIONS = ""; HEADER_SEARCH_PATHS = ( + ../macosx, /opt/local/include, ., ../posix, @@ -17908,6 +17910,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ""; HEADER_SEARCH_PATHS = ( + ../macosx, /opt/local/include, ., ../posix, @@ -17960,6 +17963,7 @@ GCC_MODEL_TUNING = G4; GCC_PREPROCESSOR_DEFINITIONS = ""; HEADER_SEARCH_PATHS = ( + ../macosx, /opt/local/include, ., ../posix, diff --git a/macosx/install_jackdmp b/macosx/install_jackdmp index ea4c9d21..b136f218 100755 --- a/macosx/install_jackdmp +++ b/macosx/install_jackdmp @@ -29,18 +29,26 @@ sudo cp jack_loopback.so /usr/local/lib/jackmp [ -f audioadapter.so ] && sudo cp audioadapter.so /usr/local/lib/jackmp # Create links to jackmp ressources -cd /usr/local/lib && [ -f libjack.0.dylib ] && sudo mv -f libjack.0.dylib tmp_libjack.0.dylib -cd /usr/local/lib && [ -f jackd ] && sudo mv -f jackd tmp_jackd +cd /usr/local/bin && [ -f jackd ] && sudo rm jackd + +cd /usr/local/lib && [ -f libjack.0.dylib ] && sudo rm libjack.0.dylib cd /usr/local/lib && [ -f libjack.dylib ] && sudo rm libjack.dylib + +cd /usr/local/lib && [ -f libjackserver.0.dylib ] && sudo rm libjackserver.0.dylib +cd /usr/local/lib && [ -f libjackserver.dylib ] && sudo rm libjackserver.dylib + cd /usr/local/lib && [ -f libjacknet.dylib ] && sudo rm libjacknet.dylib cd /usr/local/lib && [ -f libjacknet.0.dylib ] && sudo rm libjacknet.0.dylib -cd /usr/local/bin && [ -f jackd ] && sudo rm jackd + cd /usr/local/lib && sudo ln -s /System/Library/Frameworks/Jackmp.framework/Jackmp libjack.dylib cd /usr/local/lib && sudo ln -s /System/Library/Frameworks/Jackmp.framework/Jackmp libjack.0.dylib + cd /usr/local/lib && sudo ln -s /System/Library/Frameworks/Jackservermp.framework/Jackservermp libjackserver.dylib cd /usr/local/lib && sudo ln -s /System/Library/Frameworks/Jackservermp.framework/Jackservermp libjackserver.0.dylib + cd /usr/local/lib && sudo ln -s /System/Library/Frameworks/Jacknet.framework/Jacknet libjacknet.dylib cd /usr/local/lib && sudo ln -s /System/Library/Frameworks/Jacknet.framework/Jacknet libjacknet.0.dylib + cd /usr/local/bin && sudo ln -s jackdmp jackd diff --git a/macosx/remove_jackdmp b/macosx/remove_jackdmp index 688cad40..b7ba42f1 100755 --- a/macosx/remove_jackdmp +++ b/macosx/remove_jackdmp @@ -9,8 +9,4 @@ sudo rm -r "/System/Library/Frameworks/Jacknet.framework" sudo rm -r "/Library/Audio/Plug-Ins/HAL/JackRouter.plugin" # Tries to restore jack -cd /usr/local/lib && sudo rm -r libjack.0.dylib -cd /usr/local/lib && [ -f tmp_libjack.0.dylib ] && sudo mv -f tmp_libjack.0.dylib libjack.0.dylib -cd /usr/local/lib && ln -s libjack.0.dylib libjack.dylib -cd /usr/local/bin && [ -f tmp_jackd ] && sudo mv -f tmp_jackd jackd diff --git a/solaris/JackPlatformPlug_os.h b/solaris/JackPlatformPlug_os.h index 9909ece2..7f4fa2cf 100644 --- a/solaris/JackPlatformPlug_os.h +++ b/solaris/JackPlatformPlug_os.h @@ -41,6 +41,10 @@ namespace Jack class JackNetUnixSocket; } +/* __JackPlatformAdapter__ */ +#include "JackOSSAdapter.h" +namespace Jack { typedef JackOSSAdapter JackPlatformAdapter; } + /* __JackPlatformMutex__ */ #include "JackPosixMutex.h" namespace Jack {typedef JackPosixMutex JackMutex; } diff --git a/windows/JackPlatformPlug_os.h b/windows/JackPlatformPlug_os.h index 65da4be8..9e34b985 100644 --- a/windows/JackPlatformPlug_os.h +++ b/windows/JackPlatformPlug_os.h @@ -47,6 +47,10 @@ namespace Jack class JackNetWinSocket; } +/* __JackPlatformAdapter__ */ +#include "JackPortAudioAdapter.h" +namespace Jack { typedef JackPortAudioAdapter JackPlatformAdapter; } + /* __JackPlatformMutex__ */ #include "JackWinMutex.h" namespace Jack {typedef JackWinMutex JackMutex; }