X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fenigma-dvbtest.cpp;h=1eaedb769e12636b923a948e158ec974ea553f36;hp=76c760c4f616fea96d9d3565d758d6ce0e83e135;hb=9c998a40679f9b630ccf8cc6fda7384ce94c30e5;hpb=f7bcb76bda4da5d8a830181b4a8335d3de67f333;ds=sidebyside

diff --git a/main/enigma-dvbtest.cpp b/main/enigma-dvbtest.cpp
index 76c760c..1eaedb7 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;
 	
@@ -45,9 +45,9 @@ public:
 		
 		fesat.frequency = 12070000;
 		fesat.symbol_rate = 27500000;
-		fesat.polarisation = eDVBFrontendParametersSatellite::Polarisation::Horizontal;
-		fesat.fec = eDVBFrontendParametersSatellite::FEC::f3_4;
-		fesat.inversion = eDVBFrontendParametersSatellite::Inversion::Off;
+		fesat.polarisation = eDVBFrontendParametersSatellite::Polarisation_Horizontal;
+		fesat.fec = eDVBFrontendParametersSatellite::FEC_3_4;
+		fesat.inversion = eDVBFrontendParametersSatellite::Inversion_Off;
 		fesat.orbital_position = 192;
 
 		eDVBFrontendParameters *fe = new eDVBFrontendParameters();
@@ -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 ...");