diff options
Diffstat (limited to 'other')
-rw-r--r-- | other/apidsl/tox.in.h | 4 | ||||
-rw-r--r-- | other/apidsl/toxav.in.h | 12 | ||||
-rw-r--r-- | other/toktok-rebase | 48 |
3 files changed, 58 insertions, 6 deletions
diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h index e062e41f..d14e48ba 100644 --- a/other/apidsl/tox.in.h +++ b/other/apidsl/tox.in.h | |||
@@ -1089,6 +1089,10 @@ namespace friend { | |||
1089 | * function, this client will appear offline to the friend and no communication | 1089 | * function, this client will appear offline to the friend and no communication |
1090 | * can occur between the two. | 1090 | * can occur between the two. |
1091 | * | 1091 | * |
1092 | * WARNING, calling ${friend.delete} while there's an active ToxAV call will | ||
1093 | * result in undefined behavior. It's the client's responsibility to end all | ||
1094 | * ToxAV calls before deleting a friend. | ||
1095 | * | ||
1092 | * @param friend_number Friend number for the friend to be deleted. | 1096 | * @param friend_number Friend number for the friend to be deleted. |
1093 | * | 1097 | * |
1094 | * @return true on success. | 1098 | * @return true on success. |
diff --git a/other/apidsl/toxav.in.h b/other/apidsl/toxav.in.h index 8a7d5358..67b670dc 100644 --- a/other/apidsl/toxav.in.h +++ b/other/apidsl/toxav.in.h | |||
@@ -216,7 +216,7 @@ const uint32_t iteration_interval(); | |||
216 | * toxav_iteration_interval() milliseconds. It is best called in the separate | 216 | * toxav_iteration_interval() milliseconds. It is best called in the separate |
217 | * thread from tox_iterate. | 217 | * thread from tox_iterate. |
218 | */ | 218 | */ |
219 | void iterate(); | 219 | void iterate(any userdata); |
220 | 220 | ||
221 | 221 | ||
222 | /******************************************************************************* | 222 | /******************************************************************************* |
@@ -269,7 +269,7 @@ bool call(uint32_t friend_number, uint32_t audio_bit_rate, uint32_t video_bit_ra | |||
269 | INVALID_BIT_RATE, | 269 | INVALID_BIT_RATE, |
270 | } | 270 | } |
271 | 271 | ||
272 | event call { | 272 | event call const { |
273 | /** | 273 | /** |
274 | * The function type for the ${event call} callback. | 274 | * The function type for the ${event call} callback. |
275 | * | 275 | * |
@@ -359,7 +359,7 @@ bitmask FRIEND_CALL_STATE { | |||
359 | ACCEPTING_V, | 359 | ACCEPTING_V, |
360 | } | 360 | } |
361 | 361 | ||
362 | event call_state { | 362 | event call_state const { |
363 | /** | 363 | /** |
364 | * The function type for the ${event call_state} callback. | 364 | * The function type for the ${event call_state} callback. |
365 | * | 365 | * |
@@ -490,7 +490,7 @@ namespace bit_rate { | |||
490 | FRIEND_NOT_IN_CALL, | 490 | FRIEND_NOT_IN_CALL, |
491 | } | 491 | } |
492 | 492 | ||
493 | event status { | 493 | event status const { |
494 | /** | 494 | /** |
495 | * The function type for the ${event status} callback. The event is triggered | 495 | * The function type for the ${event status} callback. The event is triggered |
496 | * when the network becomes too saturated for current bit rates at which | 496 | * when the network becomes too saturated for current bit rates at which |
@@ -601,7 +601,7 @@ namespace video { | |||
601 | 601 | ||
602 | 602 | ||
603 | namespace audio { | 603 | namespace audio { |
604 | event receive_frame { | 604 | event receive_frame const { |
605 | /** | 605 | /** |
606 | * The function type for the ${event receive_frame} callback. The callback can be | 606 | * The function type for the ${event receive_frame} callback. The callback can be |
607 | * called multiple times per single iteration depending on the amount of queued | 607 | * called multiple times per single iteration depending on the amount of queued |
@@ -620,7 +620,7 @@ namespace audio { | |||
620 | } | 620 | } |
621 | 621 | ||
622 | namespace video { | 622 | namespace video { |
623 | event receive_frame { | 623 | event receive_frame const { |
624 | /** | 624 | /** |
625 | * The function type for the ${event receive_frame} callback. | 625 | * The function type for the ${event receive_frame} callback. |
626 | * | 626 | * |
diff --git a/other/toktok-rebase b/other/toktok-rebase new file mode 100644 index 00000000..c6f9f38a --- /dev/null +++ b/other/toktok-rebase | |||
@@ -0,0 +1,48 @@ | |||
1 | #!/usr/bin/zsh | ||
2 | |||
3 | if [[ $1 == '-v' ]]; then | ||
4 | set -u -x | ||
5 | fi | ||
6 | |||
7 | PREHEAD=`git rev-parse --abbrev-ref HEAD` | ||
8 | TRGT=`git show-ref toktok/master --hash` | ||
9 | EXCLD=`git branch --contains $TRGT` | ||
10 | |||
11 | FAILED=() | ||
12 | SUCCESS=() | ||
13 | EXCLUDED=() | ||
14 | |||
15 | echo "Auto Rebaseing!" | ||
16 | git fetch --all > /dev/null 2>&1 | ||
17 | |||
18 | if [[ $1 == '-v' ]]; then | ||
19 | git branch --no-merged=toktok/master | ||
20 | fi | ||
21 | |||
22 | for i in `git branch --no-merged=toktok/master`; do | ||
23 | each=`echo $i | sed 's/*//'` | ||
24 | |||
25 | # quick exclude | ||
26 | if [[ ${EXCLD[(i)${each}]} -le ${#EXCLD} ]]; then | ||
27 | EXCLUDED+=$each | ||
28 | continue | ||
29 | fi | ||
30 | |||
31 | git checkout $each > /dev/null 2>&1 | ||
32 | git rebase toktok/master > /dev/null 2>&1 | ||
33 | if [[ $? != 0 ]]; then | ||
34 | git rebase --abort > /dev/null 2>&1 | ||
35 | FAILED+=($each) | ||
36 | else | ||
37 | SUCCESS+=($each) | ||
38 | fi | ||
39 | done | ||
40 | |||
41 | echo "Was able to rebase (Don't forget to git push --force)" | ||
42 | echo "\t $SUCCESS" | ||
43 | echo "These branches failed" | ||
44 | echo "\t $FAILED" | ||
45 | echo "These branches were skipped without changes" | ||
46 | echo "\t $EXCLUDED" | ||
47 | |||
48 | git checkout $PREHEAD > /dev/null 2>&1 | ||