git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move media scanner components into core, patch by Moritz Venn (002_enigma2_move_media...
[enigma2.git]
/
lib
/
python
/
Plugins
/
Extensions
/
MediaPlayer
/
plugin.py
diff --git
a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 06b6bfabfe2538205116d192bf6f7ff2b70a0da4..0de820c84189591246b7ea1cf2ef7fe2337cb222 100644
(file)
--- a/
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@
-717,7
+717,7
@@
def filescan_open(list, session, **kwargs):
mp.switchToPlayList()
for file in list:
mp.switchToPlayList()
for file in list:
- ref = eServiceReference(4097, 0, file)
+ ref = eServiceReference(4097, 0, file
.path
)
mp.playlist.addFile(ref)
# TODO: rather play first than last file?
mp.playlist.addFile(ref)
# TODO: rather play first than last file?
@@
-725,9
+725,7
@@
def filescan_open(list, session, **kwargs):
mp.playlist.updateList()
def filescan(**kwargs):
mp.playlist.updateList()
def filescan(**kwargs):
- # we expect not to be called if the MediaScanner plugin is not available,
- # thus we don't catch an ImportError exception here
- from Plugins.Extensions.MediaScanner.plugin import Scanner, ScanPath
+ from Components.Scanner import Scanner, ScanPath
return [
Scanner(mimetypes = ["video/mpeg"],
paths_to_scan =
return [
Scanner(mimetypes = ["video/mpeg"],
paths_to_scan =