Merge branch 'master' of https://github.com/mannol/toxcore

1 files changed, 17 insertions, 80 deletions

diff --git a/toxav/rtp.h b/toxav/rtp.h
index d57c5ef7..613fbec8 100644
--- a/toxav/rtp.h
+++ b/toxav/rtp.h
@@ -24,19 +24,15 @@
 
 #define RTP_VERSION 2
 #include <inttypes.h>
-#include <pthread.h>
+// #include <pthread.h>
 
-#include "../toxcore/util.h"
-#include "../toxcore/network.h"
-#include "../toxcore/net_crypto.h"
 #include "../toxcore/Messenger.h"
 
 #define MAX_SEQU_NUM 65535
 #define MAX_RTP_SIZE 65535
 
 /**
- * @brief Standard rtp header
- *
+ * Standard rtp header
  */
 
 typedef struct _RTPHeader {
@@ -52,8 +48,7 @@ typedef struct _RTPHeader {
 
 
 /**
- * @brief Standard rtp extension header.
- *
+ * Standard rtp extension header.
  */
 typedef struct _RTPExtHeader {
     uint16_t  type;          /* Extension profile */
@@ -64,8 +59,7 @@ typedef struct _RTPExtHeader {
 
 
 /**
- * @brief Standard rtp message.
- *
+ * Standard rtp message.
  */
 typedef struct _RTPMessage {
     RTPHeader    *header;
@@ -79,11 +73,11 @@ typedef struct _RTPMessage {
 
 
 /**
- * @brief Our main session descriptor.
- *        It measures the session variables and controls
- *        the entire session. There are functions for manipulating
- *        the session so tend to use those instead of directly modifying
- *        session parameters.
+ * Our main session descriptor.
+ * It measures the session variables and controls
+ * the entire session. There are functions for manipulating
+ * the session so tend to use those instead of directly modifying
+ * session parameters.
  *
  */
 typedef struct _RTPSession {
@@ -109,88 +103,31 @@ typedef struct _RTPSession {
     uint8_t         prefix;
 
     int             dest;
-    int32_t         call_index;
-    struct _ToxAv *av;
 
-} RTPSession;
+    struct _CSSession *cs;
 
+} RTPSession;
 
 /**
- * @brief Release all messages held by session.
- *
- * @param session The session.
- * @return int
- * @retval -1 Error occurred.
- * @retval 0 Success.
+ * Must be called before calling any other rtp function.
  */
-int rtp_release_session_recv ( RTPSession *session );
-
+RTPSession *rtp_new ( int payload_type, Messenger *messenger, int friend_num );
 
 /**
- * @brief Call this to change queue limit
- *
- * @param session The session
- * @param limit new limit
- * @return void
+ * Terminate the session.
  */
-void rtp_queue_adjust_limit ( RTPSession *session, uint64_t limit );
+void rtp_kill ( RTPSession *session, Messenger *messenger );
 
 /**
- * @brief Get's oldest message in the list.
- *
- * @param session Where the list is.
- * @return RTPMessage* The message. You need to call rtp_msg_free() to free it.
- * @retval NULL No messages in the list, or no list.
- */
-RTPMessage *rtp_recv_msg ( RTPSession *session );
-
-
-/**
- * @brief Sends msg to _RTPSession::dest
- *
- * @param session The session.
- * @param msg The message
- * @param messenger Tox* object.
- * @return int
- * @retval -1 On error.
- * @retval 0 On success.
+ * Sends msg to _RTPSession::dest
  */
 int rtp_send_msg ( RTPSession *session, Messenger *messenger, const uint8_t *data, uint16_t length );
 
-
 /**
- * @brief Speaks for it self.
- *
- * @param session The control session msg belongs to. It can be NULL.
- * @param msg The message.
- * @return void
+ * Dealloc msg.
  */
 void rtp_free_msg ( RTPSession *session, RTPMessage *msg );
 
-/**
- * @brief Must be called before calling any other rtp function. It's used
- *        to initialize RTP control session.
- *
- * @param payload_type Type of payload used to send. You can use values in toxmsi.h::MSICallType
- * @param messenger Tox* object.
- * @param friend_num Friend id.
- * @return RTPSession* Created control session.
- * @retval NULL Error occurred.
- */
-RTPSession *rtp_init_session ( int payload_type, Messenger *messenger, int friend_num );
-
-
-/**
- * @brief Terminate the session.
- *
- * @param session The session.
- * @param messenger The messenger who owns the session
- * @return int
- * @retval -1 Error occurred.
- * @retval 0 Success.
- */
-void rtp_terminate_session ( RTPSession *session, Messenger *messenger );
-
 
 
 #endif /* __TOXRTP */