diff --git a/linphone/README.mingw b/linphone/README.mingw index 59133a7b8..9e9709b73 100644 --- a/linphone/README.mingw +++ b/linphone/README.mingw @@ -101,8 +101,7 @@ make setup.exe #build plugins cd mediastreamer2/plugins/msx264 ./autogen.sh -PKG_CONFIG_PATH=/opt/linphone/lib/pkgconfig ./configure --prefix=/opt/linphone --enable-shared --disable-static --enable-hacked-x264 -make +PKG_CONFIG_PATH=/opt/linphone/lib/pkgconfig ./configure --prefix=/opt/linphone --enable-shared --disable-static #make a binary zip of this plugin make zip #or make an installer @@ -155,17 +154,11 @@ When running "make install DESTDIR=", somepath must be absolute and sh copy ~/libxml2-install/usr/local/* into linphone-deps/. - building x264: - - * Download lastest snapshot the linphone fork of x264 from - http://download.savannah.gnu.org/releases/linphone/plugins/sources/ - This fork just brings the H264 Nalu size control feature, necessary to make video packet that fits into the network mtu. - It will be no longer necessary as soon as x264 official project will accept this patch or a similar one. - + * download yasm normal version windows executable from yasm project page: http://www.tortall.net/projects/yasm/wiki/Download copy it as /usr/local/bin/yasm.exe - uncompress the x264 tarball cd into x264/ dir then run: ./configure --enable-pic make diff --git a/linphone/console/commands.c b/linphone/console/commands.c index 445bf0e39..ae5c5b8fe 100644 --- a/linphone/console/commands.c +++ b/linphone/console/commands.c @@ -764,7 +764,7 @@ lpc_cmd_proxy(LinphoneCore *lc, char *args) static int lpc_cmd_call_logs(LinphoneCore *lc, char *args) { - MSList *elem=linphone_core_get_call_logs(lc); + const MSList *elem=linphone_core_get_call_logs(lc); for (;elem!=NULL;elem=ms_list_next(elem)) { LinphoneCallLog *cl=(LinphoneCallLog*)elem->data; diff --git a/linphone/coreapi/linphonecore.c b/linphone/coreapi/linphonecore.c index 78f36283d..d0a4f16a8 100644 --- a/linphone/coreapi/linphonecore.c +++ b/linphone/coreapi/linphonecore.c @@ -243,6 +243,14 @@ char * linphone_call_log_to_str(LinphoneCallLog *cl){ return tmp; } +void linphone_call_log_set_user_pointer(LinphoneCallLog *cl, void *up){ + cl->user_pointer=up; +} + +void *linphone_call_log_get_user_pointer(const LinphoneCallLog *cl){ + return cl->user_pointer; +} + void linphone_call_log_destroy(LinphoneCallLog *cl){ if (cl->from!=NULL) osip_free(cl->from); if (cl->to!=NULL) osip_free(cl->to); @@ -2339,7 +2347,7 @@ LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) return lc->net_conf.firewall_policy; } -MSList * linphone_core_get_call_logs(LinphoneCore *lc){ +const MSList * linphone_core_get_call_logs(LinphoneCore *lc){ lc->missed_calls=0; return lc->call_logs; } diff --git a/linphone/coreapi/linphonecore.h b/linphone/coreapi/linphonecore.h index 64870e83b..4628292f7 100644 --- a/linphone/coreapi/linphonecore.h +++ b/linphone/coreapi/linphonecore.h @@ -188,11 +188,14 @@ typedef struct _LinphoneCallLog{ LinphoneAddress *to; char start_date[128]; int duration; + void *user_pointer; } LinphoneCallLog; /*public: */ +void linphone_call_log_set_user_pointer(LinphoneCallLog *cl, void *up); +void *linphone_call_log_get_user_pointer(const LinphoneCallLog *cl); char * linphone_call_log_to_str(LinphoneCallLog *cl); typedef enum{ @@ -724,7 +727,7 @@ void linphone_core_notify_all_friends(LinphoneCore *lc, LinphoneOnlineStatus os) LinphoneFriend *linphone_core_get_friend_by_uri(const LinphoneCore *lc, const char *uri); /* returns a list of LinphoneCallLog */ -MSList * linphone_core_get_call_logs(LinphoneCore *lc); +const MSList * linphone_core_get_call_logs(LinphoneCore *lc); /* video support */ void linphone_core_enable_video(LinphoneCore *lc, bool_t vcap_enabled, bool_t display_enabled); diff --git a/linphone/gtk-glade/calllogs.c b/linphone/gtk-glade/calllogs.c index 59a8bcbda..b652f9a10 100644 --- a/linphone/gtk-glade/calllogs.c +++ b/linphone/gtk-glade/calllogs.c @@ -25,7 +25,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){ GtkTextIter iter,begin; int off; char *logmsg; - MSList *logs; + const MSList *logs; for (logs=linphone_core_get_call_logs(linphone_gtk_get_core());logs!=NULL;logs=logs->next){ LinphoneCallLog *cl=(LinphoneCallLog*)logs->data; logmsg=linphone_call_log_to_str(cl);