openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

ServiceItem cleanup - fix media playing

This commit is contained in:
Tim Bentley 2009-11-14 10:51:58 +00:00
parent b1766d7ee4
commit b0ae4e4ceb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/serviceitem.py
View File

@ -293,8 +293,8 @@ class ServiceItem(object):
else:
return self._raw_frames[row][u'image']
def get_frame_title(self, row):
def get_frame_title(self, row=0):
"""
Returns the title of the raw frame
"""
return self._raw_frames[row][u'title']
return self._raw_frames[row][u'title']

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

@ -88,7 +88,7 @@ class SlideController(QtGui.QWidget):
self.timer_id = 0
self.wasCommandItem = False
self.songEdit = False
self.row = 0
self.selectedRow = 0
self.Panel = QtGui.QWidget(parent.ControlSplitter)
# Layout for holding panel
self.PanelLayout = QtGui.QVBoxLayout(self.Panel)
@ -404,14 +404,14 @@ class SlideController(QtGui.QWidget):
self.wasCommandItem = True
if self.isLive:
Receiver().send_message(u'%s_start' % item.name.lower(), \
[item.shortname, item.service_item_path,
item.service_frames[0][u'title'], self.isLive])
[item.title, item.service_item_path,
item.get_frame_title(), self.isLive])
else:
if item.is_media():
self.onMediaStart(item)
slideno = 0
if self.songEdit:
slideno = self.row
slideno = self.selectedRow
self.songEdit = False
self.displayServiceManagerItems(item, slideno)
@ -438,7 +438,7 @@ class SlideController(QtGui.QWidget):
self.wasCommandItem = False
if self.isLive:
Receiver().send_message(u'%s_start' % item.name.lower(), \
[item.shortname, item.service_item_path,
[item.name, item.service_item_path,
item.service_frames[0][u'title'], slideno, self.isLive])
else:
if item.is_media():
@ -523,7 +523,7 @@ class SlideController(QtGui.QWidget):
if this is the Live Controller also display on the screen
"""
row = self.PreviewListWidget.currentRow()
self.row = 0
self.selectedRow = 0
if row > -1 and row < self.PreviewListWidget.rowCount():
if self.serviceItem.is_command():
Receiver().send_message(u'%s_slide'% self.serviceItem.name.lower(), [row])
@ -536,7 +536,7 @@ class SlideController(QtGui.QWidget):
log.log(15, u'Slide Rendering took %4s' % (time.time() - before))
if self.isLive:
self.parent.mainDisplay.frameView(frame)
self.row = row
self.selectedRow = row
def onSlideChange(self, row):
"""
@ -642,7 +642,7 @@ class SlideController(QtGui.QWidget):
def onMediaStart(self, item):
self.mediaObject.stop()
self.mediaObject.clearQueue()
file = os.path.join(item.service_item_path, item.get_frame_title(0))
file = os.path.join(item.service_item_path, item.get_frame_title())
self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
self.onMediaPlay()
@ -667,4 +667,4 @@ class SlideController(QtGui.QWidget):
self.mediaObject.stop()
self.video.hide()
self.SlidePreview.clear()
self.SlidePreview.show()
self.SlidePreview.show()