Change SubtitleOctopus class API - added a few methods to be used in lite mode

Also marked some methods as const

Author: JustAMan

src/SubtitleOctopus.cpp

@@ -199,19 +199,23 @@ class SubtitleOctopus {
 
     int status;
 
-    SubtitleOctopus() {
-        status = 0;
-        ass_library = NULL;
-        ass_renderer = NULL;
-        track = NULL;
-        canvas_w = 0;
-        canvas_h = 0;
+    SubtitleOctopus(): status(0), ass_library(NULL), ass_renderer(NULL), track(NULL), canvas_w(0), canvas_h(0), m_is_event_animated(NULL), m_drop_animations(false) {
     }
 
     void setLogLevel(int level) {
         log_level = level;
     }
 
+    void setDropAnimations(bool value) {
+        bool rescan = m_drop_animations != value && track != NULL;
+        m_drop_animations = value;
+        if (rescan) rescanAllAnimations();
+    }
+
+    bool getDropAnimations() const {
+        return m_drop_animations;
+    }
+
     void initLibrary(int frame_w, int frame_h) {
         ass_library = ass_library_init();
         if (!ass_library) {
@@ -242,14 +246,7 @@ class SubtitleOctopus {
             printf("Failed to start a track\n");
             exit(4);
         }
-
-        free(m_is_event_animated);
-        m_is_event_animated = (int*)malloc(sizeof(int) * track->n_events);
-        if (m_is_event_animated == NULL) {
-            printf("cannot parse animated events\n");
-            exit(5);
-        }
-        detectAnimatedEvents();
+        rescanAllAnimations();
     }
 
     void createTrackMem(char *buf, unsigned long bufsize) {
@@ -259,6 +256,7 @@ class SubtitleOctopus {
             printf("Failed to start a track\n");
             exit(4);
         }
+        rescanAllAnimations();
     }
 
     void removeTrack() {
@@ -277,6 +275,7 @@ class SubtitleOctopus {
         canvas_h = frame_h;
         canvas_w = frame_w;
     }
+
     ASS_Image* renderImage(double time, int* changed) {
         ASS_Image *img = ass_render_frame(ass_renderer, track, (int) (time * 1000), changed);
         return img;
@@ -291,6 +290,7 @@ class SubtitleOctopus {
         free(m_is_event_animated);
         m_is_event_animated = NULL;
     }
+
     void reloadLibrary() {
         quitLibrary();
 
@@ -305,23 +305,27 @@ class SubtitleOctopus {
         ass_set_margins(ass_renderer, top, bottom, left, right);
     }
 
-    int getEventCount() {
+    int getEventCount() const {
         return track->n_events;
     }
 
     int allocEvent() {
+        free(m_is_event_animated);
+        m_is_event_animated = NULL;
         return ass_alloc_event(track);
     }
 
     void removeEvent(int eid) {
+        free(m_is_event_animated);
+        m_is_event_animated = NULL;
         ass_free_event(track, eid);
     }
 
-    int getStyleCount() {
+    int getStyleCount() const {
         return track->n_styles;
     }
 
-    int getStyleByName(const char* name) {
+    int getStyleByName(const char* name) const {
         for (int n = 0; n < track->n_styles; n++) {
             if (track->styles[n].Name && strcmp(track->styles[n].Name, name) == 0)
                 return n;
@@ -338,6 +342,8 @@ class SubtitleOctopus {
     }
 
     void removeAllEvents() {
+        free(m_is_event_animated);
+        m_is_event_animated = NULL;
         ass_flush_events(track);
     }
 
@@ -451,7 +457,7 @@ class SubtitleOctopus {
         return &m_blendResult;
     }
 
-    double findNextEventStart(double tm) {
+    double findNextEventStart(double tm) const {
         if (!track || track->n_events == 0) return -1;
 
         ASS_Event *cur = track->events;
@@ -468,7 +474,7 @@ class SubtitleOctopus {
         return closest / 1000.0;
     }
 
-    EventStopTimesResult* findEventStopTimes(double tm) {
+    EventStopTimesResult* findEventStopTimes(double tm) const {
         static EventStopTimesResult result;
         if (!track || track->n_events == 0) {
             result.eventFinish = result.emptyFinish = -1;
@@ -492,7 +498,7 @@ class SubtitleOctopus {
                     if (finish > maxFinish) {
                         maxFinish = finish;
                     }
-                    if (!current_animated) current_animated = m_is_event_animated[i];
+                    if (!current_animated && m_is_event_animated) current_animated = m_is_event_animated[i];
                 }
             } else if (start < minStart || minStart == -1) {
                 minStart = start;
@@ -520,18 +526,26 @@ class SubtitleOctopus {
         return &result;
     }
 
-private:
-    void detectAnimatedEvents() {
+    void rescanAllAnimations() {
+        free(m_is_event_animated);
+        m_is_event_animated = (int*)malloc(sizeof(int) * track->n_events);
+        if (m_is_event_animated == NULL) {
+            printf("cannot parse animated events\n");
+            exit(5);
+        }
+
         ASS_Event *cur = track->events;
         int *animated = m_is_event_animated;
         for (int i = 0; i < track->n_events; i++, cur++, animated++) {
             *animated = _is_event_animated(cur);
         }
     }
 
+private:
     ReusableBuffer m_blend;
     RenderBlendResult m_blendResult;
     int *m_is_event_animated;
+    bool m_drop_animations;
 };
 
 int main(int argc, char *argv[]) { return 0; }

src/SubtitleOctopus.idl

@@ -178,6 +178,8 @@ interface SubtitleOctopus {
     attribute ASS_Renderer ass_renderer;
     attribute ASS_Library ass_library;
     void setLogLevel(long level);
+    void setDropAnimations(bool value);
+    bool getDropAnimations();
     void initLibrary(long frame_w, long frame_h);
     void createTrack(DOMString subfile);
     void createTrackMem(DOMString buf, unsigned long bufsize);
@@ -200,4 +202,5 @@ interface SubtitleOctopus {
     RenderBlendResult renderBlend(double tm, long force);
     double findNextEventStart(double tm);
     EventStopTimesResult findEventStopTimes(double tm);
+    void rescanAllAnimations();
 };