Expose api functions for enabling and disabling AV in AV groups

A group loaded from a savefile starts with AV disabled.

5 files changed, 135 insertions, 3 deletions

diff --git a/toxav/groupav.c b/toxav/groupav.c
index 4c16d1de..f49848de 100644
--- a/toxav/groupav.c
+++ b/toxav/groupav.c
@@ -433,14 +433,19 @@ static int handle_group_audio_packet(void *object, uint32_t groupnumber, uint32_
     return 0;
 }
 
-/* Convert groupchat to an A/V groupchat.
+/* Enable A/V in a groupchat.
  *
  * return 0 on success.
  * return -1 on failure.
  */
-static int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t groupnumber,
-                               audio_data_cb *audio_callback, void *userdata)
+int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t groupnumber,
+                        audio_data_cb *audio_callback, void *userdata)
 {
+    if (group_get_type(g_c, groupnumber) != GROUPCHAT_TYPE_AV
+            || group_get_object(g_c, groupnumber) != nullptr) {
+        return -1;
+    }
+
     Group_AV *group_av = new_group_av(log, tox, g_c, audio_callback, userdata);
 
     if (group_av == nullptr) {
@@ -455,10 +460,52 @@ static int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, ui
         return -1;
     }
 
+    int numpeers = group_number_peers(g_c, groupnumber, false);
+
+    for (uint32_t i = 0; i < numpeers; ++i) {
+        group_av_peer_new(group_av, groupnumber, i);
+    }
+
     group_lossy_packet_registerhandler(g_c, GROUP_AUDIO_PACKET_ID, &handle_group_audio_packet);
     return 0;
 }
 
+/* Disable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int groupchat_disable_av(Group_Chats *g_c, uint32_t groupnumber)
+{
+    if (group_get_type(g_c, groupnumber) != GROUPCHAT_TYPE_AV) {
+        return -1;
+    }
+
+    Group_AV *group_av = (Group_AV *)group_get_object(g_c, groupnumber);
+
+    if (group_av == nullptr) {
+        return -1;
+    }
+
+    int numpeers = group_number_peers(g_c, groupnumber, false);
+
+    for (uint32_t i = 0; i < numpeers; ++i) {
+        group_av_peer_delete(group_av, groupnumber, group_peer_get_object(g_c, groupnumber, i));
+        group_peer_set_object(g_c, groupnumber, i, nullptr);
+    }
+
+    kill_group_av(group_av);
+
+    if (group_set_object(g_c, groupnumber, nullptr) == -1
+            || callback_groupchat_peer_new(g_c, groupnumber, nullptr) == -1
+            || callback_groupchat_peer_delete(g_c, groupnumber, nullptr) == -1
+            || callback_groupchat_delete(g_c, groupnumber, nullptr) == -1) {
+        return -1;
+    }
+
+    return 0;
+}
+
 /* Create a new toxav group.
  *
  * return group number on success.
diff --git a/toxav/groupav.h b/toxav/groupav.h
index a65921a4..45ff1d60 100644
--- a/toxav/groupav.h
+++ b/toxav/groupav.h
@@ -59,5 +59,19 @@ int join_av_groupchat(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t fr
 int group_send_audio(Group_Chats *g_c, uint32_t groupnumber, const int16_t *pcm, unsigned int samples, uint8_t channels,
                      uint32_t sample_rate);
 
+/* Enable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int groupchat_enable_av(const Logger *log, Tox *tox, Group_Chats *g_c, uint32_t groupnumber,
+                        audio_data_cb *audio_callback, void *userdata);
+
+/* Disable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int groupchat_disable_av(Group_Chats *g_c, uint32_t groupnumber);
 
 #endif // C_TOXCORE_TOXAV_GROUPAV_H
diff --git a/toxav/toxav.api.h b/toxav/toxav.api.h
index 14c6a8e1..84c006b7 100644
--- a/toxav/toxav.api.h
+++ b/toxav/toxav.api.h
@@ -654,6 +654,27 @@ int toxav_join_av_groupchat(Tox *tox, uint32_t friendnumber, const uint8_t *data
 int toxav_group_send_audio(Tox *tox, uint32_t groupnumber, const int16_t *pcm, unsigned int samples, uint8_t channels,
                            uint32_t sample_rate);
 
+/* Enable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ *
+ * Audio data callback format (same as the one for toxav_add_av_groupchat()):
+ *   audio_callback(Tox *tox, uint32_t groupnumber, uint32_t peernumber, const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t sample_rate, void *userdata)
+ *
+ * Note that total size of pcm in bytes is equal to (samples * channels * sizeof(int16_t)).
+ */
+int toxav_groupchat_enable_av(Tox *tox, uint32_t groupnumber,
+                              void (*audio_callback)(void *, uint32_t, uint32_t, const int16_t *, unsigned int, uint8_t, uint32_t, void *),
+                              void *userdata);
+
+/* Disable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int toxav_groupchat_disable_av(Tox *tox, uint32_t groupnumber);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/toxav/toxav.h b/toxav/toxav.h
index bc634e91..6c1ea093 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -782,6 +782,27 @@ int toxav_join_av_groupchat(Tox *tox, uint32_t friendnumber, const uint8_t *data
 int toxav_group_send_audio(Tox *tox, uint32_t groupnumber, const int16_t *pcm, unsigned int samples, uint8_t channels,
                            uint32_t sample_rate);
 
+/* Enable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ *
+ * Audio data callback format (same as the one for toxav_add_av_groupchat()):
+ *   audio_callback(Tox *tox, uint32_t groupnumber, uint32_t peernumber, const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t sample_rate, void *userdata)
+ *
+ * Note that total size of pcm in bytes is equal to (samples * channels * sizeof(int16_t)).
+ */
+int toxav_groupchat_enable_av(Tox *tox, uint32_t groupnumber,
+                              void (*audio_callback)(void *, uint32_t, uint32_t, const int16_t *, unsigned int, uint8_t, uint32_t, void *),
+                              void *userdata);
+
+/* Disable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int toxav_groupchat_disable_av(Tox *tox, uint32_t groupnumber);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/toxav/toxav_old.c b/toxav/toxav_old.c
index e9850973..af9980b0 100644
--- a/toxav/toxav_old.c
+++ b/toxav/toxav_old.c
@@ -80,3 +80,32 @@ int toxav_group_send_audio(Tox *tox, uint32_t groupnumber, const int16_t *pcm, u
     Messenger *m = *(Messenger **)tox;
     return group_send_audio(m->conferences_object, groupnumber, pcm, samples, channels, sample_rate);
 }
+
+/* Enable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ *
+ * Audio data callback format (same as the one for toxav_add_av_groupchat()):
+ *   audio_callback(Tox *tox, uint32_t groupnumber, uint32_t peernumber, const int16_t *pcm, unsigned int samples, uint8_t channels, uint32_t sample_rate, void *userdata)
+ *
+ * Note that total size of pcm in bytes is equal to (samples * channels * sizeof(int16_t)).
+ */
+int toxav_groupchat_enable_av(Tox *tox, uint32_t groupnumber, audio_data_cb *audio_callback, void *userdata)
+{
+    // TODO(iphydf): Don't rely on toxcore internals.
+    Messenger *m = *(Messenger **)tox;
+    return groupchat_enable_av(m->log, tox, m->conferences_object, groupnumber, audio_callback, userdata);
+}
+
+/* Disable A/V in a groupchat.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int toxav_groupchat_disable_av(Tox *tox, uint32_t groupnumber)
+{
+    // TODO(iphydf): Don't rely on toxcore internals.
+    Messenger *m = *(Messenger **)tox;
+    return groupchat_disable_av(m->conferences_object, groupnumber);
+}