forked from openlp/openlp
Video cleanups for display
This commit is contained in:
parent
4b38c22d30
commit
5ba7febc3b
@ -51,8 +51,10 @@ class DisplayManager(QtGui.QWidget):
|
|||||||
QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
|
QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay)
|
QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay)
|
||||||
# QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
# QtCore.SIGNAL(u'videodisplay_start'), self.hideDisplayForVideo)
|
QtCore.SIGNAL(u'videodisplay_start'), self.onStartVideo)
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'videodisplay_stop'), self.onStopVideo)
|
||||||
|
|
||||||
def setup(self):
|
def setup(self):
|
||||||
self.videoDisplay.setup()
|
self.videoDisplay.setup()
|
||||||
@ -78,6 +80,22 @@ class DisplayManager(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
self.mainDisplay.addAlert(alertMessage, location)
|
self.mainDisplay.addAlert(alertMessage, location)
|
||||||
|
|
||||||
|
def onStartVideo(self, item):
|
||||||
|
"""
|
||||||
|
Handles the Starting of a Video and Display Management
|
||||||
|
"""
|
||||||
|
self.videoDisplay.setVisible(True)
|
||||||
|
self.mainDisplay.setVisible(False)
|
||||||
|
self.videoDisplay.onMediaQueue(item)
|
||||||
|
|
||||||
|
def onStopVideo(self):
|
||||||
|
"""
|
||||||
|
Handles the Stopping of a Video and Display Management
|
||||||
|
"""
|
||||||
|
self.mainDisplay.setVisible(True)
|
||||||
|
self.videoDisplay.setVisible(False)
|
||||||
|
self.videoDisplay.onMediaStop()
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
"""
|
"""
|
||||||
Handles the closure of the displays
|
Handles the closure of the displays
|
||||||
@ -388,14 +406,10 @@ class VideoDisplay(Phonon.VideoWidget):
|
|||||||
except AttributeError:
|
except AttributeError:
|
||||||
pass
|
pass
|
||||||
self.setWindowFlags(flags)
|
self.setWindowFlags(flags)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
QtCore.SIGNAL(u'videodisplay_start'), self.onMediaQueue)
|
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'videodisplay_play'), self.onMediaPlay)
|
QtCore.SIGNAL(u'videodisplay_play'), self.onMediaPlay)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'videodisplay_pause'), self.onMediaPause)
|
QtCore.SIGNAL(u'videodisplay_pause'), self.onMediaPause)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
QtCore.SIGNAL(u'videodisplay_stop'), self.onMediaStop)
|
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'videodisplay_background'), self.onMediaBackground)
|
QtCore.SIGNAL(u'videodisplay_background'), self.onMediaBackground)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
@ -462,8 +476,8 @@ class VideoDisplay(Phonon.VideoWidget):
|
|||||||
Set up a video to play from the serviceitem.
|
Set up a video to play from the serviceitem.
|
||||||
"""
|
"""
|
||||||
log.debug(u'VideoDisplay Queue new media message %s' % message)
|
log.debug(u'VideoDisplay Queue new media message %s' % message)
|
||||||
file = os.path.join(message[0].get_frame_path(),
|
file = os.path.join(message.get_frame_path(),
|
||||||
message[0].get_frame_title())
|
message.get_frame_title())
|
||||||
self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
|
self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
|
||||||
self._play()
|
self._play()
|
||||||
|
|
||||||
@ -551,21 +565,6 @@ class AudioPlayer(QtCore.QObject):
|
|||||||
self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
|
self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
|
||||||
Phonon.createPath(self.mediaObject, self.audioObject)
|
Phonon.createPath(self.mediaObject, self.audioObject)
|
||||||
|
|
||||||
# QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
# QtCore.SIGNAL(u'videodisplay_start'), self.onMediaQueue)
|
|
||||||
# QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
# QtCore.SIGNAL(u'videodisplay_play'), self.onMediaPlay)
|
|
||||||
# QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
# QtCore.SIGNAL(u'videodisplay_pause'), self.onMediaPause)
|
|
||||||
# QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
# QtCore.SIGNAL(u'videodisplay_stop'), self.onMediaStop)
|
|
||||||
# QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
# QtCore.SIGNAL(u'videodisplay_background'), self.onMediaBackground)
|
|
||||||
# QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
# QtCore.SIGNAL(u'config_updated'), self.setup)
|
|
||||||
# QtCore.QObject.connect(self.mediaObject,
|
|
||||||
# QtCore.SIGNAL(u'finished()'), self.onMediaBackground)
|
|
||||||
|
|
||||||
def setup(self):
|
def setup(self):
|
||||||
"""
|
"""
|
||||||
Sets up the Audio Player for use
|
Sets up the Audio Player for use
|
||||||
|
@ -923,8 +923,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
log.debug(u'SlideController onMediaStart')
|
log.debug(u'SlideController onMediaStart')
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
Receiver.send_message(u'videodisplay_start',
|
Receiver.send_message(u'videodisplay_start', item)
|
||||||
[item, self.blankButton.isChecked()])
|
|
||||||
else:
|
else:
|
||||||
self.mediaObject.stop()
|
self.mediaObject.stop()
|
||||||
self.mediaObject.clearQueue()
|
self.mediaObject.clearQueue()
|
||||||
|
Loading…
Reference in New Issue
Block a user