From cdc810de67716ee06fed8df2b3c980df329f72c0 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 7 Dec 2012 06:04:15 +0000 Subject: [PATCH] Correct fix this time --- openlp/plugins/media/lib/mediaitem.py | 4 ++-- openlp/plugins/songs/forms/editsongform.py | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 2965eb53a..1ab36ff45 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -316,9 +316,9 @@ class MediaMediaItem(MediaManagerItem): key=lambda filename: os.path.split(unicode(filename))[1]) ext = [] if type == MediaType.Audio: - ext = self.plugin.audio_extensions_list + ext = self.plugin.mediaController.audio_extensions_list else: - ext = self.plugin.video_extensions_list + ext = self.plugin.mediaController.video_extensions_list ext = map(lambda x: x[1:], ext) media = filter(lambda x: os.path.splitext(x)[1] in ext, media) return media diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 378a1c14c..a1242552a 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -58,7 +58,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): Constructor """ QtGui.QDialog.__init__(self, parent) - self.parent = parent self.mediaitem = mediaitem self.song = None # can this be automated? @@ -180,8 +179,12 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): set_case_insensitive_completer(self.themes, self.themeComboBox) def loadMediaFiles(self): - self.audioAddFromMediaButton.setVisible(True) - self.mediaForm.populateFiles(self.parent.mediaController.audio_extensions_list) + self.audioAddFromMediaButton.setVisible(False) + for plugin in self.parent().pluginManager.plugins: + if plugin.name == u'media' and plugin.status == PluginStatus.Active: + self.audioAddFromMediaButton.setVisible(True) + self.mediaForm.populateFiles(plugin.mediaItem.getList(MediaType.Audio)) + break def newSong(self): log.debug(u'New Song')