updated to Blackmagic SDK 3.5

README.md

@@ -1,8 +1,8 @@
-atemOSC v2.0
+atemOSC v2.1
 ============
 
 This is a Mac OS X application, providing an interface to control an ATEM video switcher via OSC. 
-The code is based on the *SwitcherPanel*-Democode (Version 3.1) provided by Blackmagic. 	Additionally the control of a tally-light interface via Arduino is provided.
+The code is based on the *SwitcherPanel*-Democode (Version 3.5) provided by Blackmagic. 	Additionally the control of a tally-light interface via Arduino is provided.
 
 ![atemOSC](https://github.com/danielbuechele/atemOSC/raw/master/atemOSC.jpg)
 

atemOSC.app/Contents/Info.plist

@@ -17,25 +17,25 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>DTCompiler</key>
 	<string></string>
 	<key>DTPlatformBuild</key>
-	<string>4G1004</string>
+	<string>4H127</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>12C60</string>
 	<key>DTSDKName</key>
 	<string></string>
 	<key>DTXcode</key>
-	<string>0451</string>
+	<string>0460</string>
 	<key>DTXcodeBuild</key>
-	<string>4G1004</string>
+	<string>4H127</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.8</string>
 	<key>NSMainNibFile</key>

atemOSC/BMDSwitcherAPIDispatch.cpp

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2011 Blackmagic Design
+** Copyright (c) 2012 Blackmagic Design
 **
 ** Permission is hereby granted, free of charge, to any person or organization
 ** obtaining a copy of the software and accompanying documentation covered by

atemOSC/English.lproj/MainMenu.xib

@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1080</int>
 		<string key="IBDocument.SystemVersion">12C60</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2843</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.34</string>
 		<string key="IBDocument.HIToolboxVersion">625.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2843</string>
+			<string key="NS.object.0">3084</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -196,7 +196,7 @@
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{335, 426}, {394, 284}}</string>
 				<int key="NSWTFlags">1954021376</int>
-				<string key="NSWindowTitle">AtemOSC</string>
+				<string key="NSWindowTitle">atemOSC</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
@@ -651,7 +651,6 @@
 											<string key="NSFrame">{{285, 9}, {88, 26}}</string>
 											<reference key="NSSuperview" ref="604341215"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSTag">3</int>
 											<bool key="NSEnabled">YES</bool>
@@ -2058,12 +2057,16 @@
 							<string>connectButtonPressed:</string>
 							<string>initPort:</string>
 							<string>portChanged:</string>
+							<string>send:Channel:</string>
+							<string>tallyChanged:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2073,6 +2076,8 @@
 							<string>connectButtonPressed:</string>
 							<string>initPort:</string>
 							<string>portChanged:</string>
+							<string>send:Channel:</string>
+							<string>tallyChanged:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2088,6 +2093,14 @@
 								<string key="name">portChanged:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">send:Channel:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">tallyChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">

atemOSC/SwitcherPanelAppDelegate.mm

@@ -259,6 +259,7 @@ @implementation SwitcherPanelAppDelegate
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
+
 	mSwitcherDiscovery = NULL;
 	mSwitcher = NULL;
 	mMixEffectBlock = NULL;
@@ -361,9 +362,27 @@ - (void) activateChannel:(int)channel isProgram:(BOOL)program {
 
     BMDSwitcherInputId InputId = channel;
     if (program) {
-        mMixEffectBlock->SetInt(bmdSwitcherMixEffectBlockPropertyIdProgramInput, InputId);
+        @try {
+            mMixEffectBlock->SetInt(bmdSwitcherMixEffectBlockPropertyIdProgramInput, InputId);
+        }
+        @catch (NSException *exception) {
+            NSAlert *alert = [[NSAlert alloc] init];
+            [alert setMessageText:exception.name];
+            [alert runModal];
+        }
+
+
     } else {
-        mMixEffectBlock->SetInt(bmdSwitcherMixEffectBlockPropertyIdPreviewInput, InputId);
+        @try {
+            mMixEffectBlock->SetInt(bmdSwitcherMixEffectBlockPropertyIdPreviewInput, InputId);
+        }
+        @catch (NSException *exception) {
+            NSAlert *alert = [[NSAlert alloc] init];
+            [alert setMessageText:exception.name];
+            [alert runModal];
+        }
+
+
     }
 }
 
@@ -389,7 +408,7 @@ - (IBAction)portChanged:(id)sender {
 - (IBAction)tallyChanged:(id)sender {
 
     NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-    [prefs setObject:[NSString stringWithFormat:@"%d",[[sender selectedItem] tag]] forKey:[NSString stringWithFormat:@"tally%ld",[sender tag]] ];
+    [prefs setObject:[NSString stringWithFormat:@"%ld",(long)[[sender selectedItem] tag]] forKey:[NSString stringWithFormat:@"tally%ld",(long)[sender tag]] ];
 }
 
 - (void)applicationWillTerminate:(NSNotification*)aNotification

atemOSC/atemOSC-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>