Commit 8b1a36ac authored by Simon Morlat's avatar Simon Morlat

fix crash and c++ compilation problem

parent 3a02574f
......@@ -1697,7 +1697,7 @@ void linphone_core_iterate(LinphoneCore *lc){
if (lc->previewstream==NULL && lc->calls==NULL)
toggle_video_preview(lc,TRUE);
#ifdef VIDEO_ENABLED
else video_stream_iterate(lc->previewstream);
if (lc->previewstream) video_stream_iterate(lc->previewstream);
#endif
}else{
if (lc->previewstream!=NULL)
......
......@@ -159,9 +159,25 @@ char * linphone_call_log_to_str(LinphoneCallLog *cl);
* The LinphoneCall object represents a call issued or received by the LinphoneCore
**/
struct _LinphoneCall;
enum _LinphoneCallState;
typedef struct _LinphoneCall LinphoneCall;
typedef enum _LinphoneCallState{
LinphoneCallIdle,
LinphoneCallIncomingReceived,
LinphoneCallOutgoingInit,
LinphoneCallOutgoingProgress,
LinphoneCallOutgoingRinging,
LinphoneCallOutgoingEarlyMedia,
LinphoneCallConnected,
LinphoneCallStreamsRunning,
LinphoneCallPausing,
LinphoneCallPaused,
LinphoneCallResuming,
LinphoneCallRefered,
LinphoneCallError,
LinphoneCallEnd,
} LinphoneCallState;
enum _LinphoneCallState linphone_call_get_state(const LinphoneCall *call);
bool_t linphone_call_asked_to_autoanswer(LinphoneCall *call);
......@@ -367,23 +383,6 @@ void linphone_chat_room_destroy(LinphoneChatRoom *cr);
void linphone_chat_room_set_user_data(LinphoneChatRoom *cr, void * ud);
void * linphone_chat_room_get_user_data(LinphoneChatRoom *cr);
typedef enum _LinphoneCallState{
LinphoneCallIdle,
LinphoneCallIncomingReceived,
LinphoneCallOutgoingInit,
LinphoneCallOutgoingProgress,
LinphoneCallOutgoingRinging,
LinphoneCallOutgoingEarlyMedia,
LinphoneCallConnected,
LinphoneCallStreamsRunning,
LinphoneCallPausing,
LinphoneCallPaused,
LinphoneCallResuming,
LinphoneCallRefered,
LinphoneCallError,
LinphoneCallEnd,
} LinphoneCallState;
typedef enum _LinphoneGlobalState{
LinphoneGlobalOff,
LinphoneGlobalStartup,
......
mediastreamer2 @ 82a85774
Subproject commit 645d53a36dd0b87c085351ee7caa84d499d19166
Subproject commit 82a85774e4912672b5820c630605543aefc032cc
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