forked from openlp/openlp
pep8 fixes
This commit is contained in:
parent
c5e5f5b889
commit
a6f5251d7e
@ -65,15 +65,14 @@ def get_vlc():
|
||||
if 'openlp.core.ui.media.vendor.vlc' in sys.modules:
|
||||
# If VLC has already been imported, no need to do all the stuff below again
|
||||
return sys.modules['openlp.core.ui.media.vendor.vlc']
|
||||
|
||||
is_vlc_available = False
|
||||
try:
|
||||
if is_macosx():
|
||||
# Newer versions of VLC on OS X need this. See https://forum.videolan.org/viewtopic.php?t=124521
|
||||
os.environ['VLC_PLUGIN_PATH'] = '/Applications/VLC.app/Contents/MacOS/plugins'
|
||||
# On Windows when frozen in PyInstaller, we need to blank SetDllDirectoryW to allow loading of the VLC dll.
|
||||
# This is due to limitations (by desgin) in PyInstaller. SetDllDirectoryW original value is restored once
|
||||
# VLC has been imported.
|
||||
# This is due to limitations (by desgin) in PyInstaller. SetDllDirectoryW original value is restored once
|
||||
# VLC has been imported.
|
||||
if is_win():
|
||||
buffer_size = 1024
|
||||
dll_directory = ctypes.create_unicode_buffer(buffer_size)
|
||||
|
@ -220,4 +220,3 @@ class SongSelectImport(object):
|
||||
db_song.add_author(author)
|
||||
self.db_manager.save_object(db_song)
|
||||
return db_song
|
||||
|
||||
|
@ -427,4 +427,3 @@ if __name__ == '__main__':
|
||||
else:
|
||||
if not main():
|
||||
sys.exit(1)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user