diff options
author | irungentoo <irungentoo@gmail.com> | 2014-05-08 18:26:01 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-05-08 18:26:01 -0400 |
commit | a26ced5fcb7a9a8bf6b4795c95b04277c14b84f2 (patch) | |
tree | 8a659c2dc15414ff227cf43c793f20ee2a91cbe1 /toxav/msi.h | |
parent | 98f20c76de801d042c695b3034056b2cfbfeaab5 (diff) | |
parent | 89022326d3742defd9c7b1111ddcda53688d85be (diff) |
Merge branch 'master' into TCP
Diffstat (limited to 'toxav/msi.h')
-rwxr-xr-x | toxav/msi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toxav/msi.h b/toxav/msi.h index 37fc07a3..39a9c792 100755 --- a/toxav/msi.h +++ b/toxav/msi.h | |||
@@ -82,7 +82,7 @@ typedef struct _MSICall { /* Call info structure */ | |||
82 | int ringing_timer_id; /* Timer id for ringing timeout */ | 82 | int ringing_timer_id; /* Timer id for ringing timeout */ |
83 | 83 | ||
84 | pthread_mutex_t mutex; /* It's to be assumed that call will have | 84 | pthread_mutex_t mutex; /* It's to be assumed that call will have |
85 | * seperate thread so add mutex | 85 | * separate thread so add mutex |
86 | */ | 86 | */ |
87 | uint32_t *peers; | 87 | uint32_t *peers; |
88 | uint16_t peer_count; | 88 | uint16_t peer_count; |
@@ -152,7 +152,7 @@ void msi_register_callback(MSICallback callback, MSICallbackID id, void* userdat | |||
152 | * | 152 | * |
153 | * @param messenger Tox* object. | 153 | * @param messenger Tox* object. |
154 | * @return MSISession* The created session. | 154 | * @return MSISession* The created session. |
155 | * @retval NULL Error occured. | 155 | * @retval NULL Error occurred. |
156 | */ | 156 | */ |
157 | MSISession *msi_init_session ( Messenger *messenger ); | 157 | MSISession *msi_init_session ( Messenger *messenger ); |
158 | 158 | ||
@@ -183,7 +183,7 @@ int msi_invite ( MSISession *session, MSICallType call_type, uint32_t rngsec, ui | |||
183 | * | 183 | * |
184 | * @param session Control session. | 184 | * @param session Control session. |
185 | * @return int | 185 | * @return int |
186 | * @retval -1 Error occured. | 186 | * @retval -1 Error occurred. |
187 | * @retval 0 Success. | 187 | * @retval 0 Success. |
188 | */ | 188 | */ |
189 | int msi_hangup ( MSISession *session ); | 189 | int msi_hangup ( MSISession *session ); |