diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp index 2d270656..84a97a54 100644 --- a/common/JackDriverLoader.cpp +++ b/common/JackDriverLoader.cpp @@ -531,7 +531,7 @@ jack_drivers_load (JSList * drivers) { HANDLE file; const char * ptr = NULL; JSList * driver_list = NULL; - jack_driver_desc_t * desc; + jack_driver_desc_t * desc = NULL; if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) { // for WIN32 ADDON_DIR is defined in JackConstants.h as relative path @@ -551,6 +551,11 @@ jack_drivers_load (JSList * drivers) { } do { + /* check the filename is of the right format */ + if (strncmp ("jack_", filedata.cFileName, 5) != 0) { + continue; + } + ptr = strrchr (filedata.cFileName, '.'); if (!ptr) { continue; @@ -560,6 +565,11 @@ jack_drivers_load (JSList * drivers) { continue; } + /* check if dll is an internal client */ + if (check_symbol(filedata.cFileName, "jack_internal_initialize")) { + continue; + } + desc = jack_get_descriptor (drivers, filedata.cFileName, "driver_get_descriptor"); if (desc) { driver_list = jack_slist_append (driver_list, desc); @@ -586,7 +596,7 @@ jack_drivers_load (JSList * drivers) { const char * ptr; int err; JSList * driver_list = NULL; - jack_driver_desc_t * desc; + jack_driver_desc_t * desc = NULL; const char* driver_dir; if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) { @@ -618,8 +628,12 @@ jack_drivers_load (JSList * drivers) { continue; } - desc = jack_get_descriptor (drivers, dir_entry->d_name, "driver_get_descriptor"); + /* check if dll is an internal client */ + if (check_symbol(dir_entry->d_name, "jack_internal_initialize")) { + continue; + } + desc = jack_get_descriptor (drivers, dir_entry->d_name, "driver_get_descriptor"); if (desc) { driver_list = jack_slist_append (driver_list, desc); } else { @@ -669,7 +683,7 @@ jack_internals_load (JSList * internals) { file = (HANDLE )FindFirstFile(dll_filename, &filedata); if (file == INVALID_HANDLE_VALUE) { - jack_error("error"); + jack_error("could not open driver directory %s", driver_dir); return NULL; } diff --git a/common/JackLibSampleRateResampler.cpp b/common/JackLibSampleRateResampler.cpp index ea70438d..4213a731 100644 --- a/common/JackLibSampleRateResampler.cpp +++ b/common/JackLibSampleRateResampler.cpp @@ -148,7 +148,7 @@ unsigned int JackLibSampleRateResampler::WriteResample(jack_default_audio_sample res = src_process(fResampler, &src_data); if (res != 0) { - jack_error("JackLibSampleRateResampler::ReadResample ratio = %f err = %s", fRatio, src_strerror(res)); + jack_error("JackLibSampleRateResampler::WriteResample ratio = %f err = %s", fRatio, src_strerror(res)); return 0; } @@ -167,7 +167,7 @@ unsigned int JackLibSampleRateResampler::WriteResample(jack_default_audio_sample if (read_frames < frames) { jack_error("Input available = %ld", available_frames); - jack_error("JackLibSampleRateResampler::ReadResample error read_frames = %ld", read_frames); + jack_error("JackLibSampleRateResampler::WriteResample error read_frames = %ld", read_frames); } return read_frames; diff --git a/common/jack/jack.h b/common/jack/jack.h index d50c0703..03d601b0 100644 --- a/common/jack/jack.h +++ b/common/jack/jack.h @@ -233,7 +233,7 @@ jack_nframes_t jack_thread_wait (jack_client_t*, int status) JACK_OPTIONAL_WEAK_ * * @return the number of frames of data to process */ - jack_nframes_t jack_cycle_wait (jack_client_t* client) JACK_OPTIONAL_WEAK_EXPORT; +jack_nframes_t jack_cycle_wait (jack_client_t* client) JACK_OPTIONAL_WEAK_EXPORT; /** * Signal next clients in the graph. diff --git a/example-clients/midi_latency_test.c b/example-clients/midi_latency_test.c index 88dad6ee..60d13882 100644 --- a/example-clients/midi_latency_test.c +++ b/example-clients/midi_latency_test.c @@ -77,7 +77,7 @@ typedef sem_t *semaphore_t; const char *ERROR_RESERVE = "could not reserve MIDI event on port buffer"; const char *ERROR_SHUTDOWN = "the JACK server has been shutdown"; -const char *ERROR_TIMEOUT = "timed out while waiting for MIDI message"; +const char *ERROR_TIMEOUT1 = "timed out while waiting for MIDI message"; const char *SOURCE_EVENT_RESERVE = "jack_midi_event_reserve"; const char *SOURCE_PROCESS = "handle_process"; @@ -209,7 +209,7 @@ get_semaphore_error() if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), semaphore_error_msg, 1024, NULL)) { - sprintf(semaphore_error_msg, 1023, "Unknown OS error code '%d'", + snprintf(semaphore_error_msg, 1023, "Unknown OS error code '%d'", error); } return semaphore_error_msg; @@ -284,7 +284,7 @@ handle_process(jack_nframes_t frames, void *arg) microseconds = jack_frames_to_time(client, last_frame_time) - last_activity_time; if ((microseconds / 1000000) >= timeout) { - set_process_error(SOURCE_PROCESS, ERROR_TIMEOUT); + set_process_error(SOURCE_PROCESS, ERROR_TIMEOUT1); } break; found_message: diff --git a/windows/JackRouter/JackRouter.cpp b/windows/JackRouter/JackRouter.cpp index e5086f8d..c5dbc495 100644 --- a/windows/JackRouter/JackRouter.cpp +++ b/windows/JackRouter/JackRouter.cpp @@ -29,13 +29,12 @@ Copyright (C) 2006 Grame #include "profport.h" /* - 08/07/2007 SL : USe jack_client_open instead of jack_client_new (automatic client renaming). 09/08/2007 SL : Add JackRouter.ini parameter file. 09/20/2007 SL : Better error report in DllRegisterServer (for Vista). 09/27/2007 SL : Add AUDO_CONNECT property in JackRouter.ini file. 10/10/2007 SL : Use ASIOSTInt32LSB instead of ASIOSTInt16LSB. - + 12/04/2011 SL : Compilation on Windows 64. */ //------------------------------------------------------------------------------------------ @@ -54,7 +53,13 @@ static const double twoRaisedTo32Reciprocal = 1. / twoRaisedTo32; #if WINDOWS #include "windows.h" #include "mmsystem.h" -#include "psapi.h" +#ifdef _WIN64 +#define JACK_ROUTER "JackRouter64.dll" +#include +#else +#define JACK_ROUTER "JackRouter.dll" +#include "./psapi.h" +#endif using namespace std; @@ -95,11 +100,11 @@ HRESULT _stdcall DllRegisterServer() LONG rc; char errstr[128]; - rc = RegisterAsioDriver (IID_ASIO_DRIVER,"JackRouter.dll","JackRouter","JackRouter","Apartment"); + rc = RegisterAsioDriver (IID_ASIO_DRIVER, JACK_ROUTER,"JackRouter","JackRouter","Apartment"); if (rc) { memset(errstr,0,128); - sprintf(errstr,"Register Server failed ! (%d)",rc); + sprintf(errstr,"Register Server failed ! (%d)", rc); MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"JackRouter",MB_OK); return -1; } @@ -115,7 +120,7 @@ HRESULT _stdcall DllUnregisterServer() LONG rc; char errstr[128]; - rc = UnregisterAsioDriver (IID_ASIO_DRIVER,"JackRouter.dll","JackRouter"); + rc = UnregisterAsioDriver (IID_ASIO_DRIVER,JACK_ROUTER,"JackRouter"); if (rc) { memset(errstr,0,128); @@ -175,7 +180,7 @@ JackRouter::JackRouter() : AsioDriver() printf("Constructor\n"); // Use "jackrouter.ini" parameters if available - HMODULE handle = LoadLibrary("JackRouter.dll"); + HMODULE handle = LoadLibrary(JACK_ROUTER); if (handle) { @@ -209,15 +214,11 @@ JackRouter::~JackRouter() { stop (); disposeBuffers (); - printf("Destructor\n"); jack_client_close(fClient); + printf("Destructor\n"); } //------------------------------------------------------------------------------------------ -#include -#include -#include -#include "psapi.h" static bool GetEXEName(DWORD dwProcessID, char* name) { diff --git a/windows/JackRouter/JackRouter.vcxproj b/windows/JackRouter/JackRouter.vcxproj new file mode 100644 index 00000000..bb9a751b --- /dev/null +++ b/windows/JackRouter/JackRouter.vcxproj @@ -0,0 +1,280 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + DynamicLibrary + false + + + DynamicLibrary + false + + + DynamicLibrary + false + + + DynamicLibrary + false + + + + + + + + + + + + + + + + + + + + + + + .\Debug\ + .\Debug\ + true + + + .\Debug\ + .\Debug\ + true + + + .\Release\ + .\Release\ + false + + + .\Release\ + .\Release\ + false + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + true + ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\JackRouter.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + true + _DEBUG;%(PreprocessorDefinitions) + .\Debug\JackRouter.tlb + true + Win32 + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\JackRouter.bsc + + + true + true + true + Windows + Debug/JackRouter_debug.dll + .\Debug\JackRouter_debug.lib + odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies) + .\JackRouter.def + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\JackRouter.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + true + _DEBUG;%(PreprocessorDefinitions) + .\Debug\JackRouter.tlb + true + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\JackRouter.bsc + + + true + true + true + Windows + Debug/JackRouter_debug.dll + .\Debug\JackRouter_debug.lib + odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies) + .\JackRouter.def + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + .\Release\ + true + .\Release\JackRouter.pch + .\Release\ + .\Release\ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\JackRouter.tlb + true + Win32 + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\JackRouter.bsc + + + true + true + Windows + .\Release\JackRouter.dll + .\Release\JackRouter.lib + odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies) + .\JackRouter.def + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;PSAPI_VERSION=2;%(PreprocessorDefinitions) + .\Release\ + true + .\Release\JackRouter.pch + .\Release\ + .\Release\ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\JackRouter.tlb + true + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\JackRouter64.bsc + + + true + true + Windows + .\Release\JackRouter64.dll + .\Release\JackRouter64.lib + odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies) + .\JackRouter.def + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/JackRouter/JackRouter.vcxproj.filters b/windows/JackRouter/JackRouter.vcxproj.filters new file mode 100644 index 00000000..899efbc8 --- /dev/null +++ b/windows/JackRouter/JackRouter.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {72f2b2b0-dbea-4574-94fa-0c1ea89a3c8e} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {9590ca0b-94c8-4c22-88b2-66724eb0ea21} + h;hpp;hxx;hm;inl + + + {9742e150-2741-4bf4-9b81-bea4aab464af} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + + + + + Source Files + + + \ No newline at end of file diff --git a/windows/JackRouter/JackRouter.vcxproj.user b/windows/JackRouter/JackRouter.vcxproj.user new file mode 100644 index 00000000..695b5c78 --- /dev/null +++ b/windows/JackRouter/JackRouter.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/windows/JackRouter/README b/windows/JackRouter/README index 5f2bce1d..0f59b441 100644 --- a/windows/JackRouter/README +++ b/windows/JackRouter/README @@ -1,3 +1,7 @@ This folder contains the sources for ASIO/JACK bridge ASIO driver called "JackRouter". The included project is a Microsoft VC++ 6 one. It requires some files (combase.cpp, dllentry.cpp, register.cpp) that are part on the ASIO driver SDK. The produced "JackRouter.dll" file -has to be registered in the system using the "regsvr32" tool. \ No newline at end of file +has to be registered in the system using the "regsvr32" tool. + +64 bits compilation +==================== +A Visual Studio 10 project has been added to compile 64 and 32 bits targets. \ No newline at end of file diff --git a/windows/JackRouter/resource.rc b/windows/JackRouter/resource.rc index e1580227..23387184 100644 --- a/windows/JackRouter/resource.rc +++ b/windows/JackRouter/resource.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -13,15 +13,12 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// French (France) resources +// Français (France) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH #pragma code_page(1252) -#endif //_WIN32 -#ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // // Version @@ -44,18 +41,14 @@ BEGIN BEGIN BLOCK "040c04b0" BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Grame\0" - VALUE "FileDescription", "JackRouter ASIO driver\0" - VALUE "FileVersion", "0, 2, 1, 0\0" - VALUE "InternalName", "JackRouter\0" - VALUE "LegalCopyright", "Copyright Grame © 2006-2010\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "JackRouter.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "JackRouter\0" - VALUE "ProductVersion", "0, 2, 1, 0\0" - VALUE "SpecialBuild", "\0" + VALUE "CompanyName", "Grame" + VALUE "FileDescription", "JackRouter ASIO driver" + VALUE "FileVersion", "0, 2, 1, 0" + VALUE "InternalName", "JackRouter" + VALUE "LegalCopyright", "Copyright Grame © 2006-2011" + VALUE "OriginalFilename", "JackRouter.dll" + VALUE "ProductName", "JackRouter" + VALUE "ProductVersion", "0, 2, 1, 0" END END BLOCK "VarFileInfo" @@ -64,8 +57,6 @@ BEGIN END END -#endif // !_MAC - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -73,18 +64,18 @@ END // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -92,7 +83,7 @@ END #endif // APSTUDIO_INVOKED -#endif // French (France) resources +#endif // Français (France) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/windows/Release/bin/libsamplerate-0.dll b/windows/Release/bin/libsamplerate_x86.dll similarity index 98% rename from windows/Release/bin/libsamplerate-0.dll rename to windows/Release/bin/libsamplerate_x86.dll index ceadc596..0eb2f104 100644 Binary files a/windows/Release/bin/libsamplerate-0.dll and b/windows/Release/bin/libsamplerate_x86.dll differ diff --git a/windows/Release/bin/portaudio_x86.dll b/windows/Release/bin/portaudio_x86.dll index ec083746..12f56208 100644 Binary files a/windows/Release/bin/portaudio_x86.dll and b/windows/Release/bin/portaudio_x86.dll differ diff --git a/windows/Release64/bin/libsamplerate_x86_64.dll b/windows/Release64/bin/libsamplerate_x86_64.dll new file mode 100644 index 00000000..099bed58 Binary files /dev/null and b/windows/Release64/bin/libsamplerate_x86_64.dll differ diff --git a/windows/Release64/bin/portaudio_x86_64.dll b/windows/Release64/bin/portaudio_x86_64.dll new file mode 100644 index 00000000..41086a3c Binary files /dev/null and b/windows/Release64/bin/portaudio_x86_64.dll differ diff --git a/windows/Setup/JackRouter.dll b/windows/Setup/JackRouter.dll index 860fcc39..e4709cd3 100644 Binary files a/windows/Setup/JackRouter.dll and b/windows/Setup/JackRouter.dll differ diff --git a/windows/Setup/JackRouter64.dll b/windows/Setup/JackRouter64.dll new file mode 100644 index 00000000..543820d4 Binary files /dev/null and b/windows/Setup/JackRouter64.dll differ diff --git a/windows/Setup/README b/windows/Setup/README index 78588ece..fa854b37 100644 --- a/windows/Setup/README +++ b/windows/Setup/README @@ -14,4 +14,11 @@ Just use : 'dlltool -l libjackserver.lib -D libjackserver.dll -d libjackserver.d Once all binaries are available, just execute the script in 'CreateInstall' to make 'setup.exe'. The setup will copy all binaries to a specified folder, register the JackRouter (in order to have it in the ASIO drivers list) and create some shortcuts in the start menu. -It's a good and proper way to get jack installed on windows. \ No newline at end of file +It's a good and proper way to get jack installed on windows. + +64 bits compilation +==================== + +- for some reasons CodeBlocks create libjack.dll.a and libjack.dll.def names. So the ".dll" part has to be removed before using "lib" tool to create ".lib" files. + +- to create 64 bits ".lib" files, the "/MACHINE:X64 option has to be used. diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci index 703e3354..e1dd6386 100644 --- a/windows/Setup/jack.ci +++ b/windows/Setup/jack.ci @@ -1,7 +1,7 @@ <*project version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" > . - Jack_v1.9.8_setup.exe + Jack_v1.9.8_32_setup.exe Jack v1.9.8 @@ -53,8 +53,8 @@ - <_>..\Release\bin\libjack.ainstlibovernewer0 -<_>.\src\vcredist_x86.exeinstovernewer0 +<_>.\src\vcredist_2010_x86.exeinstovernewer0 +<_>..\Release\bin\libjack.ainstlibovernewer0 <_>..\Release\bin\libjack.libinstlibovernewer0 <_>..\Release\bin\libjack.definstlibovernewer0 <_>..\Release\bin\libjackserver.ainstlibovernewer0 @@ -66,10 +66,11 @@ <_>..\Release\bin\jack_lsp.exeinstovernewer0 <_>..\Release\bin\jack_metro.exeinstovernewer0 <_>..\Release\bin\jack_unload.exeinstovernewer0 +<_>..\Release\bin\jack_midi_latency_test.exeinstovernewer0 <_>..\Release\bin\jackd.exeinstovernewer0 <_>..\Release\bin\libjack.dllsysovernewer0 <_>..\Release\bin\libjackserver.dllsysovernewer0 -<_>..\Release\bin\libsamplerate-0.dllinstovernewer0 +<_>..\Release\bin\libsamplerate_x86.dllinstovernewer0 <_>..\Release\bin\portaudio_x86.dllinstovernewer0 <_>..\Release\bin\jack\jack_net.dllinstjackovernewer0 <_>..\Release\bin\jack\jack_netone.dllinstjackovernewer0 @@ -106,8 +107,7 @@ - <_>appinstvcredist_x86.exe1instend - + <_>appinstvcredist_2010_x86.exe1instend diff --git a/windows/Setup/jack64.ci b/windows/Setup/jack64.ci index 881bd9e0..24eaa6e9 100644 --- a/windows/Setup/jack64.ci +++ b/windows/Setup/jack64.ci @@ -1,5 +1,5 @@ <*project - version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" > + version = 4 civer = "Free v4.14.5" winver = "2.8/6.1.7600" > . Jack_v1.9.8_64_setup.exe @@ -50,27 +50,38 @@ My Demo - + - <_>..\Release64\bin\libjack64.ainstlibovernewer0 -<_>.\src\vcredist_x86.exeinstovernewer0 +<_>.\src\vcredist_2010_x86.exeinstovernewer0 +<_>.\src\vcredist_2010_x64.exeinstovernewer0 +<_>..\Release64\bin\libjack64.ainstlibovernewer0 <_>..\Release64\bin\libjack64.libinstlibovernewer0 <_>..\Release64\bin\libjack64.definstlibovernewer0 +<_>..\Release64\bin\libjack64.dllwinovernewer0 <_>..\Release64\bin\libjackserver64.ainstlibovernewer0 <_>..\Release64\bin\libjackserver64.libinstlibovernewer0 <_>..\Release64\bin\libjackserver64.definstlibovernewer0 +<_>..\Release64\bin\libjackserver64.dllwinovernewer0 +<_>..\Release\bin\libjack.ainstlibovernewer0 +<_>..\Release\bin\libjack.libinstlibovernewer0 +<_>..\Release\bin\libjack.definstlibovernewer0 +<_>..\Release\bin\libjack.dllsysovernewer0 +<_>..\Release\bin\libjackserver.ainstlibovernewer0 +<_>..\Release\bin\libjackserver.libinstlibovernewer0 +<_>..\Release\bin\libjackserver.definstlibovernewer0 +<_>..\Release\bin\libjackserver.dllsysovernewer0 <_>..\Release64\bin\jack_connect.exeinstovernewer0 <_>..\Release64\bin\jack_disconnect.exeinstovernewer0 <_>..\Release64\bin\jack_load.exeinstovernewer0 <_>..\Release64\bin\jack_lsp.exeinstovernewer0 <_>..\Release64\bin\jack_metro.exeinstovernewer0 <_>..\Release64\bin\jack_unload.exeinstovernewer0 +<_>..\Release64\bin\jack_midi_latency_test.exeinstovernewer0 <_>..\Release64\bin\jackd.exeinstovernewer0 -<_>..\Release64\bin\libjack64.dllsysovernewer0 -<_>..\Release64\bin\libjackserver64.dllsysovernewer0 -<_>..\Release64\bin\libsamplerate-0-x86_64.dllinstovernewer0 +<_>..\Release64\bin\libsamplerate_x86_64.dllinstovernewer0 <_>..\Release64\bin\portaudio_x86_64.dllinstovernewer0 +<_>..\Release\bin\portaudio_x86.dllinstovernewer0 <_>..\Release64\bin\jack\jack_net.dllinstjackovernewer0 <_>..\Release64\bin\jack\jack_netone.dllinstjackovernewer0 <_>..\Release64\bin\jack_netsource.exeinstovernewer0 @@ -94,6 +105,7 @@ <_>..\..\common\jack\systemdeps.hinstincludes\jackovernewer1 <_>..\..\common\jack\weakjack.hinstincludes\jackovernewer1 <_>..\..\common\jack\weakmacros.hinstincludes\jackovernewer1 +<_>.\JackRouter.dllinstovernewer0 <_>.\JackRouter64.dllinstovernewer0 <_>.\JackRouter.iniinstovernewer0 <_>.\qjackctl\mingwm10.dllinstovernewer0 @@ -106,37 +118,38 @@ -<_>appinstvcredist_x86.exe1instend - + <_>appinstvcredist_2010_x86.exe1instend + <_>appinstvcredist_2010_x64.exe1instend - + -<_>progJack NetDriverinstjackd.exe-R -S -d netinst + <_>progJack NetDriverinstjackd.exe-R -S -d netinst <_>progJack Portaudioinstjackd.exe-R -S -d portaudioinst <_>progJack Controlinstqjackctl.exeinstjackdmp.exe <_>progJack Commandsyscmd.exeinst - + - + - <_>instJackRouter64.dll + <_>instJackRouter.dll + <_>instJackRouter64.dll - + - + - + Pathadd= - + \ No newline at end of file diff --git a/windows/Setup/src/gpl_installer.rtf b/windows/Setup/src/gpl_installer.rtf index cc8bcb4e..fac711f5 100644 Binary files a/windows/Setup/src/gpl_installer.rtf and b/windows/Setup/src/gpl_installer.rtf differ diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp index 7c915a46..6ad084a7 100644 --- a/windows/jack_audioadapter.cbp +++ b/windows/jack_audioadapter.cbp @@ -95,7 +95,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -152,7 +152,7 @@ - + diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp index 5a5f8168..6424a96e 100644 --- a/windows/jack_netadapter.cbp +++ b/windows/jack_netadapter.cbp @@ -85,7 +85,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/windows/jack_netsource.cbp b/windows/jack_netsource.cbp index 99a895fc..e4dd05bc 100644 --- a/windows/jack_netsource.cbp +++ b/windows/jack_netsource.cbp @@ -81,7 +81,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -124,7 +124,7 @@ - + diff --git a/windows/jackd.workspace b/windows/jackd.workspace index 7a05eb57..c55b6e63 100644 --- a/windows/jackd.workspace +++ b/windows/jackd.workspace @@ -7,14 +7,12 @@ - - + - @@ -23,5 +21,8 @@ + + + diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp index 25e6338d..720aee33 100644 --- a/windows/libjackserver.cbp +++ b/windows/libjackserver.cbp @@ -70,7 +70,7 @@ - +