-when caption is hidden, window is without a thick frame now, child view responsible for NC_HITTEST

-preliminary support for subtitle language order (similar to Haali Media Splitter)
-same for audio language order
-added menu option to override embedded style for subtitles

Patch by foxx1337

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1622 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 7 insertions, 1 deletions

diff --git a/src/apps/mplayerc/MainFrm.h b/src/apps/mplayerc/MainFrm.h
index 95843eb5d..7ba7a650b 100644
--- a/src/apps/mplayerc/MainFrm.h
+++ b/src/apps/mplayerc/MainFrm.h
@@ -215,6 +215,7 @@ class CMainFrame : public CFrameWnd, public CDropTarget
 

 	CCritSec m_csSubLock;

 	CInterfaceList<ISubStream> m_pSubStreams;

+	CAtlList<int> m_iAudioStreams; // foxX uses this to keep a mapping of audio streams, in which they're ordered based by language user preference

 	int m_iSubtitleSel; // if(m_iSubtitleSel&(1<<31)): disabled

 	DWORD_PTR m_nSubtitleId;

 

@@ -423,7 +424,12 @@ public:
 	REFERENCE_TIME GetPos(), GetDur();

 	void SeekTo(REFERENCE_TIME rt, bool fSeekToKeyFrame = false);

 

-	bool LoadSubtitle(CString fn);

+	// audio streams order functions

+	void InsertAudioStream(const CComQIPtr<IAMStreamSelect> &pSS, int i);

+	void SetupAudioStreams();

+	// subtitle streams order function

+	bool LoadSubtitle(CString fn, ISubStream **actualStream = NULL);

+

 	void UpdateSubtitle(bool fApplyDefStyle = false);

 	void SetSubtitle(ISubStream* pSubStream, bool fApplyDefStyle = false);

 	void ReplaceSubtitle(ISubStream* pSubStreamOld, ISubStream* pSubStreamNew);