X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.cpp;h=852c4034aec4fae7f399ff982e71875fb21a649e;hb=07aa6cf57eae72224a32f6ef3f83b299f49977cf;hp=756c6854c3a34f271920a5cdc9b64d2783253b10;hpb=4911a0121954f6b6657ba28fab8d9dd9031d9a59;p=vuplus_dvbapp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 756c685..852c403 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -15,6 +15,7 @@ #include #include #include +#include DEFINE_REF(eDVBRegisteredFrontend); DEFINE_REF(eDVBRegisteredDemux); @@ -93,6 +94,8 @@ eDVBResourceManager::eDVBResourceManager() num_adapter++; } + setUsbTuner(); + int fd = open("/proc/stb/info/model", O_RDONLY); char tmp[255]; int rd = fd >= 0 ? read(fd, tmp, 255) : 0; @@ -151,11 +154,7 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr) { struct stat s; char filename[128]; -#if HAVE_DVB_API_VERSION < 3 - sprintf(filename, "/dev/dvb/card%d/frontend%d", m_nr, num_fe); -#else sprintf(filename, "/dev/dvb/adapter%d/frontend%d", m_nr, num_fe); -#endif if (stat(filename, &s)) break; eDVBFrontend *fe; @@ -182,11 +181,7 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr) { struct stat s; char filename[128]; -#if HAVE_DVB_API_VERSION < 3 - sprintf(filename, "/dev/dvb/card%d/demux%d", m_nr, num_demux); -#else sprintf(filename, "/dev/dvb/adapter%d/demux%d", m_nr, num_demux); -#endif if (stat(filename, &s)) break; ePtr demux; @@ -246,11 +241,7 @@ int eDVBAdapterLinux::exist(int nr) { struct stat s; char filename[128]; -#if HAVE_DVB_API_VERSION < 3 - sprintf(filename, "/dev/dvb/card%d", nr); -#else sprintf(filename, "/dev/dvb/adapter%d", nr); -#endif if (!stat(filename, &s)) return 1; return 0; @@ -325,6 +316,59 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter) } +void eDVBResourceManager::setUsbTuner() +{ + std::ifstream in("/proc/bus/nim_sockets"); + std::string line; + + int res = -1; + int fe_idx = -1; + int usbtuner_idx[8] = {0}; + int usbtuner_count = 0; + + if (in.is_open()) + { + while(!in.eof()) + { + getline(in, line); + if ((res = sscanf(line.c_str(), "NIM Socket %d:", &fe_idx)) == 1) + continue; + + if ((fe_idx != -1) && (line.find("\tName: ") == 0) && (line.find("VTUNER") != -1)) + usbtuner_idx[usbtuner_count++] = fe_idx; + } + in.close(); + } + + if (usbtuner_count) + { + for (eSmartPtrList::iterator it(m_frontend.begin()); it != m_frontend.end(); ++it) + { + int slotid = it->m_frontend->getSlotID(); + for (int i=0; i < usbtuner_count ; i++) + { + if (slotid == usbtuner_idx[i]) + { + it->m_frontend->setUSBTuner(true); + break; + } + } + } + for (eSmartPtrList::iterator it(m_simulate_frontend.begin()); it != m_simulate_frontend.end(); ++it) + { + int slotid = it->m_frontend->getSlotID(); + for (int i=0; i < usbtuner_count ; i++) + { + if (slotid == usbtuner_idx[i]) + { + it->m_frontend->setUSBTuner(true); + break; + } + } + } + } +} + PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list) { if (!PyList_Check(list)) @@ -388,7 +432,7 @@ bool eDVBResourceManager::frontendIsCompatible(int index, const char *type) } else if (!strcmp(type, "DVB-C")) { -#if DVB_API_VERSION > 5 || DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 6 +#if defined SYS_DVBC_ANNEX_A return i->m_frontend->supportsDeliverySystem(SYS_DVBC_ANNEX_A, false); #else return i->m_frontend->supportsDeliverySystem(SYS_DVBC_ANNEX_AC, false); @@ -420,7 +464,7 @@ void eDVBResourceManager::setFrontendType(int index, const char *type) } else if (!strcmp(type, "DVB-C")) { -#if DVB_API_VERSION > 5 || DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 6 +#if defined SYS_DVBC_ANNEX_A whitelist.push_back(SYS_DVBC_ANNEX_A); #else whitelist.push_back(SYS_DVBC_ANNEX_AC); @@ -2035,7 +2079,8 @@ RESULT eDVBChannel::playSource(ePtr &source, const char *streaminfo_f return -ENOENT; } - m_tstools.setSource(source, streaminfo_file); + m_source = source; + m_tstools.setSource(m_source, streaminfo_file); /* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST, THEN DO A REAL FIX HERE! */ @@ -2043,14 +2088,6 @@ RESULT eDVBChannel::playSource(ePtr &source, const char *streaminfo_f if (m_pvr_fd_dst < 0) { /* (this codepath needs to be improved anyway.) */ -#if HAVE_DVB_API_VERSION < 3 - m_pvr_fd_dst = open("/dev/pvr", O_WRONLY); - if (m_pvr_fd_dst < 0) - { - eDebug("can't open /dev/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved. - return -ENODEV; - } -#else ePtr &demux = m_demux ? m_demux : m_decoder_demux; if (demux) { @@ -2066,18 +2103,17 @@ RESULT eDVBChannel::playSource(ePtr &source, const char *streaminfo_f eDebug("no demux allocated yet.. so its not possible to open the dvr device!!"); return -ENODEV; } -#endif } m_pvr_thread = new eDVBChannelFilePush(); m_pvr_thread->enablePVRCommit(1); /* If the source specifies a length, it's a file. If not, it's a stream */ - m_pvr_thread->setStreamMode(source->isStream()); + m_pvr_thread->setStreamMode(m_source->isStream()); m_pvr_thread->setScatterGather(this); m_event(this, evtPreStart); - m_pvr_thread->start(source, m_pvr_fd_dst); + m_pvr_thread->start(m_source, m_pvr_fd_dst); CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent); m_state = state_ok; @@ -2099,8 +2135,9 @@ void eDVBChannel::stopSource() ::close(m_pvr_fd_dst); m_pvr_fd_dst = -1; } - ePtr d; - m_tstools.setSource(d); + + m_source = NULL; + m_tstools.setSource(m_source); } void eDVBChannel::stopFile() @@ -2141,8 +2178,7 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in } else now = pos; /* fixup supplied */ - off_t off = 0; /* TODO: fixme */ - r = m_tstools.fixupPTS(off, now); + r = m_tstools.fixupPTS(m_source ? m_source->offset() : 0, now); if (r) { eDebug("fixup PTS failed");