corrected bug that made pygame mandatory.

xuxiandi · Jan 26, 2014 · 68597cc · 68597cc
1 parent ddba657
commit 68597cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/moviepy/audio/AudioClip.py b/moviepy/audio/AudioClip.py
@@ -86,12 +86,13 @@ def to_audiofile(self,filename, fps=44100, nbytes=2, buffersize=5000,
                       codec, bitrate, verbose)
 
 try:
-    # Add methods preview (only if pygame installed)
+
+    # Add method preview (only if pygame installed)
     from moviepy.audio.io.preview import preview
     AudioClip.preview = preview
+
 except:
     pass
-from moviepy.audio.io.preview import preview
 
 
 class AudioArrayClip(AudioClip):
@@ -131,7 +132,6 @@ def gf(t):
         self.get_frame = gf
 
 
-
 class CompositeAudioClip(AudioClip):
 
     """

diff --git a/moviepy/video/compositing/CompositeVideoClip.py b/moviepy/video/compositing/CompositeVideoClip.py
@@ -85,7 +85,9 @@ def playing_clips(self, t=0):
         """ Returns a list of the clips in the composite clips that are
             actually playing at the given time `t`. """
         return [c for c in self.clips if c.is_playing(t)]
-
+
+
+
 def clips_array(array, rows_widths=None, cols_widths=None,
                 transparent = True, bg_color = (0,0,0)):
 

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 from setuptools import setup, find_packages
 
 setup(name='moviepy',
-      version='0.2.1.6.9',
+      version='0.2.1.6.91',
       author='Zulko 2013',
     description='Module for script-based video editing',
     long_description=open('README.rst').read(),