diff options
| author | Aleksoid <aleksoid@users.sourceforge.net> | 2011-06-21 05:48:41 +0400 |
|---|---|---|
| committer | Aleksoid <aleksoid@users.sourceforge.net> | 2011-06-21 05:48:41 +0400 |
| commit | ce296a75c356925e2bfcc148f7d0590ea49e6e8f (patch) | |
| tree | 3e72276460b277522ab0e27cb00f5a7a639fdd5d /src/filters/parser/MpegSplitter | |
| parent | b920d2cca047d74bd6fc4b76d9403c62f0c3abd7 (diff) | |
Change : MPEGSplitter, more user-friendly display of subtitle's information from the BD structure.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3254 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser/MpegSplitter')
| -rw-r--r-- | src/filters/parser/MpegSplitter/MpegSplitter.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index f7ba719fa..24c72e32c 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -431,31 +431,27 @@ CString GetMediaTypeDesc(const CMediaType *_pMediaType, const CHdmvClipInfo::Str Infos.AddTail(pPresentationDesc);
}
- if (_pMediaType->cbFormat == sizeof(SUBTITLEINFO)) {
+ if (pClipInfo) {
+ CString name = ISO6392ToLanguage(pClipInfo->m_LanguageCode);
+ if (!name.IsEmpty()) {
+ Infos.AddHead(name);
+ } else if (!lang.IsEmpty()) {
+ Infos.AddHead(lang);
+ }
+ } else if (_pMediaType->cbFormat == sizeof(SUBTITLEINFO)) {
const SUBTITLEINFO *pInfo = GetFormatHelper(pInfo, _pMediaType);
CString name = ISO6392ToLanguage(pInfo->IsoLang);
if (!lang.IsEmpty()) {
Infos.AddHead(lang);
- } else {
- if (!name.IsEmpty()) {
- Infos.AddHead(name);
- }
+ } else if (!name.IsEmpty()) {
+ Infos.AddHead(name);
}
if (pInfo->TrackName[0]) {
Infos.AddTail(pInfo->TrackName);
}
- } else {
- if (pClipInfo) {
- CString name = ISO6392ToLanguage(pClipInfo->m_LanguageCode);
- if (!name.IsEmpty()) {
- Infos.AddHead(name);
- }
- } else {
- if (!lang.IsEmpty()) {
- Infos.AddHead(lang);
- }
- }
+ } else if (!lang.IsEmpty()) {
+ Infos.AddHead(lang);
}
}
|