openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-888815 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #888815 in OpenLP: "Linked audio will not play when song sent Live from a saved Service"
  https://bugs.launchpad.net/openlp/+bug/888815

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-888815/+merge/97103

Fixed bug #888815 where the files were not being loaded into the audio player because their paths were not absolute. Now when the files are loaded from the saved service file, the paths recreated properly.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-888815/+merge/97103
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-888815 into lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2012-01-29 22:13:51 +0000
+++ openlp/core/lib/serviceitem.py	2012-03-12 21:18:29 +0000
@@ -325,7 +325,10 @@
         if u'media_length' in header:
             self.media_length = header[u'media_length']
         if u'background_audio' in header:
-            self.background_audio = header[u'background_audio']
+            self.background_audio = []
+            for filename in header[u'background_audio']:
+                # Give them real file paths
+                self.background_audio.append(os.path.join(path, filename))
         self.theme_overwritten = header.get(u'theme_overwritten', False)
         if self.service_item_type == ServiceItemType.Text:
             for slide in serviceitem[u'serviceitem'][u'data']: