AudioSelection : Dolby Digital downmix -> Donly Digital / DTS downmix

[vuplus_dvbapp] / main / enigma-dvbtest.cpp

diff --git a/main/enigma-dvbtest.cpp b/main/enigma-dvbtest.cpp
index 4fdb698..1eaedb7 100644 (file)
--- 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;
        
@@ -27,34 +27,44 @@ public:
        {
                eDebug("mich gibts nu!");
                
+                       /* Resourcemanager erstellen */
                m_mgr = new eDVBResourceManager();
-               
+       
+               /* Dummy DVB-Channellist anlegen.. */
+                       
+                       /* Datenbank erstellen */
                m_dvbdb = new eDVBDB();
+                       /* als Primary datenbank setzen */
                m_mgr->setChannelList(m_dvbdb);
                
+                       /* testtransponder adden */
                eDVBChannelID chid(1,2,3);
                
+                       /* frontenddaten... */
                eDVBFrontendParametersSatellite fesat;
                
                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();
                
                fe->setDVBS(fesat);
-               
+                       /* Zur Kanalliste hinzufuegen.. */
                m_dvbdb->addChannelToList(chid, fe);
                
+                       /* Channel allokieren... tunen startet hier, sofern noetig */
                if (m_mgr->allocateChannel(chid, m_channel))
                        eDebug("shit it failed!");
                
                if (m_channel)
                {
+                               /* Auf State-Change listenen */
                        m_channel->connectStateChange(slot(*this, &eMain::channelStateChanged), m_state_change_connection);
+                               /* Initial provozieren */
                        channelStateChanged(m_channel);
                }
        }
@@ -62,20 +72,25 @@ public:
        void channelStateChanged(iDVBChannel *channel)
        {
                int state;
+                       /* Channelstate holen */
                channel->getState(state);
                eDebug("channel state is now %d", state);
                
+                       /* Wenn Wechsel von nicht-ok auf ok (das erste mal) */
                if ((m_last_channel_state != iDVBChannel::state_ok)
                         && (state == iDVBChannel::state_ok) && (!m_demux))
                {
                        eDebug("we'll start tuning!");
+                               /* Demux holen */
                        if (m_channel)
                                if (m_channel->getDemux(m_demux))
                                        eDebug("shit it failed.. again.");
                
                        if (m_demux)
                        {
+                                       /* auf table ready connecten */
                                CONNECT(m_table.tableReady, eMain::tableReady);
+                                       /* und section lesen beginnen */
                                m_table.begin(this, eDVBPMTSpec(0x20, 0x33f6), m_demux);
                        }
                }
@@ -85,16 +100,20 @@ public:
        
        void tableReady(int)
        {
-               ePtr<eTable<ProgramMapTable> > ptr;
+                       /* table "fertig" (wie auch immer) */
+               ePtr<eTable<ProgramMapSection> > ptr;
+                               /* erfolgreich? */
                if (!m_table.getCurrent(ptr))
                {
-                       ProgramMapTableConstIterator i;
+                               /* dumpen ... */
+                       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 ...");
+                               /* und raus */
                        quit(0);
                }
                eDebug("table ready.");