diff options
Diffstat (limited to 'lib/dvb_ci')
| -rw-r--r-- | lib/dvb_ci/Makefile.am | 30 | ||||
| -rw-r--r-- | lib/dvb_ci/dvbci.cpp | 5 |
2 files changed, 27 insertions, 8 deletions
diff --git a/lib/dvb_ci/Makefile.am b/lib/dvb_ci/Makefile.am index fc7f7625..9ef72492 100644 --- a/lib/dvb_ci/Makefile.am +++ b/lib/dvb_ci/Makefile.am @@ -1,10 +1,28 @@ -INCLUDES = \ - -I$(top_srcdir)/include +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -include Python.h \ + -include $(top_builddir)/enigma2_config.h noinst_LIBRARIES = libenigma_dvb_ci.a -libenigma_dvb_ci_a_SOURCES = dvbci.cpp dvbci_session.cpp dvbci_resmgr.cpp \ - dvbci_appmgr.cpp dvbci_camgr.cpp \ - dvbci_datetimemgr.cpp dvbci_mmi.cpp \ - dvbci_ui.cpp +libenigma_dvb_ci_a_SOURCES = \ + dvbci.cpp \ + dvbci_appmgr.cpp \ + dvbci_camgr.cpp \ + dvbci_datetimemgr.cpp \ + dvbci_mmi.cpp \ + dvbci_resmgr.cpp \ + dvbci_session.cpp \ + dvbci_ui.cpp +dvbciincludedir = $(pkgincludedir)/lib/dvb_ci +dvbciinclude_HEADERS = \ + dvbci.h \ + dvbci_appmgr.h \ + dvbci_camgr.h \ + dvbci_datetimemgr.h \ + dvbci_mmi.h \ + dvbci_resmgr.h \ + dvbci_session.h \ + dvbci_ui.h diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 883fb5a4..8a43e5b1 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -297,8 +297,9 @@ void eDVBCIInterfaces::recheckPMTHandlers() if (!pmthandler->getProgramInfo(p)) { int cnt=0; - for (caidSet::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt) - caids.push_front(*x); + std::set<eDVBServicePMTHandler::program::capid_pair> set(p.caids.begin(), p.caids.end()); + for (std::set<eDVBServicePMTHandler::program::capid_pair>::reverse_iterator x(set.rbegin()); x != set.rend(); ++x, ++cnt) + caids.push_front(x->caid); if (service && cnt) service->m_ca = caids; } |