Fix song loading and wildcard import

bzr-revno: 906

openlp/plugins/presentations/lib/pptviewcontroller.py

@@ -27,7 +27,7 @@ import os
 import logging
 
 if os.name == u'nt':
-    from ctypes import *
+    from ctypes import cdll
     from ctypes.wintypes import RECT
 
 from presentationcontroller import PresentationController, PresentationDocument

openlp/plugins/songs/lib/mediaitem.py

@@ -371,7 +371,8 @@ class SongMediaItem(MediaManagerItem):
             author_list = author_list + unicode(author.display_name)
             author_audit.append(unicode(author.display_name))
         if song.ccli_number is None or len(song.ccli_number) == 0:
-            ccli = self.parent.settings_form.GeneralTab.CCLINumber
+            ccli = QtCore.QSettings().value(u'general/ccli number',
+                QtCore.QVariant(u'')).toString()
         else:
             ccli = unicode(song.ccli_number)
         raw_footer.append(song.title)