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_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
[vuplus_dvbapp]
/
lib
/
service
/
servicemp3.h
diff --git
a/lib/service/servicemp3.h
b/lib/service/servicemp3.h
index
a813957
..
b864a10
100644
(file)
--- a/
lib/service/servicemp3.h
+++ b/
lib/service/servicemp3.h
@@
-1,7
+1,6
@@
#ifndef __servicemp3_h
#define __servicemp3_h
#ifndef __servicemp3_h
#define __servicemp3_h
-#ifdef HAVE_GSTREAMER
#include <lib/base/message.h>
#include <lib/service/iservice.h>
#include <lib/dvb/pmt.h>
#include <lib/base/message.h>
#include <lib/service/iservice.h>
#include <lib/dvb/pmt.h>
@@
-212,9
+211,13
@@
private:
std::list<ePangoSubtitlePage> m_subtitle_pages;
ePtr<eTimer> m_subtitle_sync_timer;
std::list<ePangoSubtitlePage> m_subtitle_pages;
ePtr<eTimer> m_subtitle_sync_timer;
+
+ ePtr<eTimer> m_streamingsrc_timeout;
void pushSubtitles();
void pullSubtitle();
void pushSubtitles();
void pullSubtitle();
+ void sourceTimeout();
int m_subs_to_pull;
int m_subs_to_pull;
+ sourceStream m_sourceinfo;
eSingleLock m_subs_to_pull_lock;
gulong m_subs_to_pull_handler_id;
eSingleLock m_subs_to_pull_lock;
gulong m_subs_to_pull_handler_id;
@@
-224,6
+227,5
@@
private:
std::string m_useragent;
RESULT trickSeek(gdouble ratio);
};
std::string m_useragent;
RESULT trickSeek(gdouble ratio);
};
-#endif
#endif
#endif