Support scrambled playback.
[vuplus_dvbapp] / lib / service / servicedvbrecord.cpp
index d0da074..6ce66ae 100644 (file)
@@ -1,18 +1,39 @@
 #include <lib/service/servicedvbrecord.h>
 #include <lib/base/eerror.h>
 #include <lib/dvb/epgcache.h>
+#include <lib/dvb/metaparser.h>
+#include <lib/base/httpstream.h>
+#include <lib/base/nconfig.h>
 
 #include <fcntl.h>
 
+       /* for cutlist */
+#include <byteswap.h>
+#include <netinet/in.h>
+
+#ifndef BYTE_ORDER
+#error no byte order defined!
+#endif
+
 DEFINE_REF(eDVBServiceRecord);
 
-eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref): m_ref(ref)
+eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref, bool isstreamclient):
+       m_ref(ref),m_is_stream_client(isstreamclient)
 {
        CONNECT(m_service_handler.serviceEvent, eDVBServiceRecord::serviceEvent);
+       CONNECT(m_event_handler.m_eit_changed, eDVBServiceRecord::gotNewEvent);
        m_state = stateIdle;
        m_want_record = 0;
+       m_record_ecm = false;
+       m_descramble = true;
+       m_pvr_descramble = false;
        m_tuned = 0;
        m_target_fd = -1;
+       m_error = 0;
+       m_streaming = 0;
+       m_simulate = false;
+       m_last_event_id = -1;
+       m_serviceType = eDVBServicePMTHandler::recording;
 }
 
 void eDVBServiceRecord::serviceEvent(int event)
@@ -24,8 +45,31 @@ void eDVBServiceRecord::serviceEvent(int event)
        {
                eDebug("tuned..");
                m_tuned = 1;
+
+                       /* start feeding EIT updates */
+               ePtr<iDVBDemux> m_demux;
+               if (!m_service_handler.getDataDemux(m_demux))
+               {
+                       eServiceReferenceDVB &ref = (eServiceReferenceDVB&) m_ref;
+                       int sid = ref.getParentServiceID().get();
+                       if (!sid)
+                               sid = ref.getServiceID().get();
+                       if ( ref.getParentTransportStreamID().get() &&
+                               ref.getParentTransportStreamID() != ref.getTransportStreamID() )
+                               m_event_handler.startOther(m_demux, sid);
+                       else
+                               m_event_handler.start(m_demux, sid);
+               }
+
                if (m_state == stateRecording && m_want_record)
                        doRecord();
+               m_event((iRecordableService*)this, evTunedIn);
+               break;
+       }
+       case eDVBServicePMTHandler::eventTuneFailed:
+       {
+               eDebug("record failed to tune");
+               m_event((iRecordableService*)this, evTuneFailed);
                break;
        }
        case eDVBServicePMTHandler::eventNewProgramInfo:
@@ -33,78 +77,166 @@ void eDVBServiceRecord::serviceEvent(int event)
                if (m_state == stateIdle)
                        doPrepare();
                else if (m_want_record) /* doRecord can be called from Prepared and Recording state */
-                       doRecord();
+               {
+                       if (m_pvr_descramble)
+                               updateDecoder();
+                       else
+                               doRecord();
+               }
+               m_event((iRecordableService*)this, evNewProgramInfo);
                break;
        }
+       case eDVBServicePMTHandler::eventMisconfiguration:
+               m_error = errMisconfiguration;
+               m_event((iRecordableService*)this, evTuneFailed);
+               break;
+       case eDVBServicePMTHandler::eventNoResources:
+               m_error = errNoResources;
+               m_event((iRecordableService*)this, evTuneFailed);
+               break;
+       case eDVBServicePMTHandler::eventEOF:
+               m_event((iRecordableService*)this, evPvrEof);
+               break;
+       case eDVBServicePMTHandler::eventStartPvrDescramble:
+               if (m_want_record)
+               {
+                       doRecord();
+               }
+               break;
        }
 }
 
-RESULT eDVBServiceRecord::prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id)
+RESULT eDVBServiceRecord::prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id, const char *name, const char *descr, const char *tags, bool descramble, bool recordecm)
 {
+       bool config_recording_always_ecm = ePythonConfigQuery::getConfigBoolValue("config.recording.always_ecm", false);
+       bool config_recording_never_decrypt = ePythonConfigQuery::getConfigBoolValue("config.recording.never_decrypt", false);
        m_filename = filename;
+       m_streaming = 0;
+       m_descramble = config_recording_never_decrypt ? false : descramble;
+       m_record_ecm = config_recording_always_ecm ? true : recordecm;
+
+       // force descramble for _pvrdesc.ts
+       if (strstr(filename, "_pvrdesc.ts"))
+       {
+               m_pvr_descramble = true;
+               m_descramble = true;
+       }
+
        if (m_state == stateIdle)
        {
                int ret = doPrepare();
                if (!ret)
                {
-                       eEPGCache::getInstance()->Lock();
-                       const eit_event_struct *event = 0;
                        eServiceReferenceDVB ref = m_ref.getParentServiceReference();
+                       ePtr<eDVBResourceManager> res_mgr;
+                       eDVBMetaParser meta;
+                       std::string service_data;
                        if (!ref.valid())
                                ref = m_ref;
-                       if ( eit_event_id != -1 )
-                       {
-                               eDebug("query epg event id %d", eit_event_id);
-                               eEPGCache::getInstance()->lookupEventId(ref, eit_event_id, event);
-                       }
-                       if ( !event && (begTime != -1 && endTime != -1) )
+                       if (!eDVBResourceManager::getInstance(res_mgr))
                        {
-                               time_t queryTime = begTime + ((endTime-begTime)/2);
-                               tm beg, end, query;
-                               localtime_r(&begTime, &beg);
-                               localtime_r(&endTime, &end);
-                               localtime_r(&queryTime, &query);
-                               eDebug("query stime %d:%d:%d, etime %d:%d:%d, qtime %d:%d:%d",
-                                       beg.tm_hour, beg.tm_min, beg.tm_sec,
-                                       end.tm_hour, end.tm_min, end.tm_sec,
-                                       query.tm_hour, query.tm_min, query.tm_sec);
-                               eEPGCache::getInstance()->lookupEventTime(ref, queryTime, event);
+                               ePtr<iDVBChannelList> db;
+                               if (!res_mgr->getChannelList(db))
+                               {
+                                       ePtr<eDVBService> service;
+                                       if (!db->getService(ref, service))
+                                       {
+                                               char tmp[255];
+                                               sprintf(tmp, "f:%x", service->m_flags);
+                                               service_data += tmp;
+                                               // cached pids
+                                               for (int x=0; x < eDVBService::cacheMax; ++x)
+                                               {
+                                                       int entry = service->getCacheEntry((eDVBService::cacheID)x);
+                                                       if (entry != -1)
+                                                       {
+                                                               sprintf(tmp, ",c:%02d%04x", x, entry);
+                                                               service_data += tmp;
+                                                       }
+                                               }
+                                       }
+                               }
                        }
-                       if ( event )
+                       meta.m_time_create = begTime;
+                       meta.m_ref = m_ref;
+                       meta.m_data_ok = 1;
+                       meta.m_service_data = service_data;
+                       if (name)
+                               meta.m_name = name;
+                       if (descr)
+                               meta.m_description = descr;
+                       if (tags)
+                               meta.m_tags = tags;
+                       meta.m_scrambled = !m_descramble;
+                       ret = meta.updateMeta(m_filename) ? -255 : 0;
+                       if (!ret)
                        {
-                               eDebug("found event.. store to disc");
-                               std::string fname = filename;
-                               fname.erase(fname.length()-2, 2);
-                               fname+="eit";
-                               int fd = open(fname.c_str(), O_CREAT|O_WRONLY, 0777);
-                               if (fd>-1)
+                               const eit_event_struct *event = 0;
+                               eEPGCache::getInstance()->Lock();
+                               if ( eit_event_id != -1 )
+                               {
+                                       eDebug("query epg event id %d", eit_event_id);
+                                       eEPGCache::getInstance()->lookupEventId(ref, eit_event_id, event);
+                               }
+                               if ( !event && (begTime != -1 && endTime != -1) )
                                {
-                                       int evLen=HILO(event->descriptors_loop_length)+12/*EIT_LOOP_SIZE*/;
-                                       int wr = ::write( fd, (unsigned char*)event, evLen );
-                                       if ( wr != evLen )
-                                               eDebug("eit write error (%m)");
-                                       ::close(fd);
+                                       time_t queryTime = begTime + ((endTime-begTime)/2);
+                                       tm beg, end, query;
+                                       localtime_r(&begTime, &beg);
+                                       localtime_r(&endTime, &end);
+                                       localtime_r(&queryTime, &query);
+                                       eDebug("query stime %d:%d:%d, etime %d:%d:%d, qtime %d:%d:%d",
+                                               beg.tm_hour, beg.tm_min, beg.tm_sec,
+                                               end.tm_hour, end.tm_min, end.tm_sec,
+                                               query.tm_hour, query.tm_min, query.tm_sec);
+                                       eEPGCache::getInstance()->lookupEventTime(ref, queryTime, event);
                                }
+                               if ( event )
+                               {
+                                       eDebug("found event.. store to disc");
+                                       std::string fname = m_filename;
+                                       fname.erase(fname.length()-2, 2);
+                                       fname+="eit";
+                                       int fd = open(fname.c_str(), O_CREAT|O_WRONLY, 0777);
+                                       if (fd>-1)
+                                       {
+                                               int evLen=HILO(event->descriptors_loop_length)+12/*EIT_LOOP_SIZE*/;
+                                               int wr = ::write( fd, (unsigned char*)event, evLen );
+                                               if ( wr != evLen )
+                                                       eDebug("eit write error (%m)");
+                                               ::close(fd);
+                                       }
+                               }
+                               eEPGCache::getInstance()->Unlock();
                        }
-                       eEPGCache::getInstance()->Unlock();
                }
                return ret;
        }
-       else
-               return -1;
+       return -1;
+}
+
+RESULT eDVBServiceRecord::prepareStreaming()
+{
+       m_filename = "";
+       m_streaming = 1;
+       if (m_state == stateIdle)
+               return doPrepare();
+       return -1;
 }
 
-RESULT eDVBServiceRecord::start()
+RESULT eDVBServiceRecord::start(bool simulate)
 {
+       m_simulate = simulate;
        m_want_record = 1;
                /* when tune wasn't yet successfully, doRecord stays in "prepared"-state which is fine. */
+       m_event((iRecordableService*)this, evStart);
        return doRecord();
 }
 
-
 RESULT eDVBServiceRecord::stop()
 {
-       eDebug("stop recording!!");
+       if (!m_simulate)
+               eDebug("stop recording!");
        if (m_state == stateRecording)
        {
                if (m_record)
@@ -114,26 +246,82 @@ RESULT eDVBServiceRecord::stop()
                        ::close(m_target_fd);
                        m_target_fd = -1;
                }
+               
+               saveCutlist();
+               
                m_state = statePrepared;
-       }
-       
+       } else if (!m_simulate)
+               eDebug("(was not recording)");
        if (m_state == statePrepared)
        {
                m_record = 0;
                m_state = stateIdle;
        }
+       m_event((iRecordableService*)this, evRecordStopped);
        return 0;
 }
 
-
 int eDVBServiceRecord::doPrepare()
 {
                /* allocate a ts recorder if we don't already have one. */
        if (m_state == stateIdle)
        {
+               int use_decode_demux = 0;
+
+               if (m_streaming)
+               {
+                       m_serviceType = m_record_ecm ? eDVBServicePMTHandler::scrambled_streamserver : eDVBServicePMTHandler::streamserver;
+               }
+               else
+               {
+                       m_serviceType = m_record_ecm ? eDVBServicePMTHandler::scrambled_recording : eDVBServicePMTHandler::recording;
+               }
+
                m_pids_active.clear();
                m_state = statePrepared;
-               return m_service_handler.tune(m_ref, 0);
+               ePtr<iTsSource> source;
+               if (!m_simulate && !m_ref.path.empty())
+               {
+                       if (m_is_stream_client)
+                       {
+                               m_descramble = true; // assume stream is scrambled
+                               m_record_ecm = false;
+                               m_serviceType = eDVBServicePMTHandler::streamclient;
+                               eHttpStream *f = new eHttpStream();
+                               f->open(m_ref.path.c_str());
+                               source = ePtr<iTsSource>(f);
+                       }
+                       else
+                       {
+                               use_decode_demux = 1;
+
+                               /* re-record a recording */
+                               eDVBMetaParser meta;
+                               if (!meta.parseFile(m_ref.path))
+                               {
+                                       m_descramble = meta.m_scrambled;
+                               }
+
+                               if(m_pvr_descramble)
+                               {
+                                       m_serviceType = eDVBServicePMTHandler::pvrDescramble;
+                               }
+                               else
+                               {
+                                       m_serviceType = eDVBServicePMTHandler::offline;
+                               }
+
+                               eRawFile *f = new eRawFile();
+                               f->open(m_ref.path.c_str());
+                               source = ePtr<iTsSource>(f);
+                       }
+                       m_event((iRecordableService*)this, evPvrTuneStart);
+               }
+               else
+               {
+                       m_event((iRecordableService*)this, evTuneStart);
+               }
+               return m_service_handler.tuneExt(m_ref, use_decode_demux, source, m_ref.path.c_str(), 0, m_simulate, 0, m_serviceType, m_descramble);
        }
        return 0;
 }
@@ -142,13 +330,32 @@ int eDVBServiceRecord::doRecord()
 {
        int err = doPrepare();
        if (err)
+       {
+               m_error = errTuneFailed;
+               m_event((iRecordableService*)this, evRecordFailed);
                return err;
+       }
        
        if (!m_tuned)
                return 0; /* try it again when we are tuned in */
        
-       if (!m_record && m_tuned)
+       if (!m_record && m_tuned && !m_streaming && !m_simulate)
        {
+               if (m_pvr_descramble)
+               {
+                       if (m_service_handler.isPmtReady())
+                       {
+                               if (!m_service_handler.isCiConnected())
+                               {
+                                       m_event((iRecordableService*)this, evRecordFailed);
+                                       return errNoCiConnected;
+                               }
+                       }
+                       else
+                       {
+                               return 0;
+                       }
+               }
 
                eDebug("Recording to %s...", m_filename.c_str());
                ::remove(m_filename.c_str());
@@ -156,123 +363,424 @@ int eDVBServiceRecord::doRecord()
                if (fd == -1)
                {
                        eDebug("eDVBServiceRecord - can't open recording file!");
-                       return -1;
+                       m_error = errOpenRecordFile;
+                       m_event((iRecordableService*)this, evRecordFailed);
+                       return errOpenRecordFile;
                }
-               
+
                        /* turn off kernel caching strategies */
                posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM);
-               
+
                ePtr<iDVBDemux> demux;
                if (m_service_handler.getDataDemux(demux))
                {
                        eDebug("eDVBServiceRecord - NO DEMUX available!");
-                       return -2;
+                       m_error = errNoDemuxAvailable;
+                       m_event((iRecordableService*)this, evRecordFailed);
+                       return errNoDemuxAvailable;
                }
                demux->createTSRecorder(m_record);
                if (!m_record)
                {
                        eDebug("eDVBServiceRecord - no ts recorder available.");
-                       return -3;
+                       m_error = errNoTsRecorderAvailable;
+                       m_event((iRecordableService*)this, evRecordFailed);
+                       return errNoTsRecorderAvailable;
                }
                m_record->setTargetFD(fd);
                m_record->setTargetFilename(m_filename.c_str());
+               m_record->connectEvent(slot(*this, &eDVBServiceRecord::recordEvent), m_con_record_event);
+
                m_target_fd = fd;
        }
-       eDebug("starting recording..");
        
+       if (m_streaming)
+       {
+               m_state = stateRecording;
+               eDebug("start streaming...");
+       } else
+       {
+               eDebug("start recording...");
+
+               eDVBServicePMTHandler::program program;
+               if (m_service_handler.getProgramInfo(program))
+                       eDebug("getting program info failed.");
+               else
+               {
+                       std::set<int> pids_to_record;
+
+                       pids_to_record.insert(0); // PAT
+
+                       if (program.pmtPid != -1)
+                               pids_to_record.insert(program.pmtPid); // PMT
+
+                       int timing_pid = -1, timing_pid_type = -1;
+
+                       eDebugNoNewLine("RECORD: have %zd video stream(s)", program.videoStreams.size());
+                       if (!program.videoStreams.empty())
+                       {
+                               eDebugNoNewLine(" (");
+                               for (std::vector<eDVBServicePMTHandler::videoStream>::const_iterator
+                                       i(program.videoStreams.begin()); 
+                                       i != program.videoStreams.end(); ++i)
+                               {
+                                       pids_to_record.insert(i->pid);
+                                       
+                                       if (timing_pid == -1)
+                                       {
+                                               timing_pid = i->pid;
+                                               timing_pid_type = i->type;
+                                       }
+                                       
+                                       if (i != program.videoStreams.begin())
+                                                       eDebugNoNewLine(", ");
+                                       eDebugNoNewLine("%04x", i->pid);
+                               }
+                               eDebugNoNewLine(")");
+                       }
+                       eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
+                       if (!program.audioStreams.empty())
+                       {
+                               eDebugNoNewLine(" (");
+                               for (std::vector<eDVBServicePMTHandler::audioStream>::const_iterator
+                                       i(program.audioStreams.begin()); 
+                                       i != program.audioStreams.end(); ++i)
+                               {
+                                       pids_to_record.insert(i->pid);
+       
+                                       if (timing_pid == -1)
+                                       {
+                                               timing_pid = i->pid;
+                                               timing_pid_type = -1;
+                                       }
+                               
+                                       if (i != program.audioStreams.begin())
+                                               eDebugNoNewLine(", ");
+                                       eDebugNoNewLine("%04x", i->pid);
+                               }
+                               eDebugNoNewLine(")");
+                       }
+                       if (!program.subtitleStreams.empty())
+                       {
+                               eDebugNoNewLine(" (");
+                               for (std::vector<eDVBServicePMTHandler::subtitleStream>::const_iterator
+                                       i(program.subtitleStreams.begin());
+                                       i != program.subtitleStreams.end(); ++i)
+                               {
+                                       pids_to_record.insert(i->pid);
+       
+                                       if (i != program.subtitleStreams.begin())
+                                               eDebugNoNewLine(", ");
+                                       eDebugNoNewLine("%04x", i->pid);
+                               }
+                               eDebugNoNewLine(")");
+                       }
+                       eDebugNoNewLine(", and the pcr pid is %04x", program.pcrPid);
+                       if (program.pcrPid != 0x1fff)
+                               pids_to_record.insert(program.pcrPid);
+                       eDebug(", and the text pid is %04x", program.textPid);
+                       if (program.textPid != -1)
+                               pids_to_record.insert(program.textPid); // Videotext
+
+                       if (m_record_ecm)
+                       {
+                               for (std::list<eDVBServicePMTHandler::program::capid_pair>::const_iterator i(program.caids.begin());
+                                                       i != program.caids.end(); ++i)
+                               {
+                                       if (i->capid >= 0) pids_to_record.insert(i->capid);
+                               }
+                               pids_to_record.insert(EventInformationSection::PID);
+                               pids_to_record.insert(TimeAndDateSection::PID);
+                       }
+
+                       {
+                               int isCrypted = (int)program.isCrypted();
+                               int scrambled = !m_descramble;
+                               if (!m_descramble)
+                               {
+                                       scrambled = isCrypted;
+                               }
+                               else if (!isCrypted)
+                               {
+                                       scrambled = 0;
+                               }
+                               else // m_descramble && isCrypted
+                               {
+                                       if (!m_service_handler.isCiConnected())
+                                               scrambled = 1;
+                                       else
+                                               scrambled = 0;
+                               }
+                               eDVBMetaParser dvbParser;
+                               dvbParser.parseFile(m_filename);
+                               dvbParser.m_scrambled = scrambled;
+                               dvbParser.updateMeta(m_filename);
+                       }
+
+                               /* find out which pids are NEW and which pids are obsolete.. */
+                       std::set<int> new_pids, obsolete_pids;
+
+                       std::set_difference(pids_to_record.begin(), pids_to_record.end(), 
+                                       m_pids_active.begin(), m_pids_active.end(),
+                                       std::inserter(new_pids, new_pids.begin()));
+
+                       std::set_difference(
+                                       m_pids_active.begin(), m_pids_active.end(),
+                                       pids_to_record.begin(), pids_to_record.end(), 
+                                       std::inserter(obsolete_pids, obsolete_pids.begin())
+                                       );
+                       
+                       for (std::set<int>::iterator i(new_pids.begin()); i != new_pids.end(); ++i)
+                       {
+                               eDebug("ADD PID: %04x", *i);
+                               m_record->addPID(*i);
+                       }
+
+                       for (std::set<int>::iterator i(obsolete_pids.begin()); i != obsolete_pids.end(); ++i)
+                       {
+                               eDebug("REMOVED PID: %04x", *i);
+                               m_record->removePID(*i);
+                       }
+
+                       if (timing_pid != -1)
+                               m_record->setTimingPID(timing_pid, timing_pid_type);
+
+                       m_pids_active = pids_to_record;
+
+                       if (m_state != stateRecording)
+                       {
+                               m_record->start();
+                               m_state = stateRecording;
+                       }
+               }
+       }
+       m_error = 0;
+       m_event((iRecordableService*)this, evRecordRunning);
+       return 0;
+}
+
+void eDVBServiceRecord::updateDecoder()
+{
+       int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1;
+
+       eDVBServicePMTHandler &h = m_service_handler;
+
        eDVBServicePMTHandler::program program;
        if (m_service_handler.getProgramInfo(program))
                eDebug("getting program info failed.");
        else
        {
-               std::set<int> pids_to_record;
-               
-               pids_to_record.insert(0); // PAT
-               
-               if (program.pmtPid != -1)
-                       pids_to_record.insert(program.pmtPid); // PMT
-               
-               int timing_pid = -1;
-               
-               eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size());
+               eDebugNoNewLine("have %zd video stream(s)", program.videoStreams.size());
                if (!program.videoStreams.empty())
                {
                        eDebugNoNewLine(" (");
                        for (std::vector<eDVBServicePMTHandler::videoStream>::const_iterator
-                               i(program.videoStreams.begin()); 
+                               i(program.videoStreams.begin());
                                i != program.videoStreams.end(); ++i)
                        {
-                               pids_to_record.insert(i->pid);
-                               
-                               if (timing_pid == -1)
-                                       timing_pid = i->pid;
-                               
+                               if (vpid == -1)
+                               {
+                                       vpid = i->pid;
+                                       vpidtype = i->type;
+                               }
                                if (i != program.videoStreams.begin())
                                        eDebugNoNewLine(", ");
                                eDebugNoNewLine("%04x", i->pid);
                        }
                        eDebugNoNewLine(")");
                }
-               eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+
+               eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
                if (!program.audioStreams.empty())
                {
                        eDebugNoNewLine(" (");
                        for (std::vector<eDVBServicePMTHandler::audioStream>::const_iterator
-                               i(program.audioStreams.begin()); 
+                               i(program.audioStreams.begin());
                                i != program.audioStreams.end(); ++i)
                        {
-                               pids_to_record.insert(i->pid);
-
-                               if (timing_pid == -1)
-                                       timing_pid = i->pid;
-                               
                                if (i != program.audioStreams.begin())
                                        eDebugNoNewLine(", ");
                                eDebugNoNewLine("%04x", i->pid);
                        }
                        eDebugNoNewLine(")");
                }
+
+               apid = program.audioStreams[program.defaultAudioStream].pid;
+               apidtype = program.audioStreams[program.defaultAudioStream].type;
+
                eDebugNoNewLine(", and the pcr pid is %04x", program.pcrPid);
-               if (program.pcrPid != 0x1fff)
-                       pids_to_record.insert(program.pcrPid);
-               eDebug(", and the text pid is %04x", program.textPid);
-               if (program.textPid != -1)
-                       pids_to_record.insert(program.textPid); // Videotext
-
-                       /* find out which pids are NEW and which pids are obsolete.. */
-               std::set<int> new_pids, obsolete_pids;
-               
-               std::set_difference(pids_to_record.begin(), pids_to_record.end(), 
-                               m_pids_active.begin(), m_pids_active.end(),
-                               std::inserter(new_pids, new_pids.begin()));
-               
-               std::set_difference(
-                               m_pids_active.begin(), m_pids_active.end(),
-                               pids_to_record.begin(), pids_to_record.end(), 
-                               std::inserter(new_pids, new_pids.begin())
-                               );
-               
-               for (std::set<int>::iterator i(new_pids.begin()); i != new_pids.end(); ++i)
+               pcrpid = program.pcrPid;
+       }
+
+       if (!m_decoder)
+       {
+               h.getDecodeDemux(m_decode_demux);
+               if (m_decode_demux)
                {
-                       eDebug("ADD PID: %04x", *i);
-                       m_record->addPID(*i);
+                       m_decode_demux->getMPEGDecoder(m_decoder, 0);
                }
-               for (std::set<int>::iterator i(obsolete_pids.begin()); i != obsolete_pids.end(); ++i)
+       }
+
+       if (m_decoder)
+       {
+               m_decoder->setVideoPID(vpid, vpidtype);
+               m_decoder->setAudioPID(apid, apidtype);
+               m_decoder->setSyncPCR(-1);
+               m_decoder->play();
+       }
+}
+
+RESULT eDVBServiceRecord::frontendInfo(ePtr<iFrontendInformation> &ptr)
+{
+       ptr = this;
+       return 0;
+}
+
+RESULT eDVBServiceRecord::connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection)
+{
+       connection = new eConnection((iRecordableService*)this, m_event.connect(event));
+       return 0;
+}
+
+RESULT eDVBServiceRecord::stream(ePtr<iStreamableService> &ptr)
+{
+       ptr = this;
+       return 0;
+}
+
+extern void PutToDict(ePyObject &dict, const char*key, long val);  // defined in dvb/frontend.cpp
+
+PyObject *eDVBServiceRecord::getStreamingData()
+{
+       eDVBServicePMTHandler::program program;
+       if (!m_tuned || m_service_handler.getProgramInfo(program))
+       {
+               Py_RETURN_NONE;
+       }
+
+       ePyObject r = program.createPythonObject();
+       ePtr<iDVBDemux> demux;
+       if (!m_service_handler.getDataDemux(demux))
+       {
+               uint8_t demux_id;
+               if (!demux->getCADemuxID(demux_id))
+                       PutToDict(r, "demux", demux_id);
+       }
+
+       return r;
+}
+
+void eDVBServiceRecord::recordEvent(int event)
+{
+       switch (event)
+       {
+       case iDVBTSRecorder::eventWriteError:
+               eWarning("[eDVBServiceRecord] record write error");
+               stop();
+               m_event((iRecordableService*)this, evRecordWriteError);
+               return;
+       default:
+               eDebug("unhandled record event %d", event);
+       }
+}
+
+void eDVBServiceRecord::gotNewEvent()
+{
+       ePtr<eServiceEvent> event_now;
+       m_event_handler.getEvent(event_now, 0);
+
+       if (!event_now)
+               return;
+
+       int event_id = event_now->getEventId();
+
+       pts_t p;
+       
+       if (m_record)
+       {
+               if (m_record->getCurrentPCR(p))
+                       eDebug("getting PCR failed!");
+               else
                {
-                       eDebug("REMOVED PID: %04x", *i);
-                       m_record->removePID(*i);
+                       m_event_timestamps[event_id] = p;
+                       eDebug("pcr of eit change: %llx", p);
                }
-               
-               if (timing_pid != -1)
-                       m_record->setTimingPID(timing_pid);
-               
-               m_pids_active = pids_to_record;
-               
-               if (m_state != stateRecording)
+       }
+
+       if (event_id != m_last_event_id)
+               eDebug("[eDVBServiceRecord] now running: %s (%d seconds)", event_now->getEventName().c_str(), event_now->getDuration());
+       
+       m_last_event_id = event_id;
+
+       m_event((iRecordableService*)this, evNewEventInfo);
+}
+
+void eDVBServiceRecord::saveCutlist()
+{
+                       /* XXX: dupe of eDVBServicePlay::saveCuesheet, refactor plz */
+       std::string filename = m_filename + ".cuts";
+
+       eDVBTSTools tstools;
+       
+       if (tstools.openFile(m_filename.c_str()))
+       {
+               eDebug("[eDVBServiceRecord] saving cutlist failed because tstools failed");
+               return;
+       }
+       
+       FILE *f = fopen(filename.c_str(), "wb");
+
+       if (f)
+       {
+               unsigned long long where;
+               int what;
+
+               for (std::map<int,pts_t>::iterator i(m_event_timestamps.begin()); i != m_event_timestamps.end(); ++i)
                {
-                       m_record->start();
-                       m_state = stateRecording;
+                       pts_t p = i->second;
+                       off_t offset = 0; // fixme, we need to note down both
+                       if (tstools.fixupPTS(offset, p))
+                       {
+                               eDebug("[eDVBServiceRecord] fixing up PTS failed, not saving");
+                               continue;
+                       }
+                       eDebug("fixed up %llx to %llx (offset %llx)", i->second, p, offset);
+#if BYTE_ORDER == BIG_ENDIAN
+                       where = p;
+#else
+                       where = bswap_64(p);
+#endif
+                       what = htonl(2); /* mark */
+                       fwrite(&where, sizeof(where), 1, f);
+                       fwrite(&what, sizeof(what), 1, f);
                }
+               fclose(f);
        }
+       
+}
+
+RESULT eDVBServiceRecord::subServices(ePtr<iSubserviceList> &ptr)
+{
+       ptr = this;
+       return 0;
+}
+
+int eDVBServiceRecord::getNumberOfSubservices()
+{
+       ePtr<eServiceEvent> evt;
+       if (!m_event_handler.getEvent(evt, 0))
+               return evt->getNumOfLinkageServices();
        return 0;
 }
+
+RESULT eDVBServiceRecord::getSubservice(eServiceReference &sub, unsigned int n)
+{
+       ePtr<eServiceEvent> evt;
+       if (!m_event_handler.getEvent(evt, 0))
+       {
+               if (!evt->getLinkageService(sub, m_ref, n))
+                       return 0;
+       }
+       sub.type=eServiceReference::idInvalid;
+       return -1;
+}