diff options
author | Underground78 <underground78@users.sourceforge.net> | 2013-05-25 15:13:28 +0400 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-25 17:22:04 +0400 |
commit | 21af717a70d05d6a4202d253d9e89134023b7c42 (patch) | |
tree | 648706ddd5df9ded1ae19cf4333c1c96e9d35763 | |
parent | 4280c3f23328c259fb0c7d9e5604e5bc59da0f17 (diff) |
Cosmetics: Fix some typos
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r-- | common/includes/LAVSplitterSettings.h | 30 | ||||
-rw-r--r-- | decoder/LAVAudio/AudioSettingsProp.cpp | 2 | ||||
-rw-r--r-- | decoder/LAVAudio/Bitstream.cpp | 2 | ||||
-rw-r--r-- | decoder/LAVAudio/LAVAudioSettings.h | 6 | ||||
-rw-r--r-- | decoder/LAVAudio/PostProcessor.cpp | 2 | ||||
-rw-r--r-- | decoder/LAVVideo/LAVVideoSettings.h | 10 | ||||
-rw-r--r-- | decoder/LAVVideo/VideoSettingsProp.cpp | 2 | ||||
-rw-r--r-- | decoder/LAVVideo/decoders/ILAVDecoder.h | 6 | ||||
-rw-r--r-- | demuxer/LAVSplitter/LAVSplitter.rc | 2 | ||||
-rw-r--r-- | demuxer/LAVSplitter/PacketQueue.cpp | 2 | ||||
-rw-r--r-- | demuxer/LAVSplitter/SettingsProp.cpp | 4 |
11 files changed, 34 insertions, 34 deletions
diff --git a/common/includes/LAVSplitterSettings.h b/common/includes/LAVSplitterSettings.h index dc4ec260..8242b919 100644 --- a/common/includes/LAVSplitterSettings.h +++ b/common/includes/LAVSplitterSettings.h @@ -43,22 +43,22 @@ interface ILAVFSettings : public IUnknown // For smooth operations, it must be called before LAV Splitter opens a file. STDMETHOD(SetRuntimeConfig)(BOOL bRuntimeConfig) = 0; - // Retrieve the preferred languages as ISO 639-2 language codes, comma seperated + // Retrieve the preferred languages as ISO 639-2 language codes, comma separated // 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)(LPWSTR *ppLanguages) = 0; - // Set the preferred languages as ISO 639-2 language codes, comma seperated + // Set the preferred languages as ISO 639-2 language codes, comma separated // To reset to no preferred language, pass NULL or the empty string STDMETHOD(SetPreferredLanguages)(LPCWSTR pLanguages) = 0; - // Retrieve the preferred subtitle languages as ISO 639-2 language codes, comma seperated + // Retrieve the preferred subtitle languages as ISO 639-2 language codes, comma separated // 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)(LPWSTR *ppLanguages) = 0; - // Set the preferred subtitle languages as ISO 639-2 language codes, comma seperated + // Set the preferred subtitle languages as ISO 639-2 language codes, comma separated // 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)(LPCWSTR pLanguages) = 0; @@ -81,10 +81,10 @@ interface ILAVFSettings : public IUnknown // @deprecated - do not use anymore, deprecated and non-functional, replaced by advanced subtitle mode STDMETHOD(SetSubtitleMatchingLanguage)(BOOL dwMode) = 0; - // Control wether a special "Forced Subtitles" stream will be created for PGS subs + // Control whether a special "Forced Subtitles" stream will be created for PGS subs STDMETHOD_(BOOL,GetPGSForcedStream)() = 0; - // Control wether a special "Forced Subtitles" stream will be created for PGS subs + // Control whether a special "Forced Subtitles" stream will be created for PGS subs STDMETHOD(SetPGSForcedStream)(BOOL bFlag) = 0; // Get the PGS forced subs config @@ -103,10 +103,10 @@ interface ILAVFSettings : public IUnknown // 0 - No Timestamp Correction, 1 - Always Timestamp Correction, 2 - Auto (Correction for Decoders that need it) STDMETHOD(SetVC1TimestampMode)(int iMode) = 0; - // Set whether substreams (AC3 in TrueHD, for example) should be shown as a seperate stream + // Set whether substreams (AC3 in TrueHD, for example) should be shown as a separate stream STDMETHOD(SetSubstreamsEnabled)(BOOL bSubStreams) = 0; - // Check whether substreams (AC3 in TrueHD, for example) should be shown as a seperate stream + // Check whether substreams (AC3 in TrueHD, for example) should be shown as a separate stream STDMETHOD_(BOOL,GetSubstreamsEnabled)() = 0; // @deprecated - no longer required @@ -123,7 +123,7 @@ interface ILAVFSettings : public IUnknown // @deprecated - no longer required STDMETHOD_(BOOL,GetFixBrokenHDPVR)() = 0; - // Control wether the givne format is enabled + // Control whether the given format is enabled STDMETHOD_(HRESULT,SetFormatEnabled)(LPCSTR strFormat, BOOL bEnabled) = 0; // Check if the given format is enabled @@ -135,12 +135,12 @@ interface ILAVFSettings : public IUnknown // Query if LAV Splitter should always completely remove the filter connected to its Audio Pin when the audio stream is changed STDMETHOD_(BOOL,GetStreamSwitchRemoveAudio)() = 0; - // Advanced Subtitle configuration. Refer to the documention for details. + // Advanced Subtitle configuration. Refer to the documentation 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)(LPWSTR *ppAdvancedConfig) = 0; - // Advanced Subtitle configuration. Refer to the documention for details. + // Advanced Subtitle configuration. Refer to the documentation 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)(LPCWSTR pAdvancedConfig) = 0; @@ -163,15 +163,15 @@ interface ILAVFSettings : public IUnknown // Get Tray Icon STDMETHOD_(BOOL,GetTrayIcon)() = 0; - // Toggle wether higher quality audio streams are preferred + // Toggle whether higher quality audio streams are preferred STDMETHOD(SetPreferHighQualityAudioStreams)(BOOL bEnabled) = 0; - // Toggle wether higher quality audio streams are preferred + // Toggle whether higher quality audio streams are preferred STDMETHOD_(BOOL,GetPreferHighQualityAudioStreams)() = 0; - // Toggle wether Matroska Linked Segments should be loaded from other files + // Toggle whether Matroska Linked Segments should be loaded from other files STDMETHOD(SetLoadMatroskaExternalSegments)(BOOL bEnabled) = 0; - // Get wether Matroska Linked Segments should be loaded from other files + // Get whether Matroska Linked Segments should be loaded from other files STDMETHOD_(BOOL,GetLoadMatroskaExternalSegments)() = 0; }; diff --git a/decoder/LAVAudio/AudioSettingsProp.cpp b/decoder/LAVAudio/AudioSettingsProp.cpp index 33115818..fb13eb48 100644 --- a/decoder/LAVAudio/AudioSettingsProp.cpp +++ b/decoder/LAVAudio/AudioSettingsProp.cpp @@ -674,7 +674,7 @@ HRESULT CLAVAudioFormatsProp::OnActivate() ListView_DeleteAllItems(hlv); ListView_SetItemCount(hlv, Codec_AudioNB); - // Create entrys for the formats + // Create entries for the formats LVITEM lvi; memset(&lvi, 0, sizeof(lvi)); lvi.mask = LVIF_TEXT|LVIF_PARAM; diff --git a/decoder/LAVAudio/Bitstream.cpp b/decoder/LAVAudio/Bitstream.cpp index dad0f850..ada9619e 100644 --- a/decoder/LAVAudio/Bitstream.cpp +++ b/decoder/LAVAudio/Bitstream.cpp @@ -36,7 +36,7 @@ static struct { { AV_CODEC_ID_DTS, Bitstream_DTS } // DTS-HD is still DTS, and handled special below }; -// Check wether a codec is bitstreaming eligible and enabled +// Check whether a codec is bitstreaming eligible and enabled BOOL CLAVAudio::IsBitstreaming(AVCodecID codec) { for(int i = 0; i < countof(lavf_bitstream_config); ++i) { diff --git a/decoder/LAVAudio/LAVAudioSettings.h b/decoder/LAVAudio/LAVAudioSettings.h index f016bbeb..3ac718f7 100644 --- a/decoder/LAVAudio/LAVAudioSettings.h +++ b/decoder/LAVAudio/LAVAudioSettings.h @@ -56,7 +56,7 @@ typedef enum LAVAudioCodec { Codec_Truespeech, Codec_TAK, - Codec_AudioNB // Number of entrys (do not use when dynamically linking) + Codec_AudioNB // Number of entries (do not use when dynamically linking) }; // Bitstreaming Codecs supported in LAV Audio @@ -67,7 +67,7 @@ typedef enum LAVBitstreamCodec { Bitstream_DTS, Bitstream_DTSHD, - Bitstream_NB // Number of entrys (do not use when dynamically linking) + Bitstream_NB // Number of entries (do not use when dynamically linking) }; @@ -81,7 +81,7 @@ typedef enum LAVAudioSampleFormat { SampleFormat_FP32, SampleFormat_Bitstream, - SampleFormat_NB // Number of entrys (do not use when dynamically linking) + SampleFormat_NB // Number of entries (do not use when dynamically linking) }; typedef enum LAVAudioMixingMode { diff --git a/decoder/LAVAudio/PostProcessor.cpp b/decoder/LAVAudio/PostProcessor.cpp index 535dc57a..200639e0 100644 --- a/decoder/LAVAudio/PostProcessor.cpp +++ b/decoder/LAVAudio/PostProcessor.cpp @@ -27,7 +27,7 @@ extern "C" { }; // PCM Volume Adjustment Factors, both for integer and float math -// Entrys start at 2 channel mixing, half volume +// entries start at 2 channel mixing, half volume static int pcm_volume_adjust_integer[7] = { 362, 443, 512, 572, 627, 677, 724 }; diff --git a/decoder/LAVVideo/LAVVideoSettings.h b/decoder/LAVVideo/LAVVideoSettings.h index aa5ef92b..b2b575ef 100644 --- a/decoder/LAVVideo/LAVVideoSettings.h +++ b/decoder/LAVVideo/LAVVideoSettings.h @@ -81,7 +81,7 @@ typedef enum LAVVideoCodec { Codec_VMNC, Codec_FLIC, - Codec_VideoNB // Number of entrys (do not use when dynamically linking) + Codec_VideoNB // Number of entries (do not use when dynamically linking) }; // Codecs with hardware acceleration @@ -209,14 +209,14 @@ interface ILAVVideoSettings : public IUnknown // >1 = Multi-Threading with the specified number of threads STDMETHOD_(DWORD,GetNumThreads)() = 0; - // Set wether the aspect ratio encoded in the stream should be forwarded to the renderer, + // Set whether the aspect ratio encoded in the stream should be forwarded to the renderer, // or the aspect ratio specified by the source filter should be kept. // 0 = AR from the source filter // 1 = AR from the Stream // 2 = AR from stream if source is not reliable STDMETHOD(SetStreamAR)(DWORD bStreamAR) = 0; - // Get wether the aspect ratio encoded in the stream should be forwarded to the renderer, + // Get whether the aspect ratio encoded in the stream should be forwarded to the renderer, // or the aspect ratio specified by the source filter should be kept. // 0 = AR from the source filter // 1 = AR from the Stream @@ -285,11 +285,11 @@ interface ILAVVideoSettings : public IUnknown // Get the deinterlacing output for the hardware decoder STDMETHOD_(LAVDeintOutput, GetHWAccelDeintOutput)() = 0; - // Set wether the hardware decoder should force high-quality deinterlacing + // Set whether the hardware decoder should force high-quality deinterlacing // Note: this option is not supported on all decoder implementations and/or all operating systems STDMETHOD(SetHWAccelDeintHQ)(BOOL bHQ) = 0; - // Get wether the hardware decoder should force high-quality deinterlacing + // Get whether the hardware decoder should force high-quality deinterlacing // Note: this option is not supported on all decoder implementations and/or all operating systems STDMETHOD_(BOOL, GetHWAccelDeintHQ)() = 0; diff --git a/decoder/LAVVideo/VideoSettingsProp.cpp b/decoder/LAVVideo/VideoSettingsProp.cpp index af2b2f9b..bb7d0394 100644 --- a/decoder/LAVVideo/VideoSettingsProp.cpp +++ b/decoder/LAVVideo/VideoSettingsProp.cpp @@ -704,7 +704,7 @@ HRESULT CLAVVideoFormatsProp::OnActivate() ListView_DeleteAllItems(hlv); ListView_SetItemCount(hlv, Codec_VideoNB); - // Create entrys for the formats + // Create entries for the formats LVITEM lvi; memset(&lvi, 0, sizeof(lvi)); lvi.mask = LVIF_TEXT|LVIF_PARAM; diff --git a/decoder/LAVVideo/decoders/ILAVDecoder.h b/decoder/LAVVideo/decoders/ILAVDecoder.h index c35c953c..8188075c 100644 --- a/decoder/LAVVideo/decoders/ILAVDecoder.h +++ b/decoder/LAVVideo/decoders/ILAVDecoder.h @@ -332,7 +332,7 @@ interface ILAVDecoder STDMETHOD_(REFERENCE_TIME, GetFrameDuration)() PURE; /** - * Query wether the format can potentially be interlaced. + * Query whether the format can potentially be interlaced. * This function should return false if the format can 100% not be interlaced, and true if it can be interlaced (but also progressive). */ STDMETHOD_(BOOL, IsInterlaced)() PURE; @@ -359,12 +359,12 @@ interface ILAVDecoder STDMETHOD_(const WCHAR*, GetDecoderName)() PURE; /** - * Get wether the decoder outputs thread-safe buffers + * Get whether the decoder outputs thread-safe buffers */ STDMETHOD(HasThreadSafeBuffers)() PURE; /** - * Get wether the decoder should sync to the main thread + * Get whether the decoder should sync to the main thread */ STDMETHOD(SyncToProcessThread)() PURE; }; diff --git a/demuxer/LAVSplitter/LAVSplitter.rc b/demuxer/LAVSplitter/LAVSplitter.rc index 5d0798b0..1f84205c 100644 --- a/demuxer/LAVSplitter/LAVSplitter.rc +++ b/demuxer/LAVSplitter/LAVSplitter.rc @@ -67,7 +67,7 @@ IDD_PROPPAGE_LAVFSETTINGS DIALOGEX 0, 0, 400, 274 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Preferred Languages\nEnter your preferred languages as their 3-letter language codes, comma seperated. (Example: ""eng,ger,fre"")",IDC_LBL_PREF_LANG,7,7,386,27 + LTEXT "Preferred Languages\nEnter your preferred languages as their 3-letter language codes, comma separated. (Example: ""eng,ger,fre"")",IDC_LBL_PREF_LANG,7,7,386,27 EDITTEXT IDC_PREF_LANG,7,35,386,14,ES_AUTOHSCROLL LTEXT "Audio:",IDC_LBL_PREF_LANG_AUDIO,7,25,31,8 EDITTEXT IDC_PREF_LANG_SUBS,7,65,386,14,ES_AUTOHSCROLL diff --git a/demuxer/LAVSplitter/PacketQueue.cpp b/demuxer/LAVSplitter/PacketQueue.cpp index bdb4316c..d0b7de11 100644 --- a/demuxer/LAVSplitter/PacketQueue.cpp +++ b/demuxer/LAVSplitter/PacketQueue.cpp @@ -81,7 +81,7 @@ void CPacketQueue::Clear() { CAutoLock cAutoLock(this); - DbgLog((LOG_TRACE, 10, L"CPacketQueue::Clear() - clearing queue with %d entrys", m_queue.size())); + DbgLog((LOG_TRACE, 10, L"CPacketQueue::Clear() - clearing queue with %d entries", m_queue.size())); std::deque<Packet *>::iterator it; for (it = m_queue.begin(); it != m_queue.end(); ++it) { diff --git a/demuxer/LAVSplitter/SettingsProp.cpp b/demuxer/LAVSplitter/SettingsProp.cpp index fc3bab2c..43cc1a39 100644 --- a/demuxer/LAVSplitter/SettingsProp.cpp +++ b/demuxer/LAVSplitter/SettingsProp.cpp @@ -137,7 +137,7 @@ void CLAVSplitterSettingsProp::UpdateSubtitleMode(LAVSubtitleMode mode) WCHAR *note = L"Default Mode: Subtitles matching the preferred languages, as well as \"default\" and \"forced\" subtitles will be loaded."; SendDlgItemMessage(m_Dlg, IDC_SUBTITLE_NOTE, WM_SETTEXT, 0, (LPARAM)note); } else if (mode == LAVSubtitleMode_Advanced) { - WCHAR *note = L"Advanced Mode: Refer to the README or the documention on http://1f0.de for details."; + WCHAR *note = L"Advanced Mode: Refer to the README or the documentation on http://1f0.de for details."; SendDlgItemMessage(m_Dlg, IDC_SUBTITLE_NOTE, WM_SETTEXT, 0, (LPARAM)note); } else { WCHAR *empty = L""; @@ -455,7 +455,7 @@ HRESULT CLAVSplitterFormatsProp::OnActivate() return E_OUTOFMEMORY; memset(m_bFormats, 0, sizeof(BOOL) * m_Formats.size()); - // Create entrys for the formats + // Create entries for the formats LVITEM lvi; memset(&lvi, 0, sizeof(lvi)); lvi.mask = LVIF_TEXT|LVIF_PARAM; |