Changeset 3923

Timestamp:

02/24/10 09:47:31 (5 months ago)

Author:

sletz

Message:

Cleanup.

Files:

• jack2/branches/libjacknet/common/JackNetAPI.cpp (modified) (1 diff)
• jack2/branches/libjacknet/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj (modified) (16 diffs)
• jack2/branches/libjacknet/macosx/iphone/main_master.mm (modified) (6 diffs)

jack2/branches/libjacknet/common/JackNetAPI.cpp

@@ -385 +385 @@
-             return DataSend();
-             
- 
+
-            jack_error("Connection lost.");
-            return -1;

jack2/branches/libjacknet/macosx/iphone/iPhoneNet.xcodeproj/project.pbxproj

@@ -50 +50 @@
-                4B1A94590F49C03600D3626B /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A93510F49ACF300D3626B /* JackNetUnixSocket.cpp */; };
-                4B1A945A0F49C03600D3626B /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A933B0F49AC4500D3626B /* JackPosixThread.cpp */; };
-                4B1A947F0F49C42300D3626B /* JackAudioQueueAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A947D0F49C42300D3626B /* JackAudioQueueAdapter.cpp */; };
-                4B1A95760F49CEAB00D3626B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B1A95750F49CEAB00D3626B /* AudioToolbox.framework */; };
-                4B2791880F72570C000536B7 /* JackGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2791870F72570C000536B7 /* JackGlobals.cpp */; };
@@ -64 +63 @@
-                4B41469F10BD3C4300C12F0C /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A93510F49ACF300D3626B /* JackNetUnixSocket.cpp */; };
-                4B4146A010BD3C4300C12F0C /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A933B0F49AC4500D3626B /* JackPosixThread.cpp */; };
-                4B4146A110BD3C4300C12F0C /* JackAudioQueueAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A947D0F49C42300D3626B /* JackAudioQueueAdapter.cpp */; };
-                4B4146A210BD3C4300C12F0C /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1360E0F4B0B4C00218A3F /* JackAudioAdapterInterface.cpp */; };
-                4B4146A310BD3C4300C12F0C /* JackResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1364B0F4B0F7700218A3F /* JackResampler.cpp */; };
@@ -91 +89 @@
-                4BCF75E110BC2FD90082C526 /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A93510F49ACF300D3626B /* JackNetUnixSocket.cpp */; };
-                4BCF75E210BC2FD90082C526 /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A933B0F49AC4500D3626B /* JackPosixThread.cpp */; };
-                4BCF75E310BC2FD90082C526 /* JackAudioQueueAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A947D0F49C42300D3626B /* JackAudioQueueAdapter.cpp */; };
-                4BCF75E410BC2FD90082C526 /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1360E0F4B0B4C00218A3F /* JackAudioAdapterInterface.cpp */; };
-                4BCF75E510BC2FD90082C526 /* JackResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1364B0F4B0F7700218A3F /* JackResampler.cpp */; };
@@ -130 +127 @@
-                4BFF45680F4D5D9700106083 /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A93510F49ACF300D3626B /* JackNetUnixSocket.cpp */; };
-                4BFF45690F4D5D9700106083 /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A933B0F49AC4500D3626B /* JackPosixThread.cpp */; };
-                4BFF456A0F4D5D9700106083 /* JackAudioQueueAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1A947D0F49C42300D3626B /* JackAudioQueueAdapter.cpp */; };
-                4BFF456B0F4D5D9700106083 /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1360E0F4B0B4C00218A3F /* JackAudioAdapterInterface.cpp */; };
-                4BFF456C0F4D5D9700106083 /* JackResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1364B0F4B0F7700218A3F /* JackResampler.cpp */; };
@@ -162 +158 @@
-                4B1A93550F49ACFC00D3626B /* JackMachThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackMachThread.cpp; path = ../JackMachThread.cpp; sourceTree = SOURCE_ROOT; };
-                4B1A93870F49B0E300D3626B /* JackMachTime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = JackMachTime.c; path = ../JackMachTime.c; sourceTree = SOURCE_ROOT; };
-                4B1A947D0F49C42300D3626B /* JackAudioQueueAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioQueueAdapter.cpp; path = ../coreaudio/JackAudioQueueAdapter.cpp; sourceTree = SOURCE_ROOT; };
-                4B1A947E0F49C42300D3626B /* JackAudioQueueAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackAudioQueueAdapter.h; path = ../coreaudio/JackAudioQueueAdapter.h; sourceTree = SOURCE_ROOT; };
-                4B1A95750F49CEAB00D3626B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.1.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; };
-                4B2791870F72570C000536B7 /* JackGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackGlobals.cpp; path = ../../common/JackGlobals.cpp; sourceTree = SOURCE_ROOT; };
@@ -171 +165 @@
-                4BCB37D5112D64B4008C7BC1 /* HardwareClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HardwareClock.cpp; sourceTree = SOURCE_ROOT; };
-                4BCB37D8112D64D8008C7BC1 /* iphone-faust.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "iphone-faust.mm"; sourceTree = SOURCE_ROOT; };
-FaustNet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iPhoneFaust
+ThruNet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iPhoneThru
-                4BCF75F610BC30140082C526 /* audio_thru.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = audio_thru.mm; sourceTree = SOURCE_ROOT; };
-                4BF1360E0F4B0B4C00218A3F /* JackAudioAdapterInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapterInterface.cpp; path = ../../common/JackAudioAdapterInterface.cpp; sourceTree = SOURCE_ROOT; };
@@ -269 +263 @@
-                                4BFF45770F4D5D9700106083 /* iPhoneFaustNet.app */,
-                                4B0772380F54018C000DC657 /* iPhoneNetMaster.app */,
-Faust
+Thru
-                                4B4146B010BD3C4300C12F0C /* iPhoneFaustNet.app */,
-                                4BCB37CE112D647C008C7BC1 /* iPhoneFaust.app */,
@@ -284 +278 @@
-                                4BF15F7711357A0E00B36B9A /* TiPhoneCoreAudioRenderer.cpp */,
-                                29B97315FDCFA39411CA2CEA /* Other Sources */,
-                                29B97317FDCFA39411CA2CEA /* Resources */,
-                                29B97323FDCFA39411CA2CEA /* Frameworks */,
-                                19C28FACFE9D520D11CA2CBB /* Products */,
@@ -294 +287 @@
-                        isa = PBXGroup;
-                        children = (
+                                29B97317FDCFA39411CA2CEA /* Resources */,
-                                4BCF75F610BC30140082C526 /* audio_thru.mm */,
-                                4BBDC8F90F5420C000465F9C /* freeverb.mm */,
@@ -303 +297 @@
-                                4BF1360E0F4B0B4C00218A3F /* JackAudioAdapterInterface.cpp */,
-                                4BF136120F4B0B5E00218A3F /* JackAudioAdapterInterface.h */,
-                                4B1A947D0F49C42300D3626B /* JackAudioQueueAdapter.cpp */,
-                                4B1A947E0F49C42300D3626B /* JackAudioQueueAdapter.h */,
-                                4B1A93870F49B0E300D3626B /* JackMachTime.c */,
-                                4B1A93540F49ACFC00D3626B /* JackMachThread.h */,
@@ -461 +453 @@
-                        name = iPhoneThruNet;
-                        productName = iPhoneNet;
-Faust
+Thru
-                        productType = "com.apple.product-type.application";
-                };
@@ -567 +559 @@
-                                4B1A94590F49C03600D3626B /* JackNetUnixSocket.cpp in Sources */,
-                                4B1A945A0F49C03600D3626B /* JackPosixThread.cpp in Sources */,
-                                4B1A947F0F49C42300D3626B /* JackAudioQueueAdapter.cpp in Sources */,
-                                4BF1360F0F4B0B4C00218A3F /* JackAudioAdapterInterface.cpp in Sources */,
-                                4BF1364D0F4B0F7700218A3F /* JackResampler.cpp in Sources */,
@@ -630 +621 @@
-                                4B41469F10BD3C4300C12F0C /* JackNetUnixSocket.cpp in Sources */,
-                                4B4146A010BD3C4300C12F0C /* JackPosixThread.cpp in Sources */,
-                                4B4146A110BD3C4300C12F0C /* JackAudioQueueAdapter.cpp in Sources */,
-                                4B4146A210BD3C4300C12F0C /* JackAudioAdapterInterface.cpp in Sources */,
-                                4B4146A310BD3C4300C12F0C /* JackResampler.cpp in Sources */,
@@ -664 +654 @@
-                                4BCF75E110BC2FD90082C526 /* JackNetUnixSocket.cpp in Sources */,
-                                4BCF75E210BC2FD90082C526 /* JackPosixThread.cpp in Sources */,
-                                4BCF75E310BC2FD90082C526 /* JackAudioQueueAdapter.cpp in Sources */,
-                                4BCF75E410BC2FD90082C526 /* JackAudioAdapterInterface.cpp in Sources */,
-                                4BCF75E510BC2FD90082C526 /* JackResampler.cpp in Sources */,
@@ -687 +676 @@
-                                4BFF45680F4D5D9700106083 /* JackNetUnixSocket.cpp in Sources */,
-                                4BFF45690F4D5D9700106083 /* JackPosixThread.cpp in Sources */,
-                                4BFF456A0F4D5D9700106083 /* JackAudioQueueAdapter.cpp in Sources */,
-                                4BFF456B0F4D5D9700106083 /* JackAudioAdapterInterface.cpp in Sources */,
-                                4BFF456C0F4D5D9700106083 /* JackResampler.cpp in Sources */,
@@ -773 +761 @@
-                                OTHER_LDFLAGS = "";
-                                PRODUCT_NAME = iPhoneNetMaster;
-2.2.1
+3.1.3
-                        };
-                        name = Debug;

jack2/branches/libjacknet/macosx/iphone/main_master.mm

@@ -21 +21 @@
-float** audio_output_buffer;
-
-2048
+4096
-int sample_rate = 44100;
-
@@ -31 +31 @@
-    int i; 
-    
+    // Copy from iPod input to network
-    for (i = 0; i < result.audio_input; i++) {
-        memcpy(audio_output_buffer[i], inputs[i], buffer_size * sizeof(float));
-    }
-   
-    if (jack_net_master_send(net, result.audio_output, audio_output_buffer, 0, NULL) < 0) {
-        printf("jack_net_master_send error..\n");
-    }
-    
+    // Copy from network to iPod output
-    if (jack_net_master_recv(net, result.audio_input, audio_input_buffer, 0, NULL) < 0) {
-        printf("jack_net_master_recv error..\n");
-    }
-    
-    for (i = 0; i < result.audio_output; i++) {
-        memcpy(outputs[i], audio_input_buffer[i], buffer_size * sizeof(float));
@@ -53 +53 @@
-    
-    int i;
+    int wait_usec = (unsigned long)((((float)buffer_size) / ((float)sample_rate)) * 1000000.0f);
-    
-    TiPhoneCoreAudioRenderer audio_device(NUM_INPUT, NUM_OUTPUT);
@@ -81 +82 @@
-    }
-    
- 
+
-        while (1) {}
-    
-    audio_device.Stop();
-    audio_device.Close();
-
-    /*
-    // Quite brutal way, the application actually does not start completely, the netjack audio processing loop is used instead...
@@ -99 +97 @@
-        if (jack_net_master_send(net, result.audio_output, audio_output_buffer, 0, NULL) < 0) {
-            printf("jack_net_master_send error..\n");
-            break;
-        }
-        
-        if (jack_net_master_recv(net, result.audio_input, audio_input_buffer, 0, NULL) < 0) {
-            printf("jack_net_master_recv error..\n");
-            break;
-        }
-        usleep(wait_usec);
-        };
-    */
+    
+    audio_device.Stop();
+    audio_device.Close();
+    
+    int retVal = UIApplicationMain(argc, argv, nil, nil);
-    
-    // Wait for application end
@@ -119 +120 @@
-    
-    for (i = 0; i < result.audio_output; i++) {
-  
+
-    }
-    free(audio_output_buffer);
-   
-    //int retVal = UIApplicationMain(argc, argv, nil, nil);
-    [pool release];
-
-
-
+
-}