Remove audio_loop afx (#1451)

Zulko · Jan 16, 2021 · 727cbca · 727cbca
1 parent b550d00
commit 727cbca
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `moviepy.video.fx.all` and `moviepy.audio.fx.all`. Use the fx method directly from the clip instance or import the fx function from `moviepy.video.fx` and `moviepy.audio.fx`. [\#1105](https://github.com/Zulko/moviepy/pull/1105)
 
 ### Removed <!-- for now removed features -->
+- `audio.fx.audio_loop` removed. Use `video.fx.loop` instead for all types of clip [\#1451](https://github.com/Zulko/moviepy/pull/1451)
 
 ### Fixed <!-- for any bug fixes -->
 - Fixed BitmapClip with fps != 1 not returning the correct frames or crashing [\#1333](https://github.com/Zulko/moviepy/pull/1333)

diff --git a/docs/ref/audiofx.rst b/docs/ref/audiofx.rst
@@ -41,7 +41,6 @@ the module ``audio.fx`` is loaded as ``afx`` and you can use ``afx.multiply_volu
 
     audio_fadein
     audio_fadeout
-    audio_loop
     audio_normalize
     multiply_stereo_volume
     multiply_volume
diff --git a/docs/ref/audiofx/moviepy.audio.fx.all.audio_loop.rst b/docs/ref/audiofx/moviepy.audio.fx.all.audio_loop.rst
diff --git a/moviepy/__init__.py b/moviepy/__init__.py
@@ -49,7 +49,7 @@
 # Transforms the effects into Clip methods so that
 # they can be called with clip.resize(width=500) instead of
 # clip.fx(vfx.resize, width=500)
-audio_fxs = inspect.getmembers(afx, inspect.isfunction)
+audio_fxs = inspect.getmembers(afx, inspect.isfunction) + [("loop", vfx.loop)]
 video_fxs = (
     inspect.getmembers(vfx, inspect.isfunction)
     + inspect.getmembers(transfx, inspect.isfunction)

diff --git a/moviepy/audio/fx/__init__.py b/moviepy/audio/fx/__init__.py
@@ -2,7 +2,6 @@
 
 from .audio_fadein import audio_fadein
 from .audio_fadeout import audio_fadeout
-from .audio_loop import audio_loop
 from .audio_normalize import audio_normalize
 from .multiply_stereo_volume import multiply_stereo_volume
 from .multiply_volume import multiply_volume
diff --git a/moviepy/audio/fx/all/__init__.py b/moviepy/audio/fx/all/__init__.py
@@ -1,7 +1,7 @@
 """
 moviepy.audio.fx.all is deprecated. 
 
-Use the fx method directly from the clip instance (e.g. ``clip.audio_loop(...)``)
+Use the fx method directly from the clip instance (e.g. ``clip.audio_normalize(...)``)
 or import the function from moviepy.audio.fx instead. 
 """
 import warnings

diff --git a/moviepy/audio/fx/audio_loop.py b/moviepy/audio/fx/audio_loop.py
diff --git a/tests/test_fx.py b/tests/test_fx.py
@@ -290,6 +290,13 @@ def test_loop():
     clip3 = loop(clip, n=3)  # loop 3 times
     clip3.write_videofile(os.path.join(TMP_DIR, "loop3.webm"))
 
+    clip = AudioClip(
+        lambda t: np.sin(440 * 2 * np.pi * t) * (t % 1) + 0.5, duration=2.5, fps=44100
+    )
+    clip1 = clip.loop(2)
+    # TODO fix AudioClip.__eq__()
+    # assert concatenate_audioclips([clip, clip]) == clip1
+
     close_all_clips(objects=locals())
 
 
@@ -572,4 +579,5 @@ def test_multiply_stereo_volume():
 
 
 if __name__ == "__main__":
-    pytest.main()
+    # pytest.main()
+    test_loop()