- reenable lcd support

[enigma2.git] / lib / dvb / dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index d4cc462cac43f5b5ddc213cc518c0616fab669f7..90df72677b8d7e67713189e01cfbf6cf2fe85f47 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -1,12 +1,14 @@
-#include <lib/dvb/idvb.h>

 #include <lib/base/eerror.h>
 #include <lib/base/eerror.h>

+#include <lib/base/filepush.h>
+#include <lib/dvb/idvb.h>

 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>

-#include <errno.h>

 
 

+#include <errno.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

+#include <fcntl.h>

 
 DEFINE_REF(eDVBRegisteredFrontend);
 DEFINE_REF(eDVBRegisteredDemux);
 
 DEFINE_REF(eDVBRegisteredFrontend);
 DEFINE_REF(eDVBRegisteredDemux);


@@ -74,7 +76,11 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
        {
                struct stat s;
                char filename[128];
        {
                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);
                sprintf(filename, "/dev/dvb/adapter%d/frontend%d", m_nr, num_fe);

+#endif

                if (stat(filename, &s))
                        break;
                ePtr<eDVBFrontend> fe;
                if (stat(filename, &s))
                        break;
                ePtr<eDVBFrontend> fe;


@@ -92,7 +98,11 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
        {
                struct stat s;
                char filename[128];
        {
                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);
                sprintf(filename, "/dev/dvb/adapter%d/demux%d", m_nr, num_demux);

+#endif

                if (stat(filename, &s))
                        break;
                ePtr<eDVBDemux> demux;
                if (stat(filename, &s))
                        break;
                ePtr<eDVBDemux> demux;


@@ -152,7 +162,11 @@ int eDVBAdapterLinux::exist(int nr)
 {
        struct stat s;
        char filename[128];
 {
        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);
        sprintf(filename, "/dev/dvb/adapter%d", nr);

+#endif

        if (!stat(filename, &s))
                return 1;
        return 0;
        if (!stat(filename, &s))
                return 1;
        return 0;


@@ -202,9 +216,9 @@ RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr<eDV
 
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux)
 {
 
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux)
 {

-               /* find first unused demux which is on same adapter as frontend */
+               /* find first unused demux which is on same adapter as frontend (or any, if PVR) */

        for (eSmartPtrList<eDVBRegisteredDemux>::iterator i(m_demux.begin()); i != m_demux.end(); ++i)
        for (eSmartPtrList<eDVBRegisteredDemux>::iterator i(m_demux.begin()); i != m_demux.end(); ++i)

-               if ((!i->m_inuse) && (i->m_adapter == fe->m_adapter))
+               if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))

                {
                        demux = new eDVBAllocatedDemux(i);
                        return 0;
                {
                        demux = new eDVBAllocatedDemux(i);
                        return 0;


@@ -228,7 +242,7 @@ RESULT eDVBResourceManager::getChannelList(ePtr<iDVBChannelList> &list)
 }
 
 
 }
 
 

-RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, ePtr<iDVBChannel> &channel)
+RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel)

 {
                /* first, check if a channel is already existing. */
        
 {
                /* first, check if a channel is already existing. */
        


@@ -277,7 +291,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, ePtr
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBResourceManager::allocateRawChannel(ePtr<iDVBChannel> &channel)
+RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel)

 {
        ePtr<eDVBAllocatedFrontend> fe;
        
 {
        ePtr<eDVBAllocatedFrontend> fe;
        


@@ -300,15 +314,26 @@ RESULT eDVBResourceManager::allocateRawChannel(ePtr<iDVBChannel> &channel)
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBResourceManager::allocatePVRChannel(int caps)
+
+RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)

 {
 {

-       return -1; // will nicht, mag nicht, und das interface ist auch kaputt
+       ePtr<eDVBAllocatedDemux> demux;
+       
+       if (allocateDemux(0, demux))
+               return errNoDemux;
+       
+       eDVBChannel *ch;
+       ch = new eDVBChannel(this, 0, demux);
+       
+       channel = ch;
+       return 0;

 }
 
 RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch)
 {
        eDebug("add channel %p", ch);
        m_active_channels.push_back(active_channel(chid, ch));
 }
 
 RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch)
 {
        eDebug("add channel %p", ch);
        m_active_channels.push_back(active_channel(chid, ch));

+       /* emit */ m_channelAdded(ch);

        return 0;
 }
 
        return 0;
 }
 


@@ -330,12 +355,20 @@ RESULT eDVBResourceManager::removeChannel(eDVBChannel *ch)
        return -ENOENT;
 }
 
        return -ENOENT;
 }
 

+RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection)
+{
+       connection = new eConnection((eDVBResourceManager*)this, m_channelAdded.connect(channelAdded));
+       return 0;
+}
+

 DEFINE_REF(eDVBChannel);
 
 eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux): m_state(state_idle), m_mgr(mgr)
 {
        m_frontend = frontend;
        m_demux = demux;
 DEFINE_REF(eDVBChannel);
 
 eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux): m_state(state_idle), m_mgr(mgr)
 {
        m_frontend = frontend;
        m_demux = demux;

+
+       m_pvr_thread = 0;

        
        if (m_frontend)
                m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged);
        
        if (m_frontend)
                m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged);


@@ -345,12 +378,25 @@ eDVBChannel::~eDVBChannel()
 {
        if (m_channel_id)
                m_mgr->removeChannel(this);
 {
        if (m_channel_id)
                m_mgr->removeChannel(this);

+       
+       if (m_pvr_thread)
+       {
+               m_pvr_thread->stop();
+               ::close(m_pvr_fd_src);
+               ::close(m_pvr_fd_dst);
+               delete m_pvr_thread;
+       }

 }
 
 void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 {
        eDebug("fe state changed!");
        int state, ourstate = 0;
 }
 
 void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 {
        eDebug("fe state changed!");
        int state, ourstate = 0;

+       
+               /* if we are already in shutdown, don't change state. */
+       if (m_state == state_release)
+               return;
+       

        if (fe->getState(state))
                return;
        
        if (fe->getState(state))
                return;
        


@@ -376,6 +422,20 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
        }
 }
 
        }
 }
 

+void eDVBChannel::AddUse()
+{
+       ++m_use_count;
+}
+
+void eDVBChannel::ReleaseUse()
+{
+       if (!--m_use_count)
+       {
+               m_state = state_release;
+               m_stateChanged(this);
+       }
+}
+

 RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
 {
        if (m_channel_id)
 RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
 {
        if (m_channel_id)


@@ -446,3 +506,84 @@ RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
        else
                return -ENODEV;
 }
        else
                return -ENODEV;
 }

+
+RESULT eDVBChannel::playFile(const char *file)
+{
+       ASSERT(!m_frontend);
+       if (m_pvr_thread)
+       {
+               m_pvr_thread->stop();
+               delete m_pvr_thread;
+               m_pvr_thread = 0;
+       }
+       
+       m_tstools.openFile(file);
+       
+               /* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST,
+                  THEN DO A REAL FIX HERE! */
+       
+               /* (this codepath needs to be improved anyway.) */
+       m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
+       if (m_pvr_fd_dst < 0)
+       {
+               eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)");
+               return -ENODEV;
+       }
+       
+       m_pvr_fd_src = open(file, O_RDONLY);
+       if (m_pvr_fd_src < 0)
+       {
+               eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file);
+               close(m_pvr_fd_dst);
+               return -ENOENT;
+       }
+       
+       m_state = state_ok;
+       m_stateChanged(this);
+       
+       m_pvr_thread = new eFilePushThread();
+       m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst);
+}
+
+RESULT eDVBChannel::getLength(pts_t &len)
+{
+       return m_tstools.calcLen(len);
+}
+
+RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
+{
+       off_t begin = 0;
+               /* getPTS for offset 0 is cached, so it doesn't harm. */
+       int r = m_tstools.getPTS(begin, pos);
+       if (r)
+       {
+               eDebug("tstools getpts(0) failed!");
+               return r;
+       }
+       
+       pts_t now;
+       
+       r = m_demux->get().getSTC(now);
+
+       if (r)
+       {
+               eDebug("demux getSTC failed");
+               return -1;
+       }
+       
+//     eDebug("STC: %08llx PTS: %08llx, diff %lld", now, pos, now - pos);
+               /* when we are less than 10 seconds before the start, return 0. */
+               /* (we're just waiting for the timespam to start) */
+       if ((now < pos) && ((pos - now) < 90000 * 10))
+       {
+               pos = 0;
+               return 0;
+       }
+       
+       if (now < pos) /* wrap around */
+               pos = now + ((pts_t)1)<<33 - pos;
+       else
+               pos = now - pos;
+       
+       return 0;
+}