git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new drivers have shorter clip input buffers.. so we have to handle short writes or...
[enigma2.git]
/
lib
/
dvb
/
decoder.cpp
diff --git
a/lib/dvb/decoder.cpp
b/lib/dvb/decoder.cpp
index 09350698ee055791f2b6d4e88968216d13c5e120..45dde8b3de5c4b4eabf059414bf8fa102cb14f1b 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];
@@
-1302,10
+1299,11
@@
RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
if (f >= 0)
{
struct stat s;
if (f >= 0)
{
struct stat s;
+ size_t written=0;
fstat(f, &s);
if (m_video_clip_fd == -1)
fstat(f, &s);
if (m_video_clip_fd == -1)
- m_video_clip_fd = open("/dev/dvb/adapter0/video0", O_WRONLY
|O_NONBLOCK
);
-
if
(m_video_clip_fd >= 0)
+ m_video_clip_fd = open("/dev/dvb/adapter0/video0", O_WRONLY);
+
while
(m_video_clip_fd >= 0)
{
bool seq_end_avail = false;
size_t pos=0;
{
bool seq_end_avail = false;
size_t pos=0;