X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d3eca61ede32dd385b2e53fb33c669efa26cbcfb..beb76be8b094d0deeded0ad42f1258222e1210cb:/lib/dvb/subtitle.cpp

diff --git a/lib/dvb/subtitle.cpp b/lib/dvb/subtitle.cpp
index b0c90222..87dadba5 100644
--- a/lib/dvb/subtitle.cpp
+++ b/lib/dvb/subtitle.cpp
@@ -81,7 +81,7 @@ void eDVBSubtitleParser::subtitle_process_line(subtitle_page *page, int object_i
 				}
 //				//eDebug("inserting %d bytes (into region %d)", len, region->region_id);
 //				eDebug("put data to region_buffer %p", &(*region->region_buffer));
-				memcpy((__u8*)region->region_buffer->surface->data + region->region_width * y + x, data, len);
+				memcpy((__u8*)region->region_buffer->surface->data + region->region_buffer->surface->stride * y + x, data, len);
 			}
 			object = object->next;
 		}
@@ -345,6 +345,8 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 			}
 		}
 
+		page->state = page_state;
+
 		//eDebug("page updated: old: %d, new: %d", page->page_version_number, page_version_number);
 			// when acquisition point or mode change: remove all displayed pages.
 		if ((page_state == 1) || (page_state == 2))
@@ -360,6 +362,13 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 			{
 				subtitle_region *p = page->regions->next;
 				//eDebug("delete region %d", page->regions->region_id);
+				while(page->regions->region_objects)
+				{
+					//eDebug("delete region object");
+					subtitle_region_object *ob = page->regions->region_objects->next;
+					delete page->regions->region_objects;
+					page->regions->region_objects = ob;
+				}
 				delete page->regions;
 				page->regions = p;
 			}
@@ -451,6 +460,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 		else if (region->region_version_number != region_version_number)
 		{
 			subtitle_region_object *objects = region->region_objects;
+			//eDebug("unequal version %p %p", objects, objects?objects->next:objects);
 			while (objects)
 			{
 				subtitle_region_object *n = objects->next;
@@ -480,7 +490,8 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 		region->region_height |= *segment++;
 		processed_length += 2;
 
-		region->region_buffer = new gPixmap(eSize(region->region_width, region->region_height), 8);
+		region->region_buffer = new gPixmap(eSize(region->region_width, region->region_height), 8, 1);
+		memset(region->region_buffer->surface->data, 0, region->region_height * region->region_buffer->surface->stride);
 		//eDebug("new region_buffer %p", &(*region->region_buffer));
 
 		int region_level_of_compatibility, region_depth;
@@ -748,10 +759,10 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 
 void eDVBSubtitleParser::subtitle_process_pes(__u8 *pkt, int len)
 {
-	//eDebugNoNewLine("subtitle_process_pes");
+	eDebugNoNewLine("subtitle_process_pes");
 	if (!extract_pts(m_show_time, pkt))
 	{
-		//eDebug(" %lld", m_show_time);
+		eDebug(" %lld", m_show_time);
 		pkt += 6; len -= 6;
 		// skip PES header
 		pkt++; len--;
@@ -786,8 +797,8 @@ void eDVBSubtitleParser::subtitle_process_pes(__u8 *pkt, int len)
 		if (len && *pkt != 0xFF)
 			eDebug("strange data at the end");
 	}
-	//else
-		//eDebug("\ndvb subtitle packet without PTS.. ignore!!");
+	else
+		eDebug("\ndvb subtitle packet without PTS.. ignore!!");
 }
 
 void eDVBSubtitleParser::subtitle_redraw_all()
@@ -796,7 +807,8 @@ void eDVBSubtitleParser::subtitle_redraw_all()
 	subtitle_page *page = m_pages;
 	while(page)
 	{
-		subtitle_redraw(page->page_id);
+		if (page->state != 0)
+			subtitle_redraw(page->page_id);
 		page = page->next;
 	}
 #else