From 2a385174257138c369be52a29c571a58b19bd226 Mon Sep 17 00:00:00 2001
From: Seipas <seipas@net-c.com>
Date: Wed, 1 Feb 2017 12:21:04 +0100
Subject: [PATCH] Hide "not-following times for syllables" warning
---
epitass.ml | 3 ++-
epitass.standalone | Bin 459877 -> 459977 bytes
makefile | 2 +-
toyunda_raw_to_v4p_ass.ml | 12 ++++++++----
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/epitass.ml b/epitass.ml
index 6d19adb..7229f4b 100644
--- a/epitass.ml
+++ b/epitass.ml
@@ -35,6 +35,7 @@ let override_style_mode = ref false in
let override_alpha_mode = ref true in
let backup_first_style_mode = ref true in
let guess_backcolor_mode= ref true in
+let warning_following_syllable_mode = ref false in
let playResX = ref 800 in
let playResY = ref 600 in
let audio_file = ref "?video" in
@@ -100,7 +101,7 @@ Arg.parse
let (style_list,event_list) = Toyunda_raw_to_v4p_ass.create_ass_events_and_styles
!font !outline_color !bold !italic !underline !strike_out !scalex !scaley !spacing !angle !borderstyle !outline !shadow !alignment !marginl !marginr
!default_font_size !default_primary_color !default_secondary_color !default_back_color !default_marginv !default_alpha !framerate
- !color_threshold !override_style_mode !override_alpha_mode !backup_first_style_mode !guess_backcolor_mode
+ !color_threshold !override_style_mode !override_alpha_mode !backup_first_style_mode !guess_backcolor_mode !warning_following_syllable_mode
sorted_toyunda positioned_lines in
(*let _ = prerr_endline "[Info] Generate ass\n" in*)
diff --git a/epitass.standalone b/epitass.standalone
index 1d6c8ff0777b4e49824f220ef71d40b7db19f6ac..c1f52bcba90a018786f8fa117c76cc2075fc5ca3 100755
GIT binary patch
delta 960
zcmc(d-%FEW6vy9Zn`gRTxizOwr*EyjT1poFO4>?uB0-9!M5rrAvo%BuGoiZhM=SSU
z6&O1g5lRg23@@Sw41{iiiWUT2S&I;F61*^|yvVonh!_3^^}vVo@IB{w&N<I>Rujc<
z)Z+0td#=k(K|@XC%F$y}u9S|@69(=|WerU0`W!ej4hp`n2Mf-RLjkAVBSX$>Ns<`R
zj7y*NMR?B-xvUM7eyGlCA=yZni95u3!h&!8Q0D8Rt(C~%kxgX9auC@>9npcAlaP<T
z063W$(*f{eC;&Bf;cq0w+DkD0Gyv~(9+9eq0K!dF5~4CavBoDG;hLLy@Ow8@g9tsd
zi66Sbg$+FrWF<J-1Iyqcy;|GW`Cu<37&(51U}a3)D{A{scI=-fE}}*&cAEXVrD<+y
zk0iB{AbzQg*v~VUpkg1ZN7DqfI+b6VmP4{QBi7w@O~bQmSx4|oT3>+k6Ohdo@x=tJ
z6!wu@{6~<m5zT~n(^5V+3746tl=k8(Va03|5?*3E4&8B@0rpbw<e@lxW~iRZvharc
z@Q~TX=ZJX|HHZTb@Z%J8vYV(Rpo-ZreS?nPN<g_)q!m$OG}`f*a38=-0*>RL3Kmv@
ziVCe(->xV--d3T?rtFe7{~%YPj(PdI3Xk)w7pbi#YK2DJY39ipsO)4N_<I8mDRQ|l
za>5rmSSep0jtz~(hN5y<9_o*VM`EM>a_@jV5{@1=;j0a(<&8gJ%a*$|y=W|mCl}_v
lEj(GSy&B~0I^!yH%wFg?ce+iI^1{KUE=txtj4cME{1;1OuowUU
delta 840
zcmc(d%WG3X6vk(6k`ohhLy|TvP4h5~rJ;$B5;am2X|OgbsHrUljf%yEprCap6paZ{
zlR!ZfJPRL12!cyRn1xU`ZbaOvOE;k_p^HZ7MiajQ7x@cx;K!W%oipE^nKK{j!S!13
zPF21&JWWccQxg+=?hiB#U;$P&(6n8BWX$^b)DI(|o~7x7)$v{kA;Do@D^Y~&8FI-P
zew?9{JjCBKG`7=+>^9&6%U}W6!9GwhggAitGe9V!Jej3on=bY6Miz!EIdbvcEXBPJ
zh*Ln1K47S|EPXQkgg5|_K<`BR{8TTe=z4%dMM~OqL4i*esmQO3^u-p$cbadXp+WWH
z9Mz-@@%RO5l|s<<X8+S%`X@gg#sL$5583K;yZYwxz^QvOh9If}7by`%6KBel_r|xn
zU48R<jUEsAd70*<;>|L(%=1tzU>dm9Mujd(Zy2#&5dni>h_6*CX47&+HLA2F)yh43
zARXFr1TgQa!SWVYYP4IL>|UZ6f2~p6G?CR+x~&WBtRo%c$vPc0V?CJ^SL&2Ecl1a@
z{0+tK(H=>5xUWI`<%l}opeKG4&(M++B0Midzf*0lQgV)$+O*ej9OX!x#(B0)VbyF?
x$L&eHiypBoF5m2bdP8O}{~lFu4EwtDt^O*UK6XL~|KfCR9$sg!@GGl*`yY};i<kfa
diff --git a/makefile b/makefile
index 29a21c5..05b39b3 100644
--- a/makefile
+++ b/makefile
@@ -29,7 +29,7 @@ FORMATV4PASS=ass
# Target par défaut : compilation et nettoyage
-all: build clean
+all: build standalone clean
# Compilation
build : $(PROGRAM)
diff --git a/toyunda_raw_to_v4p_ass.ml b/toyunda_raw_to_v4p_ass.ml
index 8fea8cf..21707f7 100644
--- a/toyunda_raw_to_v4p_ass.ml
+++ b/toyunda_raw_to_v4p_ass.ml
@@ -314,7 +314,7 @@ type style = int(*id*) * int(*font_size*) * color(*primaryColour*) * color(*seco
let create_ass_events_and_styles
font outline_color bold italic underline strike_out scalex scaley spacing angle borderstyle outline shadow alignment marginl marginr
default_font_size default_primary_color default_secondary_color default_back_color default_marginv default_alpha framerate
-color_threshold override_style_mode override_alpha_mode backup_first_style_mode guess_backcolor_mode
+color_threshold override_style_mode override_alpha_mode backup_first_style_mode guess_backcolor_mode warning_following_syllable_mode
sorted_toyunda positioned_lines =
(*For each pipe number*)
@@ -523,9 +523,13 @@ sorted_toyunda positioned_lines =
then if expected_frame == first_frame
then (sf,"")
else
- let _ = Printf.eprintf "[Warning] Expected next syllable frame %d, got %d.\n" expected_frame sf in
- let _ = if sf < expected_frame then Printf.eprintf "[ERROR] The previous syllable was too long, printing a negative \\k tag.\n" else () in
- (first_frame, String.concat "" ["{\\k";string_of_int ((sf-expected_frame)*100/framerate);"}"])
+ let _ =
+ if sf < expected_frame
+ then Printf.eprintf "[ERROR] The previous syllable was too long (%d>%d), printing a negative \\k tag.\n" expected_frame sf
+ else if warning_following_syllable_mode
+ then Printf.eprintf "[Warning] Expected next syllable frame %d, got %d.\n" expected_frame sf
+ else () in
+ (first_frame, String.concat "" ["{\\k";string_of_int ((sf-expected_frame)*100/framerate);"}"])
else (first_frame,"") in
let kstring = string_of_int ((ef-sf)*100/framerate) in
(*let _ = Printf.eprintf "[Test] kstring %s for ef-sf = %d-%d = %d | expected_frame=%d first_frame=%d \n" kstring ef sf (ef-sf) expected_frame first_frame in*)
--
GitLab