Update ms2

[linphone] / console / linphonec.h

diff --git a/console/linphonec.h b/console/linphonec.h
index 732c99a6a8dacbc8b19c15e64242841ca5d1f7ca..3265d42ac3de2ed191342815cdc3ab99026edd03 100644 (file)
--- a/console/linphonec.h
+++ b/console/linphonec.h
@@ -29,13 +29,12 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_READLINE
 #ifdef HAVE_READLINE_H
 #include <readline.h>
-#define HAVE_READLINE
 #else
 #ifdef HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
-#define HAVE_READLINE
 #endif
 #endif
 #ifdef HAVE_HISTORY_H
@@ -45,8 +44,9 @@
 #include <readline/history.h>
 #endif
 #endif
+#endif
 
-
+#undef PARAMS
 /**************************************************************************
  *
  * Compile-time defines
@@ -67,7 +67,7 @@
  * Time between calls to linphonec_idle_call during main
  * input read loop in microseconds.
  */
-#define LPC_READLINE_TIMEOUT 1000000
+#define LPC_READLINE_TIMEOUT 10000
 
 /*
  * Filename of linphonec history
@@ -97,6 +97,17 @@ typedef struct {
        char *doc;              /* Long description.  */
 } LPC_COMMAND;
 
+typedef struct {
+       int x,y,w,h;
+       unsigned long wid;
+       bool_t show;
+       bool_t refresh;
+} VideoParams;
+
+
+extern VideoParams lpc_video_params;
+extern VideoParams lpc_preview_params;
+
 /***************************************************************************
  *
  *  Forward declarations
@@ -112,6 +123,10 @@ void linphonec_set_autoanswer(bool_t enabled);
 bool_t linphonec_get_autoanswer();
 void linphonec_command_finished(void);
 void linphonec_set_caller(const char *caller);
+LinphoneCall *linphonec_get_call(long id);
+void linphonec_call_identify(LinphoneCall* call);
+
+extern bool_t linphonec_camera_enabled;
 
 #endif /* def LINPHONEC_H */