diff --git a/ChangeLog b/ChangeLog index 64abde55..0ecb5ff9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,10 @@ Florian Faber Jackdmp changes log --------------------------- +2008-08-06 Stephane Letz + + * Correct driver hierarchy on macosx and windows targets. + 2008-08-05 Stephane Letz * Merge Michael Voigt "drops" branch after reorganization step. @@ -33,8 +37,8 @@ Florian Faber 2008-09-03 Stephane Letz - * Implement DBUS entry points to handle internal clients, add new commands in jack_control." - * Add new "desc" (extended description) in jack_driver_desc_t, to be used by backends and internal clients." + * Implement DBUS entry points to handle internal clients, add new commands in jack_control. + * Add new "desc" (extended description) in jack_driver_desc_t, to be used by backends and internal clients. 2008-09-01 Stephane Letz diff --git a/common/wscript b/common/wscript index 27a9e544..fe71f3d4 100644 --- a/common/wscript +++ b/common/wscript @@ -43,7 +43,7 @@ def create_jack_process_obj(bld, target, sources, uselib = None): process.env['shlib_PATTERN'] = '%s.so' process.defines = 'HAVE_CONFIG_H' if bld.env()['IS_MACOSX']: - env_includes = ['../macosx', '../posix'] + env_includes = ['../macosx', '../posix', '../macosx/coreaudio'] if bld.env()['IS_LINUX']: env_includes = ['../linux', '../posix', '../linux/alsa'] process.includes = ['.'] + env_includes + ['jack', '..'] @@ -224,7 +224,7 @@ def build(bld): ] if bld.env()['IS_MACOSX']: - audio_adapter_sources += ['../macosx/JackCoreAudioAdapter.cpp'] + audio_adapter_sources += ['../macosx/coreaudio/JackCoreAudioAdapter.cpp'] process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) process.env.append_value("LINKFLAGS", "../macosx/libportaudio.a -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreServices") process.env.append_value("LINKFLAGS", "-lsamplerate") diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index b55d1863..06201fac 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -102,8 +102,6 @@ /* Begin PBXBuildFile section */ 4B0A28ED0D520852002EFF74 /* tw.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B0A28EC0D520852002EFF74 /* tw.c */; }; 4B0A29260D52108E002EFF74 /* tw.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B0A28EC0D520852002EFF74 /* tw.c */; }; - 4B19B3040E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3020E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp */; }; - 4B19B3050E2362BB00DD4A82 /* JackCoreAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3030E2362BB00DD4A82 /* JackCoreAudioAdapter.h */; }; 4B19B3130E2362E800DD4A82 /* JackAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3060E2362E700DD4A82 /* JackAudioAdapter.cpp */; }; 4B19B3140E2362E800DD4A82 /* JackAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3070E2362E700DD4A82 /* JackAudioAdapter.h */; }; 4B19B3150E2362E800DD4A82 /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */; }; @@ -294,8 +292,6 @@ 4B35C5E20D4731D2000DE7AE /* testSynchroServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA577FB08BF8E4600F82DE1 /* testSynchroServer.cpp */; }; 4B35C5F60D4731D2000DE7AE /* testSynchroClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA577BC08BF8BE200F82DE1 /* testSynchroClient.cpp */; }; 4B35C60A0D4731D2000DE7AE /* testSynchroServerClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBD13CC08C71EB40079F7FF /* testSynchroServerClient.cpp */; }; - 4B35C6160D4731D2000DE7AE /* JackCoreAudioDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B395C9706AEF53800923527 /* JackCoreAudioDriver.h */; }; - 4B35C6180D4731D2000DE7AE /* JackCoreAudioDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B395C9606AEF53800923527 /* JackCoreAudioDriver.cpp */; }; 4B35C6210D4731D2000DE7AE /* JackPortAudioDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B978DEB0A31D099009E2DD1 /* JackPortAudioDriver.h */; }; 4B35C6230D4731D2000DE7AE /* JackPortAudioDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B978DEC0A31D099009E2DD1 /* JackPortAudioDriver.cpp */; }; 4B35C62C0D4731D2000DE7AE /* JackDummyDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3988A08B3CF6C00B6F371 /* JackDummyDriver.h */; }; @@ -468,8 +464,6 @@ 4B699D59097D421600A18468 /* testSynchroServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA577FB08BF8E4600F82DE1 /* testSynchroServer.cpp */; }; 4B699D71097D421600A18468 /* testSynchroClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA577BC08BF8BE200F82DE1 /* testSynchroClient.cpp */; }; 4B699D89097D421700A18468 /* testSynchroServerClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBD13CC08C71EB40079F7FF /* testSynchroServerClient.cpp */; }; - 4B699D99097D421700A18468 /* JackCoreAudioDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B395C9706AEF53800923527 /* JackCoreAudioDriver.h */; }; - 4B699D9B097D421700A18468 /* JackCoreAudioDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B395C9606AEF53800923527 /* JackCoreAudioDriver.cpp */; }; 4B699DA8097D421700A18468 /* JackDummyDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3988A08B3CF6C00B6F371 /* JackDummyDriver.h */; }; 4B699DAA097D421700A18468 /* JackDummyDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3988908B3CF6C00B6F371 /* JackDummyDriver.cpp */; }; 4B6B9EF60CD095930051EE5A /* midiport.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6B9EF50CD0958B0051EE5A /* midiport.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -566,6 +560,10 @@ 4BE4CC020CDA153500CCF5BB /* JackTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE4CC000CDA153400CCF5BB /* JackTools.h */; }; 4BE4CC030CDA153500CCF5BB /* JackTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */; }; 4BE4CC040CDA153500CCF5BB /* JackTools.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE4CC000CDA153400CCF5BB /* JackTools.h */; }; + 4BE5FECD0E725C090020B576 /* JackCoreAudioDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE5FECB0E725C090020B576 /* JackCoreAudioDriver.cpp */; }; + 4BE5FECE0E725C090020B576 /* JackCoreAudioDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE5FECC0E725C090020B576 /* JackCoreAudioDriver.h */; }; + 4BE5FED10E725C320020B576 /* JackCoreAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE5FECF0E725C320020B576 /* JackCoreAudioAdapter.cpp */; }; + 4BE5FED20E725C320020B576 /* JackCoreAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE5FED00E725C320020B576 /* JackCoreAudioAdapter.h */; }; 4BE6C6AD0A3E0A65005A203A /* jack_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6C6AC0A3E0A65005A203A /* jack_test.cpp */; }; 4BF4BAB10E3480AB00403CDF /* JackAudioAdapterFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF4BAB00E3480AB00403CDF /* JackAudioAdapterFactory.cpp */; }; 4BF520530CB8D0E80037470E /* timestamps.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF520520CB8D0E80037470E /* timestamps.c */; }; @@ -1159,8 +1157,6 @@ 4B0A28EC0D520852002EFF74 /* tw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tw.c; path = "../example-clients/tw.c"; sourceTree = SOURCE_ROOT; }; 4B0A292D0D52108E002EFF74 /* jack_thread_wait */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_thread_wait; sourceTree = BUILT_PRODUCTS_DIR; }; 4B19B3000E23620F00DD4A82 /* audioadapter.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = audioadapter.so; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B19B3020E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JackCoreAudioAdapter.cpp; sourceTree = SOURCE_ROOT; }; - 4B19B3030E2362BB00DD4A82 /* JackCoreAudioAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JackCoreAudioAdapter.h; sourceTree = SOURCE_ROOT; }; 4B19B3060E2362E700DD4A82 /* JackAudioAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapter.cpp; path = ../common/JackAudioAdapter.cpp; sourceTree = SOURCE_ROOT; }; 4B19B3070E2362E700DD4A82 /* JackAudioAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackAudioAdapter.h; path = ../common/JackAudioAdapter.h; sourceTree = SOURCE_ROOT; }; 4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapterInterface.cpp; path = ../common/JackAudioAdapterInterface.cpp; sourceTree = SOURCE_ROOT; }; @@ -1213,12 +1209,10 @@ 4B37C20306DF1FBE0016E567 /* CALatencyLog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CALatencyLog.cpp; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.cpp; sourceTree = ""; }; 4B37C20406DF1FBE0016E567 /* CALatencyLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CALatencyLog.h; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.h; sourceTree = ""; }; 4B37C20906DF1FE20016E567 /* latency.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = latency.c; path = /Developer/Examples/CoreAudio/PublicUtility/latency.c; sourceTree = ""; }; - 4B395C9606AEF53800923527 /* JackCoreAudioDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackCoreAudioDriver.cpp; sourceTree = SOURCE_ROOT; }; - 4B395C9706AEF53800923527 /* JackCoreAudioDriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JackCoreAudioDriver.h; sourceTree = SOURCE_ROOT; }; 4B3F49070AD8503300491C6E /* jack_cpu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jack_cpu.c; path = ../tests/jack_cpu.c; sourceTree = SOURCE_ROOT; }; 4B4259E5076B635E00C1ECE1 /* JackMacEngineRPC.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackMacEngineRPC.cpp; sourceTree = SOURCE_ROOT; }; 4B44FAE50C7598370033A72C /* JackServerLaunch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackServerLaunch.cpp; path = ../common/JackServerLaunch.cpp; sourceTree = SOURCE_ROOT; }; - 4B464301076CAC7700E5077C /* Jack-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = "Jack-Info.plist"; sourceTree = SOURCE_ROOT; }; + 4B464301076CAC7700E5077C /* Jack-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "Jack-Info.plist"; sourceTree = SOURCE_ROOT; }; 4B4CA9730E02CF9600F4BFDA /* JackRestartThreadedDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackRestartThreadedDriver.h; path = ../common/JackRestartThreadedDriver.h; sourceTree = SOURCE_ROOT; }; 4B4CA9740E02CF9600F4BFDA /* JackRestartThreadedDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackRestartThreadedDriver.cpp; path = ../common/JackRestartThreadedDriver.cpp; sourceTree = SOURCE_ROOT; }; 4B4E9AF80E5F1090000A3278 /* JackControlAPI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackControlAPI.cpp; path = ../common/JackControlAPI.cpp; sourceTree = SOURCE_ROOT; }; @@ -1332,7 +1326,11 @@ 4BD6240C0CBCF16600DE782F /* inprocess.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = inprocess.c; path = "../example-clients/inprocess.c"; sourceTree = SOURCE_ROOT; }; 4BE4CBFF0CDA153400CCF5BB /* JackTools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackTools.cpp; path = ../common/JackTools.cpp; sourceTree = SOURCE_ROOT; }; 4BE4CC000CDA153400CCF5BB /* JackTools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackTools.h; path = ../common/JackTools.h; sourceTree = SOURCE_ROOT; }; - 4BE50F8F0B01EE8000C05E63 /* Jackwrapper-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Jackwrapper-Info.plist"; sourceTree = ""; }; + 4BE50F8F0B01EE8000C05E63 /* Jackwrapper-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Jackwrapper-Info.plist"; sourceTree = ""; }; + 4BE5FECB0E725C090020B576 /* JackCoreAudioDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreAudioDriver.cpp; path = coreaudio/JackCoreAudioDriver.cpp; sourceTree = SOURCE_ROOT; }; + 4BE5FECC0E725C090020B576 /* JackCoreAudioDriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackCoreAudioDriver.h; path = coreaudio/JackCoreAudioDriver.h; sourceTree = SOURCE_ROOT; }; + 4BE5FECF0E725C320020B576 /* JackCoreAudioAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreAudioAdapter.cpp; path = coreaudio/JackCoreAudioAdapter.cpp; sourceTree = SOURCE_ROOT; }; + 4BE5FED00E725C320020B576 /* JackCoreAudioAdapter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackCoreAudioAdapter.h; path = coreaudio/JackCoreAudioAdapter.h; sourceTree = SOURCE_ROOT; }; 4BE6C6A30A3E096F005A203A /* jack_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_test; sourceTree = BUILT_PRODUCTS_DIR; }; 4BE6C6AC0A3E0A65005A203A /* jack_test.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = jack_test.cpp; path = ../tests/jack_test.cpp; sourceTree = SOURCE_ROOT; }; 4BE99D300AD7A04800C59091 /* jack_cpu */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_cpu; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2242,6 +2240,8 @@ 4B19B3010E23629800DD4A82 /* Adapter */ = { isa = PBXGroup; children = ( + 4BE5FECF0E725C320020B576 /* JackCoreAudioAdapter.cpp */, + 4BE5FED00E725C320020B576 /* JackCoreAudioAdapter.h */, 4BF4BAB00E3480AB00403CDF /* JackAudioAdapterFactory.cpp */, 4B19B3060E2362E700DD4A82 /* JackAudioAdapter.cpp */, 4B19B3070E2362E700DD4A82 /* JackAudioAdapter.h */, @@ -2251,8 +2251,6 @@ 4B19B30E0E2362E700DD4A82 /* JackLibSampleRateResampler.cpp */, 4B19B30F0E2362E700DD4A82 /* JackLibSampleRateResampler.h */, 4B19B3120E2362E700DD4A82 /* JackResampler.cpp */, - 4B19B3020E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp */, - 4B19B3030E2362BB00DD4A82 /* JackCoreAudioAdapter.h */, ); name = Adapter; sourceTree = ""; @@ -2507,11 +2505,11 @@ 4BD56D8607968979006D44F9 /* Audio */ = { isa = PBXGroup; children = ( + 4BE5FECB0E725C090020B576 /* JackCoreAudioDriver.cpp */, + 4BE5FECC0E725C090020B576 /* JackCoreAudioDriver.h */, 4B940B9B06DDDE5B00D77F60 /* AudioHardware.h */, 4BF8D2290834F07D00C94B91 /* JackAudioDriver.h */, 4BF8D22A0834F07D00C94B91 /* JackAudioDriver.cpp */, - 4B395C9706AEF53800923527 /* JackCoreAudioDriver.h */, - 4B395C9606AEF53800923527 /* JackCoreAudioDriver.cpp */, BA15108F0E1D19B9004A8C63 /* JackPortAudioDevices.h */, BA15108E0E1D19B9004A8C63 /* JackPortAudioDevices.cpp */, 4B978DEB0A31D099009E2DD1 /* JackPortAudioDriver.h */, @@ -2619,11 +2617,11 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4B19B3050E2362BB00DD4A82 /* JackCoreAudioAdapter.h in Headers */, 4B19B3140E2362E800DD4A82 /* JackAudioAdapter.h in Headers */, 4B19B3160E2362E800DD4A82 /* JackAudioAdapterInterface.h in Headers */, 4B19B3190E2362E800DD4A82 /* JackException.h in Headers */, 4B19B31C0E2362E800DD4A82 /* JackLibSampleRateResampler.h in Headers */, + 4BE5FED20E725C320020B576 /* JackCoreAudioAdapter.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2883,7 +2881,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4B35C6160D4731D2000DE7AE /* JackCoreAudioDriver.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3198,7 +3195,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4B699D99097D421700A18468 /* JackCoreAudioDriver.h in Headers */, + 4BE5FECE0E725C090020B576 /* JackCoreAudioDriver.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5278,12 +5275,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4B19B3040E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp in Sources */, 4B19B3130E2362E800DD4A82 /* JackAudioAdapter.cpp in Sources */, 4B19B3150E2362E800DD4A82 /* JackAudioAdapterInterface.cpp in Sources */, 4B19B31B0E2362E800DD4A82 /* JackLibSampleRateResampler.cpp in Sources */, 4B19B31F0E2362E800DD4A82 /* JackResampler.cpp in Sources */, 4BF4BAB10E3480AB00403CDF /* JackAudioAdapterFactory.cpp in Sources */, + 4BE5FED10E725C320020B576 /* JackCoreAudioAdapter.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5547,7 +5544,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4B35C6180D4731D2000DE7AE /* JackCoreAudioDriver.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5868,7 +5864,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4B699D9B097D421700A18468 /* JackCoreAudioDriver.cpp in Sources */, + 4BE5FECD0E725C090020B576 /* JackCoreAudioDriver.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/JackCoreAudioAdapter.cpp b/macosx/coreaudio/JackCoreAudioAdapter.cpp similarity index 100% rename from macosx/JackCoreAudioAdapter.cpp rename to macosx/coreaudio/JackCoreAudioAdapter.cpp diff --git a/macosx/JackCoreAudioAdapter.h b/macosx/coreaudio/JackCoreAudioAdapter.h similarity index 100% rename from macosx/JackCoreAudioAdapter.h rename to macosx/coreaudio/JackCoreAudioAdapter.h diff --git a/macosx/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp similarity index 100% rename from macosx/JackCoreAudioDriver.cpp rename to macosx/coreaudio/JackCoreAudioDriver.cpp diff --git a/macosx/JackCoreAudioDriver.h b/macosx/coreaudio/JackCoreAudioDriver.h similarity index 100% rename from macosx/JackCoreAudioDriver.h rename to macosx/coreaudio/JackCoreAudioDriver.h diff --git a/macosx/wscript b/macosx/wscript index 2787933c..883ae3af 100644 --- a/macosx/wscript +++ b/macosx/wscript @@ -44,7 +44,7 @@ def build(bld): create_jack_driver_obj(bld, 'dummy', '../common/JackDummyDriver.cpp') - create_jack_audio_driver_obj(bld, 'coreaudio', 'JackCoreAudioDriver.cpp') + create_jack_audio_driver_obj(bld, 'coreaudio', 'coreaudio/JackCoreAudioDriver.cpp') portaudio_src = [ '../windows/JackPortAudioDriver.cpp', diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp index 3253957a..cb519d11 100644 --- a/windows/jack_audioadapter.cbp +++ b/windows/jack_audioadapter.cbp @@ -87,8 +87,8 @@ - - + + diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp index 4e0cfc13..8556baca 100644 --- a/windows/jack_portaudio.cbp +++ b/windows/jack_portaudio.cbp @@ -99,8 +99,8 @@ - - + + diff --git a/windows/JackPortAudioAdapter.cpp b/windows/portaudio/JackPortAudioAdapter.cpp similarity index 100% rename from windows/JackPortAudioAdapter.cpp rename to windows/portaudio/JackPortAudioAdapter.cpp diff --git a/windows/JackPortAudioAdapter.h b/windows/portaudio/JackPortAudioAdapter.h similarity index 100% rename from windows/JackPortAudioAdapter.h rename to windows/portaudio/JackPortAudioAdapter.h diff --git a/windows/JackPortAudioDevices.cpp b/windows/portaudio/JackPortAudioDevices.cpp similarity index 100% rename from windows/JackPortAudioDevices.cpp rename to windows/portaudio/JackPortAudioDevices.cpp diff --git a/windows/JackPortAudioDevices.h b/windows/portaudio/JackPortAudioDevices.h similarity index 100% rename from windows/JackPortAudioDevices.h rename to windows/portaudio/JackPortAudioDevices.h diff --git a/windows/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp similarity index 100% rename from windows/JackPortAudioDriver.cpp rename to windows/portaudio/JackPortAudioDriver.cpp diff --git a/windows/JackPortAudioDriver.h b/windows/portaudio/JackPortAudioDriver.h similarity index 100% rename from windows/JackPortAudioDriver.h rename to windows/portaudio/JackPortAudioDriver.h