#include <dvbsi++/iso639_language_descriptor.h>
#include <dvbsi++/stream_identifier_descriptor.h>
#include <dvbsi++/subtitling_descriptor.h>
+#include <dvbsi++/teletext_descriptor.h>
eDVBServicePMTHandler::eDVBServicePMTHandler()
:m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF)
{
m_have_cached_program = false;
serviceEvent(eventNewProgramInfo);
- eEPGCache::getInstance()->PMTready(this);
if (!m_pvr_channel) // don't send campmt to camd.socket for playbacked services
{
+ eEPGCache::getInstance()->PMTready(this);
if(!m_ca_servicePtr)
{
int demuxes[2] = {0,0};
PyObject *eDVBServicePMTHandler::getCaIds()
{
- PyObject *ret=0;
+ ePyObject ret;
program prog;
}
}
- return ret ? ret : PyList_New(0);
+ return ret ? (PyObject*)ret : (PyObject*)PyList_New(0);
}
int eDVBServicePMTHandler::getProgramInfo(struct program &program)
s.composition_page_id = (*it)->getCompositionPageId();
s.ancillary_page_id = (*it)->getAncillaryPageId();
s.language_code = (*it)->getIso639LanguageCode();
- eDebug("add subtitle %s PID %04x, type %d, composition page %d, ancillary_page %d",
- s.language_code.c_str(), s.pid, s.subtitling_type, s.composition_page_id, s.ancillary_page_id);
+// eDebug("add dvb subtitle %s PID %04x, type %d, composition page %d, ancillary_page %d",
+// s.language_code.c_str(), s.pid, s.subtitling_type, s.composition_page_id, s.ancillary_page_id);
program.subtitleStreams.push_back(s);
}
break;
}
case TELETEXT_DESCRIPTOR:
if ( program.textPid == -1 || (*es)->getPid() == cached_tpid )
- program.textPid = (*es)->getPid();
+ {
+ subtitleStream s;
+ s.subtitling_type = 0x01; // EBU TELETEXT SUBTITLES
+ s.pid = program.textPid = (*es)->getPid();
+ TeletextDescriptor *d = (TeletextDescriptor*)(*desc);
+ const VbiTeletextList *list = d->getVbiTeletexts();
+ for (VbiTeletextConstIterator it(list->begin()); it != list->end(); ++it)
+ {
+ switch((*it)->getTeletextType())
+ {
+ case 0x02: // Teletext subtitle page
+ case 0x05: // Teletext subtitle page for hearing impaired pepople
+ s.language_code = (*it)->getIso639LanguageCode();
+ s.teletext_page_number = (*it)->getTeletextPageNumber();
+ s.teletext_magazine_number = (*it)->getTeletextMagazineNumber();
+// eDebug("add teletext subtitle %s PID %04x, page number %d, magazine number %d",
+// s.language_code.c_str(), s.pid, s.teletext_page_number, s.teletext_magazine_number);
+ program.subtitleStreams.push_back(s);
+ break;
+ }
+ }
+ }
break;
case DTS_DESCRIPTOR:
isaudio = 1;
} else
{
eDVBMetaParser parser;
-
- if (parser.parseFile(ref.path))
+
+ int ret=parser.parseFile(ref.path);
+ if (ret || !parser.m_ref.getServiceID().get() /* incorrect sid in meta file or recordings.epl*/ )
{
eWarning("no .meta file found, trying to find PMT pid");
eDVBTSTools tstools;
}
} else
{
- serviceEvent(eventTuneFailed);
+ serviceEvent(eventNoResources);
return res;
}
++m_sendstate;
}
}
+
+static PyObject *createTuple(int pid, const char *type)
+{
+ PyObject *r = PyTuple_New(2);
+ PyTuple_SetItem(r, 0, PyInt_FromLong(pid));
+ PyTuple_SetItem(r, 1, PyString_FromString(type));
+ return r;
+}
+
+static inline void PyList_AppendSteal(PyObject *list, PyObject *item)
+{
+ PyList_Append(list, item);
+ Py_DECREF(item);
+}
+
+PyObject *eDVBServicePMTHandler::program::createPythonObject()
+{
+ PyObject *r = PyDict_New();
+
+ PyObject *l = PyList_New(0);
+
+ PyList_AppendSteal(l, createTuple(0, "pat"));
+
+ if (pmtPid != -1)
+ PyList_AppendSteal(l, createTuple(pmtPid, "pmt"));
+
+ for (std::vector<eDVBServicePMTHandler::videoStream>::const_iterator
+ i(videoStreams.begin());
+ i != videoStreams.end(); ++i)
+ PyList_AppendSteal(l, createTuple(i->pid, "video"));
+
+ for (std::vector<eDVBServicePMTHandler::audioStream>::const_iterator
+ i(audioStreams.begin());
+ i != audioStreams.end(); ++i)
+ PyList_AppendSteal(l, createTuple(i->pid, "audio"));
+
+ for (std::vector<eDVBServicePMTHandler::subtitleStream>::const_iterator
+ i(subtitleStreams.begin());
+ i != subtitleStreams.end(); ++i)
+ PyList_AppendSteal(l, createTuple(i->pid, "subtitle"));
+
+ PyList_AppendSteal(l, createTuple(pcrPid, "pcr"));
+
+ if (textPid != -1)
+ PyList_AppendSteal(l, createTuple(textPid, "text"));
+
+ PyDict_SetItemString(r, "pids", l);
+ return r;
+}