Skip to content

Commit

Permalink
Merge pull request #51 from SteffeyDev/aux-fix
Browse files Browse the repository at this point in the history
Resolves #50 - Aux Fix
  • Loading branch information
sneat authored Oct 31, 2017
2 parents ef1128b + a3b25a4 commit 90fc8fa
Show file tree
Hide file tree
Showing 15 changed files with 1,460 additions and 1,430 deletions.
14 changes: 8 additions & 6 deletions atemOSC.app/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>16G29</string>
<string>17A405</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>atemOSC</string>
<key>CFBundleIconFile</key>
<string>AppIcon</string>
<key>CFBundleIconName</key>
<string>AppIcon</string>
<key>CFBundleIdentifier</key>
<string>cc.buechele.atemOSC</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -31,17 +33,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8E3004b</string>
<string>9A1004</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16E185</string>
<string>17A360</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0833</string>
<string>0901</string>
<key>DTXcodeBuild</key>
<string>8E3004b</string>
<string>9A1004</string>
<key>LSMinimumSystemVersion</key>
<string>10.9</string>
<key>NSMainNibFile</key>
Expand Down
Binary file modified atemOSC.app/Contents/MacOS/atemOSC
Binary file not shown.
Binary file modified atemOSC.app/Contents/Resources/AppIcon.icns
Binary file not shown.
Binary file added atemOSC.app/Contents/Resources/Assets.car
Binary file not shown.
Binary file modified atemOSC.app/Contents/Resources/English.lproj/MainMenu.nib
Binary file not shown.
70 changes: 35 additions & 35 deletions atemOSC/AppDelegate.h
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
/* -LICENSE-START-
** Copyright (c) 2011 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
** this license (the "Software") to use, reproduce, display, distribute,
** execute, and transmit the Software, and to prepare derivative works of the
** Software, and to permit third-parties to whom the Software is furnished to
** do so, all subject to the following:
**
** The copyright notices in the Software and this entire statement, including
** the above license grant, this restriction and the following disclaimer,
** must be included in all copies of the Software, in whole or in part, and
** all derivative works of the Software, unless such copies or derivative
** works are solely in the form of machine-executable object code generated by
** a source language processor.
**
** 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
** DEALINGS IN THE SOFTWARE.
** -LICENSE-END-
*/
** Copyright (c) 2011 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
** this license (the "Software") to use, reproduce, display, distribute,
** execute, and transmit the Software, and to prepare derivative works of the
** Software, and to permit third-parties to whom the Software is furnished to
** do so, all subject to the following:
**
** The copyright notices in the Software and this entire statement, including
** the above license grant, this restriction and the following disclaimer,
** must be included in all copies of the Software, in whole or in part, and
** all derivative works of the Software, unless such copies or derivative
** works are solely in the form of machine-executable object code generated by
** a source language processor.
**
** 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
** DEALINGS IN THE SOFTWARE.
** -LICENSE-END-
*/

#import "BMDSwitcherAPI.h"
#import "VVOSC/VVOSC.h"
Expand All @@ -39,19 +39,19 @@
@interface AppDelegate : NSObject <NSApplicationDelegate>
{
NSWindow *window;

IBMDSwitcherDiscovery* mSwitcherDiscovery;
IBMDSwitcher* mSwitcher;
IBMDSwitcherKeyFlyParameters* mDVEControl;
IBMDSwitcherKeyFlyParameters* mDVEControl;
SwitcherMonitor* mSwitcherMonitor;
DownstreamKeyerMonitor* mDownstreamKeyerMonitor;
TransitionParametersMonitor* mTransitionParametersMonitor;
OSCReceiver* mOscReceiver;
OSCManager* manager;
IBOutlet OSCAddressPanel* helpPanel;
IBOutlet NSTextView* logTextView;
DownstreamKeyerMonitor* mDownstreamKeyerMonitor;
TransitionParametersMonitor* mTransitionParametersMonitor;
OSCReceiver* mOscReceiver;
OSCManager* manager;
IBOutlet OSCAddressPanel* helpPanel;
IBOutlet NSTextView* logTextView;
}

@property (readonly) std::vector<IBMDSwitcherSuperSourceBox*> mSuperSourceBoxes;
Expand Down
Loading

0 comments on commit 90fc8fa

Please sign in to comment.