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

bugfixing

Browse Source
This commit is contained in:
rimach 2011-12-05 19:48:32 +01:00
parent ae5998e2dc
commit 2df4a1903e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,8 +311,12 @@ class MediaController(object):
isValid = self.check_file_type(controller, display) isValid = self.check_file_type(controller, display)
display.override[u'theme'] = u'' display.override[u'theme'] = u''
display.override[u'video'] = True display.override[u'video'] = True
if not controller.media_info.is_background:
controller.media_info.start_time = display.serviceItem.start_time controller.media_info.start_time = display.serviceItem.start_time
controller.media_info.end_time = display.serviceItem.end_time controller.media_info.end_time = display.serviceItem.end_time
else:
controller.media_info.start_time = 0
controller.media_info.end_time = 0
elif controller.previewDisplay: elif controller.previewDisplay:
display = controller.previewDisplay display = controller.previewDisplay
isValid = self.check_file_type(controller, display) isValid = self.check_file_type(controller, display)

2
openlp/core/ui/media/vlcplayer.py
View File

@ -31,7 +31,7 @@ from datetime import datetime
try: try:
import vlc import vlc
vlc_available = bool(vlc.get_default_instance()) vlc_available = bool(vlc.get_default_instance())
except ImportError: except (ImportError, WindowsError):
vlc_available = False vlc_available = False
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui