projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_411_timeshift_disable_without_live'
[vuplus_dvbapp]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index
b4d0f19
..
1262836
100644
(file)
--- a/
lib/service/servicedvb.h
+++ b/
lib/service/servicedvb.h
@@
-159,7
+159,7
@@
public:
// iTimeshiftService
RESULT startTimeshift();
// iTimeshiftService
RESULT startTimeshift();
- RESULT stopTimeshift();
+ RESULT stopTimeshift(
bool swToLive=true
);
int isTimeshiftActive();
RESULT activateTimeshift();
int isTimeshiftActive();
RESULT activateTimeshift();
@@
-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;
@@
-230,9
+230,11
@@
private:
void switchToLive();
void switchToTimeshift();
void switchToLive();
void switchToTimeshift();
- void updateDecoder();
+ void updateDecoder(
bool sendSeekableStateChanged=false
);
int m_skipmode;
int m_skipmode;
+ int m_fastforward;
+ int m_slowmotion;
/* cuesheet */
/* cuesheet */