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 commit 'origin/bug_202_networkconfig_cleanup' into experimental
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index 6eba5064f57978334cda2061c26655e12440cfce..e3c7fd58933fa13e0510f46bbb0129a1ed2333c9 100644
(file)
--- a/
lib/service/servicedvb.h
+++ b/
lib/service/servicedvb.h
@@
-210,7
+210,7
@@
private:
Signal2<void,iPlayableService*,int> m_event;
/* pvr */
Signal2<void,iPlayableService*,int> m_event;
/* pvr */
- int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
+ int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active
, m_timeshift_changed
;
int m_first_program_info;
std::string m_timeshift_file;
int m_first_program_info;
std::string m_timeshift_file;
@@
-220,7
+220,7
@@
private:
int m_current_audio_stream;
int selectAudioStream(int n = -1);
int m_current_audio_stream;
int selectAudioStream(int n = -1);
- RESULT setFastForward_internal(int ratio);
+ RESULT setFastForward_internal(int ratio
, bool final_seek=false
);
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
/* timeshift */
ePtr<iDVBTSRecorder> m_record;
@@
-233,6
+233,8
@@
private:
void updateDecoder();
int m_skipmode;
void updateDecoder();
int m_skipmode;
+ int m_fastforward;
+ int m_slowmotion;
/* cuesheet */
/* cuesheet */