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

Live generation cleaned up

Browse Source
This commit is contained in:
Tim Bentley 2010-06-05 17:06:39 +01:00
parent 7bf8e71acf
commit 8da2167ebe
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp/plugins/songs/lib/mediaitem.py
View File

@ -334,21 +334,12 @@ class SongMediaItem(MediaManagerItem):
if len(order) == 0: if len(order) == 0:
break break
for verse in verseList: for verse in verseList:
if verse[1]:
# if verse[0][u'type'] == "Verse" \
# or verse[0][u'type'] == "Chorus":
if verse[0][u'label'] == order[1:] and \ if verse[0][u'label'] == order[1:] and \
verse[0][u'type'][0] == order[0]: verse[0][u'type'][0] == order[0]:
verseTag = u'%s:%s' % \ verseTag = u'%s:%s' % \
(verse[0][u'type'], verse[0][u'label']) (verse[0][u'type'], verse[0][u'label'])
service_item.add_from_text\ service_item.add_from_text\
(verse[1][:30], verse[1], verseTag) (verse[1][:30], verse[1], verseTag)
# else:
# if verse[0][u'type'][0] == order[0]:
# verseTag = u'%s:%s' % \
# (verse[0][u'type'], verse[0][u'label'])
# service_item.add_from_text\
# (verse[1][:30], verse[1], verseTag)
else: else:
verses = song.lyrics.split(u'\n\n') verses = song.lyrics.split(u'\n\n')
for slide in verses: for slide in verses: