vlc/python | branch: master | Olivier Aubert <[email protected]> | Wed Dec 8 18:44:54 2010 +0100| [0e393a06fde6b0acca6f1fbe558bcaa343dcfaab] | committer: Olivier Aubert
Strip trailing whitespace > http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=0e393a06fde6b0acca6f1fbe558bcaa343dcfaab --- footer.py | 2 +- generate.py | 4 ++-- header.py | 4 ++-- override.py | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/footer.py b/footer.py index f1ee857..a4b0f1b 100644 --- a/footer.py +++ b/footer.py @@ -101,7 +101,7 @@ if __name__ == '__main__': media = instance.media_new(movie, 'sub-filter=marq') # load marqee option except NameError: print('NameError: %s (%s vs LibVLC %s)' % (sys.exc_info()[1], - __version__, + __version__, libvlc_get_version())) sys.exit(1) player = instance.media_player_new() diff --git a/generate.py b/generate.py index 4f8229a..8f9c66e 100755 --- a/generate.py +++ b/generate.py @@ -308,7 +308,7 @@ class Par(object): # be hardcoded this way, but works all right for now. def flags(self, out=(), default=None): """Return parameter flags tuple. - + Return the parameter flags tuple for the given parameter type and name and a list of parameter names documented as [OUT]. @@ -887,7 +887,7 @@ class _Enum(ctypes.c_ulong): # arg names, excluding output args # and rename first arg to 'self' args = ', '.join(['self'] + f.args(1)) #PYCHOK flake - + # xformed doc string without first @param docs = self.epylink(f.epydocs(1, 8), striprefix) #PYCHOK flake diff --git a/header.py b/header.py index 6044541..65ee5de 100755 --- a/header.py +++ b/header.py @@ -57,7 +57,7 @@ if sys.platform.startswith('linux'): elif sys.platform.startswith('win'): import ctypes.util as u - p = u.find_library('libvlc.dll') + p = u.find_library('libvlc.dll') if p is None: try: # some registry settings import _winreg as w # leaner than win32api, win32con @@ -158,7 +158,7 @@ class _Ctype(object): """(INTERNAL) ctypes parameter conversion method. """ return this._as_parameter_ - + class ListPOINTER(object): """Just like a POINTER but accept a list of ctype as an argument. """ diff --git a/override.py b/override.py index 762ea54..ea18988 100644 --- a/override.py +++ b/override.py @@ -75,8 +75,8 @@ class Instance: i = head while i: i = i.contents - d = [{'id': libvlc_audio_output_device_id (self, i.name, d), - 'longname': libvlc_audio_output_device_longname(self, i.name, d)} + d = [{'id': libvlc_audio_output_device_id (self, i.name, d), + 'longname': libvlc_audio_output_device_longname(self, i.name, d)} for d in range(libvlc_audio_output_device_count (self, i.name))] r.append({'name': i.name, 'description': i.description, 'devices': d}) i = i.next @@ -200,17 +200,17 @@ class MediaPlayer: #PYCHOK expected (comment is lost) Coordinates are expressed in terms of the decoded video resolution, B{not} in terms of pixels on the screen/viewport. To get the latter, you must query your windowing system directly. - + Either coordinate may be negative or larger than the corresponding size of the video, if the cursor is outside the rendering area. - + @warning: The coordinates may be out-of-date if the pointer is not located on the video rendering area. LibVLC does not track the mouse pointer if the latter is outside the video widget. - + @note: LibVLC does not support multiple mouse pointers (but does support multiple input devices sharing the same pointer). - + @param num: video number (default 0). """ r = libvlc_video_get_cursor(self, num) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
