mixedinkey-opensource · armadsen · Jun 19, 2022 · Nov 5, 2019 · Aug 25, 2019 · Aug 26, 2019
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,5 @@ profile
 *.moved-aside
 
 build
-.DS_Store
+.build
+.DS_Store
diff --git a/Examples/macOS/MIDI Files Testbed/MIDI Files Testbed.xcodeproj/project.pbxproj b/Examples/macOS/MIDI Files Testbed/MIDI Files Testbed.xcodeproj/project.pbxproj
@@ -214,12 +214,12 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MIK;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Mixed In Key";
 			};
 			buildConfigurationList = 9DB2A5EE192D184D0047A3EB /* Build configuration list for PBXProject "MIDI Files Testbed" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -343,6 +343,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -351,14 +352,17 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -393,6 +397,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -401,14 +406,17 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -436,6 +444,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Source/MIDI Files Testbed-Prefix.pch";
@@ -451,6 +460,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Source/MIDI Files Testbed-Prefix.pch";

diff --git a/Examples/macOS/MIDI Files Testbed/Resources/Base.lproj/MainWindow.xib b/Examples/macOS/MIDI Files Testbed/Resources/Base.lproj/MainWindow.xib
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7525" systemVersion="14C1514" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7525"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MIKMainWindowController">
@@ -17,7 +18,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="bjF-sO-f3j">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -41,10 +42,10 @@
                         </connections>
                     </button>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yxv-Ce-QrW">
-                        <rect key="frame" x="390" y="316" width="73" height="26"/>
+                        <rect key="frame" x="386" y="316" width="77" height="25"/>
                         <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="BX3-0d-ikz" id="e7m-FA-thV">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="menu"/>
+                            <font key="font" metaFont="system"/>
                             <menu key="menu" id="xEd-Qa-ruC">
                                 <items>
                                     <menuItem title="Item 1" state="on" id="BX3-0d-ikz"/>
@@ -109,7 +110,7 @@
                     <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="66N-u6-qWG">
                         <rect key="frame" x="20" y="20" width="440" height="279"/>
                         <clipView key="contentView" id="TRb-H3-fEu">
-                            <rect key="frame" x="1" y="1" width="166" height="79"/>
+                            <rect key="frame" x="0.0" y="0.0" width="440" height="279"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <customView identifier="FlippedScrollContentContainer" translatesAutoresizingMaskIntoConstraints="NO" id="e8Y-Fj-noD" customClass="MIKFlippedScrollContentContainerView">
@@ -139,28 +140,52 @@
                             <constraint firstItem="TbG-Pk-GIu" firstAttribute="height" secondItem="66N-u6-qWG" secondAttribute="height" priority="499" id="Rhe-zz-aQ4"/>
                             <constraint firstItem="TbG-Pk-GIu" firstAttribute="width" secondItem="66N-u6-qWG" secondAttribute="width" priority="499" id="sMF-8v-snG"/>
                         </constraints>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="QM4-rs-jPX">
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="QM4-rs-jPX">
                             <rect key="frame" x="1" y="80" width="166" height="15"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="oAs-ip-mnU">
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="oAs-ip-mnU">
                             <rect key="frame" x="167" y="1" width="15" height="79"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
+                    <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gae-60-TCU">
+                        <rect key="frame" x="262" y="320" width="75" height="19"/>
+                        <sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="0.5" maxValue="2" doubleValue="1" tickMarkPosition="above" sliderType="linear" id="8Jf-9i-Gjg"/>
+                        <connections>
+                            <binding destination="-2" name="value" keyPath="sequencer.rate" id="Kif-Rq-wOB"/>
+                        </connections>
+                    </slider>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gvF-Hl-naY">
+                        <rect key="frame" x="343" y="322" width="37" height="16"/>
+                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="ISD-lm-4lE">
+                            <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" formatWidth="-1" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="j3O-vZ-BqN"/>
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="-2" name="value" keyPath="sequencer.rate" id="Zmj-xM-yKQ"/>
+                        </connections>
+                    </textField>
                 </subviews>
                 <constraints>
                     <constraint firstItem="eSe-hq-VkU" firstAttribute="baseline" secondItem="FGs-7w-fIc" secondAttribute="baseline" id="0r6-Fc-wlf"/>
                     <constraint firstItem="eSe-hq-VkU" firstAttribute="baseline" secondItem="6ro-dS-WBO" secondAttribute="baseline" id="1W0-W0-uPG"/>
                     <constraint firstItem="6ro-dS-WBO" firstAttribute="leading" secondItem="bjF-sO-f3j" secondAttribute="leading" constant="20" symbolic="YES" id="6xX-m0-HjF"/>
                     <constraint firstItem="6ro-dS-WBO" firstAttribute="top" secondItem="bjF-sO-f3j" secondAttribute="top" constant="20" symbolic="YES" id="8F5-6k-xGC"/>
+                    <constraint firstItem="gae-60-TCU" firstAttribute="centerY" secondItem="FGs-7w-fIc" secondAttribute="centerY" id="BO3-76-Sud"/>
                     <constraint firstItem="66N-u6-qWG" firstAttribute="top" secondItem="6ro-dS-WBO" secondAttribute="bottom" constant="20" id="Gie-yv-4ch"/>
                     <constraint firstItem="66N-u6-qWG" firstAttribute="leading" secondItem="bjF-sO-f3j" secondAttribute="leading" constant="20" id="Gmk-15-BtN"/>
+                    <constraint firstItem="gvF-Hl-naY" firstAttribute="leading" secondItem="gae-60-TCU" secondAttribute="trailing" constant="10" id="U5Q-Mz-pYH"/>
                     <constraint firstItem="FGs-7w-fIc" firstAttribute="baseline" secondItem="Yxv-Ce-QrW" secondAttribute="baseline" id="YW7-Yn-AOk"/>
                     <constraint firstItem="FGs-7w-fIc" firstAttribute="leading" secondItem="eSe-hq-VkU" secondAttribute="trailing" constant="12" symbolic="YES" id="Z30-Ap-cbi"/>
                     <constraint firstAttribute="trailing" secondItem="Yxv-Ce-QrW" secondAttribute="trailing" constant="20" symbolic="YES" id="cMb-KV-09e"/>
+                    <constraint firstItem="gae-60-TCU" firstAttribute="leading" secondItem="FGs-7w-fIc" secondAttribute="trailing" constant="8" id="e9p-R7-qe0"/>
                     <constraint firstItem="eSe-hq-VkU" firstAttribute="leading" secondItem="6ro-dS-WBO" secondAttribute="trailing" constant="12" symbolic="YES" id="eea-wH-bX4"/>
                     <constraint firstAttribute="bottom" secondItem="66N-u6-qWG" secondAttribute="bottom" constant="20" id="hbT-kV-NcJ"/>
+                    <constraint firstItem="gvF-Hl-naY" firstAttribute="centerY" secondItem="Yxv-Ce-QrW" secondAttribute="centerY" id="iJe-Br-mcz"/>
+                    <constraint firstItem="Yxv-Ce-QrW" firstAttribute="leading" secondItem="gvF-Hl-naY" secondAttribute="trailing" constant="10" id="ikh-ee-3cJ"/>
                     <constraint firstAttribute="trailing" secondItem="66N-u6-qWG" secondAttribute="trailing" constant="20" id="y1j-mW-Gt6"/>
                 </constraints>
             </view>

diff --git a/Framework/MIKMIDI Tests/MIKMIDICommandTests.m b/Framework/MIKMIDI Tests/MIKMIDICommandTests.m
@@ -66,6 +66,39 @@ - (void)testChannelPressureCommand
 	XCTAssertEqual(mutableCommand.pressure, 27, @"Setting the pressure on a MIKMutableMIDIChannelPressureCommand instance failed.");
 }
 
+- (void)testPitchBendChangeCommand
+{
+    MIDIPacket packet = MIKMIDIPacketCreate(0, 1, @[@0xef]);
+    XCTAssertTrue([[MIKMIDICommand commandWithMIDIPacket:&packet] isKindOfClass:[MIKMIDIPitchBendChangeCommand class]]);
+
+    Class immutableClass = [MIKMIDIPitchBendChangeCommand class];
+    Class mutableClass = [MIKMutableMIDIPitchBendChangeCommand class];
+
+    MIKMIDIPitchBendChangeCommand *command = [[immutableClass alloc] init];
+    XCTAssert([command isMemberOfClass:[immutableClass class]], @"[[MIKMIDIPitchBendChangeCommand alloc] init] did not return an MIKMIDIPitchBendChangeCommand instance.");
+    XCTAssert([[MIKMIDICommand commandForCommandType:MIKMIDICommandTypePitchWheelChange] isMemberOfClass:[immutableClass class]], @"[MIKMIDICommand commandForCommandType:MIKMIDICommandTypeSystemExclusive] did not return an MIKMIDIPitchBendChangeCommand instance.");
+    XCTAssert([[command copy] isMemberOfClass:[immutableClass class]], @"[MIKMIDIPitchBendChangeCommand copy] did not return an MIKMIDIPitchBendChangeCommand instance.");
+    XCTAssertEqual(command.commandType, MIKMIDICommandTypePitchWheelChange, @"[[MIKMIDIPitchBendChangeCommand alloc] init] produced a command instance with the wrong command type.");
+    XCTAssertEqual(command.data.length, 3, "MIKMIDIPitchBendChangeCommand had an incorrect data length %@ (should be 3)", @(command.data.length));
+
+    MIKMutableMIDIPitchBendChangeCommand *mutableCommand = [command mutableCopy];
+    XCTAssert([mutableCommand isMemberOfClass:[mutableClass class]], @"-[MIKMIDIPitchBendChangeCommand mutableCopy] did not return an mutableClass instance.");
+    XCTAssert([[mutableCommand copy] isMemberOfClass:[immutableClass class]], @"-[mutableClass mutableCopy] did not return an MIKMIDIPitchBendChangeCommand instance.");
+
+    NSDate *date = [NSDate date];
+    MIKMIDIPitchBendChangeCommand *convenienceTest = [MIKMIDIPitchBendChangeCommand pitchBendChangeCommandWithPitchChange:42 channel:2 timestamp:date];
+    XCTAssertNotNil(convenienceTest);
+    XCTAssert([convenienceTest isMemberOfClass:[immutableClass class]], @"[MIKMIDIPitchBendChangeCommand pitchBendChangeCommandWithPitchChange:...] did not return an MIKMIDIPitchBendChangeCommand instance.");
+    XCTAssertEqual(convenienceTest.pitchChange, 42);
+    XCTAssertEqual(convenienceTest.channel, 2);
+
+    MIKMutableMIDIPitchBendChangeCommand *mutableConvenienceTest = [MIKMutableMIDIPitchBendChangeCommand pitchBendChangeCommandWithPitchChange:42 channel:2 timestamp:date];
+    XCTAssertNotNil(mutableConvenienceTest);
+    XCTAssert([mutableConvenienceTest isMemberOfClass:[mutableClass class]], @"[MIKMutableMIDIPitchBendChangeCommand pitchBendChangeCommandWithPitchChange:...] did not return an MIKMutableMIDIPitchBendChangeCommand instance.");
+    XCTAssertEqual(mutableConvenienceTest.pitchChange, 42);
+    XCTAssertEqual(mutableConvenienceTest.channel, 2);
+}
+
 - (void)testKeepAliveCommand
 {
 	MIDIPacket packet = MIKMIDIPacketCreate(0, 1, @[@0xfe]);

diff --git a/Framework/MIKMIDI Tests/MIKMIDIEventCachingTests.m b/Framework/MIKMIDI Tests/MIKMIDIEventCachingTests.m
@@ -29,7 +29,7 @@ - (void)setUp
 	self.sequence = sequence;
 }
 
-- (void)testPerformanceExample {
+- (void)testTempoEventsPerformance {
     // This is an example of a performance test case.
     [self measureBlock:^{
 		for (NSInteger i=0; i<5000; i++) {