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

Fix from misalignment

Browse Source
This commit is contained in:
Tim Bentley 2012-11-10 16:51:23 +00:00
parent 69b2bcb21f
commit 431a5fbb15
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,12 +456,6 @@ class ServiceItem(object):
if length > 0: if length > 0:
self.add_capability(ItemCapabilities.HasVariableStartTime) self.add_capability(ItemCapabilities.HasVariableStartTime)
def get_filename(self):
"""
Returns the full filename
"""
return os.path.join(self.get_frame_path(), self.get_frame_title())
def get_frames(self): def get_frames(self):
""" """
Returns the frames for the ServiceItem Returns the frames for the ServiceItem

2
openlp/core/ui/media/mediacontroller.py
View File

@ -379,7 +379,7 @@ class MediaController(object):
controller.media_info.volume = controller.volumeSlider.value() controller.media_info.volume = controller.volumeSlider.value()
controller.media_info.is_background = False controller.media_info.is_background = False
controller.media_info.file_info = \ controller.media_info.file_info = \
QtCore.QFileInfo(serviceItem.get_filename()) QtCore.QFileInfo(serviceItem.get_frame_path())
display = self._define_display(controller) display = self._define_display(controller)
if controller.isLive: if controller.isLive:
isValid = self._check_file_type(controller, display, serviceItem) isValid = self._check_file_type(controller, display, serviceItem)