diff options
Diffstat (limited to 'toxav')
-rw-r--r-- | toxav/Makefile.inc | 1 | ||||
-rw-r--r-- | toxav/bwcontroler.c | 2 | ||||
-rw-r--r-- | toxav/toxav.c | 2 | ||||
-rw-r--r-- | toxav/toxav.h | 9 |
4 files changed, 4 insertions, 10 deletions
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc index 232c06de..083f862f 100644 --- a/toxav/Makefile.inc +++ b/toxav/Makefile.inc | |||
@@ -18,7 +18,6 @@ libtoxav_la_SOURCES = ../toxav/rtp.h \ | |||
18 | ../toxav/bwcontroler.c \ | 18 | ../toxav/bwcontroler.c \ |
19 | ../toxav/toxav.h \ | 19 | ../toxav/toxav.h \ |
20 | ../toxav/toxav.c \ | 20 | ../toxav/toxav.c \ |
21 | ../toxav/toxav_old.h \ | ||
22 | ../toxav/toxav_old.c | 21 | ../toxav/toxav_old.c |
23 | 22 | ||
24 | libtoxav_la_CFLAGS = -I../toxcore \ | 23 | libtoxav_la_CFLAGS = -I../toxcore \ |
diff --git a/toxav/bwcontroler.c b/toxav/bwcontroler.c index 2c468ce3..a4328045 100644 --- a/toxav/bwcontroler.c +++ b/toxav/bwcontroler.c | |||
@@ -200,7 +200,7 @@ int on_update (BWControler *bwc, struct BWCMessage *msg) | |||
200 | int bwc_handle_data(Messenger* m, uint32_t friendnumber, const uint8_t* data, uint16_t length, void* object) | 200 | int bwc_handle_data(Messenger* m, uint32_t friendnumber, const uint8_t* data, uint16_t length, void* object) |
201 | { | 201 | { |
202 | if (length != sizeof(struct BWCMessage)) | 202 | if (length != sizeof(struct BWCMessage)) |
203 | return; | 203 | return -1; |
204 | 204 | ||
205 | /* NOTE the data is mutable */ | 205 | /* NOTE the data is mutable */ |
206 | return on_update(object, (struct BWCMessage *) data); | 206 | return on_update(object, (struct BWCMessage *) data); |
diff --git a/toxav/toxav.c b/toxav/toxav.c index 4a413b66..7585206c 100644 --- a/toxav/toxav.c +++ b/toxav/toxav.c | |||
@@ -63,7 +63,7 @@ typedef struct ToxAVCall_s { | |||
63 | struct ToxAVCall_s *next; | 63 | struct ToxAVCall_s *next; |
64 | } ToxAVCall; | 64 | } ToxAVCall; |
65 | 65 | ||
66 | struct ToxAV_s { | 66 | struct ToxAV { |
67 | Messenger *m; | 67 | Messenger *m; |
68 | MSISession *msi; | 68 | MSISession *msi; |
69 | 69 | ||
diff --git a/toxav/toxav.h b/toxav/toxav.h index befae5dc..d558991f 100644 --- a/toxav/toxav.h +++ b/toxav/toxav.h | |||
@@ -87,7 +87,7 @@ typedef struct Tox Tox; | |||
87 | */ | 87 | */ |
88 | #ifndef TOXAV_DEFINED | 88 | #ifndef TOXAV_DEFINED |
89 | #define TOXAV_DEFINED | 89 | #define TOXAV_DEFINED |
90 | typedef struct ToxAV_s ToxAV; | 90 | typedef struct ToxAV ToxAV; |
91 | #endif /* TOXAV_DEFINED */ | 91 | #endif /* TOXAV_DEFINED */ |
92 | 92 | ||
93 | 93 | ||
@@ -510,12 +510,7 @@ typedef enum TOXAV_ERR_BIT_RATE_SET { | |||
510 | } TOXAV_ERR_BIT_RATE_SET; | 510 | } TOXAV_ERR_BIT_RATE_SET; |
511 | 511 | ||
512 | /** | 512 | /** |
513 | * Set the audio bit rate to be used in subsequent audio frames. If the passed | 513 | * Set the audio bit rate to be used in subsequent audio/video frames. |
514 | * bit rate is the same as the current bit rate this function will return true | ||
515 | * without calling a callback. If there is an active non forceful setup with the | ||
516 | * passed audio bit rate and the new set request is forceful, the bit rate is | ||
517 | * forcefully set and the previous non forceful request is cancelled. The active | ||
518 | * non forceful setup will be canceled in favour of new non forceful setup. | ||
519 | * | 514 | * |
520 | * @param friend_number The friend number of the friend for which to set the | 515 | * @param friend_number The friend number of the friend for which to set the |
521 | * audio bit rate. | 516 | * audio bit rate. |