And the docs are a bit better again...

Author: dschreij

README.md

@@ -1,7 +1,6 @@
 #Movie decoder for Python based on MoviePy
 
-This library allows you to play and render movies in Python. It is based on the
-(rather excellent) [MoviePy](http://zulko.github.io/moviepy/) module created by Zulko, which offers a convenient Python interface to ffmpeg. This library should hence be able to decode any format that ffmpeg supports. If ffmpeg is not found to be installed, moviepy will download it for you on first use, which may take some time (keep an eye on that terminal/command prompt to see the download progress).
+This library allows you to decode and render movies in Python. It is based on the (rather excellent) [MoviePy](http://zulko.github.io/moviepy/) module created by Zulko, which offers a convenient Python interface to ffmpeg. This library should hence be able to decode any format that ffmpeg supports. If ffmpeg is not found to be installed, moviepy will download it for you on first use, which may take some time (keep an eye on that terminal/command prompt to see the download progress).
 
 One will have to implement the actual rendering of each frame himself, but you can use the play.py module included in this repository as an example. The `play.py` shows how to play a video using OpenGL+pygame for the video rendering and pyaudio for audio playback (using pygame.mixer is also an option, but that doesn't work smoothly yet).
 
@@ -35,6 +34,7 @@ This module depends on the following other libraries.
 
 - MoviePy (http://zulko.github.io/moviepy/)
 - pyAudio (https://people.csail.mit.edu/hubert/pyaudio/)
+- numpy (http://www.numpy.org)
 
 That should be enough to get you started, if you plan to implement your own rendering functions for video and audio. If you also want to be able to view the example provided by `play.py` you further need
 

docs/source/dependencies.md

@@ -1,12 +1,12 @@
 ## Dependencies
 
-This module depends on the following other libraries.
+This module depends on the following libraries:
 
 - MoviePy (<http://zulko.github.io/moviepy/>)
 - pyaudio (<https://people.csail.mit.edu/hubert/pyaudio/>)
 - numpy (<http://www.numpy.org/>)
 
-That should be enough to get you started when you plan to implement your own rendering functions to display the video frames. If you also want to be able to view the example provided by `play.py` you furthermore need
+That should get you started if you plan to implement your own rendering functions to display the video frames. When you also want to be able to view the example provided by `play.py` you furthermore need
 
 - pygame (<http://www.pygame.org/>)
 - pyOpenGL (<http://pyopengl.sourceforge.net/>)

docs/source/index.rst

@@ -5,12 +5,15 @@
 
 Media decoder documentation
 ===========================
-
 This library allows you to decode and render video files (and in the future also
-audio files) in Python. It provides an internal clock that determines which 
-(video and/or audio) frame needs to be displayed at a specified time, and this frame 
-can then (optionally) be passed on to a callback function that takes care of the 
-actual rendering of the frame. In short, this library should help you get started 
+separate audio files) in Python. The user thus has to take care of the rendering of these 
+frames himself by writing the necessary rendering functions 
+(although modules for rendering sound are included in the package). 
+
+There is an internal clock (class ``Timer``) that determines which 
+video and audio frame needs to be rendered at a specified time, and these frames 
+can then (optionally) be passed to a callback functions which take care of the 
+actual rendering. In short, this library should help you get started 
 when you want to implement your own video player and want to have full control over
 the way audio and video is rendered.
 
@@ -20,10 +23,6 @@ render any media format that ffmpeg supports. If ffmpeg is not found, moviepy
 will download it for you on first usage, which may take some time 
 (so keep an eye on that terminal/command prompt to track the download progress).
 
-This library's main purpose is to decode video and/or audio files and supply the 
-user with video and audio frames depending on the playtime of the media stream. 
-The user thus has to take care of the rendering of these frames himself (although 
-modules for sound rendering are included in the package). 
 The ``play.py`` contains an example of how to play a video using OpenGL+pygame for 
 the video rendering and pyaudio for audio playback (using pygame.mixer is also an 
 option, but that doesn't work smoothly yet). You can play a video by calling 

mediadecoder/timer.py

@@ -12,9 +12,17 @@
 
 class Timer(object):
 	""" Timer serves as a video clock that is used to determine which frame needs to be
-	displayed at the specified time. It runs in a separate thread. 
-	Time can be polled by checking its property clock.time, and the current frame
-	can be determined by checking clock.current_frame. """
+	displayed at a specified time. the clock runs in its own separate thread. 
+	Say you have an instance of Timer called ``clock``. The time can be polled by 
+	checking 
+
+	>> clock.time 
+
+	and the current frame can be determined by checking 
+
+	>> clock.current_frame. 
+
+	"""
 
 	def __init__(self, fps=None, max_duration=None):
 		""" Constructor.

setup.py

@@ -28,9 +28,10 @@
 		'moviepy',
 		'numpy',
 	],
+	license='MIT',
 	classifiers=[
 		'Intended Audience :: Developers',
-		'Topic :: Desktop Environment',
+		'Environment :: Console',
 		'Topic :: Documentation :: Sphinx',
 		'Topic :: Multimedia :: Sound/Audio',
 		'Topic :: Multimedia :: Sound/Audio :: Players',
@@ -40,7 +41,6 @@
 		'Operating System :: Microsoft :: Windows',
 		'Operating System :: POSIX',
 		'License :: OSI Approved :: MIT License',
-		'Programming Language :: Python :: 2',
-		'Programming Language :: Python :: 3',
+		'Programming Language :: Python',
 	],
 )