diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-03-24 23:33:42 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-03-24 23:33:42 +0000 |
| commit | 983b1c68de5a56ec171d409d1d56ff786cc24bdf (patch) | |
| tree | 39d60d5e3e06897a55075d526c8cfa2ddc08927d /lib | |
| parent | 7c8c5bc3e04718569b1b848d252d515b81545130 (diff) | |
| download | enigma2-983b1c68de5a56ec171d409d1d56ff786cc24bdf.tar.gz enigma2-983b1c68de5a56ec171d409d1d56ff786cc24bdf.zip | |
mediaplayer can play wave files (package gst-plugin-wavparse needed)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Screens/MediaPlayer.py | 2 | ||||
| -rw-r--r-- | lib/service/servicefs.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py index 2ae53fac..da50ae55 100644 --- a/lib/python/Screens/MediaPlayer.py +++ b/lib/python/Screens/MediaPlayer.py @@ -23,7 +23,7 @@ class MediaPlayer(Screen, InfoBarSeek): Screen.__init__(self, session) self.session.nav.stopService() - self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|avi)", useServiceRef = True) + self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|wav|wave)", useServiceRef = True) self["filelist"] = self.filelist self.playlist = PlayList() diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp index c53e055e..3e2f97b3 100644 --- a/lib/service/servicefs.cpp +++ b/lib/service/servicefs.cpp @@ -135,7 +135,7 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted) if (extension == ".ts") type = eServiceFactoryDVB::id; - else if (extension == ".mp3" || extension == ".ogg" || extension == ".avi") + else if (extension == ".mp3") type = 4097; else if (extension == ".ogg") type = 4097; @@ -143,6 +143,8 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted) type = 4097; else if (extension == ".vob") type = 4097; + else if (extension == ".wav" || extension == ".wave") + type = 4097; if (type != -1) { |