openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/vlc-plugin-path into lp:openlp.

Commit message:
Package the VLC plugins too.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/vlc-plugin-path/+merge/370014

Package the VLC plugins too.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/vlc-plugin-path into lp:openlp.

=== modified file 'openlp/core/app.py'
--- openlp/core/app.py	2019-05-24 18:50:51 +0000
+++ openlp/core/app.py	2019-07-11 17:18:44 +0000
@@ -391,7 +391,11 @@
             vlc_lib = 'libvlc.dylib'
         elif is_win():
             vlc_lib = 'libvlc.dll'
-        os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir) / vlc_lib)
+        # Path to libvlc
+        os.environ['PYTHON_VLC_LIB_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir) / 'vlc' / vlc_lib)
+        log.debug('VLC Path: {}'.format(os.environ['PYTHON_VLC_LIB_PATH']))
+        # Path to VLC directory containing VLC's "plugins" directory
+        os.environ['PYTHON_VLC_MODULE_PATH'] = str(AppLocation.get_directory(AppLocation.AppDir) / 'vlc')
         log.debug('VLC Path: {}'.format(os.environ['PYTHON_VLC_LIB_PATH']))
     # Initialise the Registry
     Registry.create()