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/PicturePlayer/plugin.py | |
| 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/PicturePlayer/plugin.py')
| -rw-r--r-- | lib/python/Plugins/Extensions/PicturePlayer/plugin.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py index 4462df13..b6699bab 100644 --- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py +++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py @@ -531,14 +531,14 @@ def main(session, **kwargs): session.open(picmain) def filescan_open(list, session, **kwargs): - session.open(picmain) # list + # Recreate List as expected by PicView + filelist = [((file.path, False), None) for file in list] + session.open(PicView, filelist, "", "") 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(extensions = ["jpg", "jpe", "jpeg"], + Scanner(mimetypes = ["image/jpeg", "image/png", "image/gif", "image/bmp"], paths_to_scan = [ ScanPath(path = "DCIM", with_subdirs = True), |