From 903395b273d5374d16867ef3bd284f52c3933cfc Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 9 Jan 2015 00:45:56 -0500 Subject: [PATCH] Display bitrate in Mbps instead of Kbps --- Limelight/Database/DataManager.m | 3 ++- Limelight/ViewControllers/SettingsViewController.m | 7 ++++--- iPad.storyboard | 4 ++-- iPhone.storyboard | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Limelight/Database/DataManager.m b/Limelight/Database/DataManager.m index 274df545..eaebf689 100644 --- a/Limelight/Database/DataManager.m +++ b/Limelight/Database/DataManager.m @@ -19,7 +19,8 @@ - (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls { Settings* settingsToSave = [self retrieveSettings]; settingsToSave.framerate = [NSNumber numberWithInteger:framerate]; - settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate]; + // Bitrate is persisted in kbps + settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate * 1000]; settingsToSave.height = [NSNumber numberWithInteger:height]; settingsToSave.width = [NSNumber numberWithInteger:width]; settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls]; diff --git a/Limelight/ViewControllers/SettingsViewController.m b/Limelight/ViewControllers/SettingsViewController.m index 821bc9d7..f7890bbb 100644 --- a/Limelight/ViewControllers/SettingsViewController.m +++ b/Limelight/ViewControllers/SettingsViewController.m @@ -10,12 +10,12 @@ #import "Settings.h" #import "DataManager.h" -#define BITRATE_INTERVAL 100 +#define BITRATE_INTERVAL 1 @implementation SettingsViewController { NSInteger _bitrate; } -static NSString* bitrateFormat = @"Bitrate: %d kbps"; +static NSString* bitrateFormat = @"Bitrate: %d Mbps"; - (void)viewDidLoad { @@ -24,7 +24,8 @@ static NSString* bitrateFormat = @"Bitrate: %d kbps"; DataManager* dataMan = [[DataManager alloc] init]; Settings* currentSettings = [dataMan retrieveSettings]; - _bitrate = [currentSettings.bitrate integerValue]; + // Bitrate is persisted in kbps + _bitrate = [currentSettings.bitrate integerValue] / 1000; NSInteger framerate = [currentSettings.framerate integerValue] == 30 ? 0 : 1; NSInteger resolution = [currentSettings.height integerValue] == 720 ? 0 : 1; NSInteger onscreenControls = [currentSettings.onscreenControls integerValue]; diff --git a/iPad.storyboard b/iPad.storyboard index e1a7a68e..8fa528b0 100644 --- a/iPad.storyboard +++ b/iPad.storyboard @@ -74,14 +74,14 @@ -