RESULT getName(const eServiceReference &ref, std::string &name);
int getLength(const eServiceReference &ref);
int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+ PyObject *getInfoObject(const eServiceReference &ref, int);
};
DEFINE_REF(eStaticServiceDVBInformation);
if (!service_center->info(parent, service_info))
{
if (!service_info->getName(parent, name))
- {
- // just show short name
- unsigned int pos = name.find("\xc2\x86");
- if ( pos != std::string::npos )
- name.erase(0, pos+2);
- pos = name.find("\xc2\x87");
- if ( pos != std::string::npos )
- name.erase(pos);
- name+=" - ";
- }
+ name=buildShortName(name) + " - ";
}
}
}
{
ePtr<eDVBResourceManager> res_mgr;
if ( eDVBResourceManager::getInstance( res_mgr ) )
- eDebug("isPlayble... no res manager!!");
+ eDebug("isPlayable... no res manager!!");
else
{
eDVBChannelID chid, chid_ignore;
return false;
}
+static void PutToDict(ePyObject &dict, const char*key, long value)
+{
+ ePyObject item = PyString_FromFormat("%d", value);
+ if (item)
+ {
+ if (PyDict_SetItemString(dict, key, item))
+ eDebug("put %s to dict failed", key);
+ Py_DECREF(item);
+ }
+ else
+ eDebug("could not create PyObject for %s", key);
+}
+
+extern void PutToDict(ePyObject &dict, const char*key, const char *value);
+
+void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm)
+{
+ const char *tmp=0;
+ PutToDict(dict, "type", "Satellite");
+ PutToDict(dict, "frequency", feparm.frequency);
+ PutToDict(dict, "symbolrate", feparm.symbol_rate);
+ PutToDict(dict, "orbital position", feparm.orbital_position);
+ switch (feparm.inversion)
+ {
+ case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break;
+ case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break;
+ default:
+ case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "inversion", tmp);
+ switch (feparm.fec)
+ {
+ case eDVBFrontendParametersSatellite::FEC::fNone: tmp="NONE"; break;
+ case eDVBFrontendParametersSatellite::FEC::f1_2: tmp="1/2"; break;
+ case eDVBFrontendParametersSatellite::FEC::f2_3: tmp="2/3"; break;
+ case eDVBFrontendParametersSatellite::FEC::f3_4: tmp="3/4"; break;
+ case eDVBFrontendParametersSatellite::FEC::f5_6: tmp="5/6"; break;
+ case eDVBFrontendParametersSatellite::FEC::f7_8: tmp="7/8"; break;
+ case eDVBFrontendParametersSatellite::FEC::f3_5: tmp="3/5"; break;
+ case eDVBFrontendParametersSatellite::FEC::f4_5: tmp="4/5"; break;
+ case eDVBFrontendParametersSatellite::FEC::f8_9: tmp="8/9"; break;
+ case eDVBFrontendParametersSatellite::FEC::f9_10: tmp="9/10"; break;
+ default:
+ case eDVBFrontendParametersSatellite::FEC::fAuto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "fec inner", tmp);
+ switch (feparm.modulation)
+ {
+ case eDVBFrontendParametersSatellite::Modulation::Auto: tmp="AUTO"; break;
+ case eDVBFrontendParametersSatellite::Modulation::QPSK: tmp="QPSK"; break;
+ case eDVBFrontendParametersSatellite::Modulation::M8PSK: tmp="8PSK"; break;
+ case eDVBFrontendParametersSatellite::Modulation::QAM_16: tmp="QAM16"; break;
+ }
+ PutToDict(dict, "modulation", tmp);
+ switch(feparm.polarisation)
+ {
+ case eDVBFrontendParametersSatellite::Polarisation::Horizontal: tmp="HORIZONTAL"; break;
+ case eDVBFrontendParametersSatellite::Polarisation::Vertical: tmp="VERTICAL"; break;
+ case eDVBFrontendParametersSatellite::Polarisation::CircularLeft: tmp="CIRCULAR LEFT"; break;
+ default:
+ case eDVBFrontendParametersSatellite::Polarisation::CircularRight: tmp="CIRCULAR RIGHT"; break;
+ }
+ PutToDict(dict, "polarization", tmp);
+ switch(feparm.system)
+ {
+ default:
+ case eDVBFrontendParametersSatellite::System::DVB_S: tmp="DVB-S"; break;
+ case eDVBFrontendParametersSatellite::System::DVB_S2:
+ switch(feparm.roll_off)
+ {
+ case eDVBFrontendParametersSatellite::RollOff::alpha_0_35: tmp="0.35"; break;
+ case eDVBFrontendParametersSatellite::RollOff::alpha_0_25: tmp="0.25"; break;
+ case eDVBFrontendParametersSatellite::RollOff::alpha_0_20: tmp="0.20"; break;
+ default:
+ case eDVBFrontendParametersSatellite::RollOff::alpha_auto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "roll off", tmp);
+ tmp="DVB-S2";
+ break;
+ }
+ PutToDict(dict, "system", tmp);
+}
-class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
+void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm)
{
- DECLARE_REF(eStaticServiceDVBBouquetInformation);
-public:
- eServiceReference m_playable_service;
- RESULT getName(const eServiceReference &ref, std::string &name);
- int getLength(const eServiceReference &ref);
- int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
-};
+ PutToDict(dict, "type", "Terrestrial");
+ PutToDict(dict, "frequency", feparm.frequency);
+ const char *tmp=0;
+ switch (feparm.bandwidth)
+ {
+ case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: tmp="8 MHz"; break;
+ case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: tmp="7 MHz"; break;
+ case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: tmp="6 MHz"; break;
+ default:
+ case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "bandwidth", tmp);
+ switch (feparm.code_rate_LP)
+ {
+ case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break;
+ default:
+ case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "code rate lp", tmp);
+ switch (feparm.code_rate_HP)
+ {
+ case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break;
+ case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break;
+ default:
+ case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "code rate hp", tmp);
+ switch (feparm.modulation)
+ {
+ case eDVBFrontendParametersTerrestrial::Modulation::QPSK: tmp="QPSK"; break;
+ case eDVBFrontendParametersTerrestrial::Modulation::QAM16: tmp="QAM16"; break;
+ case eDVBFrontendParametersTerrestrial::Modulation::QAM64: tmp="QAM64"; break;
+ default:
+ case eDVBFrontendParametersTerrestrial::Modulation::Auto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "constellation", tmp);
+ switch (feparm.transmission_mode)
+ {
+ case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: tmp="2k"; break;
+ case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: tmp="8k"; break;
+ default:
+ case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "transmission mode", tmp);
+ switch (feparm.guard_interval)
+ {
+ case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32: tmp="1/32"; break;
+ case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16: tmp="1/16"; break;
+ case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8: tmp="1/8"; break;
+ case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4: tmp="1/4"; break;
+ default:
+ case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "guard interval", tmp);
+ switch (feparm.hierarchy)
+ {
+ case eDVBFrontendParametersTerrestrial::Hierarchy::HNone: tmp="NONE"; break;
+ case eDVBFrontendParametersTerrestrial::Hierarchy::H1: tmp="1"; break;
+ case eDVBFrontendParametersTerrestrial::Hierarchy::H2: tmp="2"; break;
+ case eDVBFrontendParametersTerrestrial::Hierarchy::H4: tmp="4"; break;
+ default:
+ case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "hierarchy", tmp);
+ switch (feparm.inversion)
+ {
+ case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break;
+ case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break;
+ default:
+ case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "inversion", tmp);
+}
+
+void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm)
+{
+ const char *tmp=0;
+ PutToDict(dict, "type", "Cable");
+ PutToDict(dict, "frequency", feparm.frequency);
+ PutToDict(dict, "symbolrate", feparm.symbol_rate);
+ switch (feparm.modulation)
+ {
+ case eDVBFrontendParametersCable::Modulation::QAM16: tmp="QAM16"; break;
+ case eDVBFrontendParametersCable::Modulation::QAM32: tmp="QAM32"; break;
+ case eDVBFrontendParametersCable::Modulation::QAM64: tmp="QAM64"; break;
+ case eDVBFrontendParametersCable::Modulation::QAM128: tmp="QAM128"; break;
+ case eDVBFrontendParametersCable::Modulation::QAM256: tmp="QAM256"; break;
+ default:
+ case eDVBFrontendParametersCable::Modulation::Auto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "modulation", tmp);
+ switch (feparm.inversion)
+ {
+ case eDVBFrontendParametersCable::Inversion::On: tmp="ON"; break;
+ case eDVBFrontendParametersCable::Inversion::Off: tmp="OFF"; break;
+ default:
+ case eDVBFrontendParametersCable::Inversion::Unknown: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "inversion", tmp);
+ switch (feparm.fec_inner)
+ {
+ case eDVBFrontendParametersCable::FEC::fNone: tmp="NONE"; break;
+ case eDVBFrontendParametersCable::FEC::f1_2: tmp="1/2"; break;
+ case eDVBFrontendParametersCable::FEC::f2_3: tmp="2/3"; break;
+ case eDVBFrontendParametersCable::FEC::f3_4: tmp="3/4"; break;
+ case eDVBFrontendParametersCable::FEC::f5_6: tmp="5/6"; break;
+ case eDVBFrontendParametersCable::FEC::f7_8: tmp="7/8"; break;
+ case eDVBFrontendParametersCable::FEC::f8_9: tmp="8/9"; break;
+ default:
+ case eDVBFrontendParametersCable::FEC::fAuto: tmp="AUTO"; break;
+ }
+ PutToDict(dict, "fec inner", tmp);
+}
+
+PyObject *eStaticServiceDVBInformation::getInfoObject(const eServiceReference &r, int what)
+{
+ if (r.type == eServiceReference::idDVB)
+ {
+ const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)r;
+ switch(what)
+ {
+ case iServiceInformation::sTransponderData:
+ {
+ ePtr<eDVBResourceManager> res;
+ if (!eDVBResourceManager::getInstance(res))
+ {
+ ePtr<iDVBChannelList> db;
+ if (!res->getChannelList(db))
+ {
+ eDVBChannelID chid;
+ ref.getChannelID(chid);
+ ePtr<iDVBFrontendParameters> feparm;
+ if (!db->getChannelFrontendData(chid, feparm))
+ {
+ int system;
+ if (!feparm->getSystem(system))
+ {
+ ePyObject dict = PyDict_New();
+ switch(system)
+ {
+ case iDVBFrontend::feSatellite:
+ {
+ eDVBFrontendParametersSatellite s;
+ feparm->getDVBS(s);
+ PutSatelliteDataToDict(dict, s);
+ break;
+ }
+ case iDVBFrontend::feTerrestrial:
+ {
+ eDVBFrontendParametersTerrestrial t;
+ feparm->getDVBT(t);
+ PutTerrestrialDataToDict(dict, t);
+ break;
+ }
+ case iDVBFrontend::feCable:
+ {
+ eDVBFrontendParametersCable c;
+ feparm->getDVBC(c);
+ PutCableDataToDict(dict, c);
+ break;
+ }
+ default:
+ eDebug("unknown frontend type %d", system);
+ Py_DECREF(dict);
+ break;
+ }
+ return dict;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ Py_RETURN_NONE;
+}
DEFINE_REF(eStaticServiceDVBBouquetInformation);
if (eDVBResourceManager::getInstance(res))
{
eDebug("eStaticServiceDVBBouquetInformation::isPlayable failed.. no resource manager!");
- return false;
+ return 0;
}
if (res->getChannelList(db))
{
eDebug("eStaticServiceDVBBouquetInformation::isPlayable failed.. no channel list!");
- return false;
+ return 0;
}
eBouquet *bouquet=0;
if (db->getBouquet(ref, bouquet))
{
eDebug("eStaticServiceDVBBouquetInformation::isPlayable failed.. getBouquet failed!");
- return false;
+ return 0;
}
+ int cur=0;
eDVBChannelID chid, chid_ignore;
((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
for (std::list<eServiceReference>::iterator it(bouquet->m_services.begin()); it != bouquet->m_services.end(); ++it)
{
- m_playable_service = *it;
((const eServiceReferenceDVB&)*it).getChannelID(chid);
- if (res->canAllocateChannel(chid, chid_ignore))
- return true;
+ int tmp=res->canAllocateChannel(chid, chid_ignore);
+ if (tmp > cur)
+ {
+ m_playable_service = *it;
+ cur = tmp;
+ }
}
+ if (cur)
+ return cur;
}
m_playable_service = eServiceReference();
- return false;
+ return 0;
}
int eStaticServiceDVBBouquetInformation::getLength(const eServiceReference &ref)
return -1;
}
+#include <lib/dvb/epgcache.h>
+
+RESULT eStaticServiceDVBBouquetInformation::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time)
+{
+ return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
+}
+
class eStaticServiceDVBPVRInformation: public iStaticServiceInformation
{
DECLARE_REF(eStaticServiceDVBPVRInformation);
RESULT getName(const eServiceReference &ref, std::string &name);
int getLength(const eServiceReference &ref);
RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT, time_t start_time);
-
+ int isPlayable(const eServiceReference &ref, const eServiceReference &ignore) { return 1; }
int getInfo(const eServiceReference &ref, int w);
std::string getInfoString(const eServiceReference &ref,int w);
};
// S = Service Reference (as python string object .. same as ref.toString())
// C = Service Reference (as python string object .. same as ref.toCompareString())
// N = Service Name (as python string object)
+// n = Short Service Name (short name brakets used) (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
ePtr<iStaticServiceInformation> sptr;
eServiceCenterPtr service_center;
- if (strchr(format, 'N'))
+ if (strchr(format, 'N') || strchr(format, 'n'))
eServiceCenter::getPrivInstance(service_center);
ret = PyList_New(services);
{
std::string name;
sptr->getName(ref, name);
+
+ // filter short name brakets
+ unsigned int pos;
+ while((pos = name.find("\xc2\x86")) != std::string::npos)
+ name.erase(pos,2);
+ while((pos = name.find("\xc2\x87")) != std::string::npos)
+ name.erase(pos,2);
+
+ if (name.length())
+ tmp = PyString_FromString(name.c_str());
+ }
+ }
+ if (!tmp)
+ tmp = PyString_FromString("<n/a>");
+ break;
+ case 'n': // short service name
+ if (service_center)
+ {
+ service_center->info(ref, sptr);
+ if (sptr)
+ {
+ std::string name;
+ sptr->getName(ref, name);
+ name = buildShortName(name);
if (name.length())
tmp = PyString_FromString(name.c_str());
}
RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
{
- if (m_parent.flags & eServiceReference::flagDirectory) // bouquet
+ if (m_parent.flags & eServiceReference::canDescent) // bouquet
{
ePtr<iDVBChannelList> db;
ePtr<eDVBResourceManager> resm;
RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServiceInformation> &ptr)
{
/* is a listable service? */
- if ((ref.flags & eServiceReference::flagDirectory) == eServiceReference::flagDirectory) // bouquet
+ if (ref.flags & eServiceReference::canDescent) // bouquet
{
if ( !ref.name.empty() ) // satellites or providers list
ptr = m_StaticServiceDVBInfo;
eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service):
m_reference(ref), m_dvb_service(service), m_have_video_pid(0), m_is_paused(0)
{
+ memset(&m_videoEventData, 0, sizeof(struct iTSMPEGDecoder::videoEvent));
m_is_primary = 1;
m_is_pvr = !m_reference.path.empty();
m_subtitle_widget = 0;
+ m_tune_state = -1;
+
CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
}
void eDVBServicePlay::serviceEvent(int event)
{
+ m_tune_state = event;
+
switch (event)
{
case eDVBServicePMTHandler::eventTuned:
}
break;
}
+ case eDVBServicePMTHandler::eventNoResources:
+ case eDVBServicePMTHandler::eventNoPAT:
+ case eDVBServicePMTHandler::eventNoPATEntry:
+ case eDVBServicePMTHandler::eventNoPMT:
case eDVBServicePMTHandler::eventTuneFailed:
{
- eDebug("DVB service failed to tune");
+ eDebug("DVB service failed to tune - error %d", event);
m_event((iPlayableService*)this, evTuneFailed);
break;
}
m_event((iPlayableService*)this, evSOF);
break;
case eDVBServicePMTHandler::eventEOF:
- switchToLive();
+ if ((!m_is_paused) && (m_skipmode >= 0))
+ switchToLive();
break;
}
}
to start recording from the data demux. */
if (m_is_pvr)
m_cue = new eCueSheet();
+ else
+ m_event(this, evStart);
m_first_program_info = 1;
eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference;
}
if (m_is_pvr)
+ {
loadCuesheet();
-
- m_event(this, evStart);
- m_event((iPlayableService*)this, evSeekableStatusChanged);
+ m_event(this, evStart);
+ }
return 0;
}
/* add bookmark for last play position */
if (m_is_pvr)
{
- pts_t play_position;
+ pts_t play_position, length;
if (!getPlayPosition(play_position))
{
/* remove last position */
++i;
}
- m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
+ if (getLength(length))
+ length = 0;
+
+ if (length)
+ {
+ int perc = play_position * 100LL / length;
+
+ /* only store last play position when between 5% and 95% */
+ if ((5 < perc) && (perc < 95))
+ m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
+ }
m_cuesheet_changed = 1;
}
}
if (!::stat(m_reference.path.c_str(), &s))
saveCuesheet();
}
-
+ m_event((iPlayableService*)this, evStopped);
return 0;
}
return m_decoder->setFastForward(ffratio);
}
-
+
RESULT eDVBServicePlay::seek(ePtr<iSeekableService> &ptr)
{
if (m_is_pvr || m_timeshift_enabled)
return 0;
}
-RESULT eDVBServicePlay::radioText(ePtr<iRadioText> &ptr)
+RESULT eDVBServicePlay::rdsDecoder(ePtr<iRdsDecoder> &ptr)
{
ptr = this;
return 0;
int eDVBServicePlay::getInfo(int w)
{
eDVBServicePMTHandler::program program;
-
+
if (w == sCAIDs)
return resIsPyObject;
eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
+ int no_program_info = 0;
+
if (h.getProgramInfo(program))
- return -1;
+ no_program_info = 1;
switch (w)
{
+#if HAVE_DVB_API_VERSION >= 3
+ case sVideoHeight:
+ if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+ return m_videoEventData.height;
+ return -1;
+ case sVideoWidth:
+ if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+ return m_videoEventData.width;
+ return -1;
+#else
+#warning "FIXMEE implement sVideoHeight, sVideoWidth for old DVB API"
+#endif
case sAspect:
- if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1)
+#if HAVE_DVB_API_VERSION >= 3
+ if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown)
+ return m_videoEventData.aspect == VIDEO_FORMAT_4_3 ? 1 : 3;
+ else
+#else
+#warning "FIXMEE implement sAspect for old DVB API"
+#endif
+ if (no_program_info)
+ return -1;
+ else if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1)
{
ePtr<eServiceEvent> evt;
if (!m_event_handler.getEvent(evt, 0))
}
}
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[0].pid;
- case sPCRPID: return program.pcrPid;
- case sPMTPID: return program.pmtPid;
- case sTXTPID: return program.textPid;
+ case sIsCrypted: if (no_program_info) return -1; return program.isCrypted();
+ case sVideoPID: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid;
+ case sVideoType: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type;
+ case sAudioPID: if (no_program_info) return -1; if (program.audioStreams.empty()) return -1; return program.audioStreams[0].pid;
+ case sPCRPID: if (no_program_info) return -1; return program.pcrPid;
+ case sPMTPID: if (no_program_info) return -1; return program.pmtPid;
+ case sTXTPID: if (no_program_info) return -1; return program.textPid;
case sSID: return ((const eServiceReferenceDVB&)m_reference).getServiceID().get();
case sONID: return ((const eServiceReferenceDVB&)m_reference).getOriginalNetworkID().get();
case sTSID: return ((const eServiceReferenceDVB&)m_reference).getTransportStreamID().get();
case sNamespace: return ((const eServiceReferenceDVB&)m_reference).getDVBNamespace().get();
case sProvider: if (!m_dvb_service) return -1; return -2;
case sServiceref: return resIsString;
+ case sDVBState: return m_tune_state;
default:
return -1;
}
{
case sCAIDs:
return m_service_handler.getCaIds();
+ case sTransponderData:
+ return eStaticServiceDVBInformation().getInfoObject(m_reference, w);
default:
break;
}
if (m_decoder->setAudioPID(program.audioStreams[i].pid, program.audioStreams[i].type))
return -4;
- if (m_radiotext_parser)
- m_radiotext_parser->start(program.audioStreams[i].pid);
+ if (m_rds_decoder)
+ m_rds_decoder->start(program.audioStreams[i].pid);
if (m_dvb_service && !m_is_pvr)
{
return 0;
}
-std::string eDVBServicePlay::getRadioText(int x)
+std::string eDVBServicePlay::getText(int x)
{
- if (m_radiotext_parser)
+ if (m_rds_decoder)
switch(x)
{
- case 0:
- return convertLatin1UTF8(m_radiotext_parser->getCurrentText());
+ case RadioText:
+ return convertLatin1UTF8(m_rds_decoder->getRadioText());
+ case RtpText:
+ return convertLatin1UTF8(m_rds_decoder->getRtpText());
}
return "";
}
-void eDVBServicePlay::radioTextUpdated()
+void eDVBServicePlay::rdsDecoderEvent(int what)
+{
+ switch(what)
+ {
+ case eDVBRdsDecoder::RadioTextChanged:
+ m_event((iPlayableService*)this, evUpdatedRadioText);
+ break;
+ case eDVBRdsDecoder::RtpTextChanged:
+ m_event((iPlayableService*)this, evUpdatedRtpText);
+ break;
+ case eDVBRdsDecoder::RassInteractivePicMaskChanged:
+ m_event((iPlayableService*)this, evUpdatedRassInteractivePicMask);
+ break;
+ case eDVBRdsDecoder::RecvRassSlidePic:
+ m_event((iPlayableService*)this, evUpdatedRassSlidePic);
+ break;
+ }
+}
+
+void eDVBServicePlay::showRassSlidePicture()
+{
+ if (m_rds_decoder)
+ {
+ if (m_decoder)
+ {
+ std::string rass_slide_pic = m_rds_decoder->getRassSlideshowPicture();
+ if (rass_slide_pic.length())
+ m_decoder->showSinglePic(rass_slide_pic.c_str());
+ else
+ eDebug("empty filename for rass slide picture received!!");
+ }
+ else
+ eDebug("no MPEG Decoder to show iframes avail");
+ }
+ else
+ eDebug("showRassSlidePicture called.. but not decoder");
+}
+
+void eDVBServicePlay::showRassInteractivePic(int page, int subpage)
+{
+ if (m_rds_decoder)
+ {
+ if (m_decoder)
+ {
+ std::string rass_interactive_pic = m_rds_decoder->getRassPicture(page, subpage);
+ if (rass_interactive_pic.length())
+ m_decoder->showSinglePic(rass_interactive_pic.c_str());
+ else
+ eDebug("empty filename for rass interactive picture %d/%d received!!", page, subpage);
+ }
+ else
+ eDebug("no MPEG Decoder to show iframes avail");
+ }
+ else
+ eDebug("showRassInteractivePic called.. but not decoder");
+}
+
+ePyObject eDVBServicePlay::getRassInteractiveMask()
{
- m_event((iPlayableService*)this, evUpdatedRadioText);
+ if (m_rds_decoder)
+ return m_rds_decoder->getRassPictureMask();
+ Py_RETURN_NONE;
}
int eDVBServiceBase::getFrontendInfo(int w)
return fe->readFrontendData(w);
}
-PyObject *eDVBServiceBase::getFrontendData(bool original)
+PyObject *eDVBServiceBase::getFrontendData()
{
- ePyObject ret;
+ ePyObject ret = PyDict_New();
+ if (ret)
+ {
+ eUsePtr<iDVBChannel> channel;
+ if(!m_service_handler.getChannel(channel))
+ {
+ ePtr<iDVBFrontend> fe;
+ if(!channel->getFrontend(fe))
+ fe->getFrontendData(ret);
+ }
+ }
+ else
+ Py_RETURN_NONE;
+ return ret;
+}
- eUsePtr<iDVBChannel> channel;
- if(!m_service_handler.getChannel(channel))
+PyObject *eDVBServiceBase::getFrontendStatus()
+{
+ ePyObject ret = PyDict_New();
+ if (ret)
+ {
+ eUsePtr<iDVBChannel> channel;
+ if(!m_service_handler.getChannel(channel))
+ {
+ ePtr<iDVBFrontend> fe;
+ if(!channel->getFrontend(fe))
+ fe->getFrontendStatus(ret);
+ }
+ }
+ else
+ Py_RETURN_NONE;
+ return ret;
+}
+
+PyObject *eDVBServiceBase::getTransponderData(bool original)
+{
+ ePyObject ret = PyDict_New();
+ if (ret)
{
- ePtr<iDVBFrontend> fe;
- if(!channel->getFrontend(fe))
+ eUsePtr<iDVBChannel> channel;
+ if(!m_service_handler.getChannel(channel))
{
- ret = fe->readTransponderData(original);
- if (ret)
+ ePtr<iDVBFrontend> fe;
+ if(!channel->getFrontend(fe))
{
+ fe->getTransponderData(ret, original);
ePtr<iDVBFrontendParameters> feparm;
channel->getCurrentFrontendParameters(feparm);
if (feparm)
}
}
}
- if (!ret)
+ else
+ Py_RETURN_NONE;
+ return ret;
+}
+
+PyObject *eDVBServiceBase::getAll(bool original)
+{
+ ePyObject ret = getTransponderData(original);
+ if (ret != Py_None)
{
- ret = Py_None;
- Py_INCREF(ret);
+ eUsePtr<iDVBChannel> channel;
+ if(!m_service_handler.getChannel(channel))
+ {
+ ePtr<iDVBFrontend> fe;
+ if(!channel->getFrontend(fe))
+ {
+ fe->getFrontendData(ret);
+ fe->getFrontendStatus(ret);
+ }
+ }
}
return ret;
}
close(m_timeshift_fd);
eDebug("remove timeshift file");
- remove(m_timeshift_file.c_str());
+ eBackgroundFileEraser::getInstance()->erase(m_timeshift_file.c_str());
return 0;
}
i != program.audioStreams.end(); ++i)
pids_to_record.insert(i->pid);
+ for (std::vector<eDVBServicePMTHandler::subtitleStream>::const_iterator
+ i(program.subtitleStreams.begin());
+ i != program.subtitleStreams.end(); ++i)
+ pids_to_record.insert(i->pid);
+
std::set<int> new_pids, obsolete_pids;
std::set_difference(pids_to_record.begin(), pids_to_record.end(),
m_decoder = 0;
m_decode_demux = 0;
m_teletext_parser = 0;
- m_radiotext_parser = 0;
+ m_rds_decoder = 0;
m_subtitle_parser = 0;
m_new_dvb_subtitle_page_connection = 0;
m_new_subtitle_page_connection = 0;
- m_radiotext_updated_connection = 0;
+ m_rds_decoder_event_connection = 0;
+ m_video_event_connection = 0;
/* free the timeshift service handler, we need the resources */
m_service_handler_timeshift.free();
m_decode_demux = 0;
m_decoder = 0;
m_teletext_parser = 0;
- m_radiotext_parser = 0;
+ m_rds_decoder = 0;
m_subtitle_parser = 0;
m_new_subtitle_page_connection = 0;
m_new_dvb_subtitle_page_connection = 0;
- m_radiotext_updated_connection = 0;
+ m_rds_decoder_event_connection = 0;
+ m_video_event_connection = 0;
m_timeshift_active = 1;
- m_event((iPlayableService*)this, evSeekableStatusChanged);
-
eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference;
r.path = m_timeshift_file;
m_cue = new eCueSheet();
m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */
- updateDecoder(); /* mainly to switch off PCR */
+
+ eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now.");
+ pause();
+ updateDecoder(); /* mainly to switch off PCR, and to set pause */
+
+ m_event((iPlayableService*)this, evSeekableStatusChanged);
}
void eDVBServicePlay::updateDecoder()
{
h.getDecodeDemux(m_decode_demux);
if (m_decode_demux)
+ {
m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary);
+ if (m_decoder)
+ m_decoder->connectVideoEvent(slot(*this, &eDVBServicePlay::video_event), m_video_event_connection);
+ }
if (m_cue)
m_cue->setDecodingDemux(m_decode_demux, m_decoder);
m_teletext_parser = new eDVBTeletextParser(m_decode_demux);
ePtr<iDVBDemux> data_demux;
if (!h.getDataDemux(data_demux))
{
- m_radiotext_parser = new eDVBRadioTextParser(data_demux);
- m_radiotext_parser->connectUpdatedRadiotext(slot(*this, &eDVBServicePlay::radioTextUpdated), m_radiotext_updated_connection);
- m_radiotext_parser->start(apid);
+ m_rds_decoder = new eDVBRdsDecoder(data_demux);
+ m_rds_decoder->connectEvent(slot(*this, &eDVBServicePlay::rdsDecoderEvent), m_rds_decoder_event_connection);
+ m_rds_decoder->start(apid);
}
}
}
if (!m_is_primary)
m_decoder->setTrickmode(1);
- m_decoder->start();
+ if (m_is_paused)
+ m_decoder->preroll();
+ else
+ m_decoder->start();
if (vpid > 0 && vpid < 0x2000)
;
m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
}
- }
+ }
m_have_video_pid = (vpid > 0 && vpid < 0x2000);
}
}
}
}
- Py_INCREF(Py_None);
- return Py_None;
+ Py_RETURN_NONE;
}
PyObject *eDVBServicePlay::getSubtitleList()
{
if (!m_teletext_parser)
- {
- Py_INCREF(Py_None);
- return Py_None;
- }
+ Py_RETURN_NONE;
ePyObject l = PyList_New(0);
std::set<int> added_ttx_pages;
m_decoder->setPCMDelay(delay);
}
+void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event)
+{
+ memcpy(&m_videoEventData, &event, sizeof(iTSMPEGDecoder::videoEvent));
+ m_event((iPlayableService*)this, evVideoSizeChanged);
+}
+
+RESULT eDVBServicePlay::stream(ePtr<iStreamableService> &ptr)
+{
+ ptr = this;
+ return 0;
+}
+
+PyObject *eDVBServicePlay::getStreamingData()
+{
+ eDVBServicePMTHandler::program program;
+ if (m_service_handler.getProgramInfo(program))
+ {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+
+ PyObject *r = program.createPythonObject();
+ ePtr<iDVBDemux> demux;
+ if (!m_service_handler.getDataDemux(demux))
+ {
+ uint8_t demux_id;
+ demux->getCADemuxID(demux_id);
+
+ PyDict_SetItemString(r, "demux", PyInt_FromLong(demux_id));
+ }
+
+ return r;
+}
+
+
DEFINE_REF(eDVBServicePlay)
+PyObject *eDVBService::getInfoObject(const eServiceReference &ref, int w)
+{
+ switch (w)
+ {
+ case iServiceInformation::sTransponderData:
+ return eStaticServiceDVBInformation().getInfoObject(ref, w);
+ default:
+ break;
+ }
+ return iStaticServiceInformation::getInfoObject(ref, w);
+}
+
eAutoInitPtr<eServiceFactoryDVB> init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");
git.cweiske.de / enigma2.git / blobdiff