From 431a5fbb158e7ac7a63be6a5aa333a5bad289dec Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 10 Nov 2012 16:51:23 +0000 Subject: [PATCH] Fix from misalignment --- openlp/core/lib/serviceitem.py | 6 ------ openlp/core/ui/media/mediacontroller.py | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index df0dfb169..ab8d92c5e 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -456,12 +456,6 @@ class ServiceItem(object): if length > 0: 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): """ Returns the frames for the ServiceItem diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 55aa1d02a..24612d9b4 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -379,7 +379,7 @@ class MediaController(object): controller.media_info.volume = controller.volumeSlider.value() controller.media_info.is_background = False controller.media_info.file_info = \ - QtCore.QFileInfo(serviceItem.get_filename()) + QtCore.QFileInfo(serviceItem.get_frame_path()) display = self._define_display(controller) if controller.isLive: isValid = self._check_file_type(controller, display, serviceItem)