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

Fix up presentations so they work again

Browse Source
This commit is contained in:
Tim Bentley 2010-04-30 06:50:52 +01:00
parent d28498611d
commit 591dc07354
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openlp/plugins/presentations/lib/messagelistener.py
View File

@ -217,7 +217,7 @@ class MessageListener(object):
isLive, item = self.decode_message(message) isLive, item = self.decode_message(message)
log.debug(u'Startup called with message %s' % message) log.debug(u'Startup called with message %s' % message)
isBlank = message[2] isBlank = message[2]
file = os.path.join(item.get_frame_path(), file = os.path.join(item.get_frame_path(),
item.get_frame_title()) item.get_frame_title())
self.handler = item.title self.handler = item.title
if self.handler == self.mediaitem.Automatic: if self.handler == self.mediaitem.Automatic:
@ -231,14 +231,17 @@ class MessageListener(object):
controller.addHandler(self.controllers[self.handler], file, isBlank) controller.addHandler(self.controllers[self.handler], file, isBlank)
def decode_message(self, message): def decode_message(self, message):
return message[1], message[0] if len(message) == 3:
return message[1], message[0], message[2]
def slide(self, message):
isLive, item = self.decode_message(message)
if isLive:
self.liveHandler.slide(slide, live)
else: else:
self.previewHandler.slide(slide, live) return message[1], message[0]
def slide(self, message):
isLive, item, slide = self.decode_message(message)
if isLive:
self.liveHandler.slide(slide, isLive)
else:
self.previewHandler.slide(slide, isLive)
def first(self, message): def first(self, message):
isLive, item = self.decode_message(message) isLive, item = self.decode_message(message)
@ -285,6 +288,6 @@ class MessageListener(object):
isLive, item = self.decode_message(message) isLive, item = self.decode_message(message)
if isLive: if isLive:
self.liveHandler.unblank() self.liveHandler.unblank()
def timeout(self): def timeout(self):
self.liveHandler.poll() self.liveHandler.poll()