[subtitle] fix background for external subitles step 2

openhdf · Apr 30, 2024 · f7eb2ad · f7eb2ad
1 parent 9b73582
commit f7eb2ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/dvb/subtitle.cpp b/lib/dvb/subtitle.cpp
@@ -254,7 +254,6 @@ int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
 	default:
 		return -1;
 	}
-	return 0;
 }
 
 int eDVBSubtitleParser::subtitle_process_segment(uint8_t *segment)
@@ -757,11 +756,13 @@ int eDVBSubtitleParser::subtitle_process_segment(uint8_t *segment)
 	{
 		subtitle_redraw_all();
 		m_seen_eod = true;
+		break;
 	}
 	case 0xFF: // stuffing
 		break;
 	default:
 		eDebug("[eDVBSubtitleParser] unhandled segment type %02x", segment_type);
+		break;
 	}
 
 	return segment_length + 6;

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
@@ -468,7 +468,7 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 				painter.setFont(subtitleStyles[face].font);
 
 				eRect &area = element.m_area;
-				if (eConfigManager::getConfigBoolValue("config.subtitles.showbackground"))
+				if (bcktrans != 255)
 				{
 					ePtr<eTextPara> para = new eTextPara(area);
 					para->setFont(subtitleStyles[face].font);
@@ -487,7 +487,7 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 					bbox.setTop(bboxTop);
 					bbox.setHeight(bboxHeight);
 					area.setTop(area.top() - borderwidth);
-					painter.setForegroundColor(gRGB(0,0,0,64));
+					painter.setForegroundColor(gRGB(0,0,0,bcktrans));
 					painter.fill(bbox);
 					borderwidth = 0;
 				}