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_537_ignore_vob_pgs_subtitles' into experimental
[vuplus_dvbapp]
/
lib
/
service
/
servicemp3.h
diff --git
a/lib/service/servicemp3.h
b/lib/service/servicemp3.h
index
3aeeab1
..
a92a4cf
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>
@@
-168,7
+167,7
@@
public:
int bufferPercent;
int avgInRate;
int avgOutRate;
int bufferPercent;
int avgInRate;
int avgOutRate;
-
long long
bufferingLeft;
+
int64_t
bufferingLeft;
bufferInfo()
:bufferPercent(0), avgInRate(0), avgOutRate(0), bufferingLeft(-1)
{
bufferInfo()
:bufferPercent(0), avgInRate(0), avgOutRate(0), bufferingLeft(-1)
{
@@
-261,6
+260,5
@@
private:
std::string m_useragent;
RESULT trickSeek(gdouble ratio);
};
std::string m_useragent;
RESULT trickSeek(gdouble ratio);
};
-#endif
#endif
#endif