diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index addfbcc76..7fed27145 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -107,7 +107,7 @@ class PresentationMediaItem(MediaManagerItem): #load the drop down selection if self.controllers[item].enabled: self.DisplayTypeComboBox.addItem(item) - if self.DisplayTypeComboBox.count > 1: + if self.DisplayTypeComboBox.count() > 1: self.DisplayTypeComboBox.insertItem(0, u'Automatic') self.DisplayTypeComboBox.setCurrentIndex(0) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index a7fa3bb6c..061eb737f 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -114,17 +114,3 @@ class PresentationPlugin(Plugin): 'programs. The choice of available presentation programs is ' 'available to the user in a drop down box.') return about_text - - def find_controller_by_type(self, filename): - filetype = os.path.splitext(filename)[1][1:] - if not filetype: - return None - for controller in self.controllers: - if self.controllers[controller].enabled: - if filetype in self.controllers[controller].supports: - return controller - for controller in self.controllers: - if self.controllers[controller].enabled: - if filetype in self.controllers[self.handler].alsosupports: - return controller - return None