Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 6 commits
  • 2 files changed
  • 0 commit comments
  • 3 contributors
Commits on May 07, 2012
@littlesat littlesat servicedvb: allow disabling auto selected subtitles via cache again
And again use 0 for this. -1 stands for no subtitle cached and 0 for no
subtitle selected. But do avoid to start DVB-graphical subtitles to start
at PID 0 so they do not disappear anymore on the subtitlelist on some
boxes
c1ed173
@littlesat littlesat servicedvb.cpp: Check on pid 0 not required in updateDecoder
As the subtitle is even not started the getCachedSubtitle function
always returns Py_None and also one small cleanup
2dd1e3d
@littlesat littlesat servicedvb.cpp: I just removed the incorrect PID != 0 check d137bd1
@littlesat littlesat servicedvb.cpp: getCachedSubtitle returns py_RETURN_NONE when cache is 0
This allow to disable auto selected subtitles once selected ON and prefer
cached subtitle is selected ON without any check for PID 0 on DVB subtitles
3184684
Commits on May 11, 2012
@pieterg pieterg keymap.xml: fix KEY_PLAY in InfobarSeekActions
We were using the KEY_PLAYPAUSE action.
The PLAY key should not pause running playback.
38ee88c
Commits on May 14, 2012
skaman Merge remote branch 'openpli/master' ff51b3c
Showing with 3 additions and 3 deletions.
  1. +1 −1  data/keymap.xml
  2. +2 −2 lib/service/servicedvb.cpp
View
2  data/keymap.xml
@@ -295,7 +295,7 @@
</device>
<key id="KEY_PLAYPAUSE" mapto="playpauseService" flags="m" />
<key id="KEY_PAUSE" mapto="pauseService" flags="m" />
- <key id="KEY_PLAY" mapto="playpauseService" flags="m" />
+ <key id="KEY_PLAY" mapto="unpauseService" flags="m" />
<key id="KEY_REWIND" mapto="seekBack" flags="b" />
<key id="KEY_FASTFORWARD" mapto="seekFwd" flags="b" />
<key id="KEY_REWIND" mapto="seekBackManual" flags="l" />
View
4 lib/service/servicedvb.cpp
@@ -3015,7 +3015,7 @@ RESULT eDVBServicePlay::disableSubtitles(eWidget *parent)
m_subtitle_pages.clear();
}
if (m_dvb_service)
- m_dvb_service->setCacheEntry(eDVBService::cSUBTITLE, -1);
+ m_dvb_service->setCacheEntry(eDVBService::cSUBTITLE, 0);
return 0;
}
@@ -3037,7 +3037,7 @@ PyObject *eDVBServicePlay::getCachedSubtitle()
if (usecache || stream == -1)
{
- if (tmp != -1)
+ if (tmp != -1 && tmp != 0)
{
unsigned int data = (unsigned int)tmp;
int pid = (data&0xFFFF0000)>>16;

No commit comments for this range

Something went wrong with that request. Please try again.