Rebased on master and removed alpha channel (again)

2 files changed, 46 insertions, 22 deletions

diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h
index dd47df23..30c78e44 100644
--- a/other/apidsl/tox.in.h
+++ b/other/apidsl/tox.in.h
@@ -340,6 +340,24 @@ enum class PROXY_TYPE {
   SOCKS5,
 }
 
+/**
+ * Type of savedata to create the Tox instance from.
+ */
+enum class SAVEDATA_TYPE {
+  /**
+   * No savedata.
+   */
+  NONE,
+  /**
+   * Savedata is one that was obtained from ${savedata.get}
+   */
+  TOX_SAVE,
+  /**
+   * Savedata is a secret key of length ${SECRET_KEY_SIZE}
+   */
+  SECRET_KEY,
+}
+
 
 static class options {
   /**
@@ -416,6 +434,23 @@ static class options {
      * The port to use for the TCP server. If 0, the tcp server is disabled.
      */
     uint16_t tcp_port;
+
+    namespace savedata {
+      /**
+       * The type of savedata to load from.
+       */
+      SAVEDATA_TYPE type;
+
+      /**
+       * The savedata.
+       */
+      const uint8_t[length] data;
+
+      /**
+       * The length of the savedata.
+       */
+      size_t length;
+    }
   }
 
 
@@ -474,21 +509,17 @@ static class options {
  * This function will bring the instance into a valid state. Running the event
  * loop with a new instance will operate correctly.
  *
- * If the data parameter is not NULL, this function will load the Tox instance
- * from a byte array previously filled by ${savedata.get}.
- *
  * If loading failed or succeeded only partially, the new or partially loaded
  * instance is returned and an error code is set.
  *
  * @param options An options object as described above. If this parameter is
  *   NULL, the default options are used.
- * @param data A byte array containing data previously stored by ${savedata.get}.
- * @param length The length of the byte array data. If this parameter is 0, the
- *   data parameter is ignored.
  *
  * @see $iterate for the event loop.
+ *
+ * @return A new Tox instance pointer on success or NULL on failure.
  */
-static this new(const options_t *options, const uint8_t[length] data) {
+static this new(const options_t *options) {
   NULL,
   /**
    * The function was unable to allocate enough memory to store the internal
@@ -580,13 +611,8 @@ uint8_t[size] savedata {
  * Sends a "get nodes" request to the given bootstrap node with IP, port, and
  * public key to setup connections.
  *
- * This function will attempt to connect to the node using UDP and TCP at the
- * same time.
- *
- * Tox will use the node as a TCP relay in case ${options.this.udp_enabled} was
- * false, and also to connect to friends that are in TCP-only mode. Tox will
- * also use the TCP connection when NAT hole punching is slow, and later switch
- * to UDP if hole punching succeeds.
+ * This function will attempt to connect to the node using UDP. You must use 
+ * this function even if ${options.this.udp_enabled} was set to false.
  *
  * @param address The hostname or IP address (IPv4 or IPv6) of the node.
  * @param port The port on the host on which the bootstrap Tox instance is
@@ -1481,7 +1507,7 @@ namespace file {
      */
     DATA,
     /**
-     * Avatar filename. This consists of $hash(image).
+     * Avatar file_id. This consists of $hash(image).
      * Avatar data. This consists of the image data.
      *
      * Avatars can be sent at any time the client wishes. Generally, a client will
@@ -1625,6 +1651,7 @@ namespace file {
 
 
   error for get {
+    NULL,
     /**
      * The friend_number passed did not designate a valid friend.
      */
diff --git a/other/apidsl/toxav.in.h b/other/apidsl/toxav.in.h
index bcf554ac..0631c827 100644
--- a/other/apidsl/toxav.in.h
+++ b/other/apidsl/toxav.in.h
@@ -562,10 +562,9 @@ namespace video {
    * @param y Y (Luminance) plane data.
    * @param u U (Chroma) plane data.
    * @param v V (Chroma) plane data.
-   * @param a A (Alpha) plane data.
    */
   bool send_frame(uint32_t friend_number, uint16_t width, uint16_t height,
-                  const uint8_t *y, const uint8_t *u, const uint8_t *v, const uint8_t *a) with error for send_frame;
+                  const uint8_t *y, const uint8_t *u, const uint8_t *v) with error for send_frame;
 }
 /*******************************************************************************
  * 
@@ -603,19 +602,17 @@ namespace video {
      *          Y = MAX(width, abs(ystride)) * height, 
      *          U = MAX(width/2, abs(ustride)) * (height/2) and 
      *          V = MAX(width/2, abs(vstride)) * (height/2).
-     *          A = MAX(width, abs(astride)) * height.
      * @param ystride
      * @param ustride
-     * @param vstride
-     * @param astride Strides data. Strides represent padding for each plane
+     * @param vstride Strides data. Strides represent padding for each plane
      *                that may or may not be present. You must handle strides in
      *                your image processing code. Strides are negative if the 
      *                image is bottom-up hence why you MUST abs() it when
      *                calculating plane buffer size.
      */
     typedef void(uint32_t friend_number, uint16_t width, uint16_t height,
-                 const uint8_t *y, const uint8_t *u, const uint8_t *v, const uint8_t *a, 
-                 int32_t ystride, int32_t ustride, int32_t vstride, int32_t astride);
+                 const uint8_t *y, const uint8_t *u, const uint8_t *v,
+                 int32_t ystride, int32_t ustride, int32_t vstride);
   }
 }