Commit 927f2c50 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩
Browse files

Added constructors for objects in factory

parent 84d94988
...@@ -323,6 +323,34 @@ LinphoneVideoActivationPolicy *linphone_factory_create_video_activation_policy(L ...@@ -323,6 +323,34 @@ LinphoneVideoActivationPolicy *linphone_factory_create_video_activation_policy(L
return linphone_video_activation_policy_new(); return linphone_video_activation_policy_new();
} }
LinphoneContent *linphone_factory_create_content(LinphoneFactory *factory) {
return linphone_content_new();
}
LinphoneBuffer *linphone_factory_create_buffer(LinphoneFactory *factory) {
return linphone_buffer_new();
}
LinphoneBuffer *linphone_factory_create_buffer_from_data(LinphoneFactory *factory, const uint8_t *data, size_t size) {
return linphone_buffer_new_from_data(data, size);
}
LinphoneBuffer *linphone_factory_create_buffer_from_string(LinphoneFactory *factory, const char *data) {
return linphone_buffer_new_from_string(data);
}
LinphoneConfig *linphone_factory_create_config(LinphoneFactory *factory, const char *path) {
return linphone_config_new(path);
}
LinphoneConfig *linphone_factory_create_config_with_factory(LinphoneFactory *factory, const char *path, const char *factory_path) {
return linphone_config_new_with_factory(path, factory_path);
}
LinphoneConfig *linphone_factory_create_config_from_string(LinphoneFactory *factory, const char *data) {
return linphone_config_new_from_buffer(data);
}
const bctbx_list_t * linphone_factory_get_dial_plans(const LinphoneFactory *factory) { const bctbx_list_t * linphone_factory_get_dial_plans(const LinphoneFactory *factory) {
return linphone_dial_plan_get_all_list(); return linphone_dial_plan_get_all_list();
} }
......
...@@ -269,6 +269,61 @@ LINPHONE_PUBLIC LinphoneVideoActivationPolicy *linphone_factory_create_video_act ...@@ -269,6 +269,61 @@ LINPHONE_PUBLIC LinphoneVideoActivationPolicy *linphone_factory_create_video_act
*/ */
LINPHONE_PUBLIC const bctbx_list_t * linphone_factory_get_dial_plans(const LinphoneFactory *factory); LINPHONE_PUBLIC const bctbx_list_t * linphone_factory_get_dial_plans(const LinphoneFactory *factory);
/**
* Creates an object LinphoneContent
* @param[in] factory the LinphoneFactory
* @return a LinphoneContent
*/
LINPHONE_PUBLIC LinphoneContent *linphone_factory_create_content(LinphoneFactory *factory);
/**
* Creates an object LinphoneBuffer
* @param[in] factory the LinphoneFactory
* @return a LinphoneBuffer
*/
LINPHONE_PUBLIC LinphoneBuffer *linphone_factory_create_buffer(LinphoneFactory *factory);
/**
* Creates an object LinphoneBuffer
* @param[in] factory the LinphoneFactory
* @param[in] data the data to set in the buffer
* @param[in] size the size of the data
* @return a LinphoneBuffer
*/
LINPHONE_PUBLIC LinphoneBuffer *linphone_factory_create_buffer_from_data(LinphoneFactory *factory, const uint8_t *data, size_t size);
/**
* Creates an object LinphoneBuffer
* @param[in] factory the LinphoneFactory
* @param[in] data the data to set in the buffer
* @return a LinphoneBuffer
*/
LINPHONE_PUBLIC LinphoneBuffer *linphone_factory_create_buffer_from_string(LinphoneFactory *factory, const char *data);
/**
* Creates an object LinphoneConfig
* @param[in] factory the LinphoneFactory
* @param[in] the path of the config
* @return a LinphoneConfig
*/
LINPHONE_PUBLIC LinphoneConfig *linphone_factory_create_config(LinphoneFactory *factory, const char *path);
/**
* Creates an object LinphoneConfig
* @param[in] factory the LinphoneFactory
* @param[in] the path of the config
* @param[in] the path of the factory
* @return a LinphoneConfig
*/
LINPHONE_PUBLIC LinphoneConfig *linphone_factory_create_config_with_factory(LinphoneFactory *factory, const char *path, const char *factory_path);
/**
* Creates an object LinphoneConfig
* @param[in] factory the LinphoneFactory
* @return a LinphoneConfig
*/
LINPHONE_PUBLIC LinphoneConfig *linphone_factory_create_config_from_string(LinphoneFactory *factory, const char *data);
/** /**
* Gets the user data in the LinphoneFactory object * Gets the user data in the LinphoneFactory object
* @param[in] factory the LinphoneFactory * @param[in] factory the LinphoneFactory
......
...@@ -70,8 +70,8 @@ public class OpenH264DownloadHelper { ...@@ -70,8 +70,8 @@ public class OpenH264DownloadHelper {
isDownloadEnabled = false; isDownloadEnabled = false;
} }
if (isCodecFound()) { if (isCodecFound()) {
Log.i("OpenH264DownloadHelper"," Loading OpenH264 downloaded plugin:" + downloadHelper.getFullPathLib()); Log.i("OpenH264DownloadHelper"," Loading OpenH264 downloaded plugin:" + getFullPathLib());
System.load(downloadHelper.getFullPathLib()); System.load(getFullPathLib());
} else { } else {
Log.i("OpenH264DownloadHelper"," Cannot load OpenH264 downloaded plugin"); Log.i("OpenH264DownloadHelper"," Cannot load OpenH264 downloaded plugin");
} }
......
...@@ -211,6 +211,8 @@ s/.value()/.toInt()/g; \ ...@@ -211,6 +211,8 @@ s/.value()/.toInt()/g; \
s/clearAuthInfos()/clearAllAuthInfo()/g; \ s/clearAuthInfos()/clearAllAuthInfo()/g; \
s/clearProxyConfigs()/clearProxyConfig()/g; \ s/clearProxyConfigs()/clearProxyConfig()/g; \
s/isVideoSupported()/videoSupported()/g; \ s/isVideoSupported()/videoSupported()/g; \
s/getReceivedVideoDefinition().width/getReceivedVideoDefinition().getWidth()/g; \
s/getReceivedVideoDefinition().height/getReceivedVideoDefinition().getHeight()/g; \
s/VideoDefinition().toDisplayableString()/VideoDefinition().getName()/g; \ s/VideoDefinition().toDisplayableString()/VideoDefinition().getName()/g; \
s/isAccountUsed()/isAccountExist()/g; \ s/isAccountUsed()/isAccountExist()/g; \
s/loadXmlFile(/loadFromXmlFile(/g; \ s/loadXmlFile(/loadFromXmlFile(/g; \
...@@ -273,11 +275,8 @@ s/new XmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), /Lin ...@@ -273,11 +275,8 @@ s/new XmlRpcSessionImpl(LinphoneManager.getLcIfManagerNotDestroyedOrNull(), /Lin
# TODO # TODO
#Tunnel, TunnelConfig #Tunnel, TunnelConfig
#AccountCreator.updatePassword => What to do ? #AccountCreator.updatePassword => What to do ?
#Core.removeFriend(friend)
#Factory.instance().enableLogCollection(isDebugEnabled); #Factory.instance().enableLogCollection(isDebugEnabled);
#Factory.instance().setDebugMode(isDebugEnabled, context.getString(R.string.app_name)); #Factory.instance().setDebugMode(isDebugEnabled, context.getString(R.string.app_name));
#setVideoDevice()
#Factory.instance().createBuffer();
# Manual changes required # Manual changes required
# Some callbacks no longer exist, their name will be "removed", remove them # Some callbacks no longer exist, their name will be "removed", remove them
......
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