diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2005-09-30 19:32:54 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2005-09-30 19:32:54 +0000 |
| commit | 8d8294b4b354436adde202604fffb55c181d686c (patch) | |
| tree | cb56e191bf75fda0d504cfc66e8e1cf4d8575e4e /main | |
| parent | fc233e3a96e68514165781859afc94a2bb33e9e9 (diff) | |
| download | enigma2-8d8294b4b354436adde202604fffb55c181d686c.tar.gz enigma2-8d8294b4b354436adde202604fffb55c181d686c.zip | |
use libdvbsi++ from tuxbox-cvs,
please add http://ghost.dream-multimedia-tv.de/libdvbsi++.bb to your bitbake/openembedded/packages/tuxbox directory and exectute "bitbake -b ../openembedded/packages/tuxbox/libdvbsi++.bb" then install the libdvbsi++...ipk
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 5 | ||||
| -rw-r--r-- | main/enigma-dvbtest.cpp | 10 | ||||
| -rw-r--r-- | main/enigma-playlist.cpp | 2 | ||||
| -rw-r--r-- | main/enigma-scan.cpp | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 5a7d1ef7..dad2b33d 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = \ - -I$(top_srcdir)/include \ - -I/usr/include/python2.3 + -I$(top_srcdir)/include bin_PROGRAMS = enigma2 @@ -13,7 +12,6 @@ enigma2_LDADD_WHOLE = \ $(top_builddir)/lib/components/libenigma_components.a \ $(top_builddir)/lib/driver/libenigma_driver.a \ $(top_builddir)/lib/dvb/libenigma_dvb.a \ - $(top_builddir)/lib/dvb_si/libenigma_dvb_si.a \ $(top_builddir)/lib/dvb_ci/libenigma_dvb_ci.a \ $(top_builddir)/lib/gdi/libenigma_gdi.a \ $(top_builddir)/lib/gui/libenigma_gui.a \ @@ -28,6 +26,7 @@ enigma2_LDADD = \ @MAD_LIBS@ \ @PNG_LIBS@ \ @SIGC_LIBS@ \ + @DVBSI_LIBS@ \ -ldl -lpthread -lcrypt -lresolv -lpython2.4 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) diff --git a/main/enigma-dvbtest.cpp b/main/enigma-dvbtest.cpp index 76c760c4..aa562399 100644 --- a/main/enigma-dvbtest.cpp +++ b/main/enigma-dvbtest.cpp @@ -7,7 +7,7 @@ #include <lib/dvb/db.h> #include <lib/dvb/isection.h> #include <lib/dvb/esection.h> -#include <lib/dvb_si/pmt.h> +#include <dvbsi++/program_map_section.h> #include <lib/dvb/specs.h> #include <unistd.h> @@ -16,7 +16,7 @@ class eMain: public eApplication, public Object ePtr<eDVBResourceManager> m_mgr; ePtr<iDVBChannel> m_channel; ePtr<iDVBDemux> m_demux; - eAUTable<eTable<ProgramMapTable> > m_table; + eAUTable<eTable<ProgramMapSection> > m_table; ePtr<eDVBDB> m_dvbdb; @@ -101,15 +101,15 @@ public: void tableReady(int) { /* table "fertig" (wie auch immer) */ - ePtr<eTable<ProgramMapTable> > ptr; + ePtr<eTable<ProgramMapSection> > ptr; /* erfolgreich? */ if (!m_table.getCurrent(ptr)) { /* dumpen ... */ - ProgramMapTableConstIterator i; + ProgramMapSectionConstIterator i; for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i) { - const ProgramMapTable &pmt = **i; + const ProgramMapSection &pmt = **i; eDebug("pcr pid: %x", pmt.getPcrPid()); } eDebug("program map ..."); diff --git a/main/enigma-playlist.cpp b/main/enigma-playlist.cpp index bafefe9a..51ffe825 100644 --- a/main/enigma-playlist.cpp +++ b/main/enigma-playlist.cpp @@ -9,7 +9,7 @@ #include <lib/dvb/db.h> #include <lib/dvb/isection.h> #include <lib/dvb/esection.h> -#include <lib/dvb_si/pmt.h> +#include <dvbsi++/program_map_section.h> #include <lib/dvb/scan.h> #include <unistd.h> diff --git a/main/enigma-scan.cpp b/main/enigma-scan.cpp index af50548e..4233c0dc 100644 --- a/main/enigma-scan.cpp +++ b/main/enigma-scan.cpp @@ -9,7 +9,7 @@ #include <lib/dvb/db.h> #include <lib/dvb/isection.h> #include <lib/dvb/esection.h> -#include <lib/dvb_si/pmt.h> +#include <dvbsi++/program_map_section.h> #include <lib/dvb/scan.h> #include <unistd.h> |