moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-01 23:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few bugs in the new resolution options and remove dead code

Browse Source
This commit is contained in:
Cameron Gutman 2023-09-29 01:23:35 -05:00
parent a342c294a1
commit 043bf735e8
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Limelight/ViewControllers/SettingsViewController.m
View File

@ -203,13 +203,11 @@ BOOL isCustomResolution(CGSize res) {
// they support HEVC decoding (A9 or later).
if (@available(iOS 11.0, tvOS 11.0, *)) {
if (!VTIsHardwareDecodeSupported(kCMVideoCodecType_HEVC)) {
[self.resolutionSelector removeSegmentAtIndex:5 animated:NO];
if (resolution >= 5) resolution--;
[self.resolutionSelector setEnabled:NO forSegmentAtIndex:3];
}
}
else {
[self.resolutionSelector removeSegmentAtIndex:5 animated:NO];
if (resolution >= 5) resolution--;
[self.resolutionSelector setEnabled:NO forSegmentAtIndex:3];
}
// Disable the HEVC selector if HEVC is not supported by the hardware
@ -271,7 +269,6 @@ BOOL isCustomResolution(CGSize res) {
[self.bitrateSlider setValue:[self getSliderValueForBitrate:_bitrate] animated:YES];
[self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged];
[self updateBitrateText];
[self updateCustomResolutionText];
[self updateResolutionDisplayViewText];
}
@ -320,13 +317,13 @@ BOOL isCustomResolution(CGSize res) {
}
- (void) newResolutionChosen {
[self updateResolutionDisplayViewText];
BOOL lastSegmentSelected = [self.resolutionSelector selectedSegmentIndex] + 1 == [self.resolutionSelector numberOfSegments];
if (lastSegmentSelected) {
[self promptCustomResolutionDialog];
}
else {
[self updateBitrate];
[self updateResolutionDisplayViewText];
_lastSelectedResolutionIndex = [self.resolutionSelector selectedSegmentIndex];
}
}
@ -404,7 +401,6 @@ BOOL isCustomResolution(CGSize res) {
resolutionTable[RESOLUTION_TABLE_CUSTOM_INDEX] = CGSizeMake(width, height);
[self updateBitrate];
[self updateCustomResolutionText];
[self updateResolutionDisplayViewText];
self->_lastSelectedResolutionIndex = [self.resolutionSelector selectedSegmentIndex];
@ -454,14 +450,6 @@ BOOL isCustomResolution(CGSize res) {
[self.resolutionDisplayView addSubview:label2];
}
- (void) updateCustomResolutionText {
if (isCustomResolution(resolutionTable[RESOLUTION_TABLE_CUSTOM_INDEX])) {
NSString *newTitle = [NSString stringWithFormat:@"Custom"];
[self.resolutionSelector setTitle:newTitle forSegmentAtIndex:[self.resolutionSelector numberOfSegments] - 1];
self.resolutionSelector.apportionsSegmentWidthsByContent = YES; // to update the width
}
}
- (void) bitrateSliderMoved {
assert(self.bitrateSlider.value < (sizeof(bitrateTable) / sizeof(*bitrateTable)));
_bitrate = bitrateTable[(int)self.bitrateSlider.value];