[vlc-commits] On MacOS X search for plugins in modules/ and plugins/ directories

[Jean Brouwers]

vlc/python | branch: master | Jean Brouwers <MrJean1 at Gmail.com> | Thu Apr  7 16:11:41 2016 +0200| [aacd7a46ce528eab24fcac8fbc5606873ac434ee] | committer: Olivier Aubert

On MacOS X search for plugins in modules/ and plugins/ directories

Signed-off-by: Olivier Aubert <contact at olivieraubert.net>

> http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=aacd7a46ce528eab24fcac8fbc5606873ac434ee
---

 generated/vlc.py    |   10 ++++++----
 generator/header.py |    8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/generated/vlc.py b/generated/vlc.py
index 6953da3..0388f96 100644
--- a/generated/vlc.py
+++ b/generated/vlc.py
@@ -50,7 +50,7 @@ import functools
 from inspect import getargspec
 
 __version__ = "N/A"
-build_date  = "Thu Apr  7 16:08:23 2016"
+build_date  = "Thu Apr  7 16:11:32 2016"
 
 # The libvlc doc states that filenames are expected to be in UTF8, do
 # not rely on sys.getfilesystemencoding() which will be confused,
@@ -159,9 +159,11 @@ def find_lib():
         p = d + 'lib/libvlc.dylib'
         if os.path.exists(p):
             dll = ctypes.CDLL(p)
-            d += 'modules'
-            if os.path.isdir(d):
-                plugin_path = d
+            for p in ('modules', 'plugins'):
+                p = d + p
+                if os.path.isdir(p):
+                    plugin_path = p
+                    break
         else:  # hope, some PATH is set...
             dll = ctypes.CDLL('libvlc.dylib')
 
diff --git a/generator/header.py b/generator/header.py
index e853b68..fcdaa19 100755
--- a/generator/header.py
+++ b/generator/header.py
@@ -158,9 +158,11 @@ def find_lib():
         p = d + 'lib/libvlc.dylib'
         if os.path.exists(p):
             dll = ctypes.CDLL(p)
-            d += 'modules'
-            if os.path.isdir(d):
-                plugin_path = d
+            for p in ('modules', 'plugins'):
+                p = d + p
+                if os.path.isdir(p):
+                    plugin_path = p
+                    break
         else:  # hope, some PATH is set...
             dll = ctypes.CDLL('libvlc.dylib')