git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add background file eraser class for asynchronous file deletion
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index 2785ce2a567bae6993371af2d9fe6177747e283a..39318b2297df89c3fe6de069ee97d8deecb34784 100644
(file)
--- a/
lib/service/servicedvb.h
+++ b/
lib/service/servicedvb.h
@@
-77,7
+77,6
@@
public:
RESULT subServices(ePtr<iSubserviceList> &ptr);
RESULT timeshift(ePtr<iTimeshiftService> &ptr);
RESULT cueSheet(ePtr<iCueSheet> &ptr);
RESULT subServices(ePtr<iSubserviceList> &ptr);
RESULT timeshift(ePtr<iTimeshiftService> &ptr);
RESULT cueSheet(ePtr<iCueSheet> &ptr);
-
// iPauseableService
RESULT pause();
// iPauseableService
RESULT pause();
@@
-106,6
+105,7
@@
public:
// iFrontendStatusInformation
int getFrontendInfo(int w);
// iFrontendStatusInformation
int getFrontendInfo(int w);
+ PyObject *getFrontendData(bool);
// iSubserviceList
int getNumberOfSubservices();
// iSubserviceList
int getNumberOfSubservices();
@@
-120,6
+120,7
@@
public:
// iCueSheet
PyObject *getCutList();
void setCutList(PyObject *);
// iCueSheet
PyObject *getCutList();
void setCutList(PyObject *);
+ void setCutListEnable(int enable);
private:
friend class eServiceFactoryDVB;
private:
friend class eServiceFactoryDVB;
@@
-142,6
+143,7
@@
private:
Signal2<void,iPlayableService*,int> m_event;
int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
Signal2<void,iPlayableService*,int> m_event;
int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
+ int m_first_program_info;
std::string m_timeshift_file;
int m_timeshift_fd;
std::string m_timeshift_file;
int m_timeshift_fd;
@@
-171,7
+173,7
@@
private:
bool operator < (const struct cueEntry &o) const
{
bool operator < (const struct cueEntry &o) const
{
- return wh
at < o.what
;
+ return wh
ere < o.where
;
}
cueEntry(const pts_t &where, unsigned int what) :
where(where), what(what)
}
cueEntry(const pts_t &where, unsigned int what) :
where(where), what(what)
@@
-180,10
+182,12
@@
private:
};
std::multiset<cueEntry> m_cue_entries;
};
std::multiset<cueEntry> m_cue_entries;
- int m_cuesheet_changed;
+ int m_cuesheet_changed
, m_cutlist_enabled
;
void loadCuesheet();
void saveCuesheet();
void loadCuesheet();
void saveCuesheet();
+
+ void cutlistToCuesheet();
};
#endif
};
#endif