From d037211739c8456b991cb3c1b7e95de1ee344364 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 1 Feb 2012 09:29:50 +0100 Subject: [PATCH 1/6] Fix 'call quality' icon overlapping contact name Mantis #131 --- Classes/ConferenceCallDetailCell.xib | 29 +++++++++++++++++++++++----- Classes/ConferenceCallDetailView.m | 8 ++------ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Classes/ConferenceCallDetailCell.xib b/Classes/ConferenceCallDetailCell.xib index 9feae9f9c..1a406056a 100644 --- a/Classes/ConferenceCallDetailCell.xib +++ b/Classes/ConferenceCallDetailCell.xib @@ -43,7 +43,7 @@ 292 - {{0, -0.5}, {80, 80}} + {80, 80} @@ -54,11 +54,11 @@ - 292 - {{79, -0.5}, {241, 80}} + 274 + {{80, 0}, {212, 80}} - + _NS:328 NO YES @@ -84,6 +84,18 @@ 16 + + + 292 + {{292, 26}, {28, 28}} + + + + _NS:567 + 3 + NO + IBCocoaTouchFramework + {320, 79} @@ -148,6 +160,7 @@ + @@ -156,6 +169,11 @@ + + 8 + + + 6 @@ -171,12 +189,13 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 7 + 8 diff --git a/Classes/ConferenceCallDetailView.m b/Classes/ConferenceCallDetailView.m index 462fbc2ec..ed6ebafea 100644 --- a/Classes/ConferenceCallDetailView.m +++ b/Classes/ConferenceCallDetailView.m @@ -147,8 +147,7 @@ NSTimer *callQualityRefresher; [view removeFromSuperview]; } } - UIImageView* callquality = [UIImageView new]; - [callquality setFrame:CGRectMake(0, 0, 28, 28)]; + UIImageView* callquality = (UIImageView*) [cell viewWithTag:3]; if (linphone_call_get_average_quality(call) >= 4) { [callquality setImage: [IncallViewController stat_sys_signal_4]]; } @@ -164,10 +163,7 @@ NSTimer *callQualityRefresher; else { [callquality setImage: [IncallViewController stat_sys_signal_0]]; } - [cell.accessoryView addSubview:callquality]; - - tableView.rowHeight = 80;//cell.bounds.size.height; - [callquality release]; + tableView.rowHeight = 80; return cell; } From 9511a40cb08a1cab880e3cbe85d2e8ec6f2778f6 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 1 Feb 2012 09:34:26 +0100 Subject: [PATCH 2/6] Add details text for LinphoneCallOutgoingRinging and LinphoneCallPausedByRemote states Mantis: #130 --- Classes/IncallViewController.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m index 6ea9207a0..b0bdf7cf7 100644 --- a/Classes/IncallViewController.m +++ b/Classes/IncallViewController.m @@ -532,9 +532,16 @@ int callCount(LinphoneCore* lc) { case LinphoneCallPaused: [ms appendFormat:@"%@", NSLocalizedString(@"Paused (tap to resume)", nil), nil]; break; + case LinphoneCallOutgoingInit: case LinphoneCallOutgoingProgress: [ms appendFormat:@"%@...", NSLocalizedString(@"In progress", nil), nil]; break; + case LinphoneCallOutgoingRinging: + [ms appendFormat:@"%@...", NSLocalizedString(@"Ringing...", nil), nil]; + break; + case LinphoneCallPausedByRemote: + [ms appendFormat:@"%@...", NSLocalizedString(@"Paused by remote", nil), nil]; + break; default: break; } From dc75c68520c150618cef22e37e2a53d117d2ab84 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 6 Feb 2012 15:37:58 +0100 Subject: [PATCH 3/6] update exosip for bugfix --- submodules/externals/exosip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/exosip b/submodules/externals/exosip index c3da03035..12dde4bdc 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit c3da0303519ad3120355cb85baee9cf6d0e4d1c2 +Subproject commit 12dde4bdc18ee6dddbb6ff407345ede5a277936d From 122fa2601d7a08984d22fe93a1ae574e4e8ff424 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 9 Feb 2012 10:27:15 +0100 Subject: [PATCH 4/6] replace PKG_CONFIG_PATH by PKG_CONFIG_LIBDIR --- submodules/build/builder-iphone-os.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 38748afd1..d87ad6390 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -104,7 +104,7 @@ veryclean: veryclean-linphone .NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile - cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install + cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean @@ -122,18 +122,18 @@ $(LINPHONE_SRC_DIR)/configure: $(LINPHONE_BUILD_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure mkdir -p $(LINPHONE_BUILD_DIR) - echo -e "\033[1mPKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + echo -e "\033[1mPKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(LINPHONE_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ ${linphone_configure_controls}\033[0m" cd $(LINPHONE_BUILD_DIR) && \ - PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ CFLAGS="$(CFLAGS) -DMS2_MINIMAL_SIZE" $(LINPHONE_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ ${linphone_configure_controls} #libphone only (asume dependencies are met) build-liblinphone: $(LINPHONE_BUILD_DIR)/Makefile - cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install + cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install clean-makefile-liblinphone: cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile @@ -152,7 +152,7 @@ $(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(osip_dir)/config $(BUILDER_SRC_DIR)/$(osip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} build-osip2: $(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(osip_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(osip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-osip2: cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make clean @@ -171,12 +171,12 @@ $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure mkdir -p $(BUILDER_BUILD_DIR)/$(eXosip_dir) cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)/\ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --enable-openssl --disable-tools build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ make DEFS="-DHAVE_CONFIG_H -include $(BUILDER_SRC_DIR)/$(eXosip_dir)/include/eXosip2/eXosip_transport_hook.h" && make install clean-eXosip2: @@ -243,7 +243,7 @@ $(MSILBC_SRC_DIR)/configure: $(MSILBC_BUILD_DIR)/Makefile: $(MSILBC_SRC_DIR)/configure mkdir -p $(MSILBC_BUILD_DIR) cd $(MSILBC_BUILD_DIR) && \ - PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(MSILBC_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) $(library_mode) build-msilbc: build-libilbc $(MSILBC_BUILD_DIR)/Makefile @@ -267,7 +267,7 @@ $(LIBILBC_SRC_DIR)/configure: $(LIBILBC_BUILD_DIR)/Makefile: $(LIBILBC_SRC_DIR)/configure mkdir -p $(LIBILBC_BUILD_DIR) cd $(LIBILBC_BUILD_DIR) && \ - PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(LIBILBC_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) $(library_mode) build-libilbc: $(LIBILBC_BUILD_DIR)/Makefile From 9beec4eaf2f3d5cafea077a8273227fb490de8a9 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 9 Feb 2012 10:37:10 +0100 Subject: [PATCH 5/6] Update silk and linphone --- submodules/linphone | 2 +- submodules/mssilk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index 026077112..286dc6983 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 02607711286be03ac9e074dde0ac02ba03025266 +Subproject commit 286dc6983555a81b8c2bb73fee09e9c611015b05 diff --git a/submodules/mssilk b/submodules/mssilk index a0ad1cca9..498a7c526 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit a0ad1cca900afc17204856fd7c2de7e8d511eaad +Subproject commit 498a7c526192392e402e72b7e9f2c6c381bdb7fd From 674fa69838ade510202a4975e34e808f87660a49 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 10 Feb 2012 11:18:37 +0100 Subject: [PATCH 6/6] Update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 286dc6983..11d7c7be8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 286dc6983555a81b8c2bb73fee09e9c611015b05 +Subproject commit 11d7c7be849174db1d18faeec8e20b56301f678c