forked from openlp/openlp
bugfixing
This commit is contained in:
parent
11aae0bb82
commit
d88f437ffc
|
@ -278,10 +278,12 @@ class MediaController(object):
|
||||||
if self.video_play([controller]):
|
if self.video_play([controller]):
|
||||||
self.video_pause([controller])
|
self.video_pause([controller])
|
||||||
self.video_seek([controller, [0]])
|
self.video_seek([controller, [0]])
|
||||||
if self.video_play([controller]):
|
if controller.isLive and QtCore.QSettings().value(u'general/auto unblank',
|
||||||
self.set_controls_visible(controller, True)
|
QtCore.QVariant(False)).toBool():
|
||||||
log.debug(u'use %s controller' % self.curDisplayMediaAPI[display])
|
self.video_play([controller])
|
||||||
return True
|
self.set_controls_visible(controller, True)
|
||||||
|
log.debug(u'use %s controller' % self.curDisplayMediaAPI[display])
|
||||||
|
return True
|
||||||
else:
|
else:
|
||||||
critical_error_message_box(
|
critical_error_message_box(
|
||||||
translate('MediaPlugin.MediaItem', 'Unsupported File'),
|
translate('MediaPlugin.MediaItem', 'Unsupported File'),
|
||||||
|
|
|
@ -269,23 +269,6 @@ class SlideController(Controller):
|
||||||
translate('OpenLP.SlideController', 'Pause audio.'),
|
translate('OpenLP.SlideController', 'Pause audio.'),
|
||||||
self.onAudioPauseClicked, True)
|
self.onAudioPauseClicked, True)
|
||||||
self.audioPauseItem.setVisible(False)
|
self.audioPauseItem.setVisible(False)
|
||||||
# Build the volumeSlider.
|
|
||||||
self.volumeSlider = QtGui.QSlider(QtCore.Qt.Horizontal)
|
|
||||||
self.volumeSlider.setTickInterval(1)
|
|
||||||
self.volumeSlider.setTickPosition(QtGui.QSlider.TicksAbove)
|
|
||||||
self.volumeSlider.setMinimum(0)
|
|
||||||
self.volumeSlider.setMaximum(10)
|
|
||||||
else:
|
|
||||||
# Build the seekSlider.
|
|
||||||
self.seekSlider = Phonon.SeekSlider()
|
|
||||||
self.seekSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
|
|
||||||
self.seekSlider.setObjectName(u'seekSlider')
|
|
||||||
self.mediabar.addToolbarWidget(u'Seek Slider', self.seekSlider)
|
|
||||||
self.volumeSlider = Phonon.VolumeSlider()
|
|
||||||
self.volumeSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
|
|
||||||
self.volumeSlider.setObjectName(u'volumeSlider')
|
|
||||||
self.mediabar.addToolbarWidget(u'Audio Volume', self.volumeSlider)
|
|
||||||
self.controllerLayout.addWidget(self.mediabar)
|
|
||||||
# Screen preview area
|
# Screen preview area
|
||||||
self.previewFrame = QtGui.QFrame(self.splitter)
|
self.previewFrame = QtGui.QFrame(self.splitter)
|
||||||
self.previewFrame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
|
self.previewFrame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
|
||||||
|
|
|
@ -213,7 +213,7 @@ class MediaMediaItem(MediaManagerItem):
|
||||||
self.plugin.mediaController.video_reset(self.mediaController)
|
self.plugin.mediaController.video_reset(self.mediaController)
|
||||||
if self.mediaLength > 0:
|
if self.mediaLength > 0:
|
||||||
service_item.add_capability(
|
service_item.add_capability(
|
||||||
ItemCapabilities.AllowsVariableStartTime)
|
ItemCapabilities.HasVariableStartTime)
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
service_item.media_length = self.mediaLength
|
service_item.media_length = self.mediaLength
|
||||||
|
|
Loading…
Reference in New Issue