Prefer string type macros in external interfaces

6 files changed, 32 insertions, 32 deletions

diff --git a/common/includes/LAVSplitterSettings.h b/common/includes/LAVSplitterSettings.h
index 7e927e11..4fd4edf3 100644
--- a/common/includes/LAVSplitterSettings.h
+++ b/common/includes/LAVSplitterSettings.h
@@ -46,22 +46,22 @@ interface ILAVFSettings : public IUnknown
   // Retrieve the preferred languages as ISO 639-2 language codes, comma seperated
   // If the result is NULL, no language has been set
   // Memory for the string will be allocated, and has to be free'ed by the caller with CoTaskMemFree
-  STDMETHOD(GetPreferredLanguages)(WCHAR **ppLanguages) = 0;
+  STDMETHOD(GetPreferredLanguages)(LPWSTR *ppLanguages) = 0;
 
   // Set the preferred languages as ISO 639-2 language codes, comma seperated
   // To reset to no preferred language, pass NULL or the empty string
-  STDMETHOD(SetPreferredLanguages)(WCHAR *pLanguages) = 0;
+  STDMETHOD(SetPreferredLanguages)(LPWSTR pLanguages) = 0;
   
   // Retrieve the preferred subtitle languages as ISO 639-2 language codes, comma seperated
   // If the result is NULL, no language has been set
   // If no subtitle language is set, the main language preference is used.
   // Memory for the string will be allocated, and has to be free'ed by the caller with CoTaskMemFree
-  STDMETHOD(GetPreferredSubtitleLanguages)(WCHAR **ppLanguages) = 0;
+  STDMETHOD(GetPreferredSubtitleLanguages)(LPWSTR *ppLanguages) = 0;
 
   // Set the preferred subtitle languages as ISO 639-2 language codes, comma seperated
   // To reset to no preferred language, pass NULL or the empty string
   // If no subtitle language is set, the main language preference is used.
-  STDMETHOD(SetPreferredSubtitleLanguages)(WCHAR *pLanguages) = 0;
+  STDMETHOD(SetPreferredSubtitleLanguages)(LPWSTR pLanguages) = 0;
 
   // Get the current subtitle mode
   // See enum for possible values
@@ -124,10 +124,10 @@ interface ILAVFSettings : public IUnknown
   STDMETHOD_(BOOL,GetFixBrokenHDPVR)() = 0;
 
   // Control wether the givne format is enabled
-  STDMETHOD_(HRESULT,SetFormatEnabled)(const char *strFormat, BOOL bEnabled) = 0;
+  STDMETHOD_(HRESULT,SetFormatEnabled)(LPCSTR strFormat, BOOL bEnabled) = 0;
 
   // Check if the given format is enabled
-  STDMETHOD_(BOOL,IsFormatEnabled)(const char *strFormat) = 0;
+  STDMETHOD_(BOOL,IsFormatEnabled)(LPCSTR strFormat) = 0;
 
   // Set if LAV Splitter should always completely remove the filter connected to its Audio Pin when the audio stream is changed
   STDMETHOD(SetStreamSwitchRemoveAudio)(BOOL bEnabled) = 0;
@@ -138,12 +138,12 @@ interface ILAVFSettings : public IUnknown
   // Advanced Subtitle configuration. Refer to the documention for details.
   // If no advanced config exists, will be NULL.
   // Memory for the string will be allocated, and has to be free'ed by the caller with CoTaskMemFree
-  STDMETHOD(GetAdvancedSubtitleConfig)(WCHAR **ppAdvancedConfig) = 0;
+  STDMETHOD(GetAdvancedSubtitleConfig)(LPWSTR *ppAdvancedConfig) = 0;
 
   // Advanced Subtitle configuration. Refer to the documention for details.
   // To reset the config, pass NULL or the empty string.
   // If no subtitle language is set, the main language preference is used.
-  STDMETHOD(SetAdvancedSubtitleConfig)(WCHAR *pAdvancedConfig) = 0;
+  STDMETHOD(SetAdvancedSubtitleConfig)(LPWSTR pAdvancedConfig) = 0;
 
   // Set if LAV Splitter should prefer audio streams for the hearing or visually impaired
   STDMETHOD(SetUseAudioForHearingVisuallyImpaired)(BOOL bEnabled) = 0;
diff --git a/common/includes/LAVSplitterSettingsInternal.h b/common/includes/LAVSplitterSettingsInternal.h
index a7e35b0e..81ca2f2f 100644
--- a/common/includes/LAVSplitterSettingsInternal.h
+++ b/common/includes/LAVSplitterSettingsInternal.h
@@ -25,9 +25,9 @@
 class FormatInfo {
 public:
   FormatInfo() : strName(NULL), strDescription(NULL) {}
-  FormatInfo(const char *name, const char *desc) : strName(name), strDescription(desc) {}
-  const char *strName;
-  const char *strDescription;
+  FormatInfo(LPCSTR name, LPCSTR desc) : strName(name), strDescription(desc) {}
+  LPCSTR strName;
+  LPCSTR strDescription;
 
   // Comparison operators for sorting (NULL safe)
   bool FormatInfo::operator < (const FormatInfo& rhs) const { return strName ? (rhs.strName ? _stricmp(strName, rhs.strName) < 0 : false) : true; }
@@ -45,7 +45,7 @@ interface ILAVFSettingsInternal : public ILAVFSettings
   // Query if the current filter graph requires VC1 Correction
   STDMETHOD_(BOOL,IsVC1CorrectionRequired)() = 0;
 
-  STDMETHOD_(const char*, GetInputFormat)() = 0;
+  STDMETHOD_(LPCSTR, GetInputFormat)() = 0;
   STDMETHOD_(std::set<FormatInfo>&, GetInputFormats)() = 0;
   STDMETHOD_(CMediaType *, GetOutputMediatype)(int stream) = 0;
 };
diff --git a/decoder/LAVAudio/LAVAudioSettings.h b/decoder/LAVAudio/LAVAudioSettings.h
index fe2bcd7c..f016bbeb 100644
--- a/decoder/LAVAudio/LAVAudioSettings.h
+++ b/decoder/LAVAudio/LAVAudioSettings.h
@@ -195,10 +195,10 @@ interface ILAVAudioStatus : public IUnknown
   STDMETHOD_(BOOL,IsSampleFormatSupported)(LAVAudioSampleFormat sfCheck) = 0;
 
   // Get details about the current decoding format
-  STDMETHOD(GetDecodeDetails)(const char **pCodec, const char **pDecodeFormat, int *pnChannels, int *pSampleRate, DWORD *pChannelMask) = 0;
+  STDMETHOD(GetDecodeDetails)(LPCSTR *pCodec, LPCSTR *pDecodeFormat, int *pnChannels, int *pSampleRate, DWORD *pChannelMask) = 0;
   
   // Get details about the current output format
-  STDMETHOD(GetOutputDetails)(const char **pOutputFormat, int *pnChannels, int *pSampleRate, DWORD *pChannelMask) = 0;
+  STDMETHOD(GetOutputDetails)(LPCSTR *pOutputFormat, int *pnChannels, int *pSampleRate, DWORD *pChannelMask) = 0;
   
   // Enable Volume measurements
   STDMETHOD(EnableVolumeStats)() = 0;
diff --git a/decoder/LAVVideo/LAVVideoSettings.h b/decoder/LAVVideo/LAVVideoSettings.h
index 3bf23b31..54ea1084 100644
--- a/decoder/LAVVideo/LAVVideoSettings.h
+++ b/decoder/LAVVideo/LAVVideoSettings.h
@@ -350,5 +350,5 @@ interface ILAVVideoSettings : public IUnknown
 interface ILAVVideoStatus : public IUnknown
 {
   // Get the name of the active decoder (can return NULL if none is active)
-  STDMETHOD_(const WCHAR *, GetActiveDecoderName)() = 0;
+  STDMETHOD_(LPCWSTR, GetActiveDecoderName)() = 0;
 };
diff --git a/demuxer/LAVSplitter/LAVSplitter.cpp b/demuxer/LAVSplitter/LAVSplitter.cpp
index 68da8309..bad89a4e 100644
--- a/demuxer/LAVSplitter/LAVSplitter.cpp
+++ b/demuxer/LAVSplitter/LAVSplitter.cpp
@@ -1501,7 +1501,7 @@ HRESULT CLAVSplitter::SetRuntimeConfig(BOOL bRuntimeConfig)
 }
 
 
-STDMETHODIMP CLAVSplitter::GetPreferredLanguages(WCHAR **ppLanguages)
+STDMETHODIMP CLAVSplitter::GetPreferredLanguages(LPWSTR *ppLanguages)
 {
   CheckPointer(ppLanguages, E_POINTER);
   size_t len = m_settings.prefAudioLangs.length() + 1;
@@ -1515,13 +1515,13 @@ STDMETHODIMP CLAVSplitter::GetPreferredLanguages(WCHAR **ppLanguages)
   return S_OK;
 }
 
-STDMETHODIMP CLAVSplitter::SetPreferredLanguages(WCHAR *pLanguages)
+STDMETHODIMP CLAVSplitter::SetPreferredLanguages(LPWSTR pLanguages)
 {
   m_settings.prefAudioLangs = std::wstring(pLanguages);
   return SaveSettings();
 }
 
-STDMETHODIMP CLAVSplitter::GetPreferredSubtitleLanguages(WCHAR **ppLanguages)
+STDMETHODIMP CLAVSplitter::GetPreferredSubtitleLanguages(LPWSTR *ppLanguages)
 {
   CheckPointer(ppLanguages, E_POINTER);
   size_t len = m_settings.prefSubLangs.length() + 1;
@@ -1535,7 +1535,7 @@ STDMETHODIMP CLAVSplitter::GetPreferredSubtitleLanguages(WCHAR **ppLanguages)
   return S_OK;
 }
 
-STDMETHODIMP CLAVSplitter::SetPreferredSubtitleLanguages(WCHAR *pLanguages)
+STDMETHODIMP CLAVSplitter::SetPreferredSubtitleLanguages(LPWSTR pLanguages)
 {
   m_settings.prefSubLangs = std::wstring(pLanguages);
   return SaveSettings();
@@ -1637,7 +1637,7 @@ STDMETHODIMP_(BOOL) CLAVSplitter::GetFixBrokenHDPVR()
   return TRUE;
 }
 
-STDMETHODIMP_(BOOL) CLAVSplitter::IsFormatEnabled(const char *strFormat)
+STDMETHODIMP_(BOOL) CLAVSplitter::IsFormatEnabled(LPCSTR strFormat)
 {
   std::string format(strFormat);
   if (m_settings.formats.find(format) != m_settings.formats.end()) {
@@ -1646,7 +1646,7 @@ STDMETHODIMP_(BOOL) CLAVSplitter::IsFormatEnabled(const char *strFormat)
   return FALSE;
 }
 
-STDMETHODIMP_(HRESULT) CLAVSplitter::SetFormatEnabled(const char *strFormat, BOOL bEnabled)
+STDMETHODIMP_(HRESULT) CLAVSplitter::SetFormatEnabled(LPCSTR strFormat, BOOL bEnabled)
 {
   std::string format(strFormat);
   if (m_settings.formats.find(format) != m_settings.formats.end()) {
@@ -1667,7 +1667,7 @@ STDMETHODIMP_(BOOL) CLAVSplitter::GetStreamSwitchRemoveAudio()
   return m_settings.StreamSwitchRemoveAudio;
 }
 
-STDMETHODIMP CLAVSplitter::GetAdvancedSubtitleConfig(WCHAR **ppAdvancedConfig)
+STDMETHODIMP CLAVSplitter::GetAdvancedSubtitleConfig(LPWSTR *ppAdvancedConfig)
 {
   CheckPointer(ppAdvancedConfig, E_POINTER);
   size_t len = m_settings.subtitleAdvanced.length() + 1;
@@ -1681,7 +1681,7 @@ STDMETHODIMP CLAVSplitter::GetAdvancedSubtitleConfig(WCHAR **ppAdvancedConfig)
   return S_OK;
 }
 
-STDMETHODIMP CLAVSplitter::SetAdvancedSubtitleConfig(WCHAR *pAdvancedConfig)
+STDMETHODIMP CLAVSplitter::SetAdvancedSubtitleConfig(LPWSTR pAdvancedConfig)
 {
   m_settings.subtitleAdvanced = std::wstring(pAdvancedConfig);
   return SaveSettings();
diff --git a/demuxer/LAVSplitter/LAVSplitter.h b/demuxer/LAVSplitter/LAVSplitter.h
index 0e2c2a22..6b5940d0 100644
--- a/demuxer/LAVSplitter/LAVSplitter.h
+++ b/demuxer/LAVSplitter/LAVSplitter.h
@@ -134,10 +134,10 @@ public:
 
   // ILAVFSettings
   STDMETHODIMP SetRuntimeConfig(BOOL bRuntimeConfig);
-  STDMETHODIMP GetPreferredLanguages(WCHAR **ppLanguages);
-  STDMETHODIMP SetPreferredLanguages(WCHAR *pLanguages);
-  STDMETHODIMP GetPreferredSubtitleLanguages(WCHAR **ppLanguages);
-  STDMETHODIMP SetPreferredSubtitleLanguages(WCHAR *pLanguages);
+  STDMETHODIMP GetPreferredLanguages(LPWSTR *ppLanguages);
+  STDMETHODIMP SetPreferredLanguages(LPWSTR pLanguages);
+  STDMETHODIMP GetPreferredSubtitleLanguages(LPWSTR *ppLanguages);
+  STDMETHODIMP SetPreferredSubtitleLanguages(LPWSTR pLanguages);
   STDMETHODIMP_(LAVSubtitleMode) GetSubtitleMode();
   STDMETHODIMP SetSubtitleMode(LAVSubtitleMode mode);
   STDMETHODIMP_(BOOL) GetSubtitleMatchingLanguage();
@@ -154,12 +154,12 @@ public:
   STDMETHODIMP_(BOOL) GetVideoParsingEnabled();
   STDMETHODIMP SetFixBrokenHDPVR(BOOL bEnabled);
   STDMETHODIMP_(BOOL) GetFixBrokenHDPVR();
-  STDMETHODIMP_(HRESULT) SetFormatEnabled(const char *strFormat, BOOL bEnabled);
-  STDMETHODIMP_(BOOL) IsFormatEnabled(const char *strFormat);
+  STDMETHODIMP_(HRESULT) SetFormatEnabled(LPCSTR strFormat, BOOL bEnabled);
+  STDMETHODIMP_(BOOL) IsFormatEnabled(LPCSTR strFormat);
   STDMETHODIMP SetStreamSwitchRemoveAudio(BOOL bEnabled);
   STDMETHODIMP_(BOOL) GetStreamSwitchRemoveAudio();
-  STDMETHODIMP GetAdvancedSubtitleConfig(WCHAR **ppAdvancedConfig);
-  STDMETHODIMP SetAdvancedSubtitleConfig(WCHAR *pAdvancedConfig);
+  STDMETHODIMP GetAdvancedSubtitleConfig(LPWSTR *ppAdvancedConfig);
+  STDMETHODIMP SetAdvancedSubtitleConfig(LPWSTR pAdvancedConfig);
   STDMETHODIMP SetUseAudioForHearingVisuallyImpaired(BOOL bEnabled);
   STDMETHODIMP_(BOOL) GetUseAudioForHearingVisuallyImpaired();
   STDMETHODIMP SetMaxQueueMemSize(DWORD dwMaxSize);
@@ -172,7 +172,7 @@ public:
   STDMETHODIMP_(BOOL) GetLoadMatroskaExternalSegments();
 
   // ILAVSplitterSettingsInternal
-  STDMETHODIMP_(const char*) GetInputFormat() { if (m_pDemuxer) return m_pDemuxer->GetContainerFormat(); return NULL; }
+  STDMETHODIMP_(LPCSTR) GetInputFormat() { if (m_pDemuxer) return m_pDemuxer->GetContainerFormat(); return NULL; }
   STDMETHODIMP_(std::set<FormatInfo>&) GetInputFormats();
   STDMETHODIMP_(BOOL) IsVC1CorrectionRequired();
   STDMETHODIMP_(CMediaType *) GetOutputMediatype(int stream);