mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-19 20:18:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move cpu count detection to mediastreamer2

Browse source
This commit is contained in:
Simon Morlat 2013-09-10 16:35:34 +02:00
parent 9df7a19ca3
commit 3a69a548df
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gtk/main.c
View file

@ -232,15 +232,6 @@ static void linphone_gtk_init_liblinphone(const char *config_file,
const char *factory_config_file, const char *db_file) {
LinphoneCoreVTable vtable={0};
gchar *secrets_file=linphone_gtk_get_config_file(SECRETS_FILE);
long num_cpu=1;
#ifdef WIN32 /*fixme to be tested*/
SYSTEM_INFO sysinfo;
GetSystemInfo( &sysinfo );
num_cpu = sysinfo.dwNumberOfProcessors;
#elif __APPLE_ || __linux
num_cpu = sysconf( _SC_NPROCESSORS_ONLN );
#endif
vtable.call_state_changed=linphone_gtk_call_state_changed;
vtable.registration_state_changed=linphone_gtk_registration_state_changed;
@ -261,9 +252,7 @@ static void linphone_gtk_init_liblinphone(const char *config_file,
the_core=linphone_core_new(&vtable,config_file,factory_config_file,NULL);
//lp_config_set_int(linphone_core_get_config(the_core), "sip", "store_auth_info", 0);
if (num_cpu>1) {
ms_set_cpu_count(num_cpu);
}
linphone_core_set_user_agent(the_core,"Linphone", LINPHONE_VERSION);
linphone_core_set_waiting_callback(the_core,linphone_gtk_wait,NULL);
linphone_core_set_zrtp_secrets_file(the_core,secrets_file);

2
mediastreamer2

@ -1 +1 @@
Subproject commit 6d02dd51a10ddd6125d66b5a03770face3ffb172
Subproject commit a1a296d106633ff6f250db46e991f53acf4f7991