Skip to content

Commit 7fefc36

Browse files
JustAMandmitrylyzo
authored andcommitted
Fix build and warnings
Cherry-picked from: jellyfin@90d4848
1 parent 16fcde7 commit 7fefc36

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/SubtitleOctopus.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,20 +199,20 @@ class SubtitleOctopus {
199199

200200
int status;
201201

202-
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) {
202+
SubtitleOctopus(): ass_library(NULL), ass_renderer(NULL), track(NULL), canvas_w(0), canvas_h(0), status(0), m_is_event_animated(NULL), m_drop_animations(false) {
203203
}
204204

205205
void setLogLevel(int level) {
206206
log_level = level;
207207
}
208208

209-
void setDropAnimations(bool value) {
210-
bool rescan = m_drop_animations != value && track != NULL;
211-
m_drop_animations = value;
209+
void setDropAnimations(int value) {
210+
bool rescan = m_drop_animations != bool(value) && track != NULL;
211+
m_drop_animations = bool(value);
212212
if (rescan) rescanAllAnimations();
213213
}
214214

215-
bool getDropAnimations() const {
215+
int getDropAnimations() const {
216216
return m_drop_animations;
217217
}
218218

src/SubtitleOctopus.idl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ interface SubtitleOctopus {
178178
attribute ASS_Renderer ass_renderer;
179179
attribute ASS_Library ass_library;
180180
void setLogLevel(long level);
181-
void setDropAnimations(bool value);
182-
bool getDropAnimations();
181+
void setDropAnimations(long value);
182+
long getDropAnimations();
183183
void initLibrary(long frame_w, long frame_h);
184184
void createTrack(DOMString subfile);
185185
void createTrackMem(DOMString buf, unsigned long bufsize);

0 commit comments

Comments
 (0)