Bump version to 1.9.10, include MIKMIDI copyright/license

zakk4223 · Jul 1, 2015 · f8b98d0 · f8b98d0
1 parent 2a3b01e
commit f8b98d0
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 21 deletions.
diff --git a/...CapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin.xcscheme b/...CapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...urePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSDesktopCapturePlugin.xcscheme b/...urePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSDesktopCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...pturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSImageCapturePlugin.xcscheme b/...pturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSImageCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...pturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSMovieCapturePlugin.xcscheme b/...pturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSMovieCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...TCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSQTCapturePlugin.xcscheme b/...TCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSQTCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...turePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSSyphonCapturePlugin.xcscheme b/...turePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSSyphonCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...apturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSTextCapturePlugin.xcscheme b/...apturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSTextCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...turePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSWindowCapturePlugin.xcscheme b/...turePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSWindowCapturePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/CocoaSplit/CocoaSplit-Info.plist b/CocoaSplit/CocoaSplit-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.9</string>
+	<string>1.9.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.9.9</string>
+	<string>1.9.10</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.video</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/CocoaSplit/en.lproj/Credits.rtf b/CocoaSplit/en.lproj/Credits.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;}
 {\colortbl;\red255\green255\blue255;\red40\green43\blue32;}
 \vieww9600\viewh8400\viewkind0
@@ -13,9 +13,27 @@ The bits I didn't write are:\
 libavformat/libavcodec/libavutil etc. The FFMpeg project. http://ffmpeg.org \
 libx264. An excellent h264 encoder. http://www.videolan.org/developers/x264.html\
 \
+MIKMIDI: An objective-c wrapper around CoreMIDI. https://github.com/mixedinkey-opensource/MIKMIDI\
+                Source included with CocoaSplit has local modifications that are not (yet) contributed back to mainline MIKMIDI\
+\
+Inclusion of MIKMIDI requires the following notice.\
+\pard\pardeftab720
+
+\f1\fs26 \cf0 \expnd0\expndtw0\kerning0
+Copyright (c) 2013 Mixed In Key, LLC. \
+Original author: Andrew R. Madsen ([email protected])\
+\
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\
+\
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\
+\
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+\f0\fs24 \kerning1\expnd0\expndtw0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+\cf0 \
 \
 
-\b License:\
+\b CocoaSplit License:\
 
 \b0 \
 \
@@ -25,7 +43,7 @@ The inclusion of x264 requires this software is licensed in a GPL compatible way
 \pard\pardeftab720
 
 \f1\fs26 \cf2 CocoaSplit\
-Copyright (C) 2013  Zachary Girouard\
+Copyright (C) 2013,2014,2015 Zachary Girouard\
 \
 This program is free software; you can redistribute it and/or\
 modify it under the terms of the GNU General Public License\

diff --git a/CocoaSplit/en.lproj/MainMenu.xib b/CocoaSplit/en.lproj/MainMenu.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
@@ -2286,7 +2286,7 @@
                     <constraint firstAttribute="bottom" secondItem="2368" secondAttribute="bottom" constant="29" id="vbt-Nq-oyK"/>
                 </constraints>
             </view>
-            <point key="canvasLocation" x="1092.5" y="724"/>
+            <point key="canvasLocation" x="1252.5" y="875"/>
         </window>
         <dictionaryController objectClassName="_NSControllerKeyValuePair" id="gSI-N4-DsK" userLabel="CompressorDictionaryController">
             <connections>
@@ -2517,8 +2517,8 @@ MgA3AEEARwBQAFcAXABkAHkAewB9AH8AgQCLAJAAlQCgAKMApQCnAKkArgC5AMIAygDNANYA2wDoAOwA
                     </connections>
                 </segmentedControl>
                 <button horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6KB-9R-g3x">
-                    <rect key="frame" x="36" y="31" width="13" height="13"/>
-                    <buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="above" alignment="left" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="bUL-4P-VX8">
+                    <rect key="frame" x="36" y="20" width="13" height="29"/>
+                    <buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="NSActionTemplate" imagePosition="above" alignment="left" controlSize="mini" imageScaling="proportionallyDown" inset="2" id="bUL-4P-VX8">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="miniSystem"/>
                     </buttonCell>
@@ -2539,6 +2539,7 @@ MgA3AEEARwBQAFcAXABkAHkAewB9AH8AgQCLAJAAlQCgAKMApQCnAKkArgC5AMIAygDNANYA2wDoAOwA
         </view>
     </objects>
     <resources>
+        <image name="NSActionTemplate" width="14" height="14"/>
         <image name="NSAddTemplate" width="11" height="11"/>
         <image name="NSAdvanced" width="32" height="32"/>
     </resources>

diff --git a/...hromaKey/CSChromaKey.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSChromaKey.xcscheme b/...hromaKey/CSChromaKey.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSChromaKey.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...tureWrapPlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/TextureWrapPlugin.xcscheme b/...tureWrapPlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/TextureWrapPlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...Plugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSFileStreamServicePlugin.xcscheme b/...Plugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSFileStreamServicePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...ugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSTwitchStreamServicePlugin.xcscheme b/...ugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSTwitchStreamServicePlugin.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"