Linphone: headers diff between 3.5.0 and 3.5.1 versions

	allfilters.h	allfilters.h

	skipping to change at line 134	skipping to change at line 134
	MS_AAL2_G726_16_ENC_ID,	MS_AAL2_G726_16_ENC_ID,
	MS_G726_40_DEC_ID,	MS_G726_40_DEC_ID,
	MS_G726_32_DEC_ID,	MS_G726_32_DEC_ID,
	MS_G726_24_DEC_ID,	MS_G726_24_DEC_ID,
	MS_G726_16_DEC_ID,	MS_G726_16_DEC_ID,
	MS_AAL2_G726_40_DEC_ID,	MS_AAL2_G726_40_DEC_ID,
	MS_AAL2_G726_32_DEC_ID,	MS_AAL2_G726_32_DEC_ID,
	MS_AAL2_G726_24_DEC_ID,	MS_AAL2_G726_24_DEC_ID,
	MS_AAL2_G726_16_DEC_ID,	MS_AAL2_G726_16_DEC_ID,
	MS_L16_ENC_ID,	MS_L16_ENC_ID,

	MS_L16_DEC_ID	MS_L16_DEC_ID,
		MS_OSX_GL_DISPLAY_ID
	} MSFilterId;	} MSFilterId;

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	2 lines changed or added

	linphonecore.h	linphonecore.h

	skipping to change at line 202	skipping to change at line 202

	/**	/**
	* Enum describing failure reasons.	* Enum describing failure reasons.
	* @ingroup initializing	* @ingroup initializing
	**/	**/
	enum _LinphoneReason{	enum _LinphoneReason{
	LinphoneReasonNone,	LinphoneReasonNone,
	LinphoneReasonNoResponse, /*<No response received from remote/	LinphoneReasonNoResponse, /*<No response received from remote/
	LinphoneReasonBadCredentials, /*<Authentication failed due to bad o r missing credentials/	LinphoneReasonBadCredentials, /*<Authentication failed due to bad o r missing credentials/
	LinphoneReasonDeclined, /*<The call has been declined/	LinphoneReasonDeclined, /*<The call has been declined/

		LinphoneReasonNotFound,
	};	};

	typedef enum _LinphoneReason LinphoneReason;	typedef enum _LinphoneReason LinphoneReason;

	const char *linphone_reason_to_string(LinphoneReason err);	const char *linphone_reason_to_string(LinphoneReason err);

	/**	/**
	* The LinphoneCall object represents a call issued or received by the Linp honeCore	* The LinphoneCall object represents a call issued or received by the Linp honeCore
	**/	**/
	struct _LinphoneCall;	struct _LinphoneCall;

	skipping to change at line 344	skipping to change at line 345
	LinphoneRegistrationCleared, /*< Unregistration succeeded /	LinphoneRegistrationCleared, /*< Unregistration succeeded /
	LinphoneRegistrationFailed /*<Registration failed /	LinphoneRegistrationFailed /*<Registration failed /
	}LinphoneRegistrationState;	}LinphoneRegistrationState;

	/**	/**
	* Human readable version of the #LinphoneRegistrationState	* Human readable version of the #LinphoneRegistrationState
	* @param cs sate	* @param cs sate
	*/	*/
	const char *linphone_registration_state_to_string(LinphoneRegistrationState cs);	const char *linphone_registration_state_to_string(LinphoneRegistrationState cs);


	/**
	* True if tunnel support was compiled.
	*/
	bool_t linphone_core_tunnel_available();

	/**
	* Update tunnel using configuration.
	*/
	void linphone_core_update_tunnel(LinphoneCore *lc);

	LinphoneProxyConfig *linphone_proxy_config_new(void);	LinphoneProxyConfig *linphone_proxy_config_new(void);
	int linphone_proxy_config_set_server_addr(LinphoneProxyConfig obj, const c har server_addr);	int linphone_proxy_config_set_server_addr(LinphoneProxyConfig obj, const c har server_addr);
	int linphone_proxy_config_set_identity(LinphoneProxyConfig obj, const char identity);	int linphone_proxy_config_set_identity(LinphoneProxyConfig obj, const char identity);
	int linphone_proxy_config_set_route(LinphoneProxyConfig obj, const char r oute);	int linphone_proxy_config_set_route(LinphoneProxyConfig obj, const char r oute);
	void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int expires);	void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int expires);
	/**	/**
	* Indicates either or not, REGISTRATION must be issued for this #Linphone ProxyConfig .	* Indicates either or not, REGISTRATION must be issued for this #Linphone ProxyConfig .
	* <br> In case this #LinphoneProxyConfig has been added to #LinphoneCore, follows the linphone_proxy_config_edit() rule.	* <br> In case this #LinphoneProxyConfig has been added to #LinphoneCore, follows the linphone_proxy_config_edit() rule.
	* @param obj object pointer	* @param obj object pointer
	* @param val if true, registration will be engaged	* @param val if true, registration will be engaged

	skipping to change at line 426	skipping to change at line 417
	/**	/**
	* @}	* @}
	**/	**/

	typedef struct _LinphoneAccountCreator{	typedef struct _LinphoneAccountCreator{
	struct _LinphoneCore *lc;	struct _LinphoneCore *lc;
	struct _SipSetupContext *ssctx;	struct _SipSetupContext *ssctx;
	char *username;	char *username;
	char *password;	char *password;
	char *domain;	char *domain;

		char *route;
		char *email;
		int suscribe;
	bool_t succeeded;	bool_t succeeded;
	}LinphoneAccountCreator;	}LinphoneAccountCreator;

	LinphoneAccountCreator linphone_account_creator_new(struct _LinphoneCore core, const char *type);	LinphoneAccountCreator linphone_account_creator_new(struct _LinphoneCore core, const char *type);
	void linphone_account_creator_set_username(LinphoneAccountCreator obj, con st char username);	void linphone_account_creator_set_username(LinphoneAccountCreator obj, con st char username);
	void linphone_account_creator_set_password(LinphoneAccountCreator obj, con st char password);	void linphone_account_creator_set_password(LinphoneAccountCreator obj, con st char password);
	void linphone_account_creator_set_domain(LinphoneAccountCreator obj, const char domain);	void linphone_account_creator_set_domain(LinphoneAccountCreator obj, const char domain);

		void linphone_account_creator_set_route(LinphoneAccountCreator *obj, const
		char *route);
		void linphone_account_creator_set_email(LinphoneAccountCreator *obj, const
		char *email);
		void linphone_account_creator_set_suscribe(LinphoneAccountCreator *obj, int
		suscribre);
	const char * linphone_account_creator_get_username(LinphoneAccountCreator * obj);	const char * linphone_account_creator_get_username(LinphoneAccountCreator * obj);
	const char * linphone_account_creator_get_domain(LinphoneAccountCreator *ob j);	const char * linphone_account_creator_get_domain(LinphoneAccountCreator *ob j);
	int linphone_account_creator_test_existence(LinphoneAccountCreator *obj);	int linphone_account_creator_test_existence(LinphoneAccountCreator *obj);

		int linphone_account_creator_test_validation(LinphoneAccountCreator *obj);
	LinphoneProxyConfig * linphone_account_creator_validate(LinphoneAccountCrea tor *obj);	LinphoneProxyConfig * linphone_account_creator_validate(LinphoneAccountCrea tor *obj);
	void linphone_account_creator_destroy(LinphoneAccountCreator *obj);	void linphone_account_creator_destroy(LinphoneAccountCreator *obj);

	struct _LinphoneAuthInfo;	struct _LinphoneAuthInfo;

	/**	/**
	* @ingroup authentication	* @ingroup authentication
	* Object holding authentication information.	* Object holding authentication information.
	*	*
	* @note The object's fields should not be accessed directly. Prefer using	* @note The object's fields should not be accessed directly. Prefer using

	skipping to change at line 952	skipping to change at line 950
	unsigned long linphone_core_get_native_video_window_id(const LinphoneCore * lc);	unsigned long linphone_core_get_native_video_window_id(const LinphoneCore * lc);
	void linphone_core_set_native_video_window_id(LinphoneCore *lc, unsigned lo ng id);	void linphone_core_set_native_video_window_id(LinphoneCore *lc, unsigned lo ng id);

	unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc);	unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc);
	void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id);	void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id);

	void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno);	void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno);
	int linphone_core_get_device_rotation(LinphoneCore *lc );	int linphone_core_get_device_rotation(LinphoneCore *lc );
	void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation);	void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation);


		/* start or stop streaming video in case of embedded window */
		void linphone_core_show_video(LinphoneCore *lc, bool_t show);

	/play/record support: use files instead of soundcard/	/play/record support: use files instead of soundcard/
	void linphone_core_use_files(LinphoneCore *lc, bool_t yesno);	void linphone_core_use_files(LinphoneCore *lc, bool_t yesno);
	void linphone_core_set_play_file(LinphoneCore lc, const char file);	void linphone_core_set_play_file(LinphoneCore lc, const char file);
	void linphone_core_set_record_file(LinphoneCore lc, const char file);	void linphone_core_set_record_file(LinphoneCore lc, const char file);

	void linphone_core_play_dtmf(LinphoneCore *lc, char dtmf, int duration_ms);	void linphone_core_play_dtmf(LinphoneCore *lc, char dtmf, int duration_ms);
	void linphone_core_stop_dtmf(LinphoneCore *lc);	void linphone_core_stop_dtmf(LinphoneCore *lc);

	int linphone_core_get_current_call_duration(const LinphoneCore *lc);	int linphone_core_get_current_call_duration(const LinphoneCore *lc);


	skipping to change at line 1073	skipping to change at line 1074
	* Defines Linphone behaviour when encryption parameters negociation fails on outoing call.	* Defines Linphone behaviour when encryption parameters negociation fails on outoing call.
	* If set to TRUE call will fail; if set to FALSE will resend an INVITE wit h encryption disabled	* If set to TRUE call will fail; if set to FALSE will resend an INVITE wit h encryption disabled
	*/	*/
	void linphone_core_set_media_encryption_mandatory(LinphoneCore *lc, bool_t m);	void linphone_core_set_media_encryption_mandatory(LinphoneCore *lc, bool_t m);

	/**	/**
	* Init call params using LinphoneCore's current configuration	* Init call params using LinphoneCore's current configuration
	*/	*/
	void linphone_core_init_default_params(LinphoneCorelc, LinphoneCallParams params);	void linphone_core_init_default_params(LinphoneCorelc, LinphoneCallParams params);


		/**
		* True if tunnel support was compiled.
		*/
		bool_t linphone_core_tunnel_available(void);

		typedef struct LinphoneTunnel LinphoneTunnel;
		/**
		* get tunnel instance if available
		*/
		LinphoneTunnel linphone_core_get_tunnel(LinphoneCore lc);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif	#endif

End of changes. 7 change blocks.
	10 lines changed or deleted	25 lines changed or added

	mscodecutils.h	mscodecutils.h

	skipping to change at line 22	skipping to change at line 22
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	GNU General Public License for more details.	GNU General Public License for more details.

	You should have received a copy of the GNU General Public License	You should have received a copy of the GNU General Public License
	along with this program; if not, write to the Free Software	along with this program; if not, write to the Free Software
	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA .	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA .
	*/	*/

	#ifndef mscodecutils_h	#ifndef mscodecutils_h
	#define mscodecutils_h	#define mscodecutils_h

	#include "ortp/str_utils.h"


		#include "mediastreamer2/mscommon.h"

		/**
		* Helper object for audio decoders to determine whether PLC (packet loss c
		oncealment is needed).
		**/
	typedef struct _MSConcealerContext MSConcealerContext;	typedef struct _MSConcealerContext MSConcealerContext;


	MSConcealerContext* ms_concealer_context_new(unsigned int max_plc_count);	/**
	void ms_concealer_context_destroy(MSConcealerContext* context);	* Creates a new concealer object.
	void ms_concealer_context_set_sampling_time(MSConcealerContext* obj,unsigne	* @param max_plc_count the number of consecutive milliseconds of PLC allow
	d long value);	ed.
	unsigned long ms_concealer_context_get_sampling_time(MSConcealerContext* ob	**/
	j);	MS2_PUBLIC MSConcealerContext* ms_concealer_context_new(unsigned int max_pl
	unsigned long ms_concealer_context_get_total_number_of_plc(MSConcealerConte	c_count);
	xt* obj);	/**
	/* return number of concelad packet since the begening of the concealement	* Destroys a concealer object.
	period or 0 if not needed*/	**/
	unsigned int ms_concealer_context_is_concealement_required(MSConcealerConte	MS2_PUBLIC void ms_concealer_context_destroy(MSConcealerContext* context);
	xt* obj,uint64_t current_time);
		/**
		* Returns 1 when PLC is needed, 0 otherwise.
		* @param obj the concealer object
		* @param current_time the current time in milliseconds, as pointed by f->t
		icker->time .
		**/
		MS2_PUBLIC unsigned int ms_concealer_context_is_concealement_required(MSCon
		cealerContext* obj,uint64_t current_time);

		/**
		* Call this function whenever you decoded a packet, for true or in PLC mod
		e, to inform the concealer
		* of how the audio stream is going.
		* @param obj the concealer object
		* @param current_time the current time in milliseconds, as pointed by f->t
		icker->time.
		* @param time_increment the number of milliseconds of audio decoded.
		* @param got_packet set to 1 if a real frame was decoded, 0 if it was a PL
		C frame.
		* @returns if a PLC period terminates, returns the duration of this PLC pe
		riod in milliseconds, 0 otherwise.
		**/
		MS2_PUBLIC int ms_concealer_inc_sample_time(MSConcealerContext* obj, uint64
		_t current_time, int time_increment, int got_packet);

	/FEC API/	/FEC API/
	typedef struct _MSRtpPayloadPickerContext MSRtpPayloadPickerContext;	typedef struct _MSRtpPayloadPickerContext MSRtpPayloadPickerContext;
	typedef mblk_t* (RtpPayloadPicker)(MSRtpPayloadPickerContext context,unsi gned int sequence_number);	typedef mblk_t* (RtpPayloadPicker)(MSRtpPayloadPickerContext context,unsi gned int sequence_number);
	struct _MSRtpPayloadPickerContext {	struct _MSRtpPayloadPickerContext {
	void* filter_graph_manager; /I.E stream/	void* filter_graph_manager; /I.E stream/
	RtpPayloadPicker picker;	RtpPayloadPicker picker;
	};	};

	#endif	#endif

End of changes. 3 change blocks.
	13 lines changed or deleted	42 lines changed or added

	msconference.h	msconference.h

	skipping to change at line 77	skipping to change at line 77

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	/**	/**
	* Creates a conference.	* Creates a conference.
	* @param params a MSAudioConferenceParams structure, containing conference parameters.	* @param params a MSAudioConferenceParams structure, containing conference parameters.
	* @returns a MSAudioConference object.	* @returns a MSAudioConference object.
	**/	**/

	MSAudioConference * ms_audio_conference_new(const MSAudioConferenceParams * params);	MS2_PUBLIC MSAudioConference * ms_audio_conference_new(const MSAudioConfere nceParams *params);

	/**	/**
	* Gets conference's current parameters.	* Gets conference's current parameters.
	* @param obj the conference.	* @param obj the conference.
	* @returns a read-only pointer to the conference parameters.	* @returns a read-only pointer to the conference parameters.
	**/	**/

	const MSAudioConferenceParams ms_audio_conference_get_params(MSAudioConfer ence obj);	MS2_PUBLIC const MSAudioConferenceParams ms_audio_conference_get_params(MS AudioConference obj);

	/**	/**
	* Adds a participant to the conference.	* Adds a participant to the conference.
	* @param obj the conference	* @param obj the conference
	* @param ep the participant, represented as a MSAudioEndpoint object	* @param ep the participant, represented as a MSAudioEndpoint object
	**/	**/

	void ms_audio_conference_add_member(MSAudioConference obj, MSAudioEndpoint ep);	MS2_PUBLIC void ms_audio_conference_add_member(MSAudioConference obj, MSAu dioEndpoint ep);

	/**	/**
	* Removes a participant from the conference.	* Removes a participant from the conference.
	* @param obj the conference	* @param obj the conference
	* @param ep the participant, represented as a MSAudioEndpoint object	* @param ep the participant, represented as a MSAudioEndpoint object
	**/	**/

	void ms_audio_conference_remove_member(MSAudioConference obj, MSAudioEndpo int ep);	MS2_PUBLIC void ms_audio_conference_remove_member(MSAudioConference obj, M SAudioEndpoint ep);

	/**	/**
	* Mutes or unmutes a participant.	* Mutes or unmutes a participant.
	*	*
	* @param obj the conference	* @param obj the conference
	* @param ep the participant, represented as a MSAudioEndpoint object	* @param ep the participant, represented as a MSAudioEndpoint object
	*	*
	* By default all participants are unmuted.	* By default all participants are unmuted.
	**/	**/

	void ms_audio_conference_mute_member(MSAudioConference obj, MSAudioEndpoin t ep, bool_t muted);	MS2_PUBLIC void ms_audio_conference_mute_member(MSAudioConference obj, MSA udioEndpoint ep, bool_t muted);

	/**	/**
	* Returns the size (ie the number of participants) of a conference.	* Returns the size (ie the number of participants) of a conference.
	* @param obj the conference	* @param obj the conference
	**/	**/

	int ms_audio_conference_get_size(MSAudioConference *obj);	MS2_PUBLIC int ms_audio_conference_get_size(MSAudioConference *obj);

	/**	/**
	* Destroys a conference.	* Destroys a conference.
	* @param obj the conference	* @param obj the conference
	* All participants must have been removed before destroying the conference .	* All participants must have been removed before destroying the conference .
	**/	**/

	void ms_audio_conference_destroy(MSAudioConference *obj);	MS2_PUBLIC void ms_audio_conference_destroy(MSAudioConference *obj);

	/**	/**
	* Creates an MSAudioEndpoint from an existing AudioStream.	* Creates an MSAudioEndpoint from an existing AudioStream.
	*	*
	* In order to create graphs for audio processing of each participant, the AudioStream object is used, because	* In order to create graphs for audio processing of each participant, the AudioStream object is used, because
	* this object already handles all the processing for volume control, encod ing, decoding, etc...	* this object already handles all the processing for volume control, encod ing, decoding, etc...
	*	*
	* The construction of the participants depends whether it is a remote part icipant, that is somebody in the network	* The construction of the participants depends whether it is a remote part icipant, that is somebody in the network
	* sending and receiving audio through RTP, or a local participant, that is somebody using the local soundcard to capture	* sending and receiving audio through RTP, or a local participant, that is somebody using the local soundcard to capture
	* and play audio.	* and play audio.

	skipping to change at line 163	skipping to change at line 163
	* 40,	* 40,
	* NULL,	* NULL,
	* NULL,	* NULL,
	* playcard,	* playcard,
	* captcard,	* captcard,
	* needs_echocancellation,	* needs_echocancellation,
	* );	* );
	* MSAudioEndpoint *local_endpoint=ms_audio_endpoint_get_from_stream(st,FAL SE);	* MSAudioEndpoint *local_endpoint=ms_audio_endpoint_get_from_stream(st,FAL SE);
	* </PRE>	* </PRE>
	**/	**/

	MSAudioEndpoint * ms_audio_endpoint_get_from_stream(AudioStream *st, bool_t is_remote);	MS2_PUBLIC MSAudioEndpoint * ms_audio_endpoint_get_from_stream(AudioStream *st, bool_t is_remote);

	/**	/**
	* Destroys a MSAudioEndpoint that was created from an AudioStream with ms_ audio_endpoint_get_from_stream().	* Destroys a MSAudioEndpoint that was created from an AudioStream with ms_ audio_endpoint_get_from_stream().
	* The AudioStream can then be destroyed if needed.	* The AudioStream can then be destroyed if needed.
	**/	**/

	void ms_audio_endpoint_release_from_stream(MSAudioEndpoint *obj);	MS2_PUBLIC void ms_audio_endpoint_release_from_stream(MSAudioEndpoint *obj) ;

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	/**	/**
	* @}	* @}
	*/	*/

	#endif	#endif

End of changes. 9 change blocks.
	9 lines changed or deleted	9 lines changed or added

	msinterfaces.h	msinterfaces.h

	skipping to change at line 55	skipping to change at line 55
	MS_FILTER_METHOD(MSFilterVideoDisplayInterface,4,long)	MS_FILTER_METHOD(MSFilterVideoDisplayInterface,4,long)

	/*scale factor of the local view /	/*scale factor of the local view /
	#define MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_SCALEFACTOR \	#define MS_VIDEO_DISPLAY_SET_LOCAL_VIEW_SCALEFACTOR \
	MS_FILTER_METHOD(MSFilterVideoDisplayInterface,5,float)	MS_FILTER_METHOD(MSFilterVideoDisplayInterface,5,float)

	/*Set the background colour for video window /	/*Set the background colour for video window /
	#define MS_VIDEO_DISPLAY_SET_BACKGROUND_COLOR \	#define MS_VIDEO_DISPLAY_SET_BACKGROUND_COLOR \
	MS_FILTER_METHOD(MSFilterVideoDisplayInterface,8,int[3])	MS_FILTER_METHOD(MSFilterVideoDisplayInterface,8,int[3])


		/*Show video. Useful to free XV port /
		#define MS_VIDEO_DISPLAY_SHOW_VIDEO \
		MS_FILTER_METHOD(MSFilterVideoDisplayInterface,9,int)

	/**	/**
	* Interface definitions for players	* Interface definitions for players
	**/	**/

	enum _MSPlayerState{	enum _MSPlayerState{
	MSPlayerClosed,	MSPlayerClosed,
	MSPlayerPaused,	MSPlayerPaused,
	MSPlayerPlaying	MSPlayerPlaying
	};	};


End of changes. 1 change blocks.
	0 lines changed or deleted	4 lines changed or added

	port.h	port.h

	skipping to change at line 221	skipping to change at line 221
	#define snprintf _snprintf	#define snprintf _snprintf
	#define strcasecmp _stricmp	#define strcasecmp _stricmp

	#if 0	#if 0
	struct timeval {	struct timeval {
	long tv_sec; /* seconds */	long tv_sec; /* seconds */
	long tv_usec; /* and microseconds */	long tv_usec; /* and microseconds */
	};	};
	#endif	#endif


		#ifdef __cplusplus
		extern "C"{
		#endif
	int gettimeofday (struct timeval tv, void tz);	int gettimeofday (struct timeval tv, void tz);
	#ifdef _WORKAROUND_MINGW32_BUGS	#ifdef _WORKAROUND_MINGW32_BUGS
	char * WSAAPI gai_strerror(int errnum);	char * WSAAPI gai_strerror(int errnum);
	#endif	#endif

		#ifdef __cplusplus
		}
		#endif

	#endif	#endif

	typedef unsigned char bool_t;	typedef unsigned char bool_t;
	#undef TRUE	#undef TRUE
	#undef FALSE	#undef FALSE
	#define TRUE 1	#define TRUE 1
	#define FALSE 0	#define FALSE 0

	#ifdef __cplusplus	#ifdef __cplusplus

End of changes. 2 change blocks.
	0 lines changed or deleted	6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	config.h	config.h

	skipping to change at line 37	skipping to change at line 37

	/* Define to 1 if you have the <dlfcn.h> header file. */	/* Define to 1 if you have the <dlfcn.h> header file. */
	#define HAVE_DLFCN_H 1	#define HAVE_DLFCN_H 1

	/* Defined when eXosip_get_socket is available */	/* Defined when eXosip_get_socket is available */
	/* #undef HAVE_EXOSIP_GET_SOCKET */	/* #undef HAVE_EXOSIP_GET_SOCKET */

	/* Defined when eXosip_get_version is available */	/* Defined when eXosip_get_version is available */
	#define HAVE_EXOSIP_GET_VERSION 1	#define HAVE_EXOSIP_GET_VERSION 1


		/* Defined when eXosip_tls_verify_certificate is available */
		/* #undef HAVE_EXOSIP_TLS_VERIFY_CERTIFICATE */

	/* If present, the getenv function allows fim to read environment variables .	/* If present, the getenv function allows fim to read environment variables .
	*/	*/
	#define HAVE_GETENV 1	#define HAVE_GETENV 1

	/* Define to 1 if you have the `getifaddrs' function. */	/* Define to 1 if you have the `getifaddrs' function. */
	#define HAVE_GETIFADDRS 1	#define HAVE_GETIFADDRS 1

	/* Tells wheter localisation is possible */	/* Tells wheter localisation is possible */
	#define HAVE_GETTEXT 1	#define HAVE_GETTEXT 1


	skipping to change at line 129	skipping to change at line 132
	/* Define to 1 if you have the <X11/Xlib.h> header file. */	/* Define to 1 if you have the <X11/Xlib.h> header file. */
	#define HAVE_X11_XLIB_H 1	#define HAVE_X11_XLIB_H 1

	/* All supported languages */	/* All supported languages */
	#define LINPHONE_ALL_LANGS "fr it de ja es pl cs nl sv pt_BR hu ru zh_CN nb _NO zh_TW"	#define LINPHONE_ALL_LANGS "fr it de ja es pl cs nl sv pt_BR hu ru zh_CN nb _NO zh_TW"

	/* Windows appdata subdir where linphonerc can be found */	/* Windows appdata subdir where linphonerc can be found */
	#define LINPHONE_CONFIG_DIR "Linphone"	#define LINPHONE_CONFIG_DIR "Linphone"

	/* path of liblinphone plugins, not mediastreamer2 plugins */	/* path of liblinphone plugins, not mediastreamer2 plugins */

	#define LINPHONE_PLUGINS_DIR "/home/ut/testing/linphone/3.5.0/lib/liblinpho ne/plugins"	#define LINPHONE_PLUGINS_DIR "/home/ut/testing/linphone/3.5.1/lib/liblinpho ne/plugins"

	/* Linphone's version number */	/* Linphone's version number */

	#define LINPHONE_VERSION "3.5.0"	#define LINPHONE_VERSION "3.5.1"

	/* Define to the sub-directory in which libtool stores uninstalled librarie s.	/* Define to the sub-directory in which libtool stores uninstalled librarie s.
	*/	*/
	#define LT_OBJDIR ".libs/"	#define LT_OBJDIR ".libs/"

	/* Define to 1 if your C compiler doesn't accept -c and -o together. */	/* Define to 1 if your C compiler doesn't accept -c and -o together. */
	/* #undef NO_MINUS_C_MINUS_O */	/* #undef NO_MINUS_C_MINUS_O */

	/* Name of package */	/* Name of package */
	#define PACKAGE "linphone"	#define PACKAGE "linphone"

	/* Define to the address where bug reports for this package should be sent. */	/* Define to the address where bug reports for this package should be sent. */
	#define PACKAGE_BUGREPORT "linphone-developers@nongnu.org"	#define PACKAGE_BUGREPORT "linphone-developers@nongnu.org"

	/* Defines the place where data are found */	/* Defines the place where data are found */

	#define PACKAGE_DATA_DIR "/home/ut/testing/linphone/3.5.0/share"	#define PACKAGE_DATA_DIR "/home/ut/testing/linphone/3.5.1/share"

	/* Defines the place where locales can be found */	/* Defines the place where locales can be found */

	#define PACKAGE_LOCALE_DIR "/home/ut/testing/linphone/3.5.0/share/locale"	#define PACKAGE_LOCALE_DIR "/home/ut/testing/linphone/3.5.1/share/locale"

	/* Define to the full name of this package. */	/* Define to the full name of this package. */
	#define PACKAGE_NAME "linphone"	#define PACKAGE_NAME "linphone"

	/* Defines the place where linphone sounds are found */	/* Defines the place where linphone sounds are found */

	#define PACKAGE_SOUND_DIR "/home/ut/testing/linphone/3.5.0/share/sounds/lin phone"	#define PACKAGE_SOUND_DIR "/home/ut/testing/linphone/3.5.1/share/sounds/lin phone"

	/* Define to the full name and version of this package. */	/* Define to the full name and version of this package. */

	#define PACKAGE_STRING "linphone 3.5.0"	#define PACKAGE_STRING "linphone 3.5.1"

	/* Define to the one symbol short name of this package. */	/* Define to the one symbol short name of this package. */
	#define PACKAGE_TARNAME "linphone"	#define PACKAGE_TARNAME "linphone"

	/* Define to the home page for this package. */	/* Define to the home page for this package. */
	#define PACKAGE_URL ""	#define PACKAGE_URL ""

	/* Define to the version of this package. */	/* Define to the version of this package. */

	#define PACKAGE_VERSION "3.5.0"	#define PACKAGE_VERSION "3.5.1"

	/* Define to 1 if you have the ANSI C header files. */	/* Define to 1 if you have the ANSI C header files. */
	#define STDC_HEADERS 1	#define STDC_HEADERS 1

	/* Tell whether date_version.h must be used */	/* Tell whether date_version.h must be used */
	/* #undef USE_BUILDDATE_VERSION */	/* #undef USE_BUILDDATE_VERSION */

	/* Version number of package */	/* Version number of package */

	#define VERSION "3.5.0"	#define VERSION "3.5.1"

	/* defined if video support is available */	/* defined if video support is available */
	#define VIDEO_ENABLED 1	#define VIDEO_ENABLED 1

	/* Tell whether RSVP support should be compiled. */	/* Tell whether RSVP support should be compiled. */
	/* #undef VINCENT_MAURY_RSVP */	/* #undef VINCENT_MAURY_RSVP */

	/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most	/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
	significant byte first (like Motorola and SPARC, unlike Intel). */	significant byte first (like Motorola and SPARC, unlike Intel). */
	#if defined AC_APPLE_UNIVERSAL_BUILD	#if defined AC_APPLE_UNIVERSAL_BUILD

End of changes. 9 change blocks.
	8 lines changed or deleted	11 lines changed or added

	mediastream.h	mediastream.h

	skipping to change at line 318	skipping to change at line 318
	MS2_PUBLIC void video_stream_send_vfu(VideoStream *stream);	MS2_PUBLIC void video_stream_send_vfu(VideoStream *stream);
	MS2_PUBLIC void video_stream_stop(VideoStream * stream);	MS2_PUBLIC void video_stream_stop(VideoStream * stream);
	MS2_PUBLIC void video_stream_set_sent_video_size(VideoStream *stream, MSVid eoSize vsize);	MS2_PUBLIC void video_stream_set_sent_video_size(VideoStream *stream, MSVid eoSize vsize);
	MS2_PUBLIC void video_stream_enable_self_view(VideoStream *stream, bool_t v al);	MS2_PUBLIC void video_stream_enable_self_view(VideoStream *stream, bool_t v al);
	MS2_PUBLIC unsigned long video_stream_get_native_window_id(VideoStream *str eam);	MS2_PUBLIC unsigned long video_stream_get_native_window_id(VideoStream *str eam);
	MS2_PUBLIC void video_stream_set_native_window_id(VideoStream *stream, unsi gned long id);	MS2_PUBLIC void video_stream_set_native_window_id(VideoStream *stream, unsi gned long id);
	MS2_PUBLIC void video_stream_set_native_preview_window_id(VideoStream *stre am, unsigned long id);	MS2_PUBLIC void video_stream_set_native_preview_window_id(VideoStream *stre am, unsigned long id);
	MS2_PUBLIC unsigned long video_stream_get_native_preview_window_id(VideoStr eam *stream);	MS2_PUBLIC unsigned long video_stream_get_native_preview_window_id(VideoStr eam *stream);
	MS2_PUBLIC void video_stream_use_preview_video_window(VideoStream *stream, bool_t yesno);	MS2_PUBLIC void video_stream_use_preview_video_window(VideoStream *stream, bool_t yesno);
	MS2_PUBLIC void video_stream_set_device_rotation(VideoStream *stream, int o rientation);	MS2_PUBLIC void video_stream_set_device_rotation(VideoStream *stream, int o rientation);

		MS2_PUBLIC void video_stream_show_video(VideoStream *stream, bool_t show);

	/provided for compatibility, use video_stream_set_direction() instead /	/provided for compatibility, use video_stream_set_direction() instead /
	MS2_PUBLIC int video_stream_recv_only_start(VideoStream videostream, RtpPr ofile profile, const char *addr, int port, int used_pt, int jitt_comp);	MS2_PUBLIC int video_stream_recv_only_start(VideoStream videostream, RtpPr ofile profile, const char *addr, int port, int used_pt, int jitt_comp);
	MS2_PUBLIC int video_stream_send_only_start(VideoStream *videostream,	MS2_PUBLIC int video_stream_send_only_start(VideoStream *videostream,
	RtpProfile profile, const char addr, int p ort, int rtcp_port,	RtpProfile profile, const char addr, int p ort, int rtcp_port,
	int used_pt, int jitt_comp, MSWebCam *devic e);	int used_pt, int jitt_comp, MSWebCam *devic e);
	MS2_PUBLIC void video_stream_recv_only_stop(VideoStream *vs);	MS2_PUBLIC void video_stream_recv_only_stop(VideoStream *vs);
	MS2_PUBLIC void video_stream_send_only_stop(VideoStream *vs);	MS2_PUBLIC void video_stream_send_only_stop(VideoStream *vs);

	/* enable ZRTP on the video stream using information from the audio stream */	/* enable ZRTP on the video stream using information from the audio stream */

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	sipsetup.h	sipsetup.h

	skipping to change at line 96	skipping to change at line 96

	struct _SipSetup{	struct _SipSetup{
	char *name;	char *name;
	unsigned int capabilities;	unsigned int capabilities;
	int initialized;	int initialized;
	bool_t (*init)(void);	bool_t (*init)(void);
	void (*exit)(void);	void (*exit)(void);
	void (init_instance)(SipSetupContext ctx);	void (init_instance)(SipSetupContext ctx);
	void (uninit_instance)(SipSetupContext ctx);	void (uninit_instance)(SipSetupContext ctx);
	int (account_exists)(SipSetupContext ctx, const char *uri);	int (account_exists)(SipSetupContext ctx, const char *uri);

	int (create_account)(SipSetupContext ctx, const char uri, const c har passwd);	int (create_account)(SipSetupContext ctx, const char uri, const c har passwd, const char *email, int suscribe);
	int (login_account)(SipSetupContext ctx, const char uri, const ch ar passwd);	int (login_account)(SipSetupContext ctx, const char uri, const ch ar passwd);
	int (get_proxy)(SipSetupContext ctx, const char domain, char pro xy, size_t sz);	int (get_proxy)(SipSetupContext ctx, const char domain, char pro xy, size_t sz);
	int (get_stun_servers)(SipSetupContext ctx, char stun1, char stu n2, size_t size);	int (get_stun_servers)(SipSetupContext ctx, char stun1, char stu n2, size_t size);
	int (get_relay)(SipSetupContext ctx, char *relay, size_t size);	int (get_relay)(SipSetupContext ctx, char *relay, size_t size);
	const char * (get_notice)(SipSetupContext ctx);	const char * (get_notice)(SipSetupContext ctx);
	const char ** (get_domains)(SipSetupContext ctx);	const char ** (get_domains)(SipSetupContext ctx);
	int (logout_account)(SipSetupContext ctx);	int (logout_account)(SipSetupContext ctx);
	BuddyLookupFuncs *buddy_lookup_funcs;	BuddyLookupFuncs *buddy_lookup_funcs;

		int (account_validated)(SipSetupContext ctx, const char *uri);
	};	};

	typedef struct _SipSetup SipSetup;	typedef struct _SipSetup SipSetup;

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C"{	extern "C"{
	#endif	#endif

	BuddyInfo *buddy_info_new();	BuddyInfo *buddy_info_new();
	void buddy_info_free(BuddyInfo *info);	void buddy_info_free(BuddyInfo *info);

	skipping to change at line 127	skipping to change at line 128
	void buddy_lookup_request_set_max_results(BuddyLookupRequest *req, int ncou nt);	void buddy_lookup_request_set_max_results(BuddyLookupRequest *req, int ncou nt);

	void sip_setup_register(SipSetup *ss);	void sip_setup_register(SipSetup *ss);
	void sip_setup_register_all(void);	void sip_setup_register_all(void);
	SipSetup sip_setup_lookup(const char type_name);	SipSetup sip_setup_lookup(const char type_name);
	void sip_setup_unregister_all(void);	void sip_setup_unregister_all(void);
	unsigned int sip_setup_get_capabilities(SipSetup *s);	unsigned int sip_setup_get_capabilities(SipSetup *s);

	SipSetupContext * sip_setup_context_new(SipSetup s, struct _LinphoneProxyC onfig cfg);	SipSetupContext * sip_setup_context_new(SipSetup s, struct _LinphoneProxyC onfig cfg);
	int sip_setup_context_account_exists(SipSetupContext ctx, const char uri) ;	int sip_setup_context_account_exists(SipSetupContext ctx, const char uri) ;

	int sip_setup_context_create_account(SipSetupContext ctx, const char uri,	int sip_setup_context_account_validated(SipSetupContext ctx, const char u
	const char *passwd);	ri);
		int sip_setup_context_create_account(SipSetupContext ctx, const char uri,
		const char passwd, const char email, int suscribe);
	int sip_setup_context_get_capabilities(SipSetupContext *ctx);	int sip_setup_context_get_capabilities(SipSetupContext *ctx);
	int sip_setup_context_login_account(SipSetupContext * ctx, const char uri, const char passwd);	int sip_setup_context_login_account(SipSetupContext * ctx, const char uri, const char passwd);
	int sip_setup_context_get_proxy(SipSetupContext ctx, const char domain, c har *proxy, size_t sz);	int sip_setup_context_get_proxy(SipSetupContext ctx, const char domain, c har *proxy, size_t sz);
	int sip_setup_context_get_stun_servers(SipSetupContext ctx, char stun1, c har *stun2, size_t size);	int sip_setup_context_get_stun_servers(SipSetupContext ctx, char stun1, c har *stun2, size_t size);
	int sip_setup_context_get_relay(SipSetupContext ctx, char relay, size_t s ize);	int sip_setup_context_get_relay(SipSetupContext ctx, char relay, size_t s ize);

	BuddyLookupRequest sip_setup_context_create_buddy_lookup_request(SipSetupC ontext ctx);	BuddyLookupRequest sip_setup_context_create_buddy_lookup_request(SipSetupC ontext ctx);
	int sip_setup_context_buddy_lookup_submit(SipSetupContext ctx , BuddyLooku pRequest req);	int sip_setup_context_buddy_lookup_submit(SipSetupContext ctx , BuddyLooku pRequest req);
	int sip_setup_context_buddy_lookup_free(SipSetupContext ctx , BuddyLookupR equest req);	int sip_setup_context_buddy_lookup_free(SipSetupContext ctx , BuddyLookupR equest req);


End of changes. 3 change blocks.
	3 lines changed or deleted	6 lines changed or added