raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Revert mediacontroller changes

Browse Source 
Revert the changes because Tim insists on it.
I do not think he is right but revert anyway to get the other changes into trunk.
This commit is contained in:
Bastian Germann 2019-04-10 18:59:16 +02:00
parent 414c1c59db
commit 4a6dbacfdf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/core/ui/media/mediacontroller.py
View File

@ -26,8 +26,13 @@ related to playing media, such as sliders.
import datetime import datetime
import logging import logging
try:
from pymediainfo import MediaInfo
pymediainfo_available = True
except ImportError:
pymediainfo_available = False
from subprocess import check_output from subprocess import check_output
from pymediainfo import MediaInfo
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore, QtWidgets
from openlp.core.state import State from openlp.core.state import State
@ -163,11 +168,11 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
self.setup() self.setup()
self.vlc_player = VlcPlayer(self) self.vlc_player = VlcPlayer(self)
State().add_service("mediacontroller", 0) State().add_service("mediacontroller", 0)
if get_vlc(): if get_vlc() and pymediainfo_available:
State().update_pre_conditions("mediacontroller", True) State().update_pre_conditions("mediacontroller", True)
else: else:
State().missing_text("mediacontroller", translate('OpenLP.SlideController', State().missing_text("mediacontroller", translate('OpenLP.SlideController',
"VLC is missing, so you are unable to play any media")) "VLC or pymediainfo are missing, so you are unable to play any media"))
self._generate_extensions_lists() self._generate_extensions_lists()
return True return True