X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7a55b56227014d8e6cff6773946d19219b4599f8..c5bb99fa2019da12a8fbaa1766189af520b9e79a:/lib/dvb/subtitle.h

diff --git a/lib/dvb/subtitle.h b/lib/dvb/subtitle.h
index 44cdd4cb..09d6cd47 100644
--- a/lib/dvb/subtitle.h
+++ b/lib/dvb/subtitle.h
@@ -54,6 +54,7 @@ struct subtitle_region
 	int region_version_number;
 	int region_height, region_width;
 	enum depth { bpp2=1, bpp4=2, bpp8=3 } region_depth;
+	
 	ePtr<gPixmap> region_buffer;
 	
 	int clut_id;
@@ -61,6 +62,8 @@ struct subtitle_region
 	subtitle_region_object *region_objects;
 	
 	subtitle_region *next;
+	
+	bool committed;
 };
 
 struct subtitle_page
@@ -68,6 +71,7 @@ struct subtitle_page
 	int page_id;
 	time_t page_time_out;
 	int page_version_number;
+	int state;
 	int pcs_size;
 	subtitle_page_region *page_regions;
 	
@@ -108,15 +112,16 @@ class eDVBSubtitleParser
 	:public iObject, public ePESParser, public Object
 {
 	DECLARE_REF(eDVBSubtitleParser);
-	subtitle_page *pages;
+	subtitle_page *m_pages;
 	ePtr<iDVBPESReader> m_pes_reader;
 	ePtr<eConnection> m_read_connection;
-	pts_t show_time;
+	pts_t m_show_time;
 	Signal1<void,const eDVBSubtitlePage&> m_new_subtitle_page;
+	int m_composition_page_id, m_ancillary_page_id;
 public:
 	eDVBSubtitleParser(iDVBDemux *demux);
 	virtual ~eDVBSubtitleParser();
-	int start(int pid);
+	int start(int pid, int composition_page_id, int ancillary_page_id);
 	int stop();
 	void connectNewPage(const Slot1<void, const eDVBSubtitlePage&> &slot, ePtr<eConnection> &connection);
 private: