vspx: replace interpolation func

SoulMelody · Aug 8, 2024 · ca78995 · ca78995
1 parent 34ae952
commit ca78995
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/libresvip/plugins/vspx/vspx_interval_dict.py b/libresvip/plugins/vspx/vspx_interval_dict.py
@@ -8,18 +8,11 @@
 
 from libresvip.core.time_interval import PiecewiseIntervalDict
 from libresvip.core.time_sync import TimeSynchronizer
+from libresvip.utils.music_math import cosine_easing_in_out_interpolation
 
 from .model import VocalSharpDefaultTrill, VocalSharpNoteTrack, VocalSharpTrill
 
 
-def vspx_cosine_easing_in_out_interpolation(
-    x: int, start: tuple[float, float], end: tuple[float, float]
-) -> float:
-    x0, y0 = start
-    x1, y1 = end
-    return (y0 + y1) / 2 + (y0 - y1) * math.cos((x - x0) / (x1 - x0) * math.pi) / 2
-
-
 def vspx_sine_vibrato_interpolation(
     seconds: float,
     vibrato_start: float,
@@ -123,8 +116,8 @@ def __post_init__(
                     por_start = middle_secs - note_track.por
                     por_end = middle_secs + note_track.por
                     self.key_interval_dict[portion.closedopen(por_start, por_end)] = (
-                        functools.partial(
-                            vspx_cosine_easing_in_out_interpolation,
+                        functools.partial(  # type: ignore[call-arg]
+                            cosine_easing_in_out_interpolation,
                             start=(por_start, prev_note.key_number),
                             end=(por_end, next_note.key_number),
                         )