Skip to content

Commit

Permalink
Include grade settings in presets.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Shaw authored and Nick Shaw committed Jul 5, 2021
1 parent 0c42437 commit a692e9d
Show file tree
Hide file tree
Showing 12 changed files with 94 additions and 34 deletions.
6 changes: 3 additions & 3 deletions ...EM Camera Control.app/Contents/Info.plist → ...EM Camera Control.app/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.1</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<string>2</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
Expand All @@ -47,7 +47,7 @@
<key>LSMinimumSystemVersion</key>
<string>10.9</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2021 Nick Shaw. All rights reserved.</string>
<string>Copyright © 2021 Antler Post. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Expand Down
Binary file renamed ...ol.app/Contents/MacOS/ATEM Camera Control → ...ol.app/Contents/MacOS/ATEM Camera Control
View file
Binary file not shown.
0 .../ATEM Camera Control.app/Contents/PkgInfo → .../ATEM Camera Control.app/Contents/PkgInfo
View file
File renamed without changes.
0 ...ntrol.app/Contents/Resources/ATEMicon.png → ...ntrol.app/Contents/Resources/ATEMicon.png
View file
File renamed without changes
0 ...ntrol.app/Contents/Resources/AppIcon.icns → ...ntrol.app/Contents/Resources/AppIcon.icns
View file
File renamed without changes.
0 ...Control.app/Contents/Resources/Assets.car → ...Control.app/Contents/Resources/Assets.car
View file
File renamed without changes.
Binary file renamed ...ontents/Resources/Base.lproj/MainMenu.nib → ...ontents/Resources/Base.lproj/MainMenu.nib
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions source/ATEM Camera Control.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,12 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "ATEM Camera Control/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.0.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.antlerpost.ATEM-Camera-Control";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -294,10 +296,12 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "ATEM Camera Control/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
MARKETING_VERSION = 1.0.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.antlerpost.ATEM-Camera-Control";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand Down
Binary file modified ....xcodeproj/project.xcworkspace/xcuserdata/nick.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
70 changes: 63 additions & 7 deletions source/ATEM Camera Control/AppDelegate.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
double gradeGain = 1.0;
double gradeSat = 1.0;

double memASettings[] = {0.35, 0.0, 18000.0, 8.0, 5600.0, 10.0};
double memBSettings[] = {0.40, 0.0, 36000.0, 24.0, 3400.0, 0.0};
double memCSettings[] = {0.50, 0.0, 36000.0, 20.0, 3400.0, 0.0};
double memDSettings[] = {0.40, 0.0, 36000.0, 24.0, 3400.0, 0.0};
double memESettings[] = {0.40, 0.0, 36000.0, 24.0, 3400.0, 0.0};
double memASettings[] = {0.35, 0.0, 18000.0, 8.0, 5600.0, 10.0, 0.0, 0.0, 1.0, 1.0};
double memBSettings[] = {0.40, 0.0, 36000.0, 24.0, 3400.0, 0.0, 0.0, 0.0, 1.0, 1.0};
double memCSettings[] = {0.50, 0.0, 36000.0, 20.0, 3400.0, 0.0, 0.0, 0.0, 1.0, 1.0};
double memDSettings[] = {0.40, 0.0, 36000.0, 24.0, 3400.0, 0.0, 0.0, 0.0, 1.0, 1.0};
double memESettings[] = {0.40, 0.0, 36000.0, 24.0, 3400.0, 0.0, 0.0, 0.0, 1.0, 1.0};
int memATimer = 0.0;
int memBTimer = 0.0;
int memCTimer = 0.0;
Expand Down Expand Up @@ -108,7 +108,7 @@ - (void) loadPrefs {
tint = (int16_t)[[[NSUserDefaults standardUserDefaults] objectForKey:@"tint"] floatValue];
lut = (int8_t)[[[NSUserDefaults standardUserDefaults] objectForKey:@"lut"] floatValue];
lutEnabled = (int8_t)[[[NSUserDefaults standardUserDefaults] objectForKey:@"lutEnabled"] floatValue];
for (int i=0; i < 6; i++) {
for (int i=0; i < 10; i++) {
memASettings[i] = (double)[[[NSUserDefaults standardUserDefaults] objectForKey:[@"memA" stringByAppendingString:[@(i) stringValue]]] floatValue];
memBSettings[i] = (double)[[[NSUserDefaults standardUserDefaults] objectForKey:[@"memB" stringByAppendingString:[@(i) stringValue]]] floatValue];
memCSettings[i] = (double)[[[NSUserDefaults standardUserDefaults] objectForKey:[@"memC" stringByAppendingString:[@(i) stringValue]]] floatValue];
Expand Down Expand Up @@ -141,6 +141,18 @@ - (void) updateAll {
[self.tintFieldValue setFloatValue:tint];
[self.tintSliderValue setFloatValue:tint];
[self wbUpdate];
[self.gradeLiftField setFloatValue:gradeLift];
[self.gradeLiftSlider setFloatValue:gradeLift];
[self sendLift];
[self.gradeGammaField setFloatValue:gradeGamma];
[self.gradeGammaSlider setFloatValue:gradeGamma];
[self sendGamma];
[self.gradeGainField setFloatValue:gradeGain];
[self.gradeGainSlider setFloatValue:gradeGain];
[self sendGain];
[self.gradeSatField setFloatValue:gradeSat];
[self.gradeSatSlider setFloatValue:gradeSat];
[self sendSat];
[self.lutSelect setIntValue:lut];
[self.lutEnable setIntValue:lutEnabled];
[self lutUpdate];
Expand All @@ -162,9 +174,13 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification {
[[NSUserDefaults standardUserDefaults] setFloat:gain forKey:@"gain"];
[[NSUserDefaults standardUserDefaults] setFloat:kelvin forKey:@"kelvin"];
[[NSUserDefaults standardUserDefaults] setFloat:tint forKey:@"tint"];
[[NSUserDefaults standardUserDefaults] setFloat:gradeLift forKey:@"gradeLift"];
[[NSUserDefaults standardUserDefaults] setFloat:gradeGamma forKey:@"gradeGamma"];
[[NSUserDefaults standardUserDefaults] setFloat:gradeGain forKey:@"gradeGain"];
[[NSUserDefaults standardUserDefaults] setFloat:gradeSat forKey:@"gradeSat"];
[[NSUserDefaults standardUserDefaults] setFloat:lut forKey:@"lut"];
[[NSUserDefaults standardUserDefaults] setFloat:lutEnabled forKey:@"lutEnabled"];
for (int i=0; i < 6; i++) {
for (int i=0; i < 10; i++) {
[[NSUserDefaults standardUserDefaults] setFloat:memASettings[i] forKey:[@"memA" stringByAppendingString:[@(i) stringValue]]];
[[NSUserDefaults standardUserDefaults] setFloat:memBSettings[i] forKey:[@"memB" stringByAppendingString:[@(i) stringValue]]];
[[NSUserDefaults standardUserDefaults] setFloat:memCSettings[i] forKey:[@"memC" stringByAppendingString:[@(i) stringValue]]];
Expand Down Expand Up @@ -391,6 +407,10 @@ - (IBAction)doMemA:(id)sender {
gain = (int8_t)memASettings[3];
kelvin = (int16_t)memASettings[4];
tint = (int16_t)memASettings[5];
gradeLift = memASettings[6];
gradeGamma = memASettings[7];
gradeGain = memASettings[8];
gradeSat = memASettings[9];
[self updateAll];
}
else {
Expand All @@ -400,6 +420,10 @@ - (IBAction)doMemA:(id)sender {
memASettings[3] = gain;
memASettings[4] = kelvin;
memASettings[5] = tint;
memASettings[6] = gradeLift;
memASettings[7] = gradeGamma;
memASettings[8] = gradeGain;
memASettings[9] = gradeSat;
}
}
}
Expand All @@ -421,6 +445,10 @@ - (IBAction)doMemB:(id)sender {
gain = (int8_t)memBSettings[3];
kelvin = (int16_t)memBSettings[4];
tint = (int16_t)memBSettings[5];
gradeLift = memBSettings[6];
gradeGamma = memBSettings[7];
gradeGain = memBSettings[8];
gradeSat = memBSettings[9];
[self updateAll];
}
else {
Expand All @@ -430,6 +458,10 @@ - (IBAction)doMemB:(id)sender {
memBSettings[3] = gain;
memBSettings[4] = kelvin;
memBSettings[5] = tint;
memBSettings[6] = gradeLift;
memBSettings[7] = gradeGamma;
memBSettings[8] = gradeGain;
memBSettings[9] = gradeSat;
}
}
}
Expand All @@ -451,6 +483,10 @@ - (IBAction)doMemC:(id)sender {
gain = (int8_t)memCSettings[3];
kelvin = (int16_t)memCSettings[4];
tint = (int16_t)memCSettings[5];
gradeLift = memCSettings[6];
gradeGamma = memCSettings[7];
gradeGain = memCSettings[8];
gradeSat = memCSettings[9];
[self updateAll];
}
else {
Expand All @@ -460,6 +496,10 @@ - (IBAction)doMemC:(id)sender {
memCSettings[3] = gain;
memCSettings[4] = kelvin;
memCSettings[5] = tint;
memCSettings[6] = gradeLift;
memCSettings[7] = gradeGamma;
memCSettings[8] = gradeGain;
memCSettings[9] = gradeSat;
}
}
}
Expand All @@ -481,6 +521,10 @@ - (IBAction)doMemD:(id)sender {
gain = (int8_t)memDSettings[3];
kelvin = (int16_t)memDSettings[4];
tint = (int16_t)memDSettings[5];
gradeLift = memDSettings[6];
gradeGamma = memDSettings[7];
gradeGain = memDSettings[8];
gradeSat = memDSettings[9];
[self updateAll];
}
else {
Expand All @@ -490,6 +534,10 @@ - (IBAction)doMemD:(id)sender {
memDSettings[3] = gain;
memDSettings[4] = kelvin;
memDSettings[5] = tint;
memDSettings[6] = gradeLift;
memDSettings[7] = gradeGamma;
memDSettings[8] = gradeGain;
memDSettings[9] = gradeSat;
}
}
}
Expand All @@ -511,6 +559,10 @@ - (IBAction)doMemE:(id)sender {
gain = (int8_t)memESettings[3];
kelvin = (int16_t)memESettings[4];
tint = (int16_t)memESettings[5];
gradeLift = memESettings[6];
gradeGamma = memESettings[7];
gradeGain = memESettings[8];
gradeSat = memESettings[9];
[self updateAll];
}
else {
Expand All @@ -520,6 +572,10 @@ - (IBAction)doMemE:(id)sender {
memESettings[3] = gain;
memESettings[4] = kelvin;
memESettings[5] = tint;
memESettings[6] = gradeLift;
memESettings[7] = gradeGamma;
memESettings[8] = gradeGain;
memESettings[9] = gradeSat;
}
}
}
Expand Down
Loading

0 comments on commit a692e9d

Please sign in to comment.