diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
| commit | 0cb206d2c07cb9e4130e13234e3fd59b127421a8 (patch) | |
| tree | 07bcbcc638a6012d32b0574531cf0bd8304484ae /lib/dvb | |
| parent | 99a717e9813eab30cd34f5da6f4a5ab6e791dc1f (diff) | |
| parent | e9272c492c7a3c7fd8a1225a4baa6bee2a02eea8 (diff) | |
| download | enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.tar.gz enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.zip | |
Merge branch 'master' into bug_245_record_playback_fixes
Diffstat (limited to 'lib/dvb')
| -rw-r--r-- | lib/dvb/decoder.cpp | 3 | ||||
| -rw-r--r-- | lib/dvb/epgcache.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 90bf19e1..710cc421 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -222,9 +222,6 @@ int eDVBAudio::startPid(int pid, int type) void eDVBAudio::stop() { -#if HAVE_DVB_API_VERSION > 2 - flush(); -#endif eDebugNoNewLine("AUDIO_STOP - "); if (::ioctl(m_fd, AUDIO_STOP) < 0) eDebug("failed (%m)"); diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index f80e1775..2dc36412 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -1717,6 +1717,7 @@ void fillTuple(ePyObject tuple, const char *argstring, int argcount, ePyObject s ++argcount; continue; default: // ignore unknown + tmp = ePyObject(); eDebug("fillTuple unknown '%c'... insert 'None' in result", c); } if (!tmp) @@ -2061,6 +2062,7 @@ void fillTuple2(ePyObject tuple, const char *argstring, int argcount, eventData inc_refcount = true; break; default: // ignore unknown + tmp = ePyObject(); eDebug("fillTuple2 unknown '%c'... insert None in Result", argstring[pos]); } if (!tmp) |