diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 70f56fab9..d86597b40 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -325,6 +325,12 @@ class ServiceItem(object): """ return self._raw_frames[row][u'title'] + def get_frame_path(self, row=0): + """ + Returns the title of the raw frame + """ + return self._raw_frames[row][u'path'] + def request_audit(self): if self.audit: - Receiver.send_message(u'songusage_live', self.audit) \ No newline at end of file + Receiver.send_message(u'songusage_live', self.audit) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index d11c4007e..c802219b5 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -466,7 +466,7 @@ class SlideController(QtGui.QWidget): else: blanked = False Receiver.send_message(u'%s_start' % serviceItem.name.lower(), \ - [serviceItem.title, serviceItem.service_item_path, + [serviceItem.title, serviceItem.get_frame_path(), serviceItem.get_frame_title(), slideno, self.isLive, blanked]) self.slideList = {} width = self.parent.ControlSplitter.sizes()[self.split] @@ -517,6 +517,7 @@ class SlideController(QtGui.QWidget): label.setPixmap(QtGui.QPixmap.fromImage(pixmap)) self.PreviewListWidget.setCellWidget(framenumber, 1, label) slide_height = width * self.parent.RenderManager.screen_ratio + row += 1 rowitem.setText(unicode(row)) self.PreviewListWidget.setItem(framenumber, 0, rowitem) self.PreviewListWidget.setItem(framenumber, 1, item) @@ -753,7 +754,7 @@ class SlideController(QtGui.QWidget): def onMediaStart(self, item): if self.isLive: Receiver.send_message(u'%s_start' % item.name.lower(), \ - [item.title, item.service_item_path, + [item.title, item.get_frame_path(), item.get_frame_title(), self.isLive, self.blankButton.isChecked()]) else: self.mediaObject.stop()