git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_474_fix_multicontent_clear'
[enigma2.git]
/
lib
/
dvb
/
teletext.cpp
diff --git
a/lib/dvb/teletext.cpp
b/lib/dvb/teletext.cpp
index 40936d4a86aa07f169daee39a9b77dcd0b7a5317..40650c01864bf652847a135a1b5d0f0592539445 100644
(file)
--- a/
lib/dvb/teletext.cpp
+++ b/
lib/dvb/teletext.cpp
@@
-287,7
+287,7
@@
void eDVBTeletextParser::processPESPacket(__u8 *pkt, int len)
if ((serial_mode || M == m_page_M) && m_page_open)
{
eDebug("Page End %d %lld", !have_pts, pts);
if ((serial_mode || M == m_page_M) && m_page_open)
{
eDebug("Page End %d %lld", !have_pts, pts);
- handlePageEnd(have_pts, pts);
+ handlePageEnd(
!
have_pts, pts);
m_page_open = 0;
}
m_page_open = 0;
}
@@
-482,11
+482,11
@@
void eDVBTeletextParser::handlePageStart()
m_subtitle_page.clear();
m_modifications.clear();
m_X28_0_valid = 0;
m_subtitle_page.clear();
m_modifications.clear();
m_X28_0_valid = 0;
- m_new_subtitle_page(m_subtitle_page);
// eDebug("erase page!");
}
// else
// eDebug("no erase flag set!");
// eDebug("erase page!");
}
// else
// eDebug("no erase flag set!");
+ m_current_source_line = -1;
}
void eDVBTeletextParser::handleLine(unsigned char *data, int len)
}
void eDVBTeletextParser::handleLine(unsigned char *data, int len)
@@
-495,6
+495,9
@@
void eDVBTeletextParser::handleLine(unsigned char *data, int len)
for (int i=0; i<len; ++i)
eDebugNoNewLine("%02x ", decode_odd_parity(data + i));
eDebug(""); */
for (int i=0; i<len; ++i)
eDebugNoNewLine("%02x ", decode_odd_parity(data + i));
eDebug(""); */
+
+ m_subtitle_page.clearLine(m_Y);
+
if (!m_Y) /* first line is page header, we don't need that. */
{
m_double_height = -1;
if (!m_Y) /* first line is page header, we don't need that. */
{
m_double_height = -1;
@@
-575,7
+578,7
@@
void eDVBTeletextParser::handleLine(unsigned char *data, int len)
{
if (b != color) /* new color is split into a new string */
{
{
if (b != color) /* new color is split into a new string */
{
- addSubtitleString(color, std::string((const char*)out, outidx));
+ addSubtitleString(color, std::string((const char*)out, outidx)
, m_Y
);
outidx = 0;
color = b;
}
outidx = 0;
color = b;
}
@@
-619,13
+622,13
@@
void eDVBTeletextParser::handleLine(unsigned char *data, int len)
}
}
// eDebug("");
}
}
// eDebug("");
- addSubtitleString(color, std::string((const char*)out, outidx));
+ addSubtitleString(color, std::string((const char*)out, outidx)
, m_Y
);
}
void eDVBTeletextParser::handlePageEnd(int have_pts, const pts_t &pts)
{
// eDebug("handle page end");
}
void eDVBTeletextParser::handlePageEnd(int have_pts, const pts_t &pts)
{
// eDebug("handle page end");
- addSubtitleString(-2, ""); /* end last line */
+ addSubtitleString(-2, ""
, -1
); /* end last line */
m_subtitle_page.m_have_pts = have_pts;
m_subtitle_page.m_pts = pts;
m_subtitle_page.m_have_pts = have_pts;
m_subtitle_page.m_pts = pts;
@@
-654,7
+657,7
@@
void eDVBTeletextParser::connectNewPage(const Slot1<void, const eDVBTeletextSubt
connection = new eConnection(this, m_new_subtitle_page.connect(slot));
}
connection = new eConnection(this, m_new_subtitle_page.connect(slot));
}
-void eDVBTeletextParser::addSubtitleString(int color, std::string string)
+void eDVBTeletextParser::addSubtitleString(int color, std::string string
, int source_line
)
{
// eDebug("(%d)add subtitle string: %s, col %d", m_Y, string.c_str(), color);
int force_cell = 0;
{
// eDebug("(%d)add subtitle string: %s, col %d", m_Y, string.c_str(), color);
int force_cell = 0;
@@
-666,19
+669,24
@@
void eDVBTeletextParser::addSubtitleString(int color, std::string string)
}
// eDebug("color %d, m_subtitle_color %d", color, m_subtitle_color);
}
// eDebug("color %d, m_subtitle_color %d", color, m_subtitle_color);
- gRGB rgbcol((color & 1) ? 255 : 128, (color & 2) ? 255 : 128, (color & 4) ? 255 : 128);
if ((color != m_subtitle_color || force_cell) && !m_subtitle_text.empty() && ((color == -2) || !string.empty()))
{
if ((color != m_subtitle_color || force_cell) && !m_subtitle_text.empty() && ((color == -2) || !string.empty()))
{
+ const gRGB pal[4] = { gRGB(64, 0, 76), gRGB(180, 40, 86), gRGB(160, 170, 105), gRGB(250, 200, 140) };
// eDebug("add text |%s|: %d != %d || %d", m_subtitle_text.c_str(), color, m_subtitle_color, force_cell);
// eDebug("add text |%s|: %d != %d || %d", m_subtitle_text.c_str(), color, m_subtitle_color, force_cell);
- m_subtitle_page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, m_subtitle_text));
+ m_subtitle_page.m_elements.push_back(eDVBTeletextSubtitlePageElement(pal[m_subtitle_color & 3], m_subtitle_text, m_current_source_line));
+ m_current_source_line = -1;
m_subtitle_text = "";
} else if (!m_subtitle_text.empty() && m_subtitle_text[m_subtitle_text.size()-1] != ' ')
m_subtitle_text += " ";
m_subtitle_text = "";
} else if (!m_subtitle_text.empty() && m_subtitle_text[m_subtitle_text.size()-1] != ' ')
m_subtitle_text += " ";
-
+
+ if (m_current_source_line == -1)
+ m_current_source_line = source_line;
+
if (!string.empty())
{
// eDebug("set %d as new color", color);
if (!string.empty())
{
// eDebug("set %d as new color", color);
- m_subtitle_color = color;
+ if (color >= 0)
+ m_subtitle_color = color;
m_subtitle_text += string;
}
}
m_subtitle_text += string;
}
}
@@
-686,11
+694,10
@@
void eDVBTeletextParser::addSubtitleString(int color, std::string string)
void eDVBTeletextParser::sendSubtitlePage()
{
// eDebug("subtitle page:");
void eDVBTeletextParser::sendSubtitlePage()
{
// eDebug("subtitle page:");
- bool empty=true;
- if (empty)
- for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i)
- if (!m_subtitle_page.m_elements[i].m_text.empty())
- empty=false;
- if (!empty)
+ bool send=m_C & (1<<4);
+ for (unsigned int i = 0; i < m_subtitle_page.m_elements.size(); ++i)
+ if (!m_subtitle_page.m_elements[i].m_text.empty())
+ send=true;
+ if (send)
m_new_subtitle_page(m_subtitle_page);
}
m_new_subtitle_page(m_subtitle_page);
}