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

Video cleanups

This commit is contained in:
Tim Bentley 2010-08-04 20:09:43 +01:00
parent 821911503e
commit 6d352df382
4 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/core/lib/renderer.py
View File

@ -293,19 +293,19 @@ class Renderer(object):
Results are cached for performance reasons. Results are cached for performance reasons.
""" """
assert(self._theme) assert(self._theme)
if self._theme.background_mode == u'transparent': # if self._theme.background_mode == u'transparent':
self.bg_frame = \ # self.bg_frame = \
QtGui.QPixmap(self.frame.width(), self.frame.height()) # QtGui.QPixmap(self.frame.width(), self.frame.height())
self.bg_frame.fill(QtCore.Qt.transparent) # self.bg_frame.fill(QtCore.Qt.transparent)
else: # else:
self.bg_frame = QtGui.QImage(self.frame.width(), self.bg_frame = QtGui.QImage(self.frame.width(),
self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied) self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied)
log.debug(u'render background %s start', self._theme.background_type) log.debug(u'render background %s start', self._theme.background_type)
painter = QtGui.QPainter() painter = QtGui.QPainter()
painter.begin(self.bg_frame) painter.begin(self.bg_frame)
if self._theme.background_mode == u'transparent': # if self._theme.background_mode == u'transparent':
painter.fillRect(self.frame.rect(), QtCore.Qt.transparent) # painter.fillRect(self.frame.rect(), QtCore.Qt.transparent)
else: # else:
if self._theme.background_type == u'solid': if self._theme.background_type == u'solid':
painter.fillRect(self.frame.rect(), painter.fillRect(self.frame.rect(),
QtGui.QColor(self._theme.background_color)) QtGui.QColor(self._theme.background_color))

19
openlp/core/ui/maindisplay.py
View File

@ -175,10 +175,8 @@ class MainDisplay(DisplayWidget):
The slide text to be displayed The slide text to be displayed
""" """
log.debug(u'alert') log.debug(u'alert')
js = "displayAlert('" + \ self.frame.evaluateJavaScript( "displayAlert('" + \
text.replace("\\", "\\\\").replace("\'", "\\\'") + "')" text.replace("\\", "\\\\").replace("\'", "\\\'") + "')")
print js
self.frame.evaluateJavaScript(js)
def image(self, image): def image(self, image):
""" """
@ -240,14 +238,16 @@ class MainDisplay(DisplayWidget):
self.frame.evaluateJavaScript( self.frame.evaluateJavaScript(
"document.getElementById('image').style.visibility = 'visible'") "document.getElementById('image').style.visibility = 'visible'")
def videoVolume(self, amount): def videoVolume(self, volume):
""" """
Changes the volume of a running video Changes the volume of a running video
""" """
log.debug(u'videoVolume') log.debug(u'videoVolume %d' % volume)
self.frame.evaluateJavaScript("document.getElementById('video').volume = 0") self.frame.evaluateJavaScript(
"document.getElementById('video').volume = %s" %
str(float(volume)/float(10)))
def video(self, videoPath, noSound=False): def video(self, videoPath, volume):
""" """
Loads and starts a video to run with the option of sound Loads and starts a video to run with the option of sound
""" """
@ -258,8 +258,7 @@ class MainDisplay(DisplayWidget):
self.frame.evaluateJavaScript( self.frame.evaluateJavaScript(
"document.getElementById('image').style.visibility = 'hidden'") "document.getElementById('image').style.visibility = 'hidden'")
self.videoPlay() self.videoPlay()
if noSound: self.videoVolume(volume)
self.videoVolume(0)
def loaded(self): def loaded(self):
""" """

5
openlp/core/ui/slidecontroller.py
View File

@ -672,7 +672,7 @@ class SlideController(QtGui.QWidget):
""" """
log.debug(u'mainDisplaySetBackground live = %s' % self.isLive) log.debug(u'mainDisplaySetBackground live = %s' % self.isLive)
if not self.display.primary: if not self.display.primary:
self.display.hideDisplay() self.onHideDisplay(True)
def onSlideBlank(self): def onSlideBlank(self):
""" """
@ -937,7 +937,7 @@ class SlideController(QtGui.QWidget):
log.debug(u'SlideController onMediaStart') log.debug(u'SlideController onMediaStart')
if self.isLive: if self.isLive:
file = os.path.join(item.get_frame_path(), item.get_frame_title()) file = os.path.join(item.get_frame_path(), item.get_frame_title())
self.display.video(file) self.display.video(file, self.volume)
self.volumeSlider.setValue(self.volume) self.volumeSlider.setValue(self.volume)
else: else:
self.mediaObject.stop() self.mediaObject.stop()
@ -954,6 +954,7 @@ class SlideController(QtGui.QWidget):
""" """
log.debug(u'SlideController mediaVolume') log.debug(u'SlideController mediaVolume')
self.volume = self.volumeSlider.value() self.volume = self.volumeSlider.value()
print self.volume
self.display.videoVolume(self.volume) self.display.videoVolume(self.volume)
def onMediaPause(self): def onMediaPause(self):

2
openlp/plugins/media/lib/mediaitem.py
View File

@ -115,7 +115,7 @@ class MediaMediaItem(MediaManagerItem):
'You must select a media file to replace the background with.')): 'You must select a media file to replace the background with.')):
item = self.listView.currentItem() item = self.listView.currentItem()
filename = unicode(item.data(QtCore.Qt.UserRole).toString()) filename = unicode(item.data(QtCore.Qt.UserRole).toString())
self.parent.liveController.display.video(filename, True) self.parent.liveController.display.video(filename, 0)
self.resetButton.setVisible(True) self.resetButton.setVisible(True)
def generateSlideData(self, service_item, item=None): def generateSlideData(self, service_item, item=None):