From 7ee1ed6595e67596385af85719a262d63dbcc93e Mon Sep 17 00:00:00 2001 From: Fraxinas Date: Mon, 29 Jun 2009 08:38:46 +0200 Subject: servicemp3: allow .flv extension (this will ONLY work with most recent version of flv containers containing h264 video and nothing else! gst-plugin-flv is required for demuxing) --- lib/service/servicemp3.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index fe8c7f3d..597c0e70 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -48,6 +48,7 @@ eServiceFactoryMP3::eServiceFactoryMP3() extensions.push_back("mp4"); extensions.push_back("mov"); extensions.push_back("m4a"); + extensions.push_back("flv"); sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions); } -- cgit v1.2.3 From d028132696a9a72e4ccf4a0f9b0e9d0e0e122f89 Mon Sep 17 00:00:00 2001 From: Fraxinas Date: Mon, 29 Jun 2009 08:47:26 +0200 Subject: Revert "servicemp3: allow .flv extension (this will ONLY work with most recent version of flv containers containing h264 video and nothing else!" This reverts commit 7ee1ed6595e67596385af85719a262d63dbcc93e. --- lib/service/servicemp3.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 597c0e70..fe8c7f3d 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -48,7 +48,6 @@ eServiceFactoryMP3::eServiceFactoryMP3() extensions.push_back("mp4"); extensions.push_back("mov"); extensions.push_back("m4a"); - extensions.push_back("flv"); sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions); } -- cgit v1.2.3 From 7af17e298fb338d477f2d93ab230e395c656ea9f Mon Sep 17 00:00:00 2001 From: Fraxinas Date: Mon, 29 Jun 2009 08:47:41 +0200 Subject: Revert "mediaplayer: allow playback of flv files" This reverts commit 35403704d9aee1e5d322e2fa59a90d8fb2a32c91. --- lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index c69dd28e..42800b5c 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -110,7 +110,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB # 'None' is magic to start at the list of mountpoints defaultDir = config.mediaplayer.defaultDir.getValue() - self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov|flv)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") + self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() -- cgit v1.2.3 From e6ca11b5b7c734505f84206b196701828136f81a Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Tue, 30 Jun 2009 00:16:19 +0200 Subject: make dm8000 blink pattern a bit nicer --- lib/python/Screens/SessionGlobals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/python/Screens/SessionGlobals.py b/lib/python/Screens/SessionGlobals.py index 18d71d39..6a9379bc 100644 --- a/lib/python/Screens/SessionGlobals.py +++ b/lib/python/Screens/SessionGlobals.py @@ -38,7 +38,7 @@ class SessionGlobals(Screen): PATTERN_ON = (20, 0xffffffff, 0xffffffff) PATTERN_OFF = (20, 0, 0) - PATTERN_BLINK = (20, 0x55555555, 0x84fc8c04) + PATTERN_BLINK = (20, 0x55555555, 0xa7fccf7a) nr_leds = SystemInfo.get("NumFrontpanelLEDs", 0) -- cgit v1.2.3 From 0c2e529601f9931dc808388dfb8ec0a5fb96f06f Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Tue, 30 Jun 2009 01:30:40 +0200 Subject: initialize m_cursor, fix cursorValid --- lib/gui/elistboxcontent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 3c9457e1..e05da215 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -49,7 +49,7 @@ int iListboxContent::currentCursorSelectable() DEFINE_REF(eListboxPythonStringContent); -eListboxPythonStringContent::eListboxPythonStringContent(): m_itemheight(25) +eListboxPythonStringContent::eListboxPythonStringContent(): m_itemheight(25), m_cursor(0) { } @@ -81,7 +81,7 @@ int eListboxPythonStringContent::cursorMove(int count) int eListboxPythonStringContent::cursorValid() { - return m_cursor < size(); + return ((unsigned int)m_cursor) < size(); } int eListboxPythonStringContent::cursorSet(int n) -- cgit v1.2.3