diff options
author | Aleksoid <aleksoid@users.sourceforge.net> | 2011-05-08 16:29:16 +0400 |
---|---|---|
committer | Aleksoid <aleksoid@users.sourceforge.net> | 2011-05-08 16:29:16 +0400 |
commit | 4c5603bfbc0cac7b7d5379f7be61147c1c023788 (patch) | |
tree | 0e4369c213b680587f5884a1f575e967fbed7582 /src/filters/parser/MpegSplitter | |
parent | db1dbeebed4460f4dd5da2e63d3878f2105b19a4 (diff) |
ticket #1321;
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3097 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser/MpegSplitter')
4 files changed, 16 insertions, 16 deletions
diff --git a/src/filters/parser/MpegSplitter/IMpegSplitterFilter.h b/src/filters/parser/MpegSplitter/IMpegSplitterFilter.h index b9613bf30..1b9983657 100644 --- a/src/filters/parser/MpegSplitter/IMpegSplitterFilter.h +++ b/src/filters/parser/MpegSplitter/IMpegSplitterFilter.h @@ -30,11 +30,11 @@ public IUnknown { STDMETHOD(SetFastStreamChange(BOOL nValue)) = 0;
STDMETHOD_(BOOL, GetFastStreamChange()) = 0;
- STDMETHOD(SetAudioLanguageOrder(CString nValue)) = 0;
- STDMETHOD_(CString, GetAudioLanguageOrder()) = 0;
+ STDMETHOD(SetAudioLanguageOrder(WCHAR *nValue)) = 0;
+ STDMETHOD_(WCHAR *, GetAudioLanguageOrder()) = 0;
- STDMETHOD(SetSubtitlesLanguageOrder(CString nValue)) = 0;
- STDMETHOD_(CString, GetSubtitlesLanguageOrder()) = 0;
+ STDMETHOD(SetSubtitlesLanguageOrder(WCHAR *nValue)) = 0;
+ STDMETHOD_(WCHAR *, GetSubtitlesLanguageOrder()) = 0;
STDMETHOD(SetVC1_GuidFlag(int nValue)) = 0;
STDMETHOD_(int, GetVC1_GuidFlag()) = 0;
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 362ef132b..1a8aac561 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -1415,28 +1415,28 @@ STDMETHODIMP_(BOOL) CMpegSplitterFilter::GetFastStreamChange() return m_useFastStreamChange;
}
-STDMETHODIMP CMpegSplitterFilter::SetAudioLanguageOrder(CString nValue)
+STDMETHODIMP CMpegSplitterFilter::SetAudioLanguageOrder(WCHAR *nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_csAudioLanguageOrder = nValue;
return S_OK;
}
-STDMETHODIMP_(CString) CMpegSplitterFilter::GetAudioLanguageOrder()
+STDMETHODIMP_(WCHAR *) CMpegSplitterFilter::GetAudioLanguageOrder()
{
CAutoLock cAutoLock(&m_csProps);
- return m_csAudioLanguageOrder;
+ return m_csAudioLanguageOrder.GetBuffer();
}
-STDMETHODIMP CMpegSplitterFilter::SetSubtitlesLanguageOrder(CString nValue)
+STDMETHODIMP CMpegSplitterFilter::SetSubtitlesLanguageOrder(WCHAR *nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_csSubtitlesLanguageOrder = nValue;
return S_OK;
}
-STDMETHODIMP_(CString) CMpegSplitterFilter::GetSubtitlesLanguageOrder()
+STDMETHODIMP_(WCHAR *) CMpegSplitterFilter::GetSubtitlesLanguageOrder()
{
CAutoLock cAutoLock(&m_csProps);
- return m_csSubtitlesLanguageOrder;
+ return m_csSubtitlesLanguageOrder.GetBuffer();
}
STDMETHODIMP CMpegSplitterFilter::SetVC1_GuidFlag(int nValue)
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.h b/src/filters/parser/MpegSplitter/MpegSplitter.h index 12e12a7aa..8343e1712 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.h +++ b/src/filters/parser/MpegSplitter/MpegSplitter.h @@ -104,11 +104,11 @@ public: STDMETHODIMP SetFastStreamChange(BOOL nValue);
STDMETHODIMP_(BOOL) GetFastStreamChange();
- STDMETHODIMP SetAudioLanguageOrder(CString nValue);
- STDMETHODIMP_(CString) GetAudioLanguageOrder();
+ STDMETHODIMP SetAudioLanguageOrder(WCHAR *nValue);
+ STDMETHODIMP_(WCHAR *) GetAudioLanguageOrder();
- STDMETHODIMP SetSubtitlesLanguageOrder(CString nValue);
- STDMETHODIMP_(CString) GetSubtitlesLanguageOrder();
+ STDMETHODIMP SetSubtitlesLanguageOrder(WCHAR *nValue);
+ STDMETHODIMP_(WCHAR *) GetSubtitlesLanguageOrder();
STDMETHODIMP SetVC1_GuidFlag(int nValue);
STDMETHODIMP_(int) GetVC1_GuidFlag();
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp index 18919afa7..2a530ab22 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.cpp @@ -121,9 +121,9 @@ bool CMpegSplitterSettingsWnd::OnApply() #ifdef REGISTER_FILTER
CString str = _T("");
m_edtAudioLanguageOrder.GetWindowText(str);
- m_pMSF->SetAudioLanguageOrder(str);
+ m_pMSF->SetAudioLanguageOrder(str.GetBuffer());
m_edtSubtitlesLanguageOrder.GetWindowText(str);
- m_pMSF->SetSubtitlesLanguageOrder(str);
+ m_pMSF->SetSubtitlesLanguageOrder(str.GetBuffer());
#endif
m_pMSF->Apply();
}
|