git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'remotes/origin/bug_609_packetmanager_fixes'
[enigma2.git]
/
lib
/
service
/
servicedvbrecord.h
diff --git
a/lib/service/servicedvbrecord.h
b/lib/service/servicedvbrecord.h
index b46a73ead40125342c52c1221389fcc78ced1f80..0535f02919f02c3658a66b03aa5b6bb0b87fc4da 100644
(file)
--- a/
lib/service/servicedvbrecord.h
+++ b/
lib/service/servicedvbrecord.h
@@
-13,38
+13,49
@@
class eDVBServiceRecord: public eDVBServiceBase,
public iRecordableService,
public iStreamableService,
class eDVBServiceRecord: public eDVBServiceBase,
public iRecordableService,
public iStreamableService,
+ public iSubserviceList,
public Object
{
DECLARE_REF(eDVBServiceRecord);
public:
RESULT connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection);
public Object
{
DECLARE_REF(eDVBServiceRecord);
public:
RESULT connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection);
- RESULT prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id);
+ RESULT prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id
, const char *name, const char *descr, const char *tags
);
RESULT prepareStreaming();
RESULT prepareStreaming();
- RESULT start();
+ RESULT start(
bool simulate=false
);
RESULT stop();
RESULT stream(ePtr<iStreamableService> &ptr);
RESULT getError(int &error) { error = m_error; return 0; }
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr);
RESULT stop();
RESULT stream(ePtr<iStreamableService> &ptr);
RESULT getError(int &error) { error = m_error; return 0; }
RESULT frontendInfo(ePtr<iFrontendInformation> &ptr);
+ RESULT subServices(ePtr<iSubserviceList> &ptr);
- /
* streamable service */
+ /
/ iStreamableService
PyObject *getStreamingData();
PyObject *getStreamingData();
+ // iSubserviceList
+ int getNumberOfSubservices();
+ RESULT getSubservice(eServiceReference &subservice, unsigned int n);
private:
enum { stateIdle, statePrepared, stateRecording };
private:
enum { stateIdle, statePrepared, stateRecording };
+ bool m_simulate;
int m_state, m_want_record;
friend class eServiceFactoryDVB;
eDVBServiceRecord(const eServiceReferenceDVB &ref);
int m_state, m_want_record;
friend class eServiceFactoryDVB;
eDVBServiceRecord(const eServiceReferenceDVB &ref);
+ eDVBServiceEITHandler m_event_handler;
+
eServiceReferenceDVB m_ref;
ePtr<iDVBTSRecorder> m_record;
eServiceReferenceDVB m_ref;
ePtr<iDVBTSRecorder> m_record;
- ePtr<eConnection>
m_con_record_event;
+ ePtr<eConnection> m_con_record_event;
int m_recording, m_tuned, m_error;
std::set<int> m_pids_active;
std::string m_filename;
int m_recording, m_tuned, m_error;
std::set<int> m_pids_active;
std::string m_filename;
+
+ std::map<int,pts_t> m_event_timestamps;
int m_target_fd;
int m_streaming;
int m_target_fd;
int m_streaming;
+ int m_last_event_id;
int doPrepare();
int doRecord();
int doPrepare();
int doRecord();
@@
-55,6
+66,10
@@
private:
/* recorder events */
void recordEvent(int event);
/* recorder events */
void recordEvent(int event);
+
+ /* eit updates */
+ void gotNewEvent();
+ void saveCutlist();
};
#endif
};
#endif