diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-05-25 01:38:39 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-05-25 01:38:39 +0200 |
| commit | 875b117b3aeca1af73942d4eeb691496f6c884f9 (patch) | |
| tree | 9833628398e010accf290606bc59d4a112aa3fed | |
| parent | 28a0e997d1d28a6d057ede5e8de70f26ceed0e8e (diff) | |
| parent | 4ea054ce5a814666d8d7af7f9951ffb783820889 (diff) | |
| download | enigma2-875b117b3aeca1af73942d4eeb691496f6c884f9.tar.gz enigma2-875b117b3aeca1af73942d4eeb691496f6c884f9.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
| -rw-r--r-- | data/keymap.xml | 6 | ||||
| -rw-r--r-- | lib/python/Components/EpgList.py | 12 | ||||
| -rw-r--r-- | main/enigma.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/data/keymap.xml b/data/keymap.xml index 8f708698..036ea467 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -332,7 +332,7 @@ <map context="InfobarTimeshiftActions"> <device name="dreambox remote control (native)"> - <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m" /> + <key id="KEY_YELLOW" mapto="timeshiftStart" flags="b" /> <key id="KEY_TV" mapto="timeshiftStop" flags="m" /> </device> <device name="dreambox advanced remote control (native)"> @@ -351,7 +351,7 @@ <map context="InfobarTimeshiftActivateActions"> <device name="dreambox remote control (native)"> <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="b" /> - <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" /> + <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="b" /> </device> <device name="dreambox advanced remote control (native)"> <key id="KEY_PREVIOUSSONG" mapto="timeshiftActivateEnd" flags="m" /> @@ -412,7 +412,7 @@ </device> <device name="dreambox advanced remote control (native)"> <key id="KEY_0" mapto="toggleMark" flags="m" /> - <key id="KEY_YELLOW" mapto="toggleMark" flags="m" /> + <key id="KEY_YELLOW" mapto="toggleMark" flags="b" /> </device> <device name="dreambox ir keyboard"> <key id="KEY_TAB" mapto="toggleMark" flags="m" /> diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 3b07412e..59f92621 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -212,7 +212,7 @@ class EPGList(HTMLComponent, GUIComponent): res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, service_name)) return res - def buildMultiEntry(self, changecount, service, eventId, begTime, duration, EventName, nowTime, service_name): + def buildMultiEntry(self, changecount, service, eventId, beginTime, duration, EventName, nowTime, service_name): (clock_pic, rec) = self.getPixmapForEntry(service, eventId, beginTime, duration) r1=self.service_rect r2=self.progress_rect @@ -226,10 +226,10 @@ class EPGList(HTMLComponent, GUIComponent): )) else: res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, service_name)) - if begTime is not None: - if nowTime < begTime: - begin = localtime(begTime) - end = localtime(begTime+duration) + if beginTime is not None: + if nowTime < beginTime: + begin = localtime(beginTime) + end = localtime(beginTime+duration) # print "begin", begin # print "end", end res.extend(( @@ -237,7 +237,7 @@ class EPGList(HTMLComponent, GUIComponent): (eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName) )) else: - percent = (nowTime - begTime) * 100 / duration + percent = (nowTime - beginTime) * 100 / duration res.extend(( (eListboxPythonMultiContent.TYPE_PROGRESS, r2.left(), r2.top(), r2.width(), r2.height(), percent), (eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName) diff --git a/main/enigma.cpp b/main/enigma.cpp index 98175c49..7f3ba44b 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -213,7 +213,7 @@ int main(int argc, char **argv) ePtr<gPixmap> wait[MAX_SPINNER]; for (i=0; i<MAX_SPINNER; ++i) { - char filename[strlen(DATADIR) + 20]; + char filename[strlen(DATADIR) + 41]; sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1); loadPNG(wait[i], filename); |