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

clean up

Browse Source
This commit is contained in:
Andreas Preikschat 2012-05-19 17:41:05 +02:00
parent b0585297fb
commit 49cd100f90
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/lib/mediamanageritem.py
View File

@ -379,8 +379,7 @@ class MediaManagerItem(QtGui.QWidget):
fullList = [] fullList = []
for count in range(self.listView.count()): for count in range(self.listView.count()):
names.append(self.listView.item(count).text()) names.append(self.listView.item(count).text())
fullList.append(self.listView.item(count). fullList.append(self.listView.item(count).data(QtCore.Qt.UserRole))
data(QtCore.Qt.UserRole))
duplicatesFound = False duplicatesFound = False
filesAdded = False filesAdded = False
for file in files: for file in files:

3
openlp/core/ui/media/vlcplayer.py
View File

@ -145,8 +145,7 @@ class VlcPlayer(MediaPlayer):
log.debug(u'load vid in Vlc Controller') log.debug(u'load vid in Vlc Controller')
controller = display.controller controller = display.controller
volume = controller.media_info.volume volume = controller.media_info.volume
file_path = str( file_path = str(controller.media_info.file_info.absoluteFilePath())
controller.media_info.file_info.absoluteFilePath().toUtf8())
path = os.path.normcase(file_path) path = os.path.normcase(file_path)
# create the media # create the media
display.vlcMedia = display.vlcInstance.media_new_path(path) display.vlcMedia = display.vlcInstance.media_new_path(path)