From 67c6fa43ac5ed85719179485b0fff4a8ad071a9f Mon Sep 17 00:00:00 2001 From: tassaron Date: Fri, 29 Apr 2022 23:19:47 -0400 Subject: switch Pillow-SIMD for Pillow It is easier for people to install with pip. We can always go back to SIMD in the future when we have a better install script. Packaged versions can still use Pillow-SIMD --- setup.py | 4 ++-- src/gui/mainwindow.py | 14 ++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index 5e01229..3709e7b 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ proj_packages = [SOURCE_PACKAGE_REGEX.sub(PACKAGE_NAME, name) for name in source setup( name='audio_visualizer_python', version=avp.__version__, - url='https://github.com/djfun/audio-visualizer-python/tree/feature-newgui', + url='https://github.com/djfun/audio-visualizer-python', license='MIT', description=PACKAGE_DESCRIPTION, author=getTextFromFile('AUTHORS', 'djfun, tassaron'), @@ -49,7 +49,7 @@ setup( package_dir={PACKAGE_NAME: SOURCE_DIRECTORY}, include_package_data=True, install_requires=[ - 'Pillow-SIMD', + 'Pillow', 'PyQt5', 'numpy', 'pytest' diff --git a/src/gui/mainwindow.py b/src/gui/mainwindow.py index c31eec9..1b28b7e 100644 --- a/src/gui/mainwindow.py +++ b/src/gui/mainwindow.py @@ -333,16 +333,7 @@ class MainWindow(QtWidgets.QMainWindow): self.openProject(self.currentProject, prompt=False) self.drawPreview(True) - # verify Pillow version - if not self.settings.value("pilMsgShown") \ - and 'post' not in Image.__version__: - self.showMessage( - msg="You are using the standard version of the " - "Python imaging library (Pillow %s). Upgrade " - "to the Pillow-SIMD fork to enable hardware accelerations " - "and export videos faster." % Image.__version__ - ) - self.settings.setValue("pilMsgShown", True) + log.info("Pillow version %s", Image.__version__) # verify Ffmpeg version if not self.settings.value("ffmpegMsgShown"): @@ -351,8 +342,7 @@ class MainWindow(QtWidgets.QMainWindow): ffmpegVers = checkOutput( ['ffmpeg', '-version'], stderr=f ) - goodVersion = (str(ffmpegVers).split()[2].startswith('3') or - str(ffmpegVers).split()[2].startswith('4')) + goodVersion = str(ffmpegVers).split()[2].startswith('4') except Exception: goodVersion = False else: -- cgit v1.2.3