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

bugfixing

This commit is contained in:
rimach crichter@web.de 2011-06-08 16:49:48 +02:00
parent 592af0e181
commit c628b3aa09
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,7 @@ class SlideController(QtGui.QWidget):
def getControlPanel(self): def getControlPanel(self):
return self.controllerLayout return self.controllerLayout
def sendToPlugins(self, **kwargs): def sendToPlugins(self, *args):
""" """
This is the generic function to send signal for control widgets, This is the generic function to send signal for control widgets,
created from within other plugins created from within other plugins
@ -341,7 +341,7 @@ class SlideController(QtGui.QWidget):
""" """
sender = self.sender().objectName() or self.sender().text() sender = self.sender().objectName() or self.sender().text()
controller = self controller = self
Receiver.send_message('%s' % sender, [controller, kwargs]) Receiver.send_message('%s' % sender, [controller, args])
def setPreviewHotkeys(self, parent=None): def setPreviewHotkeys(self, parent=None):
self.previousItem.setObjectName(u'previousItemPreview') self.previousItem.setObjectName(u'previousItemPreview')

6
openlp/plugins/media/lib/mediamanager.py
View File

@ -247,7 +247,7 @@ class MediaManager(object):
#now start playing #now start playing
self.video_play([controller]) self.video_play([controller])
self.video_pause([controller]) self.video_pause([controller])
self.video_seek([controller, 0]) self.video_seek([controller, [0]])
self.video_play([controller]) self.video_play([controller])
self.set_controls_visible(controller, True) self.set_controls_visible(controller, True)
@ -312,7 +312,7 @@ class MediaManager(object):
Changes the volume of a running video Changes the volume of a running video
""" """
controller = msg[0] controller = msg[0]
vol = msg[1] vol = msg[1][0]
log.debug(u'video_volume %d' % vol) log.debug(u'video_volume %d' % vol)
for display in self.curDisplayMediaAPI.keys(): for display in self.curDisplayMediaAPI.keys():
if display.controller == controller: if display.controller == controller:
@ -324,7 +324,7 @@ class MediaManager(object):
""" """
log.debug(u'video_seek') log.debug(u'video_seek')
controller = msg[0] controller = msg[0]
seekVal = msg[1] seekVal = msg[1][0]
for display in self.curDisplayMediaAPI.keys(): for display in self.curDisplayMediaAPI.keys():
if display.controller == controller: if display.controller == controller:
self.curDisplayMediaAPI[display].seek(display, seekVal) self.curDisplayMediaAPI[display].seek(display, seekVal)