Skip to content

Commit

Permalink
Split AC3 and DTS in source filters list.
Browse files Browse the repository at this point in the history
Add .dtshd and .dtsma to supported extensions.
  • Loading branch information
kasper93 committed Apr 9, 2015
1 parent fc26085 commit 19733e5
Show file tree
Hide file tree
Showing 87 changed files with 287 additions and 101 deletions.
11 changes: 9 additions & 2 deletions src/mpc-hc/AppSettings.cpp
Expand Up @@ -213,8 +213,11 @@ CAppSettings::CAppSettings()
#if INTERNAL_SOURCEFILTER_FLIC
SrcFiltersKeys[SRC_FLIC] = FilterKey(_T("SRC_FLIC"), true);
#endif
#if INTERNAL_SOURCEFILTER_DTSAC3
SrcFiltersKeys[SRC_DTSAC3] = FilterKey(_T("SRC_DTSAC3"), true);
#if INTERNAL_SOURCEFILTER_AC3
SrcFiltersKeys[SRC_AC3] = FilterKey(_T("SRC_AC3"), true);
#endif
#if INTERNAL_SOURCEFILTER_DTS
SrcFiltersKeys[SRC_DTS] = FilterKey(_T("SRC_DTS"), true);
#endif
#if INTERNAL_SOURCEFILTER_MATROSKA
SrcFiltersKeys[SRC_MATROSKA] = FilterKey(_T("SRC_MATROSKA"), true);
Expand Down Expand Up @@ -2392,6 +2395,10 @@ void CAppSettings::UpdateSettings()
VERIFY(pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_DISABLE_SUBTITLE_ANIMATION, bDisableSubtitleAnimation));
}
// no break
case 5:
copyInt(IDS_R_INTERNAL_FILTERS, _T("SRC_DTSAC3"), IDS_R_INTERNAL_FILTERS, _T("SRC_DTS"));
copyInt(IDS_R_INTERNAL_FILTERS, _T("SRC_DTSAC3"), IDS_R_INTERNAL_FILTERS, _T("SRC_AC3"));
// no break
default:
pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_R_VERSION, APPSETTINGS_VERSION);
}
Expand Down
2 changes: 1 addition & 1 deletion src/mpc-hc/AppSettings.h
Expand Up @@ -367,7 +367,7 @@ class CUIceClient : public CRemoteCtrlClient
CUIceClient();
};

#define APPSETTINGS_VERSION 5
#define APPSETTINGS_VERSION 6

class CAppSettings
{
Expand Down
21 changes: 14 additions & 7 deletions src/mpc-hc/FGManager.cpp
Expand Up @@ -1530,20 +1530,27 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk)
}
#endif

#if INTERNAL_SOURCEFILTER_DTSAC3
if (src[SRC_DTSAC3]) {
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("0,4,,7FFE8001")); // DTS
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("0,4,,fE7f0180")); // DTS LE
#if INTERNAL_SOURCEFILTER_AC3
if (src[SRC_AC3]) {
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("0,2,,0B77")); // AC3, E-AC3
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("0,4,,52494646,8,8,,57415645666D7420"));// RIFFxxxxWAVEfmt_ for DTSWAV
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("4,4,,F8726FBB")); // MLP
pFGLAVSplitterSource->m_extensions.AddTail(_T(".ac3"));
pFGLAVSplitterSource->m_extensions.AddTail(_T(".dts"));
pFGLAVSplitterSource->m_extensions.AddTail(_T(".eac3"));
pFGLAVSplitterSource->AddEnabledFormat("ac3");
pFGLAVSplitterSource->AddEnabledFormat("eac3");
}
#endif

#if INTERNAL_SOURCEFILTER_DTS
if (src[SRC_DTS]) {
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("0,4,,7FFE8001")); // DTS
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("0,4,,fE7f0180")); // DTS LE
pFGLAVSplitterSource->m_chkbytes.AddTail(_T("0,4,,52494646,8,8,,57415645666D7420"));// RIFFxxxxWAVEfmt_ for DTSWAV
pFGLAVSplitterSource->m_extensions.AddTail(_T(".dts"));
pFGLAVSplitterSource->m_extensions.AddTail(_T(".dtshd"));
pFGLAVSplitterSource->m_extensions.AddTail(_T(".dtsma"));
pFGLAVSplitterSource->AddEnabledFormat("dts");
pFGLAVSplitterSource->AddEnabledFormat("dtshd");
pFGLAVSplitterSource->AddEnabledFormat("eac3");
}
#endif

Expand Down
7 changes: 5 additions & 2 deletions src/mpc-hc/FilterEnum.h
Expand Up @@ -43,8 +43,11 @@ enum SOURCE_FILTER {
#if INTERNAL_SOURCEFILTER_FLIC
SRC_FLIC,
#endif
#if INTERNAL_SOURCEFILTER_DTSAC3
SRC_DTSAC3,
#if INTERNAL_SOURCEFILTER_AC3
SRC_AC3,
#endif
#if INTERNAL_SOURCEFILTER_DTS
SRC_DTS,
#endif
#if INTERNAL_SOURCEFILTER_MATROSKA
SRC_MATROSKA,
Expand Down
15 changes: 8 additions & 7 deletions src/mpc-hc/InternalFiltersConfig.h
Expand Up @@ -37,7 +37,8 @@
#define INTERNAL_SOURCEFILTER_CDDA INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_CDXA INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_DSM INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_DTSAC3 INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_AC3 INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_DTS INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_VTS INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_FLIC INTERNAL_FILTERS_ENABLED
#define INTERNAL_SOURCEFILTER_FLAC INTERNAL_FILTERS_ENABLED
Expand Down Expand Up @@ -105,12 +106,12 @@

// Groups
#define HAS_SOURCEFILTERS \
(INTERNAL_SOURCEFILTER_AVI || INTERNAL_SOURCEFILTER_CDDA || INTERNAL_SOURCEFILTER_CDXA || INTERNAL_SOURCEFILTER_DSM || INTERNAL_SOURCEFILTER_DTSAC3 || \
INTERNAL_SOURCEFILTER_VTS || INTERNAL_SOURCEFILTER_FLIC || INTERNAL_SOURCEFILTER_FLAC || INTERNAL_SOURCEFILTER_FLV || INTERNAL_SOURCEFILTER_ASF || \
INTERNAL_SOURCEFILTER_WTV || INTERNAL_SOURCEFILTER_MATROSKA || INTERNAL_SOURCEFILTER_MP4 || INTERNAL_SOURCEFILTER_OGG || INTERNAL_SOURCEFILTER_MPEGAUDIO || \
INTERNAL_SOURCEFILTER_MPEG || INTERNAL_SOURCEFILTER_REALMEDIA || INTERNAL_SOURCEFILTER_HTTP || INTERNAL_SOURCEFILTER_UDP ||INTERNAL_SOURCEFILTER_RTP || \
INTERNAL_SOURCEFILTER_RTSP || INTERNAL_SOURCEFILTER_AVI2AC3 || INTERNAL_SOURCEFILTER_RFS || INTERNAL_SOURCEFILTER_RTSP || INTERNAL_SOURCEFILTER_MMS || \
INTERNAL_SOURCEFILTER_RTMP || INTERNAL_SOURCEFILTER_AVS || INTERNAL_SOURCEFILTER_GIF)
(INTERNAL_SOURCEFILTER_AVI || INTERNAL_SOURCEFILTER_CDDA || INTERNAL_SOURCEFILTER_CDXA || INTERNAL_SOURCEFILTER_DSM || INTERNAL_SOURCEFILTER_AC3 || \
INTERNAL_SOURCEFILTER_DTS || INTERNAL_SOURCEFILTER_VTS || INTERNAL_SOURCEFILTER_FLIC || INTERNAL_SOURCEFILTER_FLAC || INTERNAL_SOURCEFILTER_FLV || \
INTERNAL_SOURCEFILTER_ASF ||INTERNAL_SOURCEFILTER_WTV || INTERNAL_SOURCEFILTER_MATROSKA || INTERNAL_SOURCEFILTER_MP4 || INTERNAL_SOURCEFILTER_OGG || \
INTERNAL_SOURCEFILTER_MPEGAUDIO || INTERNAL_SOURCEFILTER_MPEG || INTERNAL_SOURCEFILTER_REALMEDIA || INTERNAL_SOURCEFILTER_HTTP || INTERNAL_SOURCEFILTER_UDP || \
INTERNAL_SOURCEFILTER_RTP || INTERNAL_SOURCEFILTER_RTSP || INTERNAL_SOURCEFILTER_AVI2AC3 || INTERNAL_SOURCEFILTER_RFS || INTERNAL_SOURCEFILTER_RTSP || \
INTERNAL_SOURCEFILTER_MMS || INTERNAL_SOURCEFILTER_RTMP || INTERNAL_SOURCEFILTER_AVS || INTERNAL_SOURCEFILTER_GIF)

#define HAS_AUDIO_DECODERS \
(INTERNAL_DECODER_LPCM || INTERNAL_DECODER_PS2AUDIO || INTERNAL_DECODER_REALAUDIO || INTERNAL_DECODER_PCM || INTERNAL_DECODER_AC3 || \
Expand Down
5 changes: 3 additions & 2 deletions src/mpc-hc/MediaFormats.cpp
@@ -1,6 +1,6 @@
/*
* (C) 2003-2006 Gabest
* (C) 2006-2014 see Authors.txt
* (C) 2006-2015 see Authors.txt
*
* This file is part of MPC-HC.
*
Expand Down Expand Up @@ -232,7 +232,8 @@ void CMediaFormats::UpdateData(bool fSave)
ADDFMT((_T("ivf"), ResStr(IDS_MFMT_IVF), _T("ivf")));
ADDFMT((_T("swf"), ResStr(IDS_MFMT_SWF), _T("swf"), false, _T("ShockWave ActiveX control"), ShockWave));
ADDFMT((_T("other"), ResStr(IDS_MFMT_OTHER), _T("divx amv")));
ADDFMT((_T("ac3dts"), ResStr(IDS_MFMT_AC3), _T("ac3 dts"), true));
ADDFMT((_T("ac3"), ResStr(IDS_MFMT_AC3), _T("ac3"), true));
ADDFMT((_T("dts"), ResStr(IDS_MFMT_DTS), _T("dts dtshd dtsma"), true));
ADDFMT((_T("aiff"), ResStr(IDS_MFMT_AIFF), _T("aif aifc aiff"), true));
ADDFMT((_T("alac"), ResStr(IDS_MFMT_ALAC), _T("alac"), true));
ADDFMT((_T("amr"), ResStr(IDS_MFMT_AMR), _T("amr"), true));
Expand Down
9 changes: 7 additions & 2 deletions src/mpc-hc/PPageInternalFilters.cpp
Expand Up @@ -343,9 +343,14 @@ void CPPageInternalFilters::InitFiltersList()
#if INTERNAL_SOURCEFILTER_DSM
m_filters.Add(filter_t(_T("DirectShow Media"), SOURCE_FILTER, SRC_DSM, 0));
#endif
#if INTERNAL_SOURCEFILTER_DTSAC3
#if INTERNAL_SOURCEFILTER_AC3
if (bLAVSplitterIsAvailable) {
m_filters.Add(filter_t(_T("DTS/AC3"), SOURCE_FILTER, SRC_DTSAC3, IDS_INTERNAL_LAVF));
m_filters.Add(filter_t(_T("AC3"), SOURCE_FILTER, SRC_AC3, IDS_INTERNAL_LAVF));
}
#endif
#if INTERNAL_SOURCEFILTER_DTS
if (bLAVSplitterIsAvailable) {
m_filters.Add(filter_t(_T("DTS/DTS-HD"), SOURCE_FILTER, SRC_DTS, IDS_INTERNAL_LAVF));
}
#endif
#if INTERNAL_SOURCEFILTER_VTS
Expand Down
3 changes: 2 additions & 1 deletion src/mpc-hc/mpc-hc.rc
Expand Up @@ -3165,7 +3165,8 @@ END

STRINGTABLE
BEGIN
IDS_MFMT_AC3 "AC-3/DTS"
IDS_MFMT_AC3 "AC-3"
IDS_MFMT_DTS "DTS/DTS-HD"
IDS_MFMT_AIFF "AIFF"
IDS_MFMT_ALAC "Apple Lossless"
END
Expand Down
6 changes: 5 additions & 1 deletion src/mpc-hc/mpciconlib/mpciconlib.cpp
@@ -1,5 +1,5 @@
/*
* (C) 2008-2013 see Authors.txt
* (C) 2008-2013, 2015 see Authors.txt
*
* This file is part of MPC-HC.
*
Expand Down Expand Up @@ -95,6 +95,10 @@ extern "C" __declspec(dllexport) int GetIconIndex(LPCTSTR ext)
iconIndex = IDI_DSM_ICON;
} else if (_tcsicmp(ext, _T(".dts")) == 0) {
iconIndex = IDI_DTS_ICON;
} else if (_tcsicmp(ext, _T(".dtshd")) == 0) {
iconIndex = IDI_DTS_ICON;
} else if (_tcsicmp(ext, _T(".dtsma")) == 0) {
iconIndex = IDI_DTS_ICON;
} else if (_tcsicmp(ext, _T(".evo")) == 0) {
iconIndex = IDI_MPEG_ICON;
} else if (_tcsicmp(ext, _T(".f4v")) == 0) {
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.ar.strings.po
Expand Up @@ -2907,8 +2907,12 @@ msgid "Other Audio"
msgstr "أصوات أخرى"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
6 changes: 5 additions & 1 deletion src/mpc-hc/mpcresources/PO/mpc-hc.be.strings.po
Expand Up @@ -2901,7 +2901,11 @@ msgid "Other Audio"
msgstr ""

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.bn.strings.po
Expand Up @@ -2902,8 +2902,12 @@ msgid "Other Audio"
msgstr "Other Audio"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.ca.strings.po
Expand Up @@ -2906,8 +2906,12 @@ msgid "Other Audio"
msgstr "Altre Àudio"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.cs.strings.po
Expand Up @@ -2902,8 +2902,12 @@ msgid "Other Audio"
msgstr "Ostatní zvukové formáty"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.da.strings.po
Expand Up @@ -2903,8 +2903,12 @@ msgid "Other Audio"
msgstr "Anden lyd"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.de.strings.po
Expand Up @@ -2908,8 +2908,12 @@ msgid "Other Audio"
msgstr "Andere Audioformate"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.el.strings.po
Expand Up @@ -2902,8 +2902,12 @@ msgid "Other Audio"
msgstr "Άλλο αρχείο ήχου"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.en_GB.strings.po
Expand Up @@ -2901,8 +2901,12 @@ msgid "Other Audio"
msgstr "Other Audio"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.es.strings.po
Expand Up @@ -2910,8 +2910,12 @@ msgid "Other Audio"
msgstr "Otro audio"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.eu.strings.po
Expand Up @@ -2901,8 +2901,12 @@ msgid "Other Audio"
msgstr "Bestelako Audioa"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.fi.strings.po
Expand Up @@ -2902,8 +2902,12 @@ msgid "Other Audio"
msgstr "Muu audio"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.fr.strings.po
Expand Up @@ -2901,8 +2901,12 @@ msgid "Other Audio"
msgstr "Autres formats audio"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.gl.strings.po
Expand Up @@ -2902,8 +2902,12 @@ msgid "Other Audio"
msgstr "Outro Audio"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down
8 changes: 6 additions & 2 deletions src/mpc-hc/mpcresources/PO/mpc-hc.he.strings.po
Expand Up @@ -2902,8 +2902,12 @@ msgid "Other Audio"
msgstr "שמע אחר"

msgctxt "IDS_MFMT_AC3"
msgid "AC-3/DTS"
msgstr "AC-3/DTS"
msgid "AC-3"
msgstr ""

msgctxt "IDS_MFMT_DTS"
msgid "DTS/DTS-HD"
msgstr ""

msgctxt "IDS_MFMT_AIFF"
msgid "AIFF"
Expand Down

0 comments on commit 19733e5

Please sign in to comment.