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

Correct fix this time

Browse Source
This commit is contained in:
Tim Bentley 2012-12-07 06:04:15 +00:00
parent 901f835e90
commit cdc810de67
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/plugins/media/lib/mediaitem.py
View File

@ -316,9 +316,9 @@ class MediaMediaItem(MediaManagerItem):
key=lambda filename: os.path.split(unicode(filename))[1]) key=lambda filename: os.path.split(unicode(filename))[1])
ext = [] ext = []
if type == MediaType.Audio: if type == MediaType.Audio:
ext = self.plugin.audio_extensions_list ext = self.plugin.mediaController.audio_extensions_list
else: else:
ext = self.plugin.video_extensions_list ext = self.plugin.mediaController.video_extensions_list
ext = map(lambda x: x[1:], ext) ext = map(lambda x: x[1:], ext)
media = filter(lambda x: os.path.splitext(x)[1] in ext, media) media = filter(lambda x: os.path.splitext(x)[1] in ext, media)
return media return media

9
openlp/plugins/songs/forms/editsongform.py
View File

@ -58,7 +58,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
Constructor Constructor
""" """
QtGui.QDialog.__init__(self, parent) QtGui.QDialog.__init__(self, parent)
self.parent = parent
self.mediaitem = mediaitem self.mediaitem = mediaitem
self.song = None self.song = None
# can this be automated? # can this be automated?
@ -180,8 +179,12 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
set_case_insensitive_completer(self.themes, self.themeComboBox) set_case_insensitive_completer(self.themes, self.themeComboBox)
def loadMediaFiles(self): def loadMediaFiles(self):
self.audioAddFromMediaButton.setVisible(True) self.audioAddFromMediaButton.setVisible(False)
self.mediaForm.populateFiles(self.parent.mediaController.audio_extensions_list) 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): def newSong(self):
log.debug(u'New Song') log.debug(u'New Song')