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_533_fix_crash_on_satconfig_close'
[enigma2.git]
/
lib
/
dvb
/
teletext.h
diff --git
a/lib/dvb/teletext.h
b/lib/dvb/teletext.h
index b8df23c6d6246c95880180bc40e40d518f5c1180..7c62afb9e45212f5f7ce91fa7b6cd57072ba2ff4 100644
(file)
--- a/
lib/dvb/teletext.h
+++ b/
lib/dvb/teletext.h
@@
-13,8
+13,11
@@
struct eDVBTeletextSubtitlePageElement
gRGB m_color;
std::string m_text;
eRect m_area;
gRGB m_color;
std::string m_text;
eRect m_area;
- eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text)
- : m_color(color), m_text(text)
+
+ int m_source_line;
+
+ eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text, int source_line)
+ : m_color(color), m_text(text), m_source_line(source_line)
{
}
};
{
}
};
@@
-24,9
+27,9
@@
struct eDVBTeletextSubtitlePage
pts_t m_pts;
int m_have_pts;
int m_timeout; /* in pts */
pts_t m_pts;
int m_have_pts;
int m_timeout; /* in pts */
- int m_C, m_Y;
std::vector<eDVBTeletextSubtitlePageElement> m_elements;
std::vector<eDVBTeletextSubtitlePageElement> m_elements;
+ void clearLine(int line) { for (unsigned int i = 0; i < m_elements.size(); ) if (m_elements[i].m_source_line == line) m_elements.erase(m_elements.begin() + i); else ++i; }
void clear() { m_elements.clear(); }
};
void clear() { m_elements.clear(); }
};
@@
-50,16
+53,19
@@
private:
eDVBTeletextSubtitlePage m_subtitle_page;
eDVBTeletextSubtitlePage m_subtitle_page;
- int m_pid, m_page_M, m_page_X, m_page_open, m_double_height, m_box_open;
-
+ int m_C, m_Y, m_pid, m_page_M, m_page_X, m_page_open, m_double_height, m_box_open;
+ int m_X28_0_valid, m_X28_t1, m_X28_t2;
+ int m_M29_0_valid, m_M29_t1, m_M29_t2;
+
void handlePageStart();
void handleLine(unsigned char *line, int len);
void handlePageEnd(int have_pts, const pts_t &pts);
std::string m_subtitle_text;
int m_subtitle_color;
void handlePageStart();
void handleLine(unsigned char *line, int len);
void handlePageEnd(int have_pts, const pts_t &pts);
std::string m_subtitle_text;
int m_subtitle_color;
+ int m_current_source_line;
- void addSubtitleString(int color, std::string string);
+ void addSubtitleString(int color, std::string string
, int source_line
);
void sendSubtitlePage();
void sendSubtitlePage();