git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix coverart png stuff
[enigma2.git]
/
lib
/
service
/
servicedvb.cpp
diff --git
a/lib/service/servicedvb.cpp
b/lib/service/servicedvb.cpp
index b97104a1c669a82eb74ae3b84349b03a51ff47dd..c66b3da15b235b46cee5b1318b29a97a4dac3c69 100644
(file)
--- a/
lib/service/servicedvb.cpp
+++ b/
lib/service/servicedvb.cpp
@@
-1025,7
+1025,7
@@
eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
m_subtitle_widget = 0;
m_tune_state = -1;
m_subtitle_widget = 0;
m_tune_state = -1;
-
+
CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
}
CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
}
@@
-1786,7
+1786,8
@@
int eDVBServicePlay::selectAudioStream(int i)
anything in the best case, or destroy the default setting in
case the real default is not yet available.)
*/
anything in the best case, or destroy the default setting in
case the real default is not yet available.)
*/
- if (m_dvb_service && !m_is_pvr && (i != -1))
+ if (m_dvb_service && !m_is_pvr && ((i != -1)
+ || ((m_dvb_service->getCacheEntry(eDVBService::cAPID) == -1) && (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)==-1))))
{
if (apidtype == eDVBAudio::aMPEG)
{
{
if (apidtype == eDVBAudio::aMPEG)
{
@@
-2775,6
+2776,10
@@
void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)
{
if (m_subtitle_widget)
{
{
if (m_subtitle_widget)
{
+ pts_t pos = 0;
+ if (m_decoder)
+ m_decoder->getPTS(0, pos);
+ eDebug("got new subtitle page %lld %lld %d", pos, page.m_pts, page.m_have_pts);
m_subtitle_pages.push_back(page);
checkSubtitleTiming();
}
m_subtitle_pages.push_back(page);
checkSubtitleTiming();
}
@@
-2782,7
+2787,7
@@
void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)
void eDVBServicePlay::checkSubtitleTiming()
{
void eDVBServicePlay::checkSubtitleTiming()
{
-
//
eDebug("checkSubtitleTiming");
+
eDebug("checkSubtitleTiming");
if (!m_subtitle_widget)
return;
while (1)
if (!m_subtitle_widget)
return;
while (1)
@@
-2811,11
+2816,11
@@
void eDVBServicePlay::checkSubtitleTiming()
if (m_decoder)
m_decoder->getPTS(0, pos);
if (m_decoder)
m_decoder->getPTS(0, pos);
-
//
eDebug("%lld %lld", pos, show_time);
+
eDebug("%lld %lld", pos, show_time);
int diff = show_time - pos;
if (diff < 0)
{
int diff = show_time - pos;
if (diff < 0)
{
-
//
eDebug("[late (%d ms)]", -diff / 90);
+
eDebug("[late (%d ms)]", -diff / 90);
diff = 0;
}
// if (diff > 900000)
diff = 0;
}
// if (diff > 900000)
@@
-2824,23
+2829,23
@@
void eDVBServicePlay::checkSubtitleTiming()
// diff = 0;
// }
// diff = 0;
// }
- if (
!diff
)
+ if (
(diff/90)<20
)
{
if (type == TELETEXT)
{
{
if (type == TELETEXT)
{
-
// eDebug("display teletext subtitle page"
);
+
eDebug("display teletext subtitle page %lld", show_time
);
m_subtitle_widget->setPage(page);
m_subtitle_pages.pop_front();
}
else
{
m_subtitle_widget->setPage(page);
m_subtitle_pages.pop_front();
}
else
{
-
//
eDebug("display dvb subtitle Page %lld", show_time);
+
eDebug("display dvb subtitle Page %lld", show_time);
m_subtitle_widget->setPage(dvb_page);
m_dvb_subtitle_pages.pop_front();
}
} else
{
m_subtitle_widget->setPage(dvb_page);
m_dvb_subtitle_pages.pop_front();
}
} else
{
-
//
eDebug("start subtitle delay %d", diff / 90);
+
eDebug("start subtitle delay %d", diff / 90);
m_subtitle_sync_timer.start(diff / 90, 1);
break;
}
m_subtitle_sync_timer.start(diff / 90, 1);
break;
}
@@
-2851,6
+2856,10
@@
void eDVBServicePlay::newDVBSubtitlePage(const eDVBSubtitlePage &p)
{
if (m_subtitle_widget)
{
{
if (m_subtitle_widget)
{
+ pts_t pos = 0;
+ if (m_decoder)
+ m_decoder->getPTS(0, pos);
+ eDebug("got new subtitle page %lld %lld", pos, p.m_show_time);
m_dvb_subtitle_pages.push_back(p);
checkSubtitleTiming();
}
m_dvb_subtitle_pages.push_back(p);
checkSubtitleTiming();
}