Use properly bound APIs

libass · Mar 23, 2020 · 88d2df4 · 88d2df4
1 parent cea2dc9
commit 88d2df4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/src/post-worker.js b/src/post-worker.js
@@ -206,7 +206,7 @@ self.blendRenderTiming = function (timing, force) {
     var startTime = performance.now();
 
     var renderResult = self.octObj.renderBlend(self.getCurrentTime() + self.delay, force);
-    var blendTime = Module.getValue(self.blendTime, 'double');
+    var blendTime = renderResult.blend_time;
     var canvases = [], buffers = [];
     if (renderResult && (renderResult.changed != 0 || force)) {
         // make a copy, as we should free the memory so subsequent calls can utilize it
@@ -247,14 +247,14 @@ self.blendRender = function (force) {
 };
 
 self.oneshotRender = function (lastRenderedTime, renderNow, iteration) {
-    var eventStart = renderNow ? lastRenderedTime : self._find_next_event_start(lastRenderedTime);
+    var eventStart = renderNow ? lastRenderedTime : self.octObj.findNextEventStart(lastRenderedTime);
     var eventFinish = -1.0, emptyFinish = -1.0, animated = false;
     var rendered = {};
     if (eventStart >= 0) {
-        self._find_event_stop_times(eventStart, self.eventFinish, self.emptyFinish, self.isAnimated);
-        eventFinish = Module.getValue(self.eventFinish, 'double');
-        emptyFinish = Module.getValue(self.emptyFinish, 'double');
-        animated = Module.getValue(self.isAnimated, 'i32') != 0;
+        eventTimes = self.findNextEventStart(eventStart);
+        eventFinish = eventTimes.eventFinish;
+        emptyFinish = eventTimes.emptyFinish;
+        animated = eventTimes.is_animated;
 
         rendered = self.blendRenderTiming(eventStart, true);
     }

diff --git a/src/pre-worker.js b/src/pre-worker.js
@@ -92,19 +92,7 @@ Module["preRun"].push(function () {
 Module['onRuntimeInitialized'] = function () {
     self.octObj = new Module.SubtitleOctopus();
 
-    self._find_next_event_start = Module['cwrap']('libassjs_find_next_event_start', 'number', ['number']);
-    self._find_event_stop_times = Module['cwrap']('libassjs_find_event_stop_times', null, ['number', 'number', 'number', 'number']);
-
     self.changed = Module._malloc(4);
-    self.blendTime = Module._malloc(8);
-    self.blendX = Module._malloc(4);
-    self.blendY = Module._malloc(4);
-    self.blendW = Module._malloc(4);
-    self.blendH = Module._malloc(4);
-
-    self.eventFinish = Module._malloc(8);
-    self.emptyFinish = Module._malloc(8);
-    self.isAnimated = Module._malloc(4);
 
     self.octObj.initLibrary(screen.width, screen.height);
     self.octObj.createTrack("/sub.ass");