From 0fedaa2ac6fca2b313f679cd7a3b96164b1600d2 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 15 Jul 2015 14:22:11 +0200 Subject: [PATCH] Logs: improve startup logs a bit --- Classes/LinphoneManager.m | 16 ++++++++++++++-- linphone.xcodeproj/project.pbxproj | 16 ++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index be025c8d8..a73ce1cf3 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -839,7 +839,8 @@ static void linphone_iphone_configuring_status_changed(LinphoneCore *lc, Linphon } - (void)onConfiguringStatusChanged:(LinphoneConfiguringState)status withMessage:(const char *)message { - LOGI(@"onConfiguringStatusChanged: %d (message: %s)", status, message); + LOGI(@"onConfiguringStatusChanged: %s %@", linphone_configuring_state_to_string(status), + message ? [NSString stringWithFormat:@"(message: %s)", message] : @""); NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:status], @"state", @@ -868,7 +869,7 @@ static void linphone_iphone_configuring_status_changed(LinphoneCore *lc, Linphon cfg:(LinphoneProxyConfig *)cfg state:(LinphoneRegistrationState)state message:(const char *)message { - LOGI(@"NEW REGISTRATION STATE: '%s' (message: '%s')", linphone_registration_state_to_string(state), message); + LOGI(@"New registration state: %s (message: %s)", linphone_registration_state_to_string(state), message); // Post event NSDictionary *dict = [NSDictionary @@ -1449,6 +1450,17 @@ static BOOL libStarted = FALSE; libmswebrtc_init(); #endif + // Set audio assets + const char *lRing = + [[LinphoneManager bundleFile:@"ring.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + lp_config_set_string(configDb, "sound", "local_ring", lRing); + const char *lRingBack = + [[LinphoneManager bundleFile:@"ringback.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + lp_config_set_string(configDb, "sound", "ringback_tone", lRingBack); + const char *lPlay = + [[LinphoneManager bundleFile:@"hold.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + lp_config_set_string(configDb, "sound", "hold_music", lPlay); + theLinphoneCore = linphone_core_new_with_config(&linphonec_vtable, configDb, (__bridge void *)(self) /* user_data */); diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 276a7d458..a1303ccaf 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -112,7 +112,6 @@ 630589E81B4E810900EFAE36 /* ContactsTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589E11B4E810900EFAE36 /* ContactsTester.m */; }; 630589EA1B4E810900EFAE36 /* LinphoneTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589E41B4E810900EFAE36 /* LinphoneTestCase.m */; }; 630589EB1B4E810900EFAE36 /* WizardTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 630589E61B4E810900EFAE36 /* WizardTester.m */; }; - 63058A0B1B4E81B700EFAE36 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 63058A0A1B4E81B700EFAE36 /* Info.plist */; }; 63058A241B4E821E00EFAE36 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A0E1B4E821E00EFAE36 /* AppDelegate.m */; }; 63058A251B4E821E00EFAE36 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 63058A0F1B4E821E00EFAE36 /* InfoPlist.strings */; }; 63058A261B4E821E00EFAE36 /* Main_iPad.strings in Resources */ = {isa = PBXBuildFile; fileRef = 63058A111B4E821E00EFAE36 /* Main_iPad.strings */; }; @@ -164,6 +163,7 @@ 639CEB061A1DF4F1004DE38F /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB081A1DF4F1004DE38F /* UIChatRoomCell.xib */; }; 639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB0B1A1DF4FA004DE38F /* UIChatCell.xib */; }; 63A4280A1B26F576000DAB93 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; }; + 63C458261B5680AC009F2D7E /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* ring.wav */; }; 63CD4B4F1A5AAC8C00B84282 /* DTAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */; }; 63D2680F1B174A5E00A2CC11 /* numpad_one_voicemail_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680D1B174A5E00A2CC11 /* numpad_one_voicemail_default.png */; }; 63D268101B174A5E00A2CC11 /* numpad_one_voicemail_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680E1B174A5E00A2CC11 /* numpad_one_voicemail_over.png */; }; @@ -1723,7 +1723,7 @@ F070E6321A2622EC00E17AFD /* incall_padding_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = incall_padding_right.png; path = Resources/incall_padding_right.png; sourceTree = ""; }; F088488C19FF8C41007FFCF3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIContactCell.xib; sourceTree = ""; }; F088488F19FF8C44007FFCF3 /* fr */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIContactCell.strings; sourceTree = ""; }; - F08F118419C09C6A007D70C2 /* liblinphoneTester Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "liblinphoneTester Tests.xctest"; path = liblinphoneTesterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + F08F118419C09C6A007D70C2 /* liblinphoneTesterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = liblinphoneTesterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; F0938158188E629800A55DFA /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; path = iTunesArtwork; sourceTree = ""; }; F09548181883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ChatRoomViewController.xib; sourceTree = ""; }; F09548191883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ChatViewController.xib; sourceTree = ""; }; @@ -1853,7 +1853,7 @@ F0C1F90A1A28781F009402C9 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; F0C1F90B1A28781F009402C9 /* strech-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "strech-bottom.png"; sourceTree = ""; }; F0C1F90C1A28781F009402C9 /* strech-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "strech-top.png"; sourceTree = ""; }; - F0F952001A6AEB1000254160 /* linphone Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "linphone Tests.xctest"; path = linphoneTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + F0F952001A6AEB1000254160 /* linphoneTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = linphoneTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; F0FF66AA1ACAEEB0008A4486 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; F84015BC1939FE37006ABAB5 /* test_failed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_failed.png; path = Resources/test_failed.png; sourceTree = ""; }; F84015BD1939FE37006ABAB5 /* test_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_inprogress.png; path = Resources/test_inprogress.png; sourceTree = ""; }; @@ -2088,8 +2088,8 @@ children = ( 1D6058910D05DD3D006BFB54 /* linphone.app */, F0BB8BD51936208100974404 /* liblinphoneTester.app */, - F08F118419C09C6A007D70C2 /* liblinphoneTester Tests.xctest */, - F0F952001A6AEB1000254160 /* linphone Tests.xctest */, + F08F118419C09C6A007D70C2 /* liblinphoneTesterTests.xctest */, + F0F952001A6AEB1000254160 /* linphoneTests.xctest */, ); name = Products; sourceTree = ""; @@ -3130,7 +3130,7 @@ ); name = liblinphoneTesterTests; productName = LinphoneTesterTests; - productReference = F08F118419C09C6A007D70C2 /* liblinphoneTester Tests.xctest */; + productReference = F08F118419C09C6A007D70C2 /* liblinphoneTesterTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; F0BB8BD41936208100974404 /* liblinphoneTester */ = { @@ -3167,7 +3167,7 @@ ); name = linphoneTests; productName = KifTests; - productReference = F0F952001A6AEB1000254160 /* linphone Tests.xctest */; + productReference = F0F952001A6AEB1000254160 /* linphoneTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -3869,6 +3869,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 63C458261B5680AC009F2D7E /* ring.wav in Resources */, 63058ADA1B4E937300EFAE36 /* certificates in Resources */, 63058ADB1B4E937300EFAE36 /* flexisip in Resources */, 63058ADC1B4E937300EFAE36 /* images in Resources */, @@ -3894,7 +3895,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 63058A0B1B4E81B700EFAE36 /* Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };