jackaudio
/
jack2
mirror of https://github.com/jackaudio/jack2
1
0
Fork 0
Code Releases 45 Activity
Browse Source

Compilation on OSX in progress.

tags/1.9.8
Stephane Letz 14 years ago
parent
0429665581
commit
955c051f72
14 changed files with 143 additions and 32 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +96
    -0
      macosx/Jackdmp.xcodeproj/project.pbxproj
  2. +14
    -6
      macosx/coremidi/JackCoreMidiDriver.cpp
  3. +4
    -4
      macosx/coremidi/JackCoreMidiDriver.h
  4. +6
    -5
      macosx/coremidi/JackCoreMidiInputPort.cpp
  5. +3
    -2
      macosx/coremidi/JackCoreMidiOutputPort.cpp
  6. +7
    -7
      macosx/coremidi/JackCoreMidiOutputPort.h
  7. +1
    -1
      macosx/coremidi/JackCoreMidiPhysicalOutputPort.cpp
  8. +2
    -0
      macosx/coremidi/JackCoreMidiPort.cpp
  9. +1
    -1
      macosx/coremidi/JackCoreMidiPort.h
  10. +3
    -0
      macosx/coremidi/JackCoreMidiUtil.cpp
  11. +1
    -2
      macosx/coremidi/JackCoreMidiUtil.h
  12. +1
    -1
      macosx/coremidi/JackCoreMidiVirtualInputPort.cpp
  13. +1
    -1
      macosx/coremidi/JackCoreMidiVirtualInputPort.h
  14. +3
    -2
      macosx/coremidi/JackCoreMidiVirtualOutputPort.cpp

+ 96
- 0
macosx/Jackdmp.xcodeproj/project.pbxproj View File

@@ -319,6 +319,38 @@
4B363F230DEB0AB0001F72D9 /* monitor_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B363F220DEB0AB0001F72D9 /* monitor_client.c */; };
4B363F3E0DEB0C31001F72D9 /* showtime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B363F3D0DEB0C31001F72D9 /* showtime.c */; };
4B363F760DEB0D7D001F72D9 /* impulse_grabber.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B363F750DEB0D7D001F72D9 /* impulse_grabber.c */; };
4B370A24133DD7E300237B68 /* JackCoreMidiInputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A14133DD7E200237B68 /* JackCoreMidiInputPort.cpp */; };
4B370A25133DD7E300237B68 /* JackCoreMidiInputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A15133DD7E200237B68 /* JackCoreMidiInputPort.h */; };
4B370A26133DD7E300237B68 /* JackCoreMidiOutputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A16133DD7E200237B68 /* JackCoreMidiOutputPort.cpp */; };
4B370A27133DD7E300237B68 /* JackCoreMidiOutputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A17133DD7E200237B68 /* JackCoreMidiOutputPort.h */; };
4B370A28133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A18133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.cpp */; };
4B370A29133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A19133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.h */; };
4B370A2A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A1A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp */; };
4B370A2B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A1B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h */; };
4B370A2C133DD7E300237B68 /* JackCoreMidiPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A1C133DD7E300237B68 /* JackCoreMidiPort.cpp */; };
4B370A2D133DD7E300237B68 /* JackCoreMidiPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A1D133DD7E300237B68 /* JackCoreMidiPort.h */; };
4B370A2E133DD7E300237B68 /* JackCoreMidiUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A1E133DD7E300237B68 /* JackCoreMidiUtil.cpp */; };
4B370A2F133DD7E300237B68 /* JackCoreMidiUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A1F133DD7E300237B68 /* JackCoreMidiUtil.h */; };
4B370A30133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A20133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp */; };
4B370A31133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A21133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h */; };
4B370A32133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A22133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp */; };
4B370A33133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A23133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h */; };
4B370A34133DD7E300237B68 /* JackCoreMidiInputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A14133DD7E200237B68 /* JackCoreMidiInputPort.cpp */; };
4B370A35133DD7E300237B68 /* JackCoreMidiInputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A15133DD7E200237B68 /* JackCoreMidiInputPort.h */; };
4B370A36133DD7E300237B68 /* JackCoreMidiOutputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A16133DD7E200237B68 /* JackCoreMidiOutputPort.cpp */; };
4B370A37133DD7E300237B68 /* JackCoreMidiOutputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A17133DD7E200237B68 /* JackCoreMidiOutputPort.h */; };
4B370A38133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A18133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.cpp */; };
4B370A39133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A19133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.h */; };
4B370A3A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A1A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp */; };
4B370A3B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A1B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h */; };
4B370A3C133DD7E300237B68 /* JackCoreMidiPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A1C133DD7E300237B68 /* JackCoreMidiPort.cpp */; };
4B370A3D133DD7E300237B68 /* JackCoreMidiPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A1D133DD7E300237B68 /* JackCoreMidiPort.h */; };
4B370A3E133DD7E300237B68 /* JackCoreMidiUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A1E133DD7E300237B68 /* JackCoreMidiUtil.cpp */; };
4B370A3F133DD7E300237B68 /* JackCoreMidiUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A1F133DD7E300237B68 /* JackCoreMidiUtil.h */; };
4B370A40133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A20133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp */; };
4B370A41133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A21133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h */; };
4B370A42133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B370A22133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp */; };
4B370A43133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370A23133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h */; };
4B3811FB13269C8300C61B14 /* latent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3811FA13269C8300C61B14 /* latent_client.c */; };
4B3811FC13269C8300C61B14 /* latent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B3811FA13269C8300C61B14 /* latent_client.c */; };
4B3814201327AA6800C61B14 /* iodelay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B38141F1327AA6800C61B14 /* iodelay.cpp */; };
@@ -1537,6 +1569,22 @@
4B363F3D0DEB0C31001F72D9 /* showtime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = showtime.c; path = "../example-clients/showtime.c"; sourceTree = SOURCE_ROOT; };
4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_impulse_grabber; sourceTree = BUILT_PRODUCTS_DIR; };
4B363F750DEB0D7D001F72D9 /* impulse_grabber.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = impulse_grabber.c; path = "../example-clients/impulse_grabber.c"; sourceTree = SOURCE_ROOT; };
4B370A14133DD7E200237B68 /* JackCoreMidiInputPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiInputPort.cpp; path = ../../coremidi/JackCoreMidiInputPort.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A15133DD7E200237B68 /* JackCoreMidiInputPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiInputPort.h; path = ../../coremidi/JackCoreMidiInputPort.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A16133DD7E200237B68 /* JackCoreMidiOutputPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiOutputPort.cpp; path = ../../coremidi/JackCoreMidiOutputPort.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A17133DD7E200237B68 /* JackCoreMidiOutputPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiOutputPort.h; path = ../../coremidi/JackCoreMidiOutputPort.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A18133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiPhysicalInputPort.cpp; path = ../../coremidi/JackCoreMidiPhysicalInputPort.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A19133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiPhysicalInputPort.h; path = ../../coremidi/JackCoreMidiPhysicalInputPort.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A1A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiPhysicalOutputPort.cpp; path = ../../coremidi/JackCoreMidiPhysicalOutputPort.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A1B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiPhysicalOutputPort.h; path = ../../coremidi/JackCoreMidiPhysicalOutputPort.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A1C133DD7E300237B68 /* JackCoreMidiPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiPort.cpp; path = ../../coremidi/JackCoreMidiPort.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A1D133DD7E300237B68 /* JackCoreMidiPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiPort.h; path = ../../coremidi/JackCoreMidiPort.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A1E133DD7E300237B68 /* JackCoreMidiUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiUtil.cpp; path = ../../coremidi/JackCoreMidiUtil.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A1F133DD7E300237B68 /* JackCoreMidiUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiUtil.h; path = ../../coremidi/JackCoreMidiUtil.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A20133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiVirtualInputPort.cpp; path = ../../coremidi/JackCoreMidiVirtualInputPort.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A21133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiVirtualInputPort.h; path = ../../coremidi/JackCoreMidiVirtualInputPort.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A22133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackCoreMidiVirtualOutputPort.cpp; path = ../../coremidi/JackCoreMidiVirtualOutputPort.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
4B370A23133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackCoreMidiVirtualOutputPort.h; path = ../../coremidi/JackCoreMidiVirtualOutputPort.h; sourceTree = BUILT_PRODUCTS_DIR; };
4B37C20306DF1FBE0016E567 /* CALatencyLog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CALatencyLog.cpp; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.cpp; sourceTree = "<absolute>"; };
4B37C20406DF1FBE0016E567 /* CALatencyLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CALatencyLog.h; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.h; sourceTree = "<absolute>"; };
4B37C20906DF1FE20016E567 /* latency.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = latency.c; path = /Developer/Examples/CoreAudio/PublicUtility/latency.c; sourceTree = "<absolute>"; };
@@ -3047,6 +3095,22 @@
4BF3390D0F8B86AF0080FB5B /* MIDI */ = {
isa = PBXGroup;
children = (
4B370A14133DD7E200237B68 /* JackCoreMidiInputPort.cpp */,
4B370A15133DD7E200237B68 /* JackCoreMidiInputPort.h */,
4B370A16133DD7E200237B68 /* JackCoreMidiOutputPort.cpp */,
4B370A17133DD7E200237B68 /* JackCoreMidiOutputPort.h */,
4B370A18133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.cpp */,
4B370A19133DD7E200237B68 /* JackCoreMidiPhysicalInputPort.h */,
4B370A1A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp */,
4B370A1B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h */,
4B370A1C133DD7E300237B68 /* JackCoreMidiPort.cpp */,
4B370A1D133DD7E300237B68 /* JackCoreMidiPort.h */,
4B370A1E133DD7E300237B68 /* JackCoreMidiUtil.cpp */,
4B370A1F133DD7E300237B68 /* JackCoreMidiUtil.h */,
4B370A20133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp */,
4B370A21133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h */,
4B370A22133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp */,
4B370A23133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h */,
4BF3391F0F8B873E0080FB5B /* JackMidiDriver.cpp */,
4BF339200F8B873E0080FB5B /* JackMidiDriver.h */,
4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */,
@@ -3994,6 +4058,14 @@
buildActionMask = 2147483647;
files = (
4BDCDB951001FB9C00B15929 /* JackCoreMidiDriver.h in Headers */,
4B370A35133DD7E300237B68 /* JackCoreMidiInputPort.h in Headers */,
4B370A37133DD7E300237B68 /* JackCoreMidiOutputPort.h in Headers */,
4B370A39133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.h in Headers */,
4B370A3B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h in Headers */,
4B370A3D133DD7E300237B68 /* JackCoreMidiPort.h in Headers */,
4B370A3F133DD7E300237B68 /* JackCoreMidiUtil.h in Headers */,
4B370A41133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h in Headers */,
4B370A43133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4054,6 +4126,14 @@
buildActionMask = 2147483647;
files = (
4BF3391A0F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */,
4B370A25133DD7E300237B68 /* JackCoreMidiInputPort.h in Headers */,
4B370A27133DD7E300237B68 /* JackCoreMidiOutputPort.h in Headers */,
4B370A29133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.h in Headers */,
4B370A2B133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.h in Headers */,
4B370A2D133DD7E300237B68 /* JackCoreMidiPort.h in Headers */,
4B370A2F133DD7E300237B68 /* JackCoreMidiUtil.h in Headers */,
4B370A31133DD7E300237B68 /* JackCoreMidiVirtualInputPort.h in Headers */,
4B370A33133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7383,6 +7463,14 @@
buildActionMask = 2147483647;
files = (
4BDCDB971001FB9C00B15929 /* JackCoreMidiDriver.cpp in Sources */,
4B370A34133DD7E300237B68 /* JackCoreMidiInputPort.cpp in Sources */,
4B370A36133DD7E300237B68 /* JackCoreMidiOutputPort.cpp in Sources */,
4B370A38133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.cpp in Sources */,
4B370A3A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp in Sources */,
4B370A3C133DD7E300237B68 /* JackCoreMidiPort.cpp in Sources */,
4B370A3E133DD7E300237B68 /* JackCoreMidiUtil.cpp in Sources */,
4B370A40133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp in Sources */,
4B370A42133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7448,6 +7536,14 @@
buildActionMask = 2147483647;
files = (
4BF3391B0F8B86DC0080FB5B /* JackCoreMidiDriver.cpp in Sources */,
4B370A24133DD7E300237B68 /* JackCoreMidiInputPort.cpp in Sources */,
4B370A26133DD7E300237B68 /* JackCoreMidiOutputPort.cpp in Sources */,
4B370A28133DD7E300237B68 /* JackCoreMidiPhysicalInputPort.cpp in Sources */,
4B370A2A133DD7E300237B68 /* JackCoreMidiPhysicalOutputPort.cpp in Sources */,
4B370A2C133DD7E300237B68 /* JackCoreMidiPort.cpp in Sources */,
4B370A2E133DD7E300237B68 /* JackCoreMidiUtil.cpp in Sources */,
4B370A30133DD7E300237B68 /* JackCoreMidiVirtualInputPort.cpp in Sources */,
4B370A32133DD7E300237B68 /* JackCoreMidiVirtualOutputPort.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};


+ 14
- 6
macosx/coremidi/JackCoreMidiDriver.cpp View File

@@ -26,6 +26,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "JackCoreMidiUtil.h"
#include "JackEngineControl.h"

namespace Jack
{

///////////////////////////////////////////////////////////////////////////////
// Static callbacks
///////////////////////////////////////////////////////////////////////////////
@@ -255,6 +258,9 @@ JackCoreMidiDriver::Open(bool capturing, bool playing, int in_channels,
int po_count = 0;
int vi_count = 0;
int vo_count = 0;
ItemCount potential_po_count;
ItemCount potential_pi_count;

CFStringRef name = CFStringCreateWithCString(0, "JackMidi",
CFStringGetSystemEncoding());
if (! name) {
@@ -277,7 +283,7 @@ JackCoreMidiDriver::Open(bool capturing, bool playing, int in_channels,
if (in_channels) {
try {
virtual_input_ports =
new JackCoreMidiVirtualInputPort[in_channels];
new JackCoreMidiVirtualInputPort*[in_channels];
} catch (std::exception e) {
jack_error("JackCoreMidiDriver::Open - while creating virtual "
"input port array: %s", e.what());
@@ -302,7 +308,7 @@ JackCoreMidiDriver::Open(bool capturing, bool playing, int in_channels,
if (out_channels) {
try {
virtual_output_ports =
new JackCoreMidiVirtualOutputPort[out_channels];
new JackCoreMidiVirtualOutputPort*[out_channels];
} catch (std::exception e) {
jack_error("JackCoreMidiDriver::Open - while creating virtual "
"output port array: %s", e.what());
@@ -325,7 +331,7 @@ JackCoreMidiDriver::Open(bool capturing, bool playing, int in_channels,
}

// Allocate and connect physical inputs
ItemCount potential_pi_count = MIDIGetNumberOfSources();
potential_pi_count = MIDIGetNumberOfSources();
if (potential_pi_count) {
status = MIDIInputPortCreate(client, CFSTR("Physical Input Port"),
HandleInputEvent, this, &internal_input);
@@ -336,7 +342,7 @@ JackCoreMidiDriver::Open(bool capturing, bool playing, int in_channels,
}
try {
physical_input_ports =
new JackCoreMidiPhysicalInputPort[potential_pi_count];
new JackCoreMidiPhysicalInputPort*[potential_pi_count];
} catch (std::exception e) {
jack_error("JackCoreMidiDriver::Open - while creating physical "
"input port array: %s", e.what());
@@ -359,7 +365,7 @@ JackCoreMidiDriver::Open(bool capturing, bool playing, int in_channels,
}

// Allocate and connect physical outputs
ItemCount potential_po_count = MIDIGetNumberOfDestinations();
potential_po_count = MIDIGetNumberOfDestinations();
if (potential_po_count) {
status = MIDIOutputPortCreate(client, CFSTR("Physical Output Port"),
&internal_output);
@@ -370,7 +376,7 @@ JackCoreMidiDriver::Open(bool capturing, bool playing, int in_channels,
}
try {
physical_output_ports =
new JackCoreMidiPhysicalOutputPort[potential_po_count];
new JackCoreMidiPhysicalOutputPort*[potential_po_count];
} catch (std::exception e) {
jack_error("JackCoreMidiDriver::Open - while creating physical "
"output port array: %s", e.what());
@@ -626,6 +632,8 @@ JackCoreMidiDriver::Write()
return 0;
}

} // end of namespace

#ifdef __cplusplus
extern "C" {
#endif


+ 4
- 4
macosx/coremidi/JackCoreMidiDriver.h View File

@@ -50,11 +50,11 @@ namespace Jack {
int num_physical_outputs;
int num_virtual_inputs;
int num_virtual_outputs;
JackCoreMidiPhysicalInputPort *physical_input_ports;
JackCoreMidiPhysicalOutputPort *physical_output_ports;
JackCoreMidiPhysicalInputPort **physical_input_ports;
JackCoreMidiPhysicalOutputPort **physical_output_ports;
double time_ratio;
JackCoreMidiVirtualInputPort *virtual_input_ports;
JackCoreMidiVirtualOutputPort *virtual_output_ports;
JackCoreMidiVirtualInputPort **virtual_input_ports;
JackCoreMidiVirtualOutputPort **virtual_output_ports;

public:



+ 6
- 5
macosx/coremidi/JackCoreMidiInputPort.cpp View File

@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

#include "JackCoreMidiInputPort.h"
#include "JackMidiUtil.h"
//#include "types.h"

using Jack::JackCoreMidiInputPort;

@@ -47,8 +48,8 @@ JackCoreMidiInputPort::~JackCoreMidiInputPort()
delete[] sysex_buffer;
}

jack_frames_t
JackCoreMidiPort::GetFramesFromTimeStamp(MIDITimeStamp timestamp)
jack_nframes_t
JackCoreMidiInputPort::GetFramesFromTimeStamp(MIDITimeStamp timestamp)
{
return GetFramesFromTime((jack_time_t) (timestamp * time_ratio));
}
@@ -59,7 +60,7 @@ JackCoreMidiInputPort::Initialize(const char *alias_name,
const char *driver_name, int index,
MIDIEndpointRef endpoint)
{
Initialize(alias_name, client_name, driver_name, index, endpoint, false);
JackCoreMidiPort::Initialize(alias_name, client_name, driver_name, index, endpoint, false);
}

void
@@ -127,7 +128,7 @@ JackCoreMidiInputPort::ProcessCoreMidi(const MIDIPacketList *packet_list)
case JackMidiWriteQueue::BUFFER_TOO_SMALL:
jack_error("JackCoreMidiInputPort::ProcessCoreMidi - The thread "
"queue couldn't enqueue a %d-byte packet. Dropping "
"event.", event->size);
"event.", event.size);
break;
default:
;
@@ -143,7 +144,7 @@ void
JackCoreMidiInputPort::ProcessJack(JackMidiBuffer *port_buffer,
jack_nframes_t frames)
{
write_queue->ResetMidiBuffer(port_buffer);
write_queue->ResetMidiBuffer(port_buffer, frames);
if (! jack_event) {
jack_event = thread_queue->DequeueEvent();
}


+ 3
- 2
macosx/coremidi/JackCoreMidiOutputPort.cpp View File

@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <new>

#include "JackCoreMidiOutputPort.h"
#include "JackMidiUtil.h"

using Jack::JackCoreMidiOutputPort;

@@ -126,7 +127,7 @@ JackCoreMidiOutputPort::Execute()
}

MIDITimeStamp
JackCoreMidiPort::GetTimeStampFromFrames(jack_nframes_t frames)
JackCoreMidiOutputPort::GetTimeStampFromFrames(jack_nframes_t frames)
{
return GetTimeFromFrames(frames) / time_ratio;
}
@@ -148,7 +149,7 @@ JackCoreMidiOutputPort::Initialize(const char *alias_name,
const char *driver_name, int index,
MIDIEndpointRef endpoint)
{
Initialize(alias_name, client_name, driver_name, index, endpoint, true);
JackCoreMidiPort::Initialize(alias_name, client_name, driver_name, index, endpoint, true);
}

void


+ 7
- 7
macosx/coremidi/JackCoreMidiOutputPort.h View File

@@ -35,11 +35,6 @@ namespace Jack {
MIDITimeStamp
GetTimeStampFromFrames(jack_nframes_t frames);

void
Initialize(const char *alias_name, const char *client_name,
const char *driver_name, int index,
MIDIEndpointRef endpoint);

static const size_t PACKET_BUFFER_SIZE = 65536;

char packet_buffer[PACKET_BUFFER_SIZE];
@@ -50,12 +45,17 @@ namespace Jack {

protected:

virtual void
virtual bool
SendPacketList(MIDIPacketList *packet_list) = 0;

void
Initialize(const char *alias_name, const char *client_name,
const char *driver_name, int index,
MIDIEndpointRef endpoint);

public:

JackCoreMidiOutputPort(double time_ratio, size_t max_bytes=4096,
JackCoreMidiOutputPort(double time_ratio, int realtime_priority, size_t max_bytes=4096,
size_t max_messages=1024);

virtual


+ 1
- 1
macosx/coremidi/JackCoreMidiPhysicalOutputPort.cpp View File

@@ -55,7 +55,7 @@ JackCoreMidiPhysicalOutputPort::~JackCoreMidiPhysicalOutputPort()
bool
JackCoreMidiPhysicalOutputPort::SendPacketList(MIDIPacketList *packet_list)
{
OSStatus status = MIDISend(internal_output, source, packet_list);
OSStatus status = MIDISend(internal_output, endpoint, packet_list);
bool result = status == noErr;
if (! result) {
WriteMacOSError("JackCoreMidiPhysicalOutputPort::SendPacketList",


+ 2
- 0
macosx/coremidi/JackCoreMidiPort.cpp View File

@@ -20,6 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <cassert>

#include "JackCoreMidiPort.h"
#include "JackCoreMidiUtil.h"
#include "JackError.h"

using Jack::JackCoreMidiPort;



+ 1
- 1
macosx/coremidi/JackCoreMidiPort.h View File

@@ -31,7 +31,6 @@ namespace Jack {
private:

char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
MIDIEndpointRef endpoint;
bool initialized;
char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];

@@ -46,6 +45,7 @@ namespace Jack {
MIDIEndpointRef endpoint, bool is_output);

double time_ratio;
MIDIEndpointRef endpoint;

public:



+ 3
- 0
macosx/coremidi/JackCoreMidiUtil.cpp View File

@@ -20,6 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <sstream>

#include "JackError.h"
#include "JackCoreMidiUtil.h"
#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>

std::string
Jack::GetMacOSErrorString(OSStatus status)
@@ -42,3 +44,4 @@ Jack::WriteMacOSError(const char *jack_function, const char *mac_function,
jack_error("%s - %s: %s", jack_function, mac_function,
GetMacOSStatusString(status).c_str());
}


+ 1
- 2
macosx/coremidi/JackCoreMidiUtil.h View File

@@ -20,8 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifndef __JackCoreMidiUtil__
#define __JackCoreMidiUtil__

#include <ErrorLib.h>

#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <string>

namespace Jack {


+ 1
- 1
macosx/coremidi/JackCoreMidiVirtualInputPort.cpp View File

@@ -50,7 +50,7 @@ JackCoreMidiVirtualInputPort(const char *alias_name, const char *client_name,
{
std::stringstream stream;
stream << "JackMidi" << (index + 1);
CFStringRef name = CFStringCreateWithString(0, stream.str().c_str(),
CFStringRef name = CFStringCreateWithCString(0, stream.str().c_str(),
CFStringGetSystemEncoding());
if (! name) {
throw std::bad_alloc();


+ 1
- 1
macosx/coremidi/JackCoreMidiVirtualInputPort.h View File

@@ -30,7 +30,7 @@ namespace Jack {

static void
HandleInputEvent(const MIDIPacketList *packet_list, void *port,
void *src_ref)
void *src_ref);

public:



+ 3
- 2
macosx/coremidi/JackCoreMidiVirtualOutputPort.cpp View File

@@ -19,6 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

#include <sstream>
#include <stdexcept>
#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>

#include "JackCoreMidiUtil.h"
#include "JackCoreMidiVirtualOutputPort.h"
@@ -62,11 +63,11 @@ JackCoreMidiVirtualOutputPort::~JackCoreMidiVirtualOutputPort()
bool
JackCoreMidiVirtualOutputPort::SendPacketList(MIDIPacketList *packet_list)
{
OSStatus status = MIDIReceived(source, packet_list);
OSStatus status = MIDIReceived(endpoint, packet_list);
bool result = status == noErr;
if (! result) {
WriteMacOSError("JackCoreMidiVirtualOutputPort::SendPacketList",
"MIDIReceived" status);
"MIDIReceived", status);
}
return result;
}

Write Preview
Loading…
Cancel
Save