1 files changed, 36 insertions, 17 deletions

diff --git a/src/kitlib.c b/src/kitlib.c
index 9ce1e27..2a2307b 100644
--- a/src/kitlib.c
+++ b/src/kitlib.c
@@ -1,11 +1,33 @@
+#include <assert.h>
+
+#include <libavformat/avformat.h>
+
 #include "kitchensink/kitchensink.h"
 #include "kitchensink/internal/kitlibstate.h"
-#include <libavformat/avformat.h>
+
+#ifdef USE_ASS
 #include <ass/ass.h>
-#include <assert.h>
 
-// No-op
-void _libass_msg_callback(int level, const char *fmt, va_list va, void *data) {}
+static void _libass_msg_callback(int level, const char *fmt, va_list va, void *data) {}
+
+int Kit_InitASS(Kit_LibraryState *state) {
+    state->libass_handle = ass_library_init();
+    ass_set_message_cb(state->libass_handle, _libass_msg_callback, NULL);
+    return 0;
+}
+
+void Kit_CloseASS(Kit_LibraryState *state) {
+    ass_library_done(state->libass_handle);
+    state->libass_handle = NULL;
+}
+
+#else
+
+int Kit_InitASS(Kit_LibraryState *state) { return 1; }
+void Kit_CloseASS(Kit_LibraryState *state) {}
+
+#endif
+
 
 int Kit_Init(unsigned int flags) {
     Kit_LibraryState *state = Kit_GetLibraryState();
@@ -14,21 +36,17 @@ int Kit_Init(unsigned int flags) {
         Kit_SetError("Kitchensink is already initialized.");
         return 1;
     }
+    av_register_all();
+
     if(flags & KIT_INIT_NETWORK) {
         avformat_network_init();
+        state->init_flags |= KIT_INIT_NETWORK;
     }
-    if(flags & KIT_INIT_FORMATS) {
-        av_register_all();
+    if(flags & KIT_INIT_ASS) {
+        if(Kit_InitASS(state) == 0) {
+            state->init_flags |= KIT_INIT_ASS;
+        }
     }
-
-    state->init_flags = flags;
-
-    // Init libass
-    //state->libass_handle = ass_library_init();
-
-    // Make libass message spam go away
-    //ass_set_message_cb(state->libass_handle, _libass_msg_callback, NULL);
-    
     return 0;
 }
 
@@ -38,9 +56,10 @@ void Kit_Quit() {
     if(state->init_flags & KIT_INIT_NETWORK) {
         avformat_network_deinit();
     }
+    if(state->init_flags & KIT_INIT_ASS) {
+        Kit_CloseASS(state);
+    }
     state->init_flags = 0;
-
-    //ass_library_done(state->libass_handle);
 }
 
 void Kit_GetVersion(Kit_Version *version) {