Add message to tell to compile from sources to enable H.264 and mpeg4.

This commit is contained in:
Ghislain MARY 2013-01-11 16:03:01 +01:00
parent 33695f4f56
commit f247f395d2
6 changed files with 58 additions and 9 deletions

View file

@ -875,7 +875,7 @@ static LinphoneCoreVTable linphonec_vtable = {
linphone_core_enable_video(theLinphoneCore, FALSE, FALSE);
}
// Disable H26
// Disable H264
{
PayloadType *pt=linphone_core_find_payload_type(theLinphoneCore,"h264",90000,-1);
if (pt) {

View file

@ -27,6 +27,7 @@
#import "IASKSpecifierValuesViewController.h"
#import "IASKPSTextFieldSpecifierViewCell.h"
#import "IASKPSTitleValueSpecifierViewCell.h"
#import "IASKSpecifier.h"
#import "IASKTextField.h"
#include "lpconfig.h"
@ -256,8 +257,12 @@
UITextField *field = ((IASKPSTextFieldSpecifierViewCell*)cell).textField;
[field setTextColor:LINPHONE_MAIN_COLOR];
}
cell.detailTextLabel.textColor = LINPHONE_MAIN_COLOR;
if([cell isKindOfClass:[IASKPSTitleValueSpecifierViewCell class]]) {
cell.detailTextLabel.textColor = [UIColor grayColor];
} else {
cell.detailTextLabel.textColor = LINPHONE_MAIN_COLOR;
}
// Background View
UACellBackgroundView *selectedBackgroundView = [[[UACellBackgroundView alloc] initWithFrame:CGRectZero] autorelease];
@ -535,6 +540,18 @@ static UICompositeViewDescription *compositeDescription = nil;
#pragma mark -
+ (IASKSpecifier*)disableCodecSpecifier:(IASKSpecifier *)specifier {
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:[specifier specifierDict]];
NSMutableString *type = [NSMutableString stringWithString:[dict objectForKey:@"Type"]];
[type setString:@"PSTitleValueSpecifier"];
[dict setObject:type forKey:@"Type"];
NSMutableArray *values = [NSMutableArray arrayWithObject:[NSNumber numberWithInt:0]];
[dict setObject:values forKey:@"Values"];
NSMutableArray *titles = [NSMutableArray arrayWithObject:NSLocalizedString(@"Disabled, build from sources to enable", nil)];
[dict setObject:titles forKey:@"Titles"];
return [[[IASKSpecifier alloc] initWithSpecifier:dict] autorelease];
}
+ (IASKSpecifier*)filterSpecifier:(IASKSpecifier *)specifier {
#ifndef HAVE_SSL
if ([[specifier key] isEqualToString:@"transport_preference"]) {
@ -559,6 +576,17 @@ static UICompositeViewDescription *compositeDescription = nil;
return [[[IASKSpecifier alloc] initWithSpecifier:dict] autorelease];
}
#endif //HAVE_SSL
// Disable H264
if ([[specifier key] isEqualToString:@"h264_preference"]) {
return [SettingsViewController disableCodecSpecifier:specifier];
}
// Disable MPEG4
if ([[specifier key] isEqualToString:@"mp4v-es_preference"]) {
return [SettingsViewController disableCodecSpecifier:specifier];
}
return specifier;
}
@ -587,10 +615,6 @@ static UICompositeViewDescription *compositeDescription = nil;
[hiddenKeys addObject:@"wifi_only_preference"];
// Disable H264 and MPEG4
[hiddenKeys addObject:@"h264_preference"];
[hiddenKeys addObject:@"mp4v-es_preference"];
[hiddenKeys addObject:@"quit_button"]; // Hide for the moment
[hiddenKeys addObject:@"about_button"]; // Hide for the moment

View file

@ -12175,7 +12175,7 @@
</dict>
</dict>
<key>change date</key>
<date>2012-12-06T16:35:25Z</date>
<date>2013-01-11T15:09:49Z</date>
<key>changed values</key>
<array/>
<key>class</key>
@ -12185,7 +12185,7 @@
<key>flags</key>
<integer>0</integer>
<key>hash</key>
<string>5d8dda6d0a22dfa9f07da63202a55cbb
<string>5b7da78da9a514075624ab4a96e0447b
</string>
<key>name</key>
<string>Localizable.strings</string>
@ -13044,6 +13044,31 @@ La cause était: %2$@</string>
<key>snapshots</key>
<dict/>
</dict>
<dict>
<key>change date</key>
<date>2001-01-01T00:00:00Z</date>
<key>changed values</key>
<array/>
<key>class</key>
<string>BLStringKeyObject</string>
<key>comment</key>
<string>No comment provided by engineer.</string>
<key>errors</key>
<array/>
<key>flags</key>
<integer>0</integer>
<key>key</key>
<string>Disabled, build from sources to enable</string>
<key>localizations</key>
<dict>
<key>en</key>
<string>Disabled, build from sources to enable</string>
<key>fr</key>
<string>Compiler depuis les sources pour activer</string>
</dict>
<key>snapshots</key>
<dict/>
</dict>
<dict>
<key>change date</key>
<date>2001-01-01T00:00:00Z</date>