mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 11:08:06 +00:00
audio: set new ringtones
This commit is contained in:
Gautier Pelloux-Prayer
parent
a083e1dc77
commit
1258240256
24 changed files with 162 additions and 66 deletions
|
|
@ -295,6 +295,10 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
|
|||
|
||||
[self setBool:[lm lpConfigBoolForKey:@"repeat_call_notification"]
|
||||
forKey:@"repeat_call_notification_preference"];
|
||||
NSString *ringtone = ([LinphoneManager bundleFile:[NSString stringWithUTF8String:linphone_core_get_ring(lc)]]
|
||||
?: [LinphoneManager bundleFile:@"notes_of_the_optimistic.caf"])
|
||||
.lastPathComponent;
|
||||
[self setObject:ringtone forKey:@"call_ringtone_preference"];
|
||||
}
|
||||
|
||||
// network section
|
||||
|
|
@ -705,6 +709,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
|
|||
[lm lpConfigSetString:[self stringForKey:@"voice_mail_uri_preference"] forKey:@"voice_mail_uri"];
|
||||
[lm lpConfigSetBool:[self boolForKey:@"repeat_call_notification_preference"]
|
||||
forKey:@"repeat_call_notification"];
|
||||
NSString *ringtone = [LinphoneManager bundleFile:[self objectForKey:@"call_ringtone_preference"]];
|
||||
linphone_core_set_ring(lc, ringtone.UTF8String);
|
||||
}
|
||||
|
||||
// network section
|
||||
|
|
|
|||
|
|
@ -663,10 +663,15 @@ static void linphone_iphone_display_status(struct _LinphoneCore *lc, const char
|
|||
// iOS8 doesn't need the timer trick for the local notification.
|
||||
if ([[UIDevice currentDevice].systemVersion floatValue] >= 8 &&
|
||||
[self lpConfigBoolForKey:@"repeat_call_notification"] == NO) {
|
||||
data->notification.soundName = @"ring.caf";
|
||||
NSString *ring =
|
||||
([LinphoneManager bundleFile:[self lpConfigStringForKey:@"local_ring" inSection:@"sound"]]
|
||||
?: [LinphoneManager bundleFile:@"notes_of_the_optimistic.caf"])
|
||||
.lastPathComponent;
|
||||
NSString *soundName = [NSString stringWithFormat:@"sounds/%@", ring];
|
||||
data->notification.soundName = soundName;
|
||||
data->notification.category = @"incoming_call";
|
||||
} else {
|
||||
data->notification.soundName = @"shortring.caf";
|
||||
data->notification.soundName = @"sounds/shortring.caf";
|
||||
data->timer = [NSTimer scheduledTimerWithTimeInterval:4.0
|
||||
target:self
|
||||
selector:@selector(localNotifContinue:)
|
||||
|
|
@ -875,6 +880,12 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char
|
|||
[alertView dismissWithClickedButtonIndex:0 animated:NO];
|
||||
}
|
||||
|
||||
// dont pop up if we are in background, in any case we will refresh registers when entering
|
||||
// the application again
|
||||
if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground) {
|
||||
return;
|
||||
}
|
||||
|
||||
NSString *realm = [NSString stringWithUTF8String:realmC];
|
||||
NSString *username = [NSString stringWithUTF8String:usernameC];
|
||||
NSString *domain = [NSString stringWithUTF8String:domainC];
|
||||
|
|
@ -945,7 +956,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char
|
|||
notif.alertBody = [NSString stringWithFormat:NSLocalizedString(@"IM_MSG", nil), from];
|
||||
}
|
||||
notif.alertAction = NSLocalizedString(@"Show", nil);
|
||||
notif.soundName = @"msg.caf";
|
||||
notif.soundName = @"sounds/msg.caf";
|
||||
notif.userInfo = @{ @"from" : from, @"from_addr" : remote_uri, @"call-id" : callID };
|
||||
|
||||
[[UIApplication sharedApplication] presentLocalNotificationNow:notif];
|
||||
|
|
@ -1335,14 +1346,6 @@ static LinphoneCoreVTable linphonec_vtable = {
|
|||
}
|
||||
|
||||
linphone_core_set_root_ca(theLinphoneCore, lRootCa);
|
||||
// Set audio assets
|
||||
const char *lRing = [[LinphoneManager bundleFile:@"ring.wav"] UTF8String];
|
||||
linphone_core_set_ring(theLinphoneCore, lRing);
|
||||
const char *lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] UTF8String];
|
||||
linphone_core_set_ringback(theLinphoneCore, lRingBack);
|
||||
const char *lPlay = [[LinphoneManager bundleFile:@"hold.wav"] UTF8String];
|
||||
lPlay = NULL;
|
||||
linphone_core_set_play_file(theLinphoneCore, lPlay);
|
||||
|
||||
linphone_core_set_zrtp_secrets_file(theLinphoneCore, [zrtpSecretsFileName UTF8String]);
|
||||
linphone_core_set_chat_database_path(theLinphoneCore, [chatDBFileName UTF8String]);
|
||||
|
|
@ -1460,15 +1463,19 @@ static BOOL libStarted = FALSE;
|
|||
libmswebrtc_init();
|
||||
|
||||
// Set audio assets
|
||||
const char *lRing = [[LinphoneManager bundleFile:@"ring.wav"] UTF8String];
|
||||
lp_config_set_string(configDb, "sound", "local_ring", lRing);
|
||||
const char *lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] UTF8String];
|
||||
lp_config_set_string(configDb, "sound", "ringback_tone", lRingBack);
|
||||
const char *lPlay = [[LinphoneManager bundleFile:@"hold.wav"] UTF8String];
|
||||
lp_config_set_string(configDb, "sound", "hold_music", lPlay);
|
||||
|
||||
theLinphoneCore =
|
||||
linphone_core_new_with_config(&linphonec_vtable, configDb, (__bridge void *)(self) /* user_data */);
|
||||
NSString *ring = ([LinphoneManager bundleFile:[self lpConfigStringForKey:@"local_ring" inSection:@"sound"]]
|
||||
?: [LinphoneManager bundleFile:@"notes_of_the_optimistic.caf"])
|
||||
.lastPathComponent;
|
||||
NSString *ringback = ([LinphoneManager bundleFile:[self lpConfigStringForKey:@"ringback_tone" inSection:@"sound"]]
|
||||
?: [LinphoneManager bundleFile:@"ringback.wav"])
|
||||
.lastPathComponent;
|
||||
NSString *hold = ([LinphoneManager bundleFile:[self lpConfigStringForKey:@"hold_music" inSection:@"sound"]]
|
||||
?: [LinphoneManager bundleFile:@"hold.caf"])
|
||||
.lastPathComponent;
|
||||
[self lpConfigSetString:[LinphoneManager bundleFile:ring] forKey:@"local_ring" inSection:@"sound"];
|
||||
[self lpConfigSetString:[LinphoneManager bundleFile:ringback] forKey:@"ringback_tone" inSection:@"sound"];
|
||||
[self lpConfigSetString:[LinphoneManager bundleFile:hold] forKey:@"hold_music" inSection:@"sound"];
|
||||
theLinphoneCore = linphone_core_new_with_config(&linphonec_vtable, configDb, (__bridge void *)(self));
|
||||
LOGI(@"Create linphonecore %p", theLinphoneCore);
|
||||
|
||||
/* set the CA file no matter what, since the remote provisioning could be hitting an HTTPS server */
|
||||
|
|
@ -2009,15 +2016,17 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
|
|||
}
|
||||
// NSLocalizedString(@"IC_MSG", nil); // Fake for genstrings
|
||||
// NSLocalizedString(@"IM_MSG", nil); // Fake for genstrings
|
||||
// NSLocalizedString(@"IM_FULLMSG", nil); // Fake for genstrings
|
||||
#ifdef USE_APN_DEV
|
||||
#define APPMODE_SUFFIX @"dev"
|
||||
#else
|
||||
#define APPMODE_SUFFIX @"prod"
|
||||
#endif
|
||||
NSString *params =
|
||||
[NSString stringWithFormat:@"app-id=%@.%@;pn-type=apple;pn-tok=%@;pn-msg-str=IM_MSG;pn-call-str=IC_MSG;pn-"
|
||||
@"call-snd=ring.caf;pn-msg-snd=msg.caf",
|
||||
[[NSBundle mainBundle] bundleIdentifier], APPMODE_SUFFIX, tokenString];
|
||||
NSString *soundName = @"shortring.caf";
|
||||
NSString *params = [NSString
|
||||
stringWithFormat:@"app-id=%@.%@;pn-type=apple;pn-tok=%@;pn-msg-str=IM_MSG;pn-call-str=IC_MSG;pn-"
|
||||
@"call-snd=%@;pn-msg-snd=sounds/msg.caf",
|
||||
[[NSBundle mainBundle] bundleIdentifier], APPMODE_SUFFIX, tokenString, soundName];
|
||||
|
||||
linphone_proxy_config_set_contact_uri_parameters(proxyCfg, [params UTF8String]);
|
||||
linphone_proxy_config_set_contact_parameters(proxyCfg, NULL);
|
||||
|
|
|
|||
|
|
@ -138,6 +138,17 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="90" height="333"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hlj-lf-AGD" userLabel="historyButton" customClass="UIIconButton">
|
||||
<rect key="frame" x="0.0" y="35" width="90" height="66"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
<accessibility key="accessibilityConfiguration" label="History"/>
|
||||
<state key="normal" image="footer_history_default.png"/>
|
||||
<state key="disabled" image="footer_history_disabled.png"/>
|
||||
<state key="highlighted" backgroundImage="color_A.png"/>
|
||||
<connections>
|
||||
<action selector="onHistoryClick:" destination="-1" eventType="touchUpInside" id="apg-Ia-q2O"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ea1-DR-JeN" userLabel="contactsButton" customClass="UIIconButton">
|
||||
<rect key="frame" x="0.0" y="101" width="90" height="66"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
|
|
@ -222,17 +233,6 @@
|
|||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
</view>
|
||||
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hlj-lf-AGD" userLabel="historyButton" customClass="UIIconButton">
|
||||
<rect key="frame" x="0.0" y="35" width="90" height="66"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
<accessibility key="accessibilityConfiguration" label="History"/>
|
||||
<state key="normal" image="footer_history_default.png"/>
|
||||
<state key="disabled" image="footer_history_disabled.png"/>
|
||||
<state key="highlighted" backgroundImage="color_A.png"/>
|
||||
<connections>
|
||||
<action selector="onHistoryClick:" destination="-1" eventType="touchUpInside" id="apg-Ia-q2O"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
|
|
|
|||
|
|
@ -35,10 +35,11 @@ INIT_WITH_COMMON {
|
|||
|
||||
- (void)settingsUpdate:(NSNotification *)notif {
|
||||
if ([[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"] == false) {
|
||||
[self stopBounceAnimation:kBounceAnimation target:self];
|
||||
[self stopAnimating:NO];
|
||||
} else {
|
||||
if (![self isHidden] && [self.layer animationForKey:kBounceAnimation] == nil) {
|
||||
[self startBounceAnimation:kBounceAnimation target:self];
|
||||
if (![self isHidden]) {
|
||||
self.hidden = YES;
|
||||
[self startAnimating:YES];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -46,8 +47,10 @@ INIT_WITH_COMMON {
|
|||
- (void)applicationWillEnterForeground:(NSNotification *)notif {
|
||||
// Force the animations
|
||||
if (self.isHidden) {
|
||||
self.hidden = NO;
|
||||
[self stopAnimating:NO];
|
||||
} else {
|
||||
self.hidden = YES;
|
||||
[self startAnimating:NO];
|
||||
}
|
||||
}
|
||||
|
|
@ -96,6 +99,7 @@ INIT_WITH_COMMON {
|
|||
}
|
||||
|
||||
- (void)startAnimating:(BOOL)animated {
|
||||
animated = NO;
|
||||
if (!self.hidden) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -118,6 +122,7 @@ INIT_WITH_COMMON {
|
|||
}
|
||||
|
||||
- (void)stopAnimating:(BOOL)animated {
|
||||
animated = NO;
|
||||
if (self.hidden) {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -362,6 +362,10 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
[_settingsController dismiss:self];
|
||||
// Set observer
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self name:kIASKAppSettingChanged object:nil];
|
||||
|
||||
if (linphone_ringtoneplayer_is_started(linphone_core_get_ringtoneplayer([LinphoneManager getLc]))) {
|
||||
linphone_core_stop_ringing([LinphoneManager getLc]);
|
||||
}
|
||||
}
|
||||
|
||||
- (void)viewWillAppear:(BOOL)animated {
|
||||
|
|
@ -411,7 +415,6 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
[keys addObject:key];
|
||||
}
|
||||
}
|
||||
|
||||
} else if ([@"video_preset_preference" compare:notif.object] == NSOrderedSame) {
|
||||
NSString *video_preset = [notif.userInfo objectForKey:@"video_preset_preference"];
|
||||
removeFromHiddenKeys = [video_preset isEqualToString:@"custom"];
|
||||
|
|
@ -694,7 +697,7 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
[alert show];
|
||||
} else if ([key isEqual:@"about_button"]) {
|
||||
[PhoneMainView.instance changeCurrentView:AboutView.compositeViewDescription push:TRUE];
|
||||
} else if ([key isEqualToString:@"reset_logs_button"]) {
|
||||
} else if ([key isEqual:@"reset_logs_button"]) {
|
||||
linphone_core_reset_log_collection();
|
||||
} else if ([key isEqual:@"send_logs_button"]) {
|
||||
NSString *message;
|
||||
|
|
@ -722,6 +725,13 @@ static UICompositeViewDescription *compositeDescription = nil;
|
|||
[self sendEmailWithDebugAttachments];
|
||||
}];
|
||||
[alert show];
|
||||
} else if ([key isEqual:@"preview_ringtone_button"]) {
|
||||
LinphoneCore *lc = [LinphoneManager getLc];
|
||||
if (linphone_ringtoneplayer_is_started(linphone_core_get_ringtoneplayer(lc))) {
|
||||
linphone_core_stop_ringing(lc);
|
||||
} else {
|
||||
linphone_core_preview_ring(lc, linphone_core_get_ring(lc), NULL, NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Resources/sounds/hold.caf
Normal file
BIN
Resources/sounds/hold.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/msg.caf
Normal file
BIN
Resources/sounds/msg.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/rings/four_hands_together.caf
Normal file
BIN
Resources/sounds/rings/four_hands_together.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/rings/house_keeping.caf
Normal file
BIN
Resources/sounds/rings/house_keeping.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/rings/it_s_a_game.caf
Normal file
BIN
Resources/sounds/rings/it_s_a_game.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/rings/leaving_a_dream.caf
Normal file
BIN
Resources/sounds/rings/leaving_a_dream.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/rings/notes_of_the_optimistic.caf
Normal file
BIN
Resources/sounds/rings/notes_of_the_optimistic.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/rings/soft_as_snow.caf
Normal file
BIN
Resources/sounds/rings/soft_as_snow.caf
Normal file
Binary file not shown.
BIN
Resources/sounds/shortring.caf
Normal file
BIN
Resources/sounds/shortring.caf
Normal file
Binary file not shown.
|
|
@ -88,6 +88,40 @@
|
|||
<key>Type</key>
|
||||
<string>PSToggleSwitchSpecifier</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Key</key>
|
||||
<string>call_ringtone_preference</string>
|
||||
<key>Title</key>
|
||||
<string>Ringtone</string>
|
||||
<key>Type</key>
|
||||
<string>PSMultiValueSpecifier</string>
|
||||
<key>Titles</key>
|
||||
<array>
|
||||
<string>Four hands together</string>
|
||||
<string>It's a game</string>
|
||||
<string>Notes of the optimistic</string>
|
||||
<string>Soft as snow</string>
|
||||
<string>Leaving a dream</string>
|
||||
<string>House Keeping</string>
|
||||
</array>
|
||||
<key>Values</key>
|
||||
<array>
|
||||
<string>four_hands_together.caf</string>
|
||||
<string>it_s_a_game.caf</string>
|
||||
<string>notes_of_the_optimistic.caf</string>
|
||||
<string>soft_as_snow.caf</string>
|
||||
<string>leaving_a_dream.caf</string>
|
||||
<string>house_keeping.caf</string>
|
||||
</array>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Key</key>
|
||||
<string>preview_ringtone_button</string>
|
||||
<key>Title</key>
|
||||
<string>Listen ringtone</string>
|
||||
<key>Type</key>
|
||||
<string>IASKButtonSpecifier</string>
|
||||
</dict>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>2</string>
|
||||
<string>3</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>UIApplicationExitsOnSuspend</key>
|
||||
|
|
|
|||
|
|
@ -495,12 +495,6 @@
|
|||
63AADBF51B6A0FF200AA16FD /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD71B6A0FF200AA16FD /* linphonerc */; };
|
||||
63AADBF61B6A0FF200AA16FD /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBD81B6A0FF200AA16FD /* linphonerc-factory */; };
|
||||
63AADBF81B6A0FF200AA16FD /* linphonerc~ipad in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDA1B6A0FF200AA16FD /* linphonerc~ipad */; };
|
||||
63AADBF91B6A0FF200AA16FD /* msg.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDB1B6A0FF200AA16FD /* msg.caf */; };
|
||||
63AADBFA1B6A0FF200AA16FD /* msg.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDC1B6A0FF200AA16FD /* msg.wav */; };
|
||||
63AADBFB1B6A0FF200AA16FD /* ring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDE1B6A0FF200AA16FD /* ring.caf */; };
|
||||
63AADBFC1B6A0FF200AA16FD /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBDF1B6A0FF200AA16FD /* ring.wav */; };
|
||||
63AADBFD1B6A0FF200AA16FD /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE01B6A0FF200AA16FD /* ringback.wav */; };
|
||||
63AADBFE1B6A0FF200AA16FD /* shortring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE21B6A0FF200AA16FD /* shortring.caf */; };
|
||||
63AADBFF1B6A0FF200AA16FD /* assistant_external_sip.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE31B6A0FF200AA16FD /* assistant_external_sip.rc */; };
|
||||
63AADC001B6A0FF200AA16FD /* assistant_linphone_create.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE41B6A0FF200AA16FD /* assistant_linphone_create.rc */; };
|
||||
63AADC011B6A0FF200AA16FD /* assistant_linphone_existing.rc in Resources */ = {isa = PBXBuildFile; fileRef = 63AADBE51B6A0FF200AA16FD /* assistant_linphone_existing.rc */; };
|
||||
|
|
@ -515,6 +509,16 @@
|
|||
63BC49E21BA2CDFC004EC273 /* UICallPausedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 63BC49E11BA2CDFC004EC273 /* UICallPausedCell.m */; };
|
||||
63C441C31BBC23ED0053DC5E /* UIAssistantTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C441C21BBC23ED0053DC5E /* UIAssistantTextField.m */; };
|
||||
63CD4B4F1A5AAC8C00B84282 /* DTAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */; };
|
||||
63CDC45D1C3BDE370085F529 /* hold.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4521C3BDE370085F529 /* hold.caf */; };
|
||||
63CDC45E1C3BDE370085F529 /* msg.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4531C3BDE370085F529 /* msg.caf */; };
|
||||
63CDC45F1C3BDE370085F529 /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4541C3BDE370085F529 /* ringback.wav */; };
|
||||
63CDC4601C3BDE370085F529 /* four_hands_together.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4561C3BDE370085F529 /* four_hands_together.caf */; };
|
||||
63CDC4611C3BDE370085F529 /* house_keeping.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4571C3BDE370085F529 /* house_keeping.caf */; };
|
||||
63CDC4621C3BDE370085F529 /* it_s_a_game.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4581C3BDE370085F529 /* it_s_a_game.caf */; };
|
||||
63CDC4631C3BDE370085F529 /* leaving_a_dream.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4591C3BDE370085F529 /* leaving_a_dream.caf */; };
|
||||
63CDC4641C3BDE370085F529 /* notes_of_the_optimistic.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC45A1C3BDE370085F529 /* notes_of_the_optimistic.caf */; };
|
||||
63CDC4651C3BDE370085F529 /* soft_as_snow.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC45B1C3BDE370085F529 /* soft_as_snow.caf */; };
|
||||
63CDC4661C3BDE370085F529 /* shortring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC45C1C3BDE370085F529 /* shortring.caf */; };
|
||||
63CFEDE81B9EDD74007EA5BD /* libantlr3c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E416D9255800EF1BEC /* libantlr3c.a */; };
|
||||
63CFEDE91B9EDD74007EA5BD /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8013C73D3100210156 /* libavcodec.a */; };
|
||||
63CFEDEA1B9EDD74007EA5BD /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8113C73D3100210156 /* libavutil.a */; };
|
||||
|
|
@ -1322,14 +1326,8 @@
|
|||
63AADBD71B6A0FF200AA16FD /* linphonerc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = linphonerc; sourceTree = "<group>"; };
|
||||
63AADBD81B6A0FF200AA16FD /* linphonerc-factory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-factory"; sourceTree = "<group>"; };
|
||||
63AADBDA1B6A0FF200AA16FD /* linphonerc~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc~ipad"; sourceTree = "<group>"; };
|
||||
63AADBDB1B6A0FF200AA16FD /* msg.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = msg.caf; sourceTree = "<group>"; };
|
||||
63AADBDC1B6A0FF200AA16FD /* msg.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = msg.wav; sourceTree = "<group>"; };
|
||||
63AADBDD1B6A0FF200AA16FD /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
63AADBDE1B6A0FF200AA16FD /* ring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = ring.caf; sourceTree = "<group>"; };
|
||||
63AADBDF1B6A0FF200AA16FD /* ring.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = ring.wav; sourceTree = "<group>"; };
|
||||
63AADBE01B6A0FF200AA16FD /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = ringback.wav; sourceTree = "<group>"; };
|
||||
63AADBE11B6A0FF200AA16FD /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
|
||||
63AADBE21B6A0FF200AA16FD /* shortring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = shortring.caf; sourceTree = "<group>"; };
|
||||
63AADBE31B6A0FF200AA16FD /* assistant_external_sip.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_external_sip.rc; sourceTree = "<group>"; };
|
||||
63AADBE41B6A0FF200AA16FD /* assistant_linphone_create.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_linphone_create.rc; sourceTree = "<group>"; };
|
||||
63AADBE51B6A0FF200AA16FD /* assistant_linphone_existing.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_linphone_existing.rc; sourceTree = "<group>"; };
|
||||
|
|
@ -1353,6 +1351,16 @@
|
|||
63C441C21BBC23ED0053DC5E /* UIAssistantTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIAssistantTextField.m; sourceTree = "<group>"; };
|
||||
63CD4B4D1A5AAC8C00B84282 /* DTAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTAlertView.h; sourceTree = "<group>"; };
|
||||
63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTAlertView.m; sourceTree = "<group>"; };
|
||||
63CDC4521C3BDE370085F529 /* hold.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = hold.caf; sourceTree = "<group>"; };
|
||||
63CDC4531C3BDE370085F529 /* msg.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = msg.caf; sourceTree = "<group>"; };
|
||||
63CDC4541C3BDE370085F529 /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = ringback.wav; sourceTree = "<group>"; };
|
||||
63CDC4561C3BDE370085F529 /* four_hands_together.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = four_hands_together.caf; sourceTree = "<group>"; };
|
||||
63CDC4571C3BDE370085F529 /* house_keeping.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = house_keeping.caf; sourceTree = "<group>"; };
|
||||
63CDC4581C3BDE370085F529 /* it_s_a_game.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = it_s_a_game.caf; sourceTree = "<group>"; };
|
||||
63CDC4591C3BDE370085F529 /* leaving_a_dream.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = leaving_a_dream.caf; sourceTree = "<group>"; };
|
||||
63CDC45A1C3BDE370085F529 /* notes_of_the_optimistic.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = notes_of_the_optimistic.caf; sourceTree = "<group>"; };
|
||||
63CDC45B1C3BDE370085F529 /* soft_as_snow.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = soft_as_snow.caf; sourceTree = "<group>"; };
|
||||
63CDC45C1C3BDE370085F529 /* shortring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = shortring.caf; sourceTree = "<group>"; };
|
||||
63CFEDE21B9EDD36007EA5BD /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = "liblinphone-sdk/apple-darwin/lib/libswresample.a"; sourceTree = "<group>"; };
|
||||
63CFEDE31B9EDD36007EA5BD /* libvo-amrwbenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libvo-amrwbenc.a"; path = "liblinphone-sdk/apple-darwin/lib/libvo-amrwbenc.a"; sourceTree = "<group>"; };
|
||||
63CFEDE41B9EDD36007EA5BD /* libbcg729.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbcg729.a; path = "liblinphone-sdk/apple-darwin/lib/libbcg729.a"; sourceTree = "<group>"; };
|
||||
|
|
@ -2504,15 +2512,10 @@
|
|||
63AADBD71B6A0FF200AA16FD /* linphonerc */,
|
||||
63AADBD81B6A0FF200AA16FD /* linphonerc-factory */,
|
||||
63AADBDA1B6A0FF200AA16FD /* linphonerc~ipad */,
|
||||
63CDC4511C3BDE370085F529 /* sounds */,
|
||||
63AADBC41B6A0FF200AA16FD /* Localizable.strings */,
|
||||
63AADBDB1B6A0FF200AA16FD /* msg.caf */,
|
||||
636B967C1C298400003BA37C /* images */,
|
||||
63AADBDC1B6A0FF200AA16FD /* msg.wav */,
|
||||
63AADBDE1B6A0FF200AA16FD /* ring.caf */,
|
||||
63AADBDF1B6A0FF200AA16FD /* ring.wav */,
|
||||
63AADBE01B6A0FF200AA16FD /* ringback.wav */,
|
||||
631348311B6FA53300C6BDCB /* rootca.pem */,
|
||||
63AADBE21B6A0FF200AA16FD /* shortring.caf */,
|
||||
);
|
||||
path = Resources;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -2534,6 +2537,31 @@
|
|||
path = Utils/TPKeyboardAvoiding;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
63CDC4511C3BDE370085F529 /* sounds */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
63CDC4521C3BDE370085F529 /* hold.caf */,
|
||||
63CDC4531C3BDE370085F529 /* msg.caf */,
|
||||
63CDC4541C3BDE370085F529 /* ringback.wav */,
|
||||
63CDC4551C3BDE370085F529 /* rings */,
|
||||
63CDC45C1C3BDE370085F529 /* shortring.caf */,
|
||||
);
|
||||
path = sounds;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
63CDC4551C3BDE370085F529 /* rings */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
63CDC4561C3BDE370085F529 /* four_hands_together.caf */,
|
||||
63CDC4571C3BDE370085F529 /* house_keeping.caf */,
|
||||
63CDC4581C3BDE370085F529 /* it_s_a_game.caf */,
|
||||
63CDC4591C3BDE370085F529 /* leaving_a_dream.caf */,
|
||||
63CDC45A1C3BDE370085F529 /* notes_of_the_optimistic.caf */,
|
||||
63CDC45B1C3BDE370085F529 /* soft_as_snow.caf */,
|
||||
);
|
||||
path = rings;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
D326483415887D4400930C67 /* Utils */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -2902,7 +2930,6 @@
|
|||
636B98741C298401003BA37C /* contacts_sip_default.png in Resources */,
|
||||
636B988B1C298401003BA37C /* dialer_background@2x.png in Resources */,
|
||||
63AADBFF1B6A0FF200AA16FD /* assistant_external_sip.rc in Resources */,
|
||||
63AADBFE1B6A0FF200AA16FD /* shortring.caf in Resources */,
|
||||
636B98081C298401003BA37C /* call_hangup_default.png in Resources */,
|
||||
636B98881C298401003BA37C /* dialer_back_disabled.png in Resources */,
|
||||
634610121B6140A500548952 /* CallOutgoingView.xib in Resources */,
|
||||
|
|
@ -2946,6 +2973,7 @@
|
|||
636B98471C298401003BA37C /* chat_attachment_disabled@2x.png in Resources */,
|
||||
636B97FC1C298401003BA37C /* call_alt_start_default.png in Resources */,
|
||||
636B98321C298401003BA37C /* camera_disabled.png in Resources */,
|
||||
63CDC4611C3BDE370085F529 /* house_keeping.caf in Resources */,
|
||||
636B97E41C298401003BA37C /* add_field_default.png in Resources */,
|
||||
636B98F31C298401003BA37C /* numpad_hash_default@2x.png in Resources */,
|
||||
636B98601C298401003BA37C /* color_F.png in Resources */,
|
||||
|
|
@ -2957,6 +2985,8 @@
|
|||
639CEAFD1A1DF4D9004DE38F /* StatusBarView.xib in Resources */,
|
||||
636B98221C298401003BA37C /* call_status_incoming.png in Resources */,
|
||||
636B983F1C298401003BA37C /* cancel_edit_disabled@2x.png in Resources */,
|
||||
63CDC4641C3BDE370085F529 /* notes_of_the_optimistic.caf in Resources */,
|
||||
63CDC4621C3BDE370085F529 /* it_s_a_game.caf in Resources */,
|
||||
636B98541C298401003BA37C /* chat_start_body_disabled.png in Resources */,
|
||||
636B97F31C298401003BA37C /* backspace_over@2x.png in Resources */,
|
||||
636B98351C298401003BA37C /* camera_selected@2x.png in Resources */,
|
||||
|
|
@ -2971,10 +3001,10 @@
|
|||
636B98871C298401003BA37C /* dialer_back_default@2x.png in Resources */,
|
||||
636B98921C298401003BA37C /* edit_list_disabled.png in Resources */,
|
||||
636B98791C298401003BA37C /* contacts_sip_selected@2x.png in Resources */,
|
||||
63AADBFB1B6A0FF200AA16FD /* ring.caf in Resources */,
|
||||
636B98DE1C298401003BA37C /* numpad_5_default.png in Resources */,
|
||||
636B99281C298401003BA37C /* route_speaker_disabled@2x.png in Resources */,
|
||||
636B98A01C298401003BA37C /* footer_history_default.png in Resources */,
|
||||
63CDC4661C3BDE370085F529 /* shortring.caf in Resources */,
|
||||
636B98381C298401003BA37C /* camera_switch_disabled.png in Resources */,
|
||||
639CEB001A1DF4E4004DE38F /* UIHistoryCell.xib in Resources */,
|
||||
636B981B1C298401003BA37C /* call_quality_indicator_4@2x.png in Resources */,
|
||||
|
|
@ -3005,7 +3035,6 @@
|
|||
636B99031C298401003BA37C /* options_selected.png in Resources */,
|
||||
636B98D01C298401003BA37C /* numpad_1_over.png in Resources */,
|
||||
636B97F21C298401003BA37C /* backspace_over.png in Resources */,
|
||||
63AADBFA1B6A0FF200AA16FD /* msg.wav in Resources */,
|
||||
636B97EB1C298401003BA37C /* back_default@2x.png in Resources */,
|
||||
636B99181C298401003BA37C /* pause_small_over_selected@2x.png in Resources */,
|
||||
636B98C01C298401003BA37C /* list_details_over.png in Resources */,
|
||||
|
|
@ -3024,8 +3053,8 @@
|
|||
636B985D1C298401003BA37C /* color_C.png in Resources */,
|
||||
636316D41A1DEC650009B839 /* SettingsView.xib in Resources */,
|
||||
636B98131C298401003BA37C /* call_quality_indicator_0@2x.png in Resources */,
|
||||
63AADBFC1B6A0FF200AA16FD /* ring.wav in Resources */,
|
||||
636B99251C298401003BA37C /* route_speaker_default.png in Resources */,
|
||||
63CDC4651C3BDE370085F529 /* soft_as_snow.caf in Resources */,
|
||||
636B98421C298401003BA37C /* chat_add_disabled.png in Resources */,
|
||||
636B98D11C298401003BA37C /* numpad_1_over@2x.png in Resources */,
|
||||
636B981C1C298401003BA37C /* call_start_body_default.png in Resources */,
|
||||
|
|
@ -3051,6 +3080,7 @@
|
|||
636B990F1C298401003BA37C /* pause_big_disabled.png in Resources */,
|
||||
63B8D68C1BCBE65600C12B09 /* ChatConversationCreateView.xib in Resources */,
|
||||
D38187D915FE347700C3EDCA /* CallIncomingView.xib in Resources */,
|
||||
63CDC45F1C3BDE370085F529 /* ringback.wav in Resources */,
|
||||
639CEB031A1DF4EB004DE38F /* UICompositeView.xib in Resources */,
|
||||
63AADBF81B6A0FF200AA16FD /* linphonerc~ipad in Resources */,
|
||||
636B98E21C298401003BA37C /* numpad_6_default.png in Resources */,
|
||||
|
|
@ -3068,7 +3098,9 @@
|
|||
636B984D1C298401003BA37C /* chat_send_default@2x.png in Resources */,
|
||||
636B97F41C298401003BA37C /* call_add_default.png in Resources */,
|
||||
636B980F1C298401003BA37C /* call_missed@2x.png in Resources */,
|
||||
63CDC45E1C3BDE370085F529 /* msg.caf in Resources */,
|
||||
636B98F41C298401003BA37C /* numpad_hash_over.png in Resources */,
|
||||
63CDC4601C3BDE370085F529 /* four_hands_together.caf in Resources */,
|
||||
636B98901C298401003BA37C /* edit_list_default.png in Resources */,
|
||||
636B98F01C298401003BA37C /* numpad_9_over.png in Resources */,
|
||||
636B984A1C298401003BA37C /* chat_message_not_delivered.png in Resources */,
|
||||
|
|
@ -3178,6 +3210,7 @@
|
|||
636B98AD1C298401003BA37C /* history_missed_default@2x.png in Resources */,
|
||||
636B98A71C298401003BA37C /* history_all_disabled@2x.png in Resources */,
|
||||
636B98641C298401003BA37C /* color_L.png in Resources */,
|
||||
63CDC4631C3BDE370085F529 /* leaving_a_dream.caf in Resources */,
|
||||
636B98191C298401003BA37C /* call_quality_indicator_3@2x.png in Resources */,
|
||||
636B98991C298401003BA37C /* footer_contacts_default@2x.png in Resources */,
|
||||
636B98681C298401003BA37C /* conference_exit_over.png in Resources */,
|
||||
|
|
@ -3233,6 +3266,7 @@
|
|||
636B98281C298401003BA37C /* call_transfer_default.png in Resources */,
|
||||
639E9CA91C0DB7FB00019A75 /* UIConfirmationDialog.xib in Resources */,
|
||||
636B98F91C298401003BA37C /* numpad_star_over.png in Resources */,
|
||||
63CDC45D1C3BDE370085F529 /* hold.caf in Resources */,
|
||||
636B99081C298401003BA37C /* options_start_conference_disabled@2x.png in Resources */,
|
||||
636B980D1C298401003BA37C /* call_incoming@2x.png in Resources */,
|
||||
636B99231C298401003BA37C /* route_earpiece_selected.png in Resources */,
|
||||
|
|
@ -3247,7 +3281,6 @@
|
|||
636B986C1C298401003BA37C /* contact_add_disabled.png in Resources */,
|
||||
636B98501C298401003BA37C /* chat_send_over.png in Resources */,
|
||||
636B98C21C298401003BA37C /* menu.png in Resources */,
|
||||
63AADBFD1B6A0FF200AA16FD /* ringback.wav in Resources */,
|
||||
636B98D31C298401003BA37C /* numpad_2_default@2x.png in Resources */,
|
||||
636B98EA1C298401003BA37C /* numpad_8_default.png in Resources */,
|
||||
636B985B1C298401003BA37C /* checkbox_unchecked@2x.png in Resources */,
|
||||
|
|
@ -3294,7 +3327,6 @@
|
|||
636B993E1C298401003BA37C /* speaker_disabled@2x.png in Resources */,
|
||||
636B985E1C298401003BA37C /* color_D.png in Resources */,
|
||||
636B982F1C298401003BA37C /* call_video_start_disabled@2x.png in Resources */,
|
||||
63AADBF91B6A0FF200AA16FD /* msg.caf in Resources */,
|
||||
636B99221C298401003BA37C /* route_earpiece_disabled@2x.png in Resources */,
|
||||
636B992D1C298401003BA37C /* routes_disabled.png in Resources */,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit f68cf75d749df061cb5753c3ee13c7dec3aa9c5f
|
||||
Subproject commit 0d2723fae84f812c8d8bb7daaee9b91ca57958b5
|
||||
Loading…
Add table
Reference in a new issue