git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow switching between simple and complex (multiple) titleset authoring mode, move...
[enigma2.git]
/
lib
/
dvb
/
teletext.h
diff --git
a/lib/dvb/teletext.h
b/lib/dvb/teletext.h
index 5b4a9703b3f52d6037e22c29b265ed50ff8cbcd3..a07c6aeaac34568a4c874958eb618bf973510df3 100644
(file)
--- a/
lib/dvb/teletext.h
+++ b/
lib/dvb/teletext.h
@@
-4,12
+4,15
@@
#include <lib/base/object.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/pesparse.h>
#include <lib/base/object.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/pesparse.h>
+#include <lib/dvb/pmt.h>
#include <lib/gdi/gpixmap.h>
#include <lib/gdi/gpixmap.h>
+#include <map>
struct eDVBTeletextSubtitlePageElement
{
gRGB m_color;
std::string m_text;
struct eDVBTeletextSubtitlePageElement
{
gRGB m_color;
std::string m_text;
+ eRect m_area;
eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text)
: m_color(color), m_text(text)
{
eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text)
: m_color(color), m_text(text)
{
@@
-19,6
+22,7
@@
struct eDVBTeletextSubtitlePageElement
struct eDVBTeletextSubtitlePage
{
pts_t m_pts;
struct eDVBTeletextSubtitlePage
{
pts_t m_pts;
+ int m_have_pts;
int m_timeout; /* in pts */
std::vector<eDVBTeletextSubtitlePageElement> m_elements;
int m_timeout; /* in pts */
std::vector<eDVBTeletextSubtitlePageElement> m_elements;
@@
-32,9
+36,12
@@
public:
eDVBTeletextParser(iDVBDemux *demux);
virtual ~eDVBTeletextParser();
int start(int pid);
eDVBTeletextParser(iDVBDemux *demux);
virtual ~eDVBTeletextParser();
int start(int pid);
- void setPage(int page);
-
+ void setPageAndMagazine(int page, int magazine);
+ void setMagazine(int magazine);
+ void connectNewPage(const Slot1<void,const eDVBTeletextSubtitlePage &> &slot, ePtr<eConnection> &connection);
+ std::set<eDVBServicePMTHandler::subtitleStream> m_found_subtitle_pages;
private:
private:
+ std::map<int, unsigned int> m_modifications;
void processPESPacket(__u8 *pkt, int len);
ePtr<iDVBPESReader> m_pes_reader;
void processPESPacket(__u8 *pkt, int len);
ePtr<iDVBPESReader> m_pes_reader;
@@
-42,20
+49,20
@@
private:
eDVBTeletextSubtitlePage m_subtitle_page;
eDVBTeletextSubtitlePage m_subtitle_page;
- int m_M, m_Y, m_X, m_S1, m_S2, m_S3, m_S4, m_C;
-
- int m_page_M, m_page_X, m_page_open;
+ int m_C, m_Y, m_pid, m_page_M, m_page_X, m_page_open, m_double_height, m_box_open;
void handlePageStart();
void handleLine(unsigned char *line, int len);
void handlePageStart();
void handleLine(unsigned char *line, int len);
- void handlePageEnd();
+ void handlePageEnd(
int have_pts, const pts_t &pts
);
std::string m_subtitle_text;
int m_subtitle_color;
std::string m_subtitle_text;
int m_subtitle_color;
- void addSubtitleString(int color,
const std::string &
string);
+ void addSubtitleString(int color,
std::string
string);
void sendSubtitlePage();
void sendSubtitlePage();
+
+ Signal1<void,const eDVBTeletextSubtitlePage&> m_new_subtitle_page;
};
#endif
};
#endif