witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

SettingsViewController: do not show custom label "Disabled, build from source to enable" for MPEG4 and H264 if there are not available; it is confusing and can be misleading about the cause of non-availability

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-08-31 17:13:57 +02:00
parent 961aa3b445
commit fa8a44eb5f
2 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Classes/SettingsViewController.m
View file

@ -507,24 +507,6 @@ static UICompositeViewDescription *compositeDescription = nil;
#pragma mark -
+ (IASKSpecifier *)disableCodecSpecifier:(IASKSpecifier *)specifier {
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:[specifier specifierDict]];
NSMutableString *type = [NSMutableString stringWithString:[dict objectForKey:kIASKType]];
[type setString:kIASKPSTitleValueSpecifier];
[dict setObject:type forKey:kIASKType];
NSMutableArray *values =
[NSMutableArray arrayWithObjects:[NSNumber numberWithInt:0], [NSNumber numberWithInt:1], nil];
[dict setObject:values forKey:kIASKValues];
NSString *title = NSLocalizedString(@"Disabled, build from sources to enable", nil);
NSMutableArray *titles = [NSMutableArray arrayWithObjects:title, title, nil];
[dict setObject:titles forKey:kIASKTitles];
return [[IASKSpecifier alloc] initWithSpecifier:dict];
}
+ (IASKSpecifier *)filterSpecifier:(IASKSpecifier *)specifier {
if (linphone_core_sip_transport_supported([LinphoneManager getLc], LinphoneTransportTls)) {
if ([[specifier key] isEqualToString:@"transport_preference"]) {
@ -568,14 +550,6 @@ static UICompositeViewDescription *compositeDescription = nil;
}
}
// Add "build from source" if MPEG4 or H264 disabled
if ([[specifier key] isEqualToString:@"h264_preference"] && ![LinphoneManager isCodecSupported:"h264"]) {
return [SettingsViewController disableCodecSpecifier:specifier];
}
if ([[specifier key] isEqualToString:@"mp4v-es_preference"] && ![LinphoneManager isCodecSupported:"mp4v-es"]) {
return [SettingsViewController disableCodecSpecifier:specifier];
}
return specifier;
}
@ -614,6 +588,13 @@ static UICompositeViewDescription *compositeDescription = nil;
if (!linphone_core_video_supported([LinphoneManager getLc]))
[hiddenKeys addObject:@"video_menu"];
if (![LinphoneManager isCodecSupported:"h264"]) {
[hiddenKeys addObject:@"h264_preference"];
}
if (![LinphoneManager isCodecSupported:"mp4v-es"]) {
[hiddenKeys addObject:@"mp4v-es_preference"];
}
if (![LinphoneManager isNotIphone3G])
[hiddenKeys addObject:@"silk_24k_preference"];

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 93910b55774ca708cc6c16c41c6a705630176ae1
Subproject commit 5ff6590ab1b9e97bc97eadaa4f64353f266e2d9f