Merge branch 'mannol1-master'

2 files changed, 35 insertions, 2 deletions

diff --git a/toxav/toxav.c b/toxav/toxav.c
index e98c9c4b..82385b95 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -795,8 +795,6 @@ int toxav_get_peer_transmission_type ( ToxAv *av, int32_t call_index, int peer )
  */
 int toxav_get_peer_id ( ToxAv *av, int32_t call_index, int peer )
 {
-    assert(av->msi_session);
-
     if ( peer < 0 || cii(call_index, av->msi_session) || !av->msi_session->calls[call_index]
             || av->msi_session->calls[call_index]->peer_count <= peer )
         return ErrorInternal;
@@ -805,6 +803,23 @@ int toxav_get_peer_id ( ToxAv *av, int32_t call_index, int peer )
 }
 
 /**
+ * @brief Get id of peer participating in conversation
+ *
+ * @param av Handler
+ * @param peer peer index
+ * @return int
+ * @retval ToxAvError No peer id
+ */
+ToxAvCallState toxav_get_call_state(ToxAv *av, int32_t call_index)
+{
+    if ( cii(call_index, av->msi_session) || !av->msi_session->calls[call_index] )
+        return av_CallNonExistant;
+
+    return av->msi_session->calls[call_index]->state;
+
+}
+
+/**
  * @brief Is certain capability supported
  *
  * @param av Handler
diff --git a/toxav/toxav.h b/toxav/toxav.h
index a548ee90..2e71c4da 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -74,6 +74,15 @@ typedef enum {
 } ToxAvCallType;
 
 
+typedef enum {
+    av_CallNonExistant = -1,
+    av_CallInviting, /* when sending call invite */
+    av_CallStarting, /* when getting call invite */
+    av_CallActive,
+    av_CallHold,
+    av_CallHanged_up
+} ToxAvCallState;
+
 /**
  * @brief Error indicators.
  */
@@ -343,6 +352,15 @@ int toxav_get_peer_transmission_type ( ToxAv *av, int32_t call_index, int peer )
 int toxav_get_peer_id ( ToxAv *av, int32_t call_index, int peer );
 
 /**
+ * @brief Get current call state
+ *
+ * @param av Handler
+ * @param call_index What call
+ * @return int
+ * @retval ToxAvCallState State id
+ */
+ToxAvCallState toxav_get_call_state ( ToxAv *av, int32_t call_index );
+/**
  * @brief Is certain capability supported
  *
  * @param av Handler