diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2007-10-07 10:24:05 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2007-10-07 10:24:05 +0000 |
| commit | fdb15fdd11d88b73900badf092cf2db0e8d3aabf (patch) | |
| tree | de15e3cad382c7e77575fbcb9c41e47689dba718 /lib/python/Plugins/Extensions/MediaPlayer | |
| parent | 22284d888f6eac661e4485ede53ca193f5ac248d (diff) | |
| download | enigma2-fdb15fdd11d88b73900badf092cf2db0e8d3aabf.tar.gz enigma2-fdb15fdd11d88b73900badf092cf2db0e8d3aabf.zip | |
move media scanner components into core, patch by Moritz Venn (002_enigma2_move_mediascanner_components_into_core.patch)
Diffstat (limited to 'lib/python/Plugins/Extensions/MediaPlayer')
| -rw-r--r-- | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 06b6bfab..0de820c8 100644 --- 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: - ref = eServiceReference(4097, 0, file) + ref = eServiceReference(4097, 0, file.path) 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): - # 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 = |