#include <lib/service/service.h>
#include <lib/base/init_num.h>
#include <lib/base/init.h>
-
+#include <lib/base/nconfig.h> // access to python config
#include <lib/dvb/dvb.h>
#include <lib/dvb/db.h>
#include <lib/dvb/decoder.h>
if (!eraser)
eDebug("FATAL !! can't get background file eraser");
- /* TODO: deferred removing.. */
for (std::list<std::string>::iterator i(res.begin()); i != res.end(); ++i)
{
eDebug("Removing %s...", i->c_str());
return 0;
}
-RESULT eDVBServiceList::getContent(PyObject *list, bool sorted)
-{
- eServiceReferenceDVB ref;
-
- if (!m_query || !list || !PyList_Check(list))
- return -1;
-
- std::list<eServiceReferenceDVB> tmplist;
-
- while (!m_query->getNextResult(ref))
- tmplist.push_back(ref);
-
- if (sorted)
- tmplist.sort(iListableServiceCompare(this));
-
- for (std::list<eServiceReferenceDVB>::iterator it(tmplist.begin());
- it != tmplist.end(); ++it)
- {
- PyObject *refobj = New_eServiceReference(*it);
- PyList_Append(list, refobj);
- Py_DECREF(refobj);
- }
- return 0;
-}
-
RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list, bool sorted)
{
eServiceReferenceDVB ref;
return 0;
}
+// The first argument of this function is a format string to specify the order and
+// the content of the returned list
+// useable format options are
+// R = Service Reference (as swig object .. this is very slow)
+// S = Service Reference (as python string object .. same as ref.toString())
+// N = Service Name (as python string object)
+// when exactly one return value per service is selected in the format string,
+// then each value is directly a list entry
+// when more than one value is returned per service, then the list is a list of
+// python tuples
+// unknown format string chars are returned as python None values !
+PyObject *eDVBServiceList::getContent(const char* format, bool sorted)
+{
+ PyObject *ret=0;
+ std::list<eServiceReference> tmplist;
+ int retcount=1;
+
+ if (!format || !(retcount=strlen(format)))
+ format = "R"; // just return service reference swig object ...
+
+ if (!getContent(tmplist, sorted))
+ {
+ int services=tmplist.size();
+ ePtr<iStaticServiceInformation> sptr;
+ eServiceCenterPtr service_center;
+
+ if (strchr(format, 'N'))
+ eServiceCenter::getPrivInstance(service_center);
+
+ ret = PyList_New(services);
+ std::list<eServiceReference>::iterator it(tmplist.begin());
+
+ for (int cnt=0; cnt < services; ++cnt)
+ {
+ eServiceReference &ref=*it++;
+ PyObject *tuple = retcount > 1 ? PyTuple_New(retcount) : 0;
+ for (int i=0; i < retcount; ++i)
+ {
+ PyObject *tmp=0;
+ switch(format[i])
+ {
+ case 'R': // service reference (swig)object
+ tmp = New_eServiceReference(ref);
+ break;
+ case 'S': // service reference string
+ tmp = PyString_FromString(ref.toString().c_str());
+ break;
+ case 'N': // service name
+ if (service_center)
+ {
+ service_center->info(ref, sptr);
+ if (sptr)
+ {
+ std::string name;
+ sptr->getName(ref, name);
+ if (name.length())
+ tmp = PyString_FromString(name.c_str());
+ }
+ }
+ if (!tmp)
+ tmp = PyString_FromString("<n/a>");
+ break;
+ default:
+ if (tuple)
+ {
+ tmp = Py_None;
+ Py_INCREF(Py_None);
+ }
+ break;
+ }
+ if (tmp)
+ {
+ if (tuple)
+ PyTuple_SET_ITEM(tuple, i, tmp);
+ else
+ PyList_SET_ITEM(ret, cnt, tmp);
+ }
+ }
+ if (tuple)
+ PyList_SET_ITEM(ret, cnt, tuple);
+ }
+ }
+ return ret ? ret : PyList_New(0);
+}
+
RESULT eDVBServiceList::getNext(eServiceReference &ref)
{
if (!m_query)
return -1;
case sIsCrypted: return program.isCrypted;
case sVideoPID: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid;
+ case sVideoType: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type;
case sAudioPID: if (program.audioStreams.empty()) return -1; return program.audioStreams[m_current_audio_stream].pid;
case sPCRPID: return program.pcrPid;
case sPMTPID: return program.pmtPid;
switch (w)
{
case sCAIDs:
- if (m_dvb_service)
- return m_service_handler.getCaIds();
+ return m_service_handler.getCaIds();
default:
break;
}
m_cue = 0;
m_decoder = 0;
m_decode_demux = 0;
+ m_teletext_parser = 0;
+
/* free the timeshift service handler, we need the resources */
m_service_handler_timeshift.free();
m_timeshift_active = 0;
m_decode_demux = 0;
m_decoder = 0;
+ m_teletext_parser = 0;
m_timeshift_active = 1;
void eDVBServicePlay::updateDecoder()
{
- int vpid = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1;
+ int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1;
eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
+ bool defaultac3=false;
+ std::string default_ac3;
+
+ if (!ePythonConfigQuery::getConfigValue("config.av.defaultac3", default_ac3))
+ defaultac3 = default_ac3 == "enable";
+
eDVBServicePMTHandler::program program;
if (h.getProgramInfo(program))
eDebug("getting program info failed.");
i != program.videoStreams.end(); ++i)
{
if (vpid == -1)
+ {
vpid = i->pid;
+ vpidtype = i->type;
+ }
if (i != program.videoStreams.begin())
eDebugNoNewLine(", ");
eDebugNoNewLine("%04x", i->pid);
i(program.audioStreams.begin());
i != program.audioStreams.end(); ++i)
{
- if (apid == -1)
+ if (apid == -1 || (apidtype == eDVBAudio::aMPEG && defaultac3))
{
- apid = i->pid;
- apidtype = i->type;
+ if ( apid == -1 || (i->type != eDVBAudio::aMPEG) )
+ {
+ apid = i->pid;
+ apidtype = i->type;
+ }
}
if (i != program.audioStreams.begin())
eDebugNoNewLine(", ");
m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary);
if (m_cue)
m_cue->setDecodingDemux(m_decode_demux, m_decoder);
+#ifdef INTERNAL_TELETEXT
+ m_teletext_parser = new eDVBTeletextParser(m_decode_demux);
+#endif
}
if (m_decoder)
{
- m_decoder->setVideoPID(vpid);
+ m_decoder->setVideoPID(vpid, vpidtype);
m_current_audio_stream = 0;
m_decoder->setAudioPID(apid, apidtype);
if (!(m_is_pvr || m_timeshift_active || !m_is_primary))
m_decoder->setSyncPCR(pcrpid);
else
m_decoder->setSyncPCR(-1);
+#ifndef INTERNAL_TELETEXT
m_decoder->setTextPID(tpid);
+#else
+ if (m_teletext_parser)
+ m_teletext_parser->start(tpid);
+#endif
+
if (!m_is_primary)
m_decoder->setTrickmode(1);
m_decoder->start();
m_dvb_service->setCachePID(eDVBService::cAC3PID, apid);
}
m_dvb_service->setCachePID(eDVBService::cVPID, vpid);
+ m_dvb_service->setCachePID(eDVBService::cVTYPE, vpidtype);
m_dvb_service->setCachePID(eDVBService::cPCRPID, pcrpid);
m_dvb_service->setCachePID(eDVBService::cTPID, tpid);
}
git.cweiske.de / enigma2.git / blobdiff