Skip to content

Commit

Permalink
Remove conversions between floats and doubles
Browse files Browse the repository at this point in the history
  • Loading branch information
OCJvanDijk committed Feb 23, 2021
1 parent 569b325 commit ee95558
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
26 changes: 13 additions & 13 deletions Brightness Sync/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
enum Status: Equatable {
case deactivated
case paused
case running(sourceBrightness: Double, targets: [Target])
case running(sourceBrightness: Float, targets: [Target])
}

struct Target: Equatable {
let id: CFUUID
let brightness: Double
let offset: Double
let brightness: Float
let offset: Float
}

var cancelBag = Set<AnyCancellable>()
Expand Down Expand Up @@ -362,9 +362,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}

class MonitorOffsets: ObservableObject {
subscript(monitor: CFUUID) -> Double {
subscript(monitor: CFUUID) -> Float {
get {
UserDefaults.standard.double(forKey: "BSBrightnessOffset_\(CFUUIDCreateString(nil, monitor)!)")
UserDefaults.standard.float(forKey: "BSBrightnessOffset_\(CFUUIDCreateString(nil, monitor)!)")
}
set {
objectWillChange.send()
Expand All @@ -373,21 +373,21 @@ class MonitorOffsets: ObservableObject {
}
}

func getLinearBrightness(_ display: CGDirectDisplayID) -> Double {
var brightness: Float = 0.0
DisplayServicesGetLinearBrightness(Int32(display), &brightness)
return Double(brightness)
func getLinearBrightness(_ display: CGDirectDisplayID) -> Float {
var brightness: Float = 0
DisplayServicesGetLinearBrightness(display, &brightness)
return brightness
}

func setLinearBrightness(_ display: CGDirectDisplayID, _ brightness: Double) {
DisplayServicesSetLinearBrightness(Int32(display), Float(brightness))
func setLinearBrightness(_ display: CGDirectDisplayID, _ brightness: Float) {
DisplayServicesSetLinearBrightness(display, brightness)
}

func estimatedLinearToUserBrightness(_ brightness: Double) -> Double {
func estimatedLinearToUserBrightness(_ brightness: Float) -> Float {
log(brightness / 0.0079) / 4.6533
}

func estimatedUserToLinearBrightness(_ brightness: Double) -> Double {
func estimatedUserToLinearBrightness(_ brightness: Float) -> Float {
exp(brightness * 4.6533) * 0.0079
}

Expand Down
4 changes: 2 additions & 2 deletions Brightness Sync/Brightness Sync-Bridging-Header.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ void CoreDisplay_Display_SetLinearBrightness(CGDirectDisplayID display, double b

CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID);

int DisplayServicesGetLinearBrightness(int display, float *brightness);
int DisplayServicesSetLinearBrightness(int display, float brightness);
int DisplayServicesGetLinearBrightness(CGDirectDisplayID display, float *brightness);
int DisplayServicesSetLinearBrightness(CGDirectDisplayID display, float brightness);

0 comments on commit ee95558

Please sign in to comment.