Merge branch 'translations'

diff --git a/data/encoding.conf b/data/encoding.conf
index 14eeaefd6926f657d52f1117ef740c784ac3c9d3..9383317e8513d1d49ef157966cb97fc87524facd 100644 (file)
--- a/data/encoding.conf
+++ b/data/encoding.conf
@@ -1,5 +1,6 @@
 #Fallback encoding when in dvb-text no encoding table is given
 #Countycode ISO8859-X or ISO6397
+ara ISO8859-6
 tur ISO8859-9
 gre ISO8859-7
 pol ISO8859-2

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 90bf19e1d68aa72d93f17ec8077a03482b2f3b30..710cc421ec59a6a476249c8bd6917df35639e7fc 100644 (file)
--- 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 f80e1775d5fed8aa998cfa0e499f9bdf5454b373..2dc36412d5fbdaa2a3dc1d8ced90755e95afab9c 100644 (file)
--- 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)