git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set frontend state to stateTuning when tuneloop starts.. ( to avoid false lostlock...
[enigma2.git]
/
lib
/
dvb
/
decoder.cpp
diff --git
a/lib/dvb/decoder.cpp
b/lib/dvb/decoder.cpp
index bf0014d87e2fbf85d26f2c782e6a075333c65c3b..cbc40683fcbd0fa8253b8f151dc2284515bb023c 100644
(file)
--- a/
lib/dvb/decoder.cpp
+++ b/
lib/dvb/decoder.cpp
@@
-301,9
+301,9
@@
eDVBPCR::~eDVBPCR()
::close(m_fd_demux);
}
::close(m_fd_demux);
}
-DEFINE_REF(eDVB
V
Text);
+DEFINE_REF(eDVB
T
Text);
-eDVB
VText::eDVBV
Text(eDVBDemux *demux): m_demux(demux)
+eDVB
TText::eDVBT
Text(eDVBDemux *demux): m_demux(demux)
{
char filename[128];
#if HAVE_DVB_API_VERSION < 3
{
char filename[128];
#if HAVE_DVB_API_VERSION < 3
@@
-316,7
+316,7
@@
eDVBVText::eDVBVText(eDVBDemux *demux): m_demux(demux)
eWarning("%s: %m", filename);
}
eWarning("%s: %m", filename);
}
-int eDVB
V
Text::startPid(int pid)
+int eDVB
T
Text::startPid(int pid)
{
if (m_fd_demux < 0)
return -1;
{
if (m_fd_demux < 0)
return -1;
@@
-340,13
+340,13
@@
int eDVBVText::startPid(int pid)
return 0;
}
return 0;
}
-void eDVB
V
Text::stop()
+void eDVB
T
Text::stop()
{
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
eWarning("video: DMX_STOP: %m");
}
{
if (::ioctl(m_fd_demux, DMX_STOP) < 0)
eWarning("video: DMX_STOP: %m");
}
-eDVB
VText::~eDVBV
Text()
+eDVB
TText::~eDVBT
Text()
{
if (m_fd_demux >= 0)
::close(m_fd_demux);
{
if (m_fd_demux >= 0)
::close(m_fd_demux);
@@
-359,10
+359,14
@@
int eTSMPEGDecoder::setState()
int res = 0;
int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
int res = 0;
int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
-
+ int nott = noaudio; /* actually same conditions */
+
if ((noaudio && m_audio) || (!m_audio && !noaudio))
m_changed |= changeAudio;
if ((noaudio && m_audio) || (!m_audio && !noaudio))
m_changed |= changeAudio;
+ if ((nott && m_text) || (!m_text && !nott))
+ m_changed |= changeText;
+
#if HAVE_DVB_API_VERSION < 3
if (m_changed & changeAudio && m_audio)
m_audio->stopPid();
#if HAVE_DVB_API_VERSION < 3
if (m_changed & changeAudio && m_audio)
m_audio->stopPid();
@@
-472,9
+476,9
@@
int eTSMPEGDecoder::setState()
if (m_text)
m_text->stop();
m_text = 0;
if (m_text)
m_text->stop();
m_text = 0;
- if ((m_textpid >= 0) && (m_textpid < 0x1FFF))
+ if ((m_textpid >= 0) && (m_textpid < 0x1FFF)
&& !nott
)
{
{
- m_text = new eDVB
V
Text(m_demux);
+ m_text = new eDVB
T
Text(m_demux);
if (m_text->startPid(m_textpid))
{
eWarning("text: startpid failed!");
if (m_text->startPid(m_textpid))
{
eWarning("text: startpid failed!");