Commit bf1d1d4e authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Fixes for wrapper and Android compil

parent 30b04f5e
...@@ -330,3 +330,7 @@ void *linphone_factory_get_user_data(const LinphoneFactory *factory) { ...@@ -330,3 +330,7 @@ void *linphone_factory_get_user_data(const LinphoneFactory *factory) {
void linphone_factory_set_user_data(LinphoneFactory *factory, void *data) { void linphone_factory_set_user_data(LinphoneFactory *factory, void *data) {
factory->user_data = data; factory->user_data = data;
} }
const bctbx_list_t * linphone_factory_get_dial_plans(LinphoneFactory *factory) {
return linphone_dial_plan_get_all_list();
}
...@@ -85,7 +85,7 @@ LINPHONE_PUBLIC int linphone_dial_plan_lookup_ccc_from_e164(const char* e164); ...@@ -85,7 +85,7 @@ LINPHONE_PUBLIC int linphone_dial_plan_lookup_ccc_from_e164(const char* e164);
LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_get_all(void); LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_get_all(void);
/** /**
* @return {\bctbx_list const LinphoneDialPlan*} of all known dial plans * @return \bctbx_list{LinphoneDialPlan} of all known dial plans
**/ **/
LINPHONE_PUBLIC const bctbx_list_t * linphone_dial_plan_get_all_list(void); LINPHONE_PUBLIC const bctbx_list_t * linphone_dial_plan_get_all_list(void);
......
...@@ -276,6 +276,13 @@ LINPHONE_PUBLIC void *linphone_factory_get_user_data(const LinphoneFactory *fact ...@@ -276,6 +276,13 @@ LINPHONE_PUBLIC void *linphone_factory_get_user_data(const LinphoneFactory *fact
*/ */
LINPHONE_PUBLIC void linphone_factory_set_user_data(LinphoneFactory *factory, void *data); LINPHONE_PUBLIC void linphone_factory_set_user_data(LinphoneFactory *factory, void *data);
/***
* Returns a bctbx_list_t of all DialPlans
* @param[in] factory the LinphoneFactory object
* @return \bctbx_list{DialPlan} a list of DialPlan
*/
LINPHONE_PUBLIC const bctbx_list_t * linphone_factory_get_dial_plans(LinphoneFactory *factory);
/** /**
* @} * @}
*/ */
......
...@@ -373,7 +373,7 @@ int DialPlan::lookupCccFromIso(string iso) { ...@@ -373,7 +373,7 @@ int DialPlan::lookupCccFromIso(string iso) {
} }
const DialPlan& DialPlan::findByCccAsInt(int ccc) { const DialPlan& DialPlan::findByCccAsInt(int ccc) {
string cccString = to_string(ccc); string cccString = Utils::toString(ccc);
return DialPlan::findByCcc(cccString); return DialPlan::findByCcc(cccString);
} }
......
...@@ -238,7 +238,7 @@ eval "$SED_START 's/mLc.destroy()/mLc = null/g' $SED_END" ...@@ -238,7 +238,7 @@ eval "$SED_START 's/mLc.destroy()/mLc = null/g' $SED_END"
#Core.needsEchoCalibration() #Core.needsEchoCalibration()
#Core.hasCrappyOpenGL() #Core.hasCrappyOpenGL()
#Core.getMSFactory() #Core.getMSFactory()
#COre.startEchoCalibration #Core.startEchoCalibration
#Core.startEchoTester #Core.startEchoTester
#Core.stopEchoTester #Core.stopEchoTester
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment