vlc/python | branch: master | Olivier Aubert <[email protected]> | Fri Apr 15 17:15:14 2016 +0200| [9eea13d2a2a3c6e0858eef5618d10eef855bd332] | committer: Olivier Aubert
Specify plugin path through the environment variable The command line option has long been removed > http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=9eea13d2a2a3c6e0858eef5618d10eef855bd332 --- generated/vlc.py | 9 +++++---- generator/header.py | 2 +- generator/override.py | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/generated/vlc.py b/generated/vlc.py index 6577869..8283c2f 100644 --- a/generated/vlc.py +++ b/generated/vlc.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: utf8 -*- +# -*- coding: utf-8 -*- # Python ctypes bindings for VLC # @@ -50,7 +50,7 @@ import functools from inspect import getargspec __version__ = "N/A" -build_date = "Fri Apr 15 16:45:33 2016" +build_date = "Fri Apr 15 17:12:59 2016" # The libvlc doc states that filenames are expected to be in UTF8, do # not rely on sys.getfilesystemencoding() which will be confused, @@ -1560,8 +1560,9 @@ class Instance(_Ctype): args.insert(0, 'vlc') if plugin_path is not None: - # specify plugin_path if detected, win32 and MacOS - args.insert(1, '--plugin-path="%s"' % (plugin_path,)) + # set plugin_path if detected, win32 and MacOS, + # if the user did not specify it itself. + os.environ.setdefault('VLC_PLUGIN_PATH', plugin_path) if PYTHON3: args = [ str_to_bytes(a) for a in args ] diff --git a/generator/header.py b/generator/header.py index fcdaa19..e9fe81d 100755 --- a/generator/header.py +++ b/generator/header.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: utf8 -*- +# -*- coding: utf-8 -*- # Python ctypes bindings for VLC # diff --git a/generator/override.py b/generator/override.py index fbb665b..309d7f9 100644 --- a/generator/override.py +++ b/generator/override.py @@ -29,8 +29,9 @@ class Instance: args.insert(0, 'vlc') if plugin_path is not None: - # specify plugin_path if detected, win32 and MacOS - args.insert(1, '--plugin-path="%s"' % (plugin_path,)) + # set plugin_path if detected, win32 and MacOS, + # if the user did not specify it itself. + os.environ.setdefault('VLC_PLUGIN_PATH', plugin_path) if PYTHON3: args = [ str_to_bytes(a) for a in args ] _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
