1 files changed, 58 insertions, 51 deletions

diff --git a/toxcore/tox.api.h b/toxcore/tox.api.h
index 0a651c11..fd908a49 100644
--- a/toxcore/tox.api.h
+++ b/toxcore/tox.api.h
@@ -376,6 +376,52 @@ enum class SAVEDATA_TYPE {
 }
 
 
+/**
+ * Severity level of log messages.
+ */
+enum class LOG_LEVEL {
+  /**
+   * Very detailed traces including all network activity.
+   */
+  TRACE,
+  /**
+   * Debug messages such as which port we bind to.
+   */
+  DEBUG,
+  /**
+   * Informational log messages such as video call status changes.
+   */
+  INFO,
+  /**
+   * Warnings about internal inconsistency or logic errors.
+   */
+  WARNING,
+  /**
+   * Severe unexpected errors caused by external or internal inconsistency.
+   */
+  ERROR,
+}
+
+/**
+ * This event is triggered when the toxcore library logs an internal message.
+ * This is mostly useful for debugging. This callback can be called from any
+ * function, not just $iterate. This means the user data lifetime must at
+ * least extend between registering and unregistering it or $kill.
+ *
+ * Other toxcore modules such as toxav may concurrently call this callback at
+ * any time. Thus, user code must make sure it is equipped to handle concurrent
+ * execution, e.g. by employing appropriate mutex locking.
+ *
+ * @param level The severity of the log message.
+ * @param file The source file from which the message originated.
+ * @param line The source line from which the message originated.
+ * @param func The function from which the message originated.
+ * @param message The log message.
+ * @param user_data The user data pointer passed to $new in options.
+ */
+typedef void log_cb(LOG_LEVEL level, string file, uint32_t line, string func, string message, any user_data);
+
+
 static class options {
   /**
    * This struct contains all the startup options for Tox. You can either
@@ -491,6 +537,18 @@ static class options {
        */
       size_t length;
     }
+
+    namespace log {
+      /**
+       * Logging callback for the new tox instance.
+       */
+      log_cb *callback;
+
+      /**
+       * User data pointer passed to the logging callback.
+       */
+      any user_data;
+    }
   }
 
 
@@ -620,57 +678,6 @@ static this new(const options_t *options) {
 void kill();
 
 
-/**
- * Severity level of log messages.
- */
-enum class LOG_LEVEL {
-  /**
-   * Very detailed traces including all network activity.
-   */
-  TRACE,
-  /**
-   * Debug messages such as which port we bind to.
-   */
-  DEBUG,
-  /**
-   * Informational log messages such as video call status changes.
-   */
-  INFO,
-  /**
-   * Warnings about internal inconsistency or logic errors.
-   */
-  WARNING,
-  /**
-   * Severe unexpected errors caused by external or internal inconsistency.
-   */
-  ERROR,
-}
-
-/**
- * This event is triggered when the toxcore library logs an internal message.
- * This is mostly useful for debugging. This callback can be called from any
- * function, not just $iterate. This means the user data lifetime must at
- * least extend between registering and unregistering it or $kill.
- *
- * Other toxcore modules such as toxav may concurrently call this callback at
- * any time. Thus, user code must make sure it is equipped to handle concurrent
- * execution, e.g. by employing appropriate mutex locking. The callback
- * registration function must not be called during execution of any other Tox
- * library function (toxcore or toxav).
- */
-event log {
-  /**
-   * @param level The severity of the log message.
-   * @param file The source file from which the message originated.
-   * @param line The source line from which the message originated.
-   * @param func The function from which the message originated.
-   * @param message The log message.
-   */
-  typedef void(LOG_LEVEL level, string file, uint32_t line, string func,
-               string message);
-}
-
-
 uint8_t[size] savedata {
   /**
    * Calculates the number of bytes required to store the tox instance with