tox A/V: integration of A/V code into tox

Also-by: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>

5 files changed, 65 insertions, 4 deletions

diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index 025f23c8..116a3e29 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libtoxcore.la
+lib_LTLIBRARIES += libtoxcore.la
 
 libtoxcore_la_include_HEADERS = \
                         ../toxcore/tox.h
@@ -34,7 +34,8 @@ libtoxcore_la_CFLAGS =  -I$(top_srcdir) \
                         $(LIBSODIUM_CFLAGS) \
                         $(NACL_CFLAGS)
 
-libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \
+libtoxcore_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \
+                        $(EXTRA_LT_LDFLAGS) \
                         $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
                         $(WINSOCK2_LIBS)
diff --git a/toxcore/misc_tools.h b/toxcore/misc_tools.h
index 448c1cbd..5fd0cb7a 100644
--- a/toxcore/misc_tools.h
+++ b/toxcore/misc_tools.h
@@ -69,6 +69,63 @@
  * TODO: Update wiki.
  **********************************************************/
 
+/* Example usage
+
+This sample program makes a new struct which contains a
+character and a tox_list_t. It then prompts a user for
+input until he enters q or e. It then adds each character
+to the list, and uses a special for loop to print them.
+It then removes all the 'z' characters, and prints the list
+again.
+
+//Notice that the data to be put in the list *contains* tox_list_t;
+//usually, this is the other way around!
+typedef struct tox_string {
+   char c;
+   tox_list_t tox_lst; //Notice that tox_lst is *NOT* a pointer.
+} tox_string_t;
+
+int main()
+{
+   tox_list_t head;
+   tox_list_new(&head); //initialize head
+   
+   //input a new character, until user enters q or e
+   char c = '\0';
+   while (c != 'q' && c != 'e') {
+      scanf("%c", &c);
+      tox_string_t* tmp = malloc(sizeof(tox_string_t));
+      tmp->c = c;
+      tox_list_add(&head, &tmp->tox_lst); //add it to the list
+   }
+   
+TOX_LIST_FOR_EACH() takes a struct tox_list and a name for a temporary pointer to use in the loop.
+   
+TOX_LIST_GET_VALUE() uses magic to return an instance of a structure that contains tox_list_t.
+You have to give it a temporary tox_string_t, name of tox_list_t member inside our structure (tox_lst),
+and the type of structure to return.
+   
+   TOX_LIST_FOR_EACH(head, tmp)
+      printf("%c", TOX_LIST_GET_VALUE(*tmp, tox_lst, tox_string_t).c);
+   
+   TOX_LIST_FOR_EACH(head, tmp) {
+      if (TOX_LIST_GET_VALUE(*tmp, tox_lst, tox_string_t).c == 'z') {
+         //If you delete tmp, you have to quit the loop, or it will go on infinitly.
+         //This will be fixed later on.
+         tox_list_remove(tmp);
+         break;
+      }
+   }
+   
+   printf("\n");
+   TOX_LIST_FOR_EACH(head, tmp)
+      printf("%c", TOX_LIST_GET_VALUE(*tmp, tox_lst, tox_string_t).c);
+   
+   
+   return 0;
+}
+*/
+
 #define MEMBER_OFFSET(var_name_in_parent, parent_type) \
    (&(((parent_type*)0)->var_name_in_parent))
 
diff --git a/toxcore/network.c b/toxcore/network.c
index 38adc179..5d695b81 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -227,7 +227,7 @@ int sendpacket(Networking_Core *net, IP_Port ip_port, uint8_t *data, uint32_t le
  *  Packet length is put into length.
  *  Dump all empty packets.
  */
-static int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t *length)
+int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t *length)
 {
     struct sockaddr_storage addr;
 #ifdef WIN32
@@ -667,6 +667,7 @@ void kill_networking(Networking_Core *net)
     return;
 }
 
+
 /* ip_equal
  *  compares two IPAny structures
  *  unset means unequal
diff --git a/toxcore/network.h b/toxcore/network.h
index 8a0e20dc..0ce1f34d 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -285,4 +285,6 @@ Networking_Core *new_networking(IP ip, uint16_t port);
 /* Function to cleanup networking stuff (doesn't do much right now). */
 void kill_networking(Networking_Core *net);
 
+int receivepacket(sock_t sock, IP_Port *ip_port, uint8_t *data, uint32_t *length);
+
 #endif
diff --git a/toxcore/util.c b/toxcore/util.c
index e307bad6..8fc6806e 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -25,7 +25,7 @@ uint64_t random_64b()
 {
     uint64_t r;
 
-    // This is probably not random enough?
+    /* This is probably not random enough? */
     r = random_int();
     r <<= 32;
     r |= random_int();