projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into obi/master
[vuplus_dvbapp]
/
lib
/
dvb
/
decoder.cpp
diff --git
a/lib/dvb/decoder.cpp
b/lib/dvb/decoder.cpp
index
0935069
..
88cd3ee
100644
(file)
--- a/
lib/dvb/decoder.cpp
+++ b/
lib/dvb/decoder.cpp
@@
-222,9
+222,6
@@
int eDVBAudio::startPid(int pid, int type)
void eDVBAudio::stop()
{
void eDVBAudio::stop()
{
-#if HAVE_DVB_API_VERSION > 2
- flush();
-#endif
eDebugNoNewLine("AUDIO_STOP - ");
if (::ioctl(m_fd, AUDIO_STOP) < 0)
eDebug("failed (%m)");
eDebugNoNewLine("AUDIO_STOP - ");
if (::ioctl(m_fd, AUDIO_STOP) < 0)
eDebug("failed (%m)");
@@
-604,7
+601,7
@@
RESULT eDVBVideo::connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEve
return 0;
}
return 0;
}
-static int readMpegProc(char *str, int decoder)
+static int readMpegProc(c
onst c
har *str, int decoder)
{
int val = -1;
char tmp[64];
{
int val = -1;
char tmp[64];