forked from openlp/openlp
Media and Blank screen now play together nicely.
This commit is contained in:
parent
ad40020169
commit
e6e6eeb7c0
@ -298,6 +298,7 @@ class MainDisplay(DisplayWidget):
|
||||
log.debug(u'Play the new media, Live ')
|
||||
if not self.mediaLoaded and not self.displayBlank:
|
||||
self.blankDisplay()
|
||||
self.display_frame = self.blankFrame
|
||||
self.firstTime = True
|
||||
self.mediaLoaded = True
|
||||
self.display.hide()
|
||||
@ -326,3 +327,4 @@ class MainDisplay(DisplayWidget):
|
||||
self.mediaLoaded = False
|
||||
self.video.setVisible(False)
|
||||
self.display.show()
|
||||
self.blankDisplay(False)
|
||||
|
@ -441,7 +441,6 @@ class SlideController(QtGui.QWidget):
|
||||
self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag),
|
||||
self.onSongBarHandler)
|
||||
item.setText(frame[u'text'])
|
||||
#print {u'x':frame[u'text']}
|
||||
else:
|
||||
label = QtGui.QLabel()
|
||||
label.setMargin(4)
|
||||
@ -493,7 +492,6 @@ class SlideController(QtGui.QWidget):
|
||||
"""
|
||||
Blank the screen.
|
||||
"""
|
||||
print "Button Pressed", blanked
|
||||
if self.serviceItem is not None:
|
||||
if self.serviceItem.is_command():
|
||||
if blanked:
|
||||
|
Loading…
Reference in New Issue
Block a user