Опция "Только форсированные" теперь работает с PGS/DVB так же как и с…

… текстовыми, смотрим в имени сабов "forced". В PGS субтитрах остается "фильтрация" по флагу forced в CompositionObject.
Aleksoid1978 · Aug 5, 2024 · 31dd224 · 31dd224
1 parent 385a4d6
commit 31dd224
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/Subtitles/BaseSub.h b/src/Subtitles/BaseSub.h
@@ -44,6 +44,8 @@ class CBaseSub
 
 	HRESULT					SetConvertType(LPCWSTR _yuvMatrix, ColorConvert::convertType _convertType);
 
+	void					SetForced(bool bForced) { m_bForced = bForced; }
+
 protected :
 	SUBTITLE_TYPE			m_nType;
 
@@ -64,4 +66,6 @@ protected :
 
 	YUVMATRIX					yuvMatrix = {};
 	ColorConvert::convertType	convertType;
+
+	bool m_bForced = false;
 };
diff --git a/src/Subtitles/DVBSub.cpp b/src/Subtitles/DVBSub.cpp
@@ -1,5 +1,5 @@
 /*
- * (C) 2006-2023 see Authors.txt
+ * (C) 2006-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -395,6 +395,11 @@ POSITION CDVBSub::GetStartPosition(REFERENCE_TIME rt, double fps, bool CleanOld/
 	if (CleanOld) {
 		CDVBSub::CleanOld(rt);
 	}
+
+	if (g_bForcedSubtitle && !m_bForced) {
+		return nullptr;
+	}
+
 	POSITION pos = m_pages.GetHeadPosition();
 	while (pos) {
 		DVB_PAGE* pPage = m_pages.GetAt(pos);

diff --git a/src/Subtitles/HdmvSub.cpp b/src/Subtitles/HdmvSub.cpp
@@ -1,5 +1,5 @@
 /*
- * (C) 2006-2023 see Authors.txt
+ * (C) 2006-2024 see Authors.txt
  *
  * This file is part of MPC-BE.
  *
@@ -54,7 +54,8 @@ POSITION CHdmvSub::GetStartPosition(REFERENCE_TIME rt, double fps, bool CleanOld
 	POSITION pos = m_pObjects.GetHeadPosition();
 	while (pos) {
 		const CompositionObject* pObject = m_pObjects.GetAt(pos);
-		if (pObject->m_rtStop <= rt || (g_bForcedSubtitle && !pObject->m_forced_on_flag)) {
+		auto skipForced = pObject->m_forced_on_flag ? false : g_bForcedSubtitle && !m_bForced;
+		if (pObject->m_rtStop <= rt || skipForced) {
 			m_pObjects.GetNext(pos);
 		} else {
 			break;

diff --git a/src/Subtitles/RenderedHdmvSubtitle.cpp b/src/Subtitles/RenderedHdmvSubtitle.cpp
@@ -45,6 +45,11 @@ CRenderedHdmvSubtitle::CRenderedHdmvSubtitle(CCritSec* pLock, SUBTITLE_TYPE nTyp
 			ASSERT(FALSE);
 			m_pSub = nullptr;
 	}
+
+	if (m_pSub) {
+		auto bForced = (CString(name).MakeLower().Find(L"forced") >= 0);
+		m_pSub->SetForced(bForced);
+	}
 }
 
 CRenderedHdmvSubtitle::CRenderedHdmvSubtitle(CCritSec* pLock)