diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-05-11 11:43:03 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-05-11 11:43:03 +0200 |
| commit | da4b044a4c350e307bf3e8ee5a211eda4a6ebac6 (patch) | |
| tree | 9dede96df2a85a33fb104b014c094a07309fba6a | |
| parent | 6b924837dedad17ea56ca37075e760828469abcb (diff) | |
| parent | c3f2fa3d78531c2cb7de469d38e44c965102d454 (diff) | |
| download | enigma2-da4b044a4c350e307bf3e8ee5a211eda4a6ebac6.tar.gz enigma2-da4b044a4c350e307bf3e8ee5a211eda4a6ebac6.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
| -rw-r--r-- | lib/dvb/decoder.cpp | 6 | ||||
| -rw-r--r-- | lib/python/Components/Converter/TemplatedMultiContent.py | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 92652a4b..30a80d10 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1002,7 +1002,7 @@ int eTSMPEGDecoder::setState() } #endif - if (m_changed & changeState) + if (m_changed & (changeState|changeVideo|changeAudio)) { /* play, slowmotion, fast-forward */ int state_table[6][4] = @@ -1015,7 +1015,7 @@ int eTSMPEGDecoder::setState() /* [stateSlowMotion] = */ {1, m_ff_sm_ratio, 0} }; int *s = state_table[m_state]; - if (m_video) + if (m_changed & (changeState|changeVideo) && m_video) { m_video->setSlowMotion(s[1]); m_video->setFastForward(s[2]); @@ -1024,7 +1024,7 @@ int eTSMPEGDecoder::setState() else m_video->freeze(); } - if (m_audio) + if (m_changed & (changeState|changeAudio) && m_audio) { if (s[0]) m_audio->unfreeze(); diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py index 25c4b1a4..8a708c14 100644 --- a/lib/python/Components/Converter/TemplatedMultiContent.py +++ b/lib/python/Components/Converter/TemplatedMultiContent.py @@ -18,13 +18,13 @@ class TemplatedMultiContent(StringList): assert "template" in self.template or "default" in self.template["templates"] # we need to have a default template if not "template" in self.template: # default template can be ["template"] or ["templates"]["default"] - self.template["template"] = self.template["templates"]["default"] + self.template["template"] = self.template["templates"]["default"][1] + self.template["itemHeight"] = self.template["template"][0] def changed(self, what): if not self.content: from enigma import eListboxPythonMultiContent self.content = eListboxPythonMultiContent() - self.content.setItemHeight(self.template["itemHeight"]) self.setTemplate() # also setup fonts (also given by source) @@ -53,8 +53,12 @@ class TemplatedMultiContent(StringList): # if skin defined "templates", that means that it defines multiple styles in a dict. template should still be a default templates = self.template.get("templates") template = self.template.get("template") + itemheight = self.template["itemHeight"] - if templates and style: # if we have a custom style defined in the source, and different templates in the skin, look it up - template = templates.get(self.source.style, template) # default to default template + if templates and style and style in templates: # if we have a custom style defined in the source, and different templates in the skin, look it up + template = templates[style][1] + itemheight = templates[style][0] self.content.setTemplate(template) + + self.content.setItemHeight(itemheight) |