diff options
99 files changed, 214 insertions, 214 deletions
diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp index 208f5a068..fd260eab0 100644 --- a/src/DSUtil/DSUtil.cpp +++ b/src/DSUtil/DSUtil.cpp @@ -820,13 +820,13 @@ cdrom_t GetCDROMType(TCHAR drive, CAtlList<CString>& files) FindFiles(path + _T("\\mpegav\\music??.mpg"), files);
FindFiles(path + _T("\\mpeg2\\music??.dat"), files);
FindFiles(path + _T("\\mpeg2\\music??.mpg"), files);
- if (files.GetCount() > 0) {
+ if (!files.IsEmpty()) {
return CDROM_VideoCD;
}
// CDROM_DVDVideo
FindFiles(path + _T("\\VIDEO_TS\\video_ts.ifo"), files);
- if (files.GetCount() > 0) {
+ if (!files.IsEmpty()) {
return CDROM_DVDVideo;
}
@@ -850,7 +850,7 @@ cdrom_t GetCDROMType(TCHAR drive, CAtlList<CString>& files) CloseHandle(hDrive);
}
- if (files.GetCount() > 0) {
+ if (!files.IsEmpty()) {
return CDROM_Audio;
}
@@ -905,13 +905,13 @@ bool GetKeyFrames(CString fn, CUIntArray& kfs) } else {
for (LONG kf = 0; ; kf++) {
kf = pavi->FindSample(kf, FIND_KEY | FIND_NEXT);
- if (kf < 0 || kfs.GetCount() > 0 && kfs[kfs.GetCount() - 1] >= (UINT)kf) {
+ if (kf < 0 || !kfs.IsEmpty() && kfs[kfs.GetCount() - 1] >= (UINT)kf) {
break;
}
kfs.Add(kf);
}
- if (kfs.GetCount() > 0 && kfs[kfs.GetCount() - 1] < si.dwLength - 1) {
+ if (!kfs.IsEmpty() && kfs[kfs.GetCount() - 1] < si.dwLength - 1) {
kfs.Add(si.dwLength - 1);
}
}
@@ -923,7 +923,7 @@ bool GetKeyFrames(CString fn, CUIntArray& kfs) AVIFileExit();
}
- return (kfs.GetCount() > 0);
+ return !kfs.IsEmpty();
}
DVD_HMSF_TIMECODE RT2HMSF(REFERENCE_TIME rt, double fps) // use to remember the current position
diff --git a/src/DeCSS/VobFile.cpp b/src/DeCSS/VobFile.cpp index 5b5a820e8..d3cbfcf9c 100644 --- a/src/DeCSS/VobFile.cpp +++ b/src/DeCSS/VobFile.cpp @@ -578,7 +578,7 @@ bool CVobFile::Open(CAtlList<CString>& vobs, int offset) {
Close();
- if (vobs.GetCount() == 0) {
+ if (vobs.IsEmpty()) {
return false;
}
@@ -608,7 +608,7 @@ bool CVobFile::Open(CAtlList<CString>& vobs, int offset) m_size += f.size;
}
- if (m_files.GetCount() > 0 && CDVDSession::Open(m_files[0].fn)) {
+ if (!m_files.IsEmpty() && CDVDSession::Open(m_files[0].fn)) {
for (size_t i = 0; !m_fHasTitleKey && i < m_files.GetCount(); i++) {
if (BeginSession()) {
m_fDVD = true;
@@ -673,7 +673,7 @@ bool CVobFile::Open(CAtlList<CString>& vobs, int offset) }
}
/*
- if(m_files.GetCount() > 0 && !m_fDVD)
+ if(!m_files.IsEmpty() && !m_fDVD)
{
CString fn = m_files[0].fn;
fn.MakeLower();
diff --git a/src/Subtitles/DVBSub.cpp b/src/Subtitles/DVBSub.cpp index ac9aad791..f4d506f38 100644 --- a/src/Subtitles/DVBSub.cpp +++ b/src/Subtitles/DVBSub.cpp @@ -417,7 +417,7 @@ void CDVBSub::Reset() m_pCurrentPage.Free();
DVB_PAGE* pPage;
- while (m_Pages.GetCount() > 0) {
+ while (!m_Pages.IsEmpty()) {
pPage = m_Pages.RemoveHead();
delete pPage;
}
@@ -426,7 +426,7 @@ void CDVBSub::Reset() void CDVBSub::RemoveOldPages(REFERENCE_TIME rt)
{
// Cleanup the old pages. We keep a 2 min buffer to play nice with the queue.
- while (m_Pages.GetCount() > 0 && m_Pages.GetHead()->rtStop + 120 * 10000000i64 < rt) {
+ while (!m_Pages.IsEmpty() && m_Pages.GetHead()->rtStop + 120 * 10000000i64 < rt) {
DVB_PAGE* pPage = m_Pages.GetHead();
if (!pPage->rendered) {
TRACE_DVB(_T("DVB - remove unrendered object, %s - %s\n"), ReftimeToString(pPage->rtStart), ReftimeToString(pPage->rtStop));
diff --git a/src/Subtitles/DVBSub.h b/src/Subtitles/DVBSub.h index cd6ab56e3..41884d847 100644 --- a/src/Subtitles/DVBSub.h +++ b/src/Subtitles/DVBSub.h @@ -185,13 +185,13 @@ public: ~DVB_PAGE() {
CompositionObject* pObject;
- while (objects.GetCount() > 0) {
+ while (!objects.IsEmpty()) {
pObject = objects.RemoveHead();
delete pObject;
}
DVB_CLUT* pCLUT;
- while (CLUTs.GetCount() > 0) {
+ while (!CLUTs.IsEmpty()) {
pCLUT = CLUTs.RemoveHead();
delete pCLUT;
}
diff --git a/src/Subtitles/HdmvSub.cpp b/src/Subtitles/HdmvSub.cpp index 8fd4e2aa6..6594d70c0 100644 --- a/src/Subtitles/HdmvSub.cpp +++ b/src/Subtitles/HdmvSub.cpp @@ -361,7 +361,7 @@ HRESULT CHdmvSub::GetTextureSize(POSITION pos, SIZE& MaxTextureSize, SIZE& Video void CHdmvSub::Reset()
{
HDMV_PRESENTATION_SEGMENT* pPresentationSegment;
- while (m_pPresentationSegments.GetCount() > 0) {
+ while (!m_pPresentationSegments.IsEmpty()) {
pPresentationSegment = m_pPresentationSegments.RemoveHead();
delete pPresentationSegment;
}
@@ -370,7 +370,7 @@ void CHdmvSub::Reset() void CHdmvSub::RemoveOldSegments(REFERENCE_TIME rt)
{
// Cleanup the old presentation segments. We keep a 2 min buffer to play nice with the queue.
- while (m_pPresentationSegments.GetCount() > 0 && m_pPresentationSegments.GetHead()->rtStop + 120 * 10000000i64 < rt) {
+ while (!m_pPresentationSegments.IsEmpty() && m_pPresentationSegments.GetHead()->rtStop + 120 * 10000000i64 < rt) {
HDMV_PRESENTATION_SEGMENT* pPresentationSegment = m_pPresentationSegments.RemoveHead();
TRACE_HDMVSUB(_T("CHdmvSub::RemoveOldSegments Remove presentation segment %d %s => %s (rt=%s)\n"),
pPresentationSegment->composition_descriptor.nNumber,
diff --git a/src/Subtitles/HdmvSub.h b/src/Subtitles/HdmvSub.h index 3f67d2700..7563102e9 100644 --- a/src/Subtitles/HdmvSub.h +++ b/src/Subtitles/HdmvSub.h @@ -88,7 +88,7 @@ public: ~HDMV_PRESENTATION_SEGMENT() {
CompositionObject* pObject;
- while (objects.GetCount() > 0) {
+ while (!objects.IsEmpty()) {
pObject = objects.RemoveHead();
delete pObject;
}
diff --git a/src/Subtitles/RTS.cpp b/src/Subtitles/RTS.cpp index e67cd58e0..f49d8801c 100644 --- a/src/Subtitles/RTS.cpp +++ b/src/Subtitles/RTS.cpp @@ -554,7 +554,7 @@ bool CPolygon::GetPOINT(CStringW& str, POINT& ret) bool CPolygon::ParseStr()
{
- if (m_pathTypesOrg.GetCount() > 0) {
+ if (!m_pathTypesOrg.IsEmpty()) {
return true;
}
@@ -1815,7 +1815,7 @@ bool CRenderedTextSubtitle::ParseSSATag(CSubtitle* sub, CStringW str, STSStyle& // TODO: call ParseStyleModifier(cmd, params, ..) and move the rest there
- CStringW p = params.GetCount() > 0 ? params[0] : L"";
+ CStringW p = !params.IsEmpty() ? params[0] : L"";
if (cmd == L"1c" || cmd == L"2c" || cmd == L"3c" || cmd == L"4c") {
int k = cmd[0] - '1';
@@ -2494,7 +2494,7 @@ STDMETHODIMP_(POSITION) CRenderedTextSubtitle::GetNext(POSITION pos) int iSegment = (int)pos;
const STSSegment* stss = GetSegment(iSegment);
- while (stss && stss->subs.GetCount() == 0) {
+ while (stss && stss->subs.IsEmpty()) {
iSegment++;
stss = GetSegment(iSegment);
}
diff --git a/src/Subtitles/RealTextParser.cpp b/src/Subtitles/RealTextParser.cpp index 7d1d2c3d7..267685435 100644 --- a/src/Subtitles/RealTextParser.cpp +++ b/src/Subtitles/RealTextParser.cpp @@ -46,7 +46,7 @@ bool CRealTextParser::ParseRealText(wstring p_szFile) list<Tag> listTags;
list<Tag> listPreviousOpenTags;
- while (p_szFile.length() > 0) {
+ while (!p_szFile.empty()) {
if (p_szFile.at(0) == '<') {
Tag oTag;
if (!ExtractTag(p_szFile, oTag)) {
@@ -72,7 +72,7 @@ bool CRealTextParser::ParseRealText(wstring p_szFile) pairTimecodes.second = pairTimecodes.first + m_iDefaultSubtitleDurationInMillisecs;
}
- if (szLine.length() > 0) {
+ if (!szLine.empty()) {
m_RealText.m_mapLines[pairTimecodes] = szLine;
}
@@ -80,7 +80,7 @@ bool CRealTextParser::ParseRealText(wstring p_szFile) } else if (!vStartTimecodes.empty() && !vEndTimecodes.empty()) {
pair<int, int> pairTimecodes(vStartTimecodes.back(), vEndTimecodes.back());
- if (szLine.length() > 0) {
+ if (!szLine.empty()) {
m_RealText.m_mapLines[pairTimecodes] = szLine;
}
@@ -140,7 +140,7 @@ bool CRealTextParser::ParseRealText(wstring p_szFile) if (bPrevEndTimeMissing) {
pair<int, int> pairTimecodes(vStartTimecodes.back(), vStartTimecodes.back() + m_iDefaultSubtitleDurationInMillisecs);
- if (szLine.length() > 0) {
+ if (!szLine.empty()) {
m_RealText.m_mapLines[pairTimecodes] = szLine;
}
@@ -148,7 +148,7 @@ bool CRealTextParser::ParseRealText(wstring p_szFile) } else if (!vStartTimecodes.empty() && !vEndTimecodes.empty()) {
pair<int, int> pairTimecodes(vStartTimecodes.back(), vEndTimecodes.back());
- if (szLine.length() > 0) {
+ if (!szLine.empty()) {
m_RealText.m_mapLines[pairTimecodes] = szLine;
}
@@ -263,7 +263,7 @@ bool CRealTextParser::ExtractTextTag(wstring& p_rszLine, Tag& p_rTag) bool CRealTextParser::ExtractString(wstring& p_rszLine, wstring& p_rszString)
{
- if (p_rszLine.length() == 0 || p_rszLine.at(0) == '<') {
+ if (p_rszLine.empty() || p_rszLine.at(0) == '<') {
if (m_bTryToIgnoreErrors) {
p_rszString = L"";
return true;
@@ -502,7 +502,7 @@ wstring CRealTextParser::RenderTags(const list<Tag>& p_crlTags) continue;
}
- if (i->first == L"size" && i->second.length() > 0 && ::iswdigit(i->second.at(0))) {
+ if (i->first == L"size" && !i->second.empty() && ::iswdigit(i->second.at(0))) {
int iSize = ::_wtoi(i->second.c_str());
if (iSize > 0 && iSize < m_iMinFontSize) {
diff --git a/src/Subtitles/STS.cpp b/src/Subtitles/STS.cpp index bbdefa4ab..ce1866139 100644 --- a/src/Subtitles/STS.cpp +++ b/src/Subtitles/STS.cpp @@ -526,7 +526,7 @@ static bool OpenSubRipper(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
static bool OpenOldSubRipper(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -559,7 +559,7 @@ static bool OpenOldSubRipper(CTextFile* file, CSimpleTextSubtitle& ret, int Char }
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
static bool OpenSubViewer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -669,7 +669,7 @@ static bool OpenSubViewer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
static STSStyle* GetMicroDVDStyle(CString str, int CharSet)
@@ -957,7 +957,7 @@ static bool OpenMicroDVD(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) }
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
static void ReplaceNoCase(CStringW& str, CStringW from, CStringW to)
@@ -1172,7 +1172,7 @@ static bool OpenVPlayer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) }
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
CStringW GetStr(CStringW& buff, char sep = ',') //throw(...)
@@ -1726,7 +1726,7 @@ static bool OpenXombieSub(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
static bool OpenUSF(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -1779,7 +1779,7 @@ static bool OpenMPL2(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) }
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
typedef bool (*STSOpenFunct)(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet);
@@ -1865,7 +1865,7 @@ void CSimpleTextSubtitle::Copy(CSimpleTextSubtitle& sts) void CSimpleTextSubtitle::Append(CSimpleTextSubtitle& sts, int timeoff)
{
if (timeoff < 0) {
- timeoff = GetCount() > 0 ? GetAt(GetCount() - 1).end : 0;
+ timeoff = !IsEmpty() ? GetAt(GetCount() - 1).end : 0;
}
for (size_t i = 0, j = GetCount(); i < j; i++) {
@@ -2284,7 +2284,7 @@ const STSSegment* CSimpleTextSubtitle::SearchSubs(int t, double fps, /*[out]*/ i }
if (0 <= ret && (size_t)ret < m_segments.GetCount()
- && m_segments[ret].subs.GetCount() > 0
+ && !m_segments[ret].subs.IsEmpty()
&& TranslateSegmentStart(ret, fps) <= t && t < TranslateSegmentEnd(ret, fps)) {
return &m_segments[ret];
}
@@ -2585,7 +2585,7 @@ bool CSimpleTextSubtitle::Open(CTextFile* f, int CharSet, CString name) for (ptrdiff_t i = 0; i < nOpenFuncts; i++) {
if (!OpenFuncts[i].open(f, *this, CharSet) /*|| !GetCount()*/) {
- if (GetCount() > 0) {
+ if (!IsEmpty()) {
int n = CountLines(f, pos, f->GetPosition());
CString s;
s.Format(_T("Syntax error at line %d!\t"), n + 1);
@@ -2766,7 +2766,7 @@ bool CSimpleTextSubtitle::SaveAs(CString fn, exttype et, double fps, int delay, }
}
- if (GetCount() > 0) {
+ if (!IsEmpty()) {
str = _T("\n");
str += _T("[Events]\n");
str += (et == EXTSSA)
@@ -3115,5 +3115,5 @@ static bool OpenRealText(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) i->first.second);
}
- return (ret.GetCount() > 0);
+ return !ret.IsEmpty();
}
diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp index 02a61a243..36cf3b652 100644 --- a/src/Subtitles/VobSubFile.cpp +++ b/src/Subtitles/VobSubFile.cpp @@ -712,7 +712,7 @@ bool CVobSubFile::ReadIdx(CString fn, int& ver) continue;
}
- if (delay < 0 && m_langs[id].subpos.GetCount() > 0) {
+ if (delay < 0 && !m_langs[id].subpos.IsEmpty()) {
__int64 ts = m_langs[id].subpos[m_langs[id].subpos.GetCount() - 1].start;
if (sb.start < ts) {
diff --git a/src/Subtitles/VobSubFileRipper.cpp b/src/Subtitles/VobSubFileRipper.cpp index 33962ffef..d373afb28 100644 --- a/src/Subtitles/VobSubFileRipper.cpp +++ b/src/Subtitles/VobSubFileRipper.cpp @@ -472,19 +472,19 @@ bool CVobSubFileRipper::Create() PGC& pgc = m_rd.pgcs[m_rd.iSelPGC];
- if (pgc.iSelAngle < 0 || pgc.iSelAngle > 9 || pgc.angles[pgc.iSelAngle].GetCount() == 0) {
+ if (pgc.iSelAngle < 0 || pgc.iSelAngle > 9 || pgc.angles[pgc.iSelAngle].IsEmpty()) {
Log(LOG_ERROR, _T("Invalid angle number (%d)!"), pgc.iSelAngle);
return false;
}
CAtlArray<vc_t>& angle = pgc.angles[pgc.iSelAngle];
- if (m_rd.selids.GetCount() == 0 && !m_rd.fClosedCaption) {
+ if (m_rd.selids.IsEmpty() && !m_rd.fClosedCaption) {
Log(LOG_ERROR, _T("No valid stream set to be extacted!"));
return false;
}
- if (m_rd.selvcs.GetCount() == 0) {
+ if (m_rd.selvcs.IsEmpty()) {
Log(LOG_ERROR, _T("No valid vob/cell id set to be extacted!"));
return false;
}
@@ -771,7 +771,7 @@ bool CVobSubFileRipper::Create() Progress(1);
for (ptrdiff_t i = 0; i < 32; i++) {
- if (m_iLang == -1 && m_langs[i].subpos.GetCount() > 0) {
+ if (m_iLang == -1 && !m_langs[i].subpos.IsEmpty()) {
m_iLang = (int)i;
}
m_langs[i].id = pgc.ids[i];
@@ -811,7 +811,7 @@ bool CVobSubFileRipper::Create() Log(LOG_INFO, _T("Subtitles saved"));
- if (!m_vob.IsDVD() && loadedchunks.GetCount() == 0) {
+ if (!m_vob.IsDVD() && loadedchunks.IsEmpty()) {
if (SaveChunks(foundchunks)) {
Log(LOG_INFO, _T(".chunk file saved"));
}
@@ -1018,7 +1018,7 @@ STDMETHODIMP CVobSubFileRipper::LoadParamFile(CString fn) } else {
line += ' ';
- while (line.GetLength() > 0) {
+ while (!line.IsEmpty()) {
int n = line.Find(_T(" "));
CString lang = line.Left(n);
@@ -1059,7 +1059,7 @@ STDMETHODIMP CVobSubFileRipper::LoadParamFile(CString fn) }
}
- if ((m_rd.selids.GetCount() > 0 || m_rd.fClosedCaption) && line.IsEmpty()) {
+ if ((!m_rd.selids.IsEmpty() || m_rd.fClosedCaption) && line.IsEmpty()) {
phase = P_OPTIONS;
}
}
diff --git a/src/Subtitles/VobSubImage.cpp b/src/Subtitles/VobSubImage.cpp index 800a49a92..7037becb4 100644 --- a/src/Subtitles/VobSubImage.cpp +++ b/src/Subtitles/VobSubImage.cpp @@ -516,7 +516,7 @@ CAutoPtrList<COutline>* CVobSubImage::GetOutlineList(CPoint& topleft) }
} while (!(x == ox && y == oy && dir == odir));
- if (o->pa.GetCount() > 0 && (x == ox && y == oy && dir == odir)) {
+ if (!o->pa.IsEmpty() && (x == ox && y == oy && dir == odir)) {
ol->AddTail(o);
} else {
ASSERT(0);
@@ -584,10 +584,10 @@ static bool FitLine(COutline& o, int& start, int& end) if (fl && fr && 1.0 * (end - start) / ((len - end) * 2 + (start - 0) * 2) > 0.4) {
return false; // if this section is relatively too small it may only be a rounded corner
}
- if (!fl && la.GetSize() > 0 && la.GetSize() <= 4 && (la[0] == 1 && la[la.GetSize() - 1] == 1)) {
+ if (!fl && !la.IsEmpty() && la.GetSize() <= 4 && (la[0] == 1 && la[la.GetSize() - 1] == 1)) {
return false; // one step at both ends, doesn't sound good for a line (may be it was skewed, so only eliminate smaller sections where beziers going to look just as good)
}
- if (!fr && ra.GetSize() > 0 && ra.GetSize() <= 4 && (ra[0] == 1 && ra[ra.GetSize() - 1] == 1)) {
+ if (!fr && !ra.IsEmpty() && ra.GetSize() <= 4 && (ra[0] == 1 && ra[ra.GetSize() - 1] == 1)) {
return false; // -''-
}
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp index 7835daf77..8ef87f601 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp @@ -67,7 +67,7 @@ HRESULT CID::HeaderWrite(IStream* pStream) MatroskaWriter::QWORD CBinary::Size(bool fWithHeader)
{
- if (GetCount() == 0) {
+ if (IsEmpty()) {
return 0;
}
@@ -81,7 +81,7 @@ MatroskaWriter::QWORD CBinary::Size(bool fWithHeader) HRESULT CBinary::Write(IStream* pStream)
{
- if (GetCount() == 0) {
+ if (IsEmpty()) {
return S_OK;
}
@@ -91,7 +91,7 @@ HRESULT CBinary::Write(IStream* pStream) MatroskaWriter::QWORD CANSI::Size(bool fWithHeader)
{
- if (GetLength() == 0) {
+ if (IsEmpty()) {
return 0;
}
@@ -105,7 +105,7 @@ MatroskaWriter::QWORD CANSI::Size(bool fWithHeader) HRESULT CANSI::Write(IStream* pStream)
{
- if (GetLength() == 0) {
+ if (IsEmpty()) {
return S_OK;
}
@@ -115,7 +115,7 @@ HRESULT CANSI::Write(IStream* pStream) MatroskaWriter::QWORD CUTF8::Size(bool fWithHeader)
{
- if (GetLength() == 0) {
+ if (IsEmpty()) {
return 0;
}
@@ -129,7 +129,7 @@ MatroskaWriter::QWORD CUTF8::Size(bool fWithHeader) HRESULT CUTF8::Write(IStream* pStream)
{
- if (GetLength() == 0) {
+ if (IsEmpty()) {
return S_OK;
}
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp index 80b3386b4..34931a5f1 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp @@ -503,7 +503,7 @@ DWORD CMatroskaMuxerFilter::ThreadProc() CAutoLock cAutoLock(&pTmp->m_csQueue);
- if (pTmp->m_blocks.GetCount() == 0 && pTmp->m_fEndOfStreamReceived) {
+ if (pTmp->m_blocks.IsEmpty() && pTmp->m_fEndOfStreamReceived) {
pActivePins.RemoveAt(pActivePins.Find(pTmp));
continue;
}
@@ -512,12 +512,12 @@ DWORD CMatroskaMuxerFilter::ThreadProc() nPinsNeeded++;
}
- if (pTmp->m_blocks.GetCount() > 0) {
+ if (!pTmp->m_blocks.IsEmpty()) {
if (pTmp->GetTrackEntry()->TrackType != TrackEntry::TypeSubtitle) {
nPinsGotSomething++;
}
- if (pTmp->m_blocks.GetCount() > 0) {
+ if (!pTmp->m_blocks.IsEmpty()) {
REFERENCE_TIME rt = pTmp->m_blocks.GetHead()->Block.TimeCode;
if (rt < rtMin) {
rtMin = rt;
@@ -527,7 +527,7 @@ DWORD CMatroskaMuxerFilter::ThreadProc() }
}
- if (pActivePins.GetCount() == 0) {
+ if (pActivePins.IsEmpty()) {
break;
}
@@ -617,7 +617,7 @@ DWORD CMatroskaMuxerFilter::ThreadProc() CAutoPtr<CueTrackPosition> ctp(DEBUG_NEW CueTrackPosition());
ctp->CueTrack.Set(b->Block.TrackNumber);
ctp->CueClusterPosition.Set(clusterpos);
- if (c.BlockGroups.GetCount() > 0) {
+ if (!c.BlockGroups.IsEmpty()) {
ctp->CueBlockNumber.Set(nBlocksInCueTrack);
}
CAutoPtr<CuePoint> cp(DEBUG_NEW CuePoint());
diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp index c134b15fc..b94ef77f8 100644 --- a/src/filters/parser/AviSplitter/AviFile.cpp +++ b/src/filters/parser/AviSplitter/AviFile.cpp @@ -49,11 +49,11 @@ HRESULT CAviFile::Init() Seek(0);
HRESULT hr = Parse(0, GetLength());
UNREFERENCED_PARAMETER(hr);
- if (m_movis.GetCount() == 0) { // FAILED(hr) is allowed as long as there was a movi chunk found
+ if (m_movis.IsEmpty()) { // FAILED(hr) is allowed as long as there was a movi chunk found
return E_FAIL;
}
- if (m_avih.dwStreams == 0 && m_strms.GetCount() > 0) {
+ if (m_avih.dwStreams == 0 && !m_strms.IsEmpty()) {
m_avih.dwStreams = (DWORD)m_strms.GetCount();
}
@@ -220,7 +220,7 @@ HRESULT CAviFile::Parse(DWORD parentid, __int64 end) }
if (m_isamv) {
// First alway video, second always audio
- strm->strh.fccType = m_strms.GetCount() == 0 ? FCC('vids') : FCC('amva');
+ strm->strh.fccType = m_strms.IsEmpty() ? FCC('vids') : FCC('amva');
strm->strh.dwRate = m_avih.dwReserved[0] * 1000; // dwReserved[0] = fps!
strm->strh.dwScale = 1000;
}
@@ -597,7 +597,7 @@ DWORD CAviFile::strm_t::GetFrame(REFERENCE_TIME rt) {
DWORD frame;
- if (strh.dwScale == 0 || rt <= 0 || cs.GetCount() == 0) {
+ if (strh.dwScale == 0 || rt <= 0 || cs.IsEmpty()) {
frame = 0;
} else if (strh.fccType == FCC('auds')) {
WAVEFORMATEX* wfe = (WAVEFORMATEX*)strf.GetData();
diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp index eb53990db..8b817c8fe 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.cpp +++ b/src/filters/parser/AviSplitter/AviSplitter.cpp @@ -193,7 +193,7 @@ HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) bool fHasIndex = false;
for (unsigned int i = 0; !fHasIndex && i < m_pFile->m_strms.GetCount(); ++i) {
- if (m_pFile->m_strms[i]->cs.GetCount() > 0) {
+ if (!m_pFile->m_strms[i]->cs.IsEmpty()) {
fHasIndex = true;
}
}
@@ -201,7 +201,7 @@ HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) for (unsigned int i = 0; i < m_pFile->m_strms.GetCount(); ++i) {
CAviFile::strm_t* s = m_pFile->m_strms[i];
- if (fHasIndex && s->cs.GetCount() == 0) {
+ if (fHasIndex && s->cs.IsEmpty()) {
continue;
}
@@ -379,7 +379,7 @@ HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) m_tFrame.Attach(DEBUG_NEW DWORD[m_pFile->m_avih.dwStreams]);
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool CAviSplitterFilter::DemuxInit()
@@ -395,7 +395,7 @@ bool CAviSplitterFilter::DemuxInit() bool fReIndex = false;
for (DWORD i = 0; i < m_pFile->m_avih.dwStreams && !fReIndex; ++i) {
- if (m_pFile->m_strms[i]->cs.GetCount() == 0 && GetOutputPin(i)) {
+ if (m_pFile->m_strms[i]->cs.IsEmpty() && GetOutputPin(i)) {
fReIndex = true;
}
}
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.cpp b/src/filters/parser/DSMSplitter/DSMSplitter.cpp index ea9a6f11a..573b7b595 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.cpp +++ b/src/filters/parser/DSMSplitter/DSMSplitter.cpp @@ -207,7 +207,7 @@ HRESULT CDSMSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) }
}
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool CDSMSplitterFilter::DemuxInit()
diff --git a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp index c5c8c355b..717dd0793 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp +++ b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp @@ -129,7 +129,7 @@ HRESULT CDSMSplitterFile::Init(IDSMResourceBagImpl& res, IDSMChapterBagImpl& cha m_rtFirst = 0;
}
- return m_mts.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_mts.IsEmpty() ? S_OK : E_FAIL;
}
bool CDSMSplitterFile::Sync(dsmp_t& type, UINT64& len, __int64 limit)
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.cpp b/src/filters/parser/FLVSplitter/FLVSplitter.cpp index 702aca967..71dc63c2b 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.cpp +++ b/src/filters/parser/FLVSplitter/FLVSplitter.cpp @@ -733,7 +733,7 @@ HRESULT CFLVSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) m_rtNewStop = m_rtStop = m_rtDuration;
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool CFLVSplitterFilter::DemuxInit()
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.cpp b/src/filters/parser/MP4Splitter/MP4Splitter.cpp index 9570c0488..2fb509507 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.cpp +++ b/src/filters/parser/MP4Splitter/MP4Splitter.cpp @@ -1362,7 +1362,7 @@ HRESULT CMP4SplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) TRACE(_T("CMP4SplitterFilter m_pOutputs.GetCount() = %d\n") , m_pOutputs.GetCount());
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool CMP4SplitterFilter::DemuxInit()
@@ -2013,7 +2013,7 @@ HRESULT CMPEG4VideoSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) m_rtNewStop = m_rtStop = m_rtDuration;
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool CMPEG4VideoSplitterFilter::DemuxInit()
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp index 494e1eda2..570475e9c 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp @@ -483,7 +483,7 @@ static int cesort(const void* a, const void* b) bool TrackEntry::Expand(CBinary& data, UINT64 Scope)
{
- if (ces.ce.GetCount() == 0) {
+ if (ces.ce.IsEmpty()) {
return true;
}
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index 04fda0b6f..3c01c402f 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -949,7 +949,7 @@ avcsuccess: SetupChapters(ChapLanguage, caroot);
}
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
void CMatroskaSplitterFilter::SetupChapters(LPCSTR lng, ChapterAtom* parent, int level)
@@ -1040,7 +1040,7 @@ void CMatroskaSplitterFilter::SendVorbisHeaderSample() }
if (pTE->CodecID.ToString() == "A_VORBIS" && pPin->CurrentMediaType().subtype == MEDIASUBTYPE_Vorbis
- && pTE->CodecPrivate.GetCount() > 0) {
+ && !pTE->CodecPrivate.IsEmpty()) {
BYTE* ptr = pTE->CodecPrivate.GetData();
CAtlList<int> sizes;
@@ -1093,7 +1093,7 @@ bool CMatroskaSplitterFilter::DemuxInit() // reindex if needed
- if (m_pFile->IsRandomAccess() && m_pFile->m_segment.Cues.GetCount() == 0) {
+ if (m_pFile->IsRandomAccess() && m_pFile->m_segment.Cues.IsEmpty()) {
m_nOpenProgress = 0;
m_pFile->m_segment.SegmentInfo.Duration.Set(0);
@@ -1420,7 +1420,7 @@ HRESULT CMatroskaSplitterOutputPin::DeliverEndOfStream() MatroskaPacket* mp = m_rob.RemoveHead();
if (m_rob.GetCount() && !mp->bg->BlockDuration.IsValid()) {
mp->rtStop = m_rob.GetHead()->rtStart;
- } else if (m_rob.GetCount() == 0 && m_rtDefaultDuration > 0) {
+ } else if (m_rob.IsEmpty() && m_rtDefaultDuration > 0) {
mp->rtStop = mp->rtStart + m_rtDefaultDuration;
}
diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.cpp b/src/filters/parser/MpaSplitter/MpaSplitter.cpp index d310a7d09..3cdc5f1d7 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.cpp +++ b/src/filters/parser/MpaSplitter/MpaSplitter.cpp @@ -153,7 +153,7 @@ HRESULT CMpaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) SetProperty(L"DESC", str);
}
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
STDMETHODIMP CMpaSplitterFilter::GetDuration(LONGLONG* pDuration)
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 22307a11b..332b234bc 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -1004,7 +1004,7 @@ HRESULT CMpegSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) m_rtNewStop = m_rtStop = m_rtDuration = 10000000i64 * m_pFile->GetLength() / m_pFile->m_rate;
}
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool CMpegSplitterFilter::DemuxInit()
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index d4ea61387..931cdf971 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -359,7 +359,7 @@ HRESULT COggSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) }
}
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool COggSplitterFilter::DemuxInit()
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 1b5a3a2af..7e9252f97 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -554,7 +554,7 @@ HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) SetProperty(L"CPYR", CStringW(m_pFile->m_cd.copyright));
SetProperty(L"DESC", CStringW(m_pFile->m_cd.comment));
- return m_pOutputs.GetCount() > 0 ? S_OK : E_FAIL;
+ return !m_pOutputs.IsEmpty() ? S_OK : E_FAIL;
}
bool CRealMediaSplitterFilter::DemuxInit()
@@ -567,7 +567,7 @@ bool CRealMediaSplitterFilter::DemuxInit() // reindex if needed
- if (m_pFile->m_irs.GetCount() == 0) {
+ if (m_pFile->m_irs.IsEmpty()) {
m_nOpenProgress = 0;
m_rtDuration = 0;
@@ -841,7 +841,7 @@ HRESULT CRealMediaSplitterOutputPin::DeliverSegments() {
HRESULT hr;
- if (m_segments.GetCount() == 0) {
+ if (m_segments.IsEmpty()) {
m_segments.Clear();
return S_OK;
}
diff --git a/src/filters/reader/CDDAReader/CDDAReader.cpp b/src/filters/reader/CDDAReader/CDDAReader.cpp index dae77eab3..f5ce61e46 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.cpp +++ b/src/filters/reader/CDDAReader/CDDAReader.cpp @@ -383,7 +383,7 @@ bool CCDDAStream::Load(const WCHAR* fnw) if (pDesc->CharacterPosition == 0) {
str[pDesc->PackType][pDesc->TrackNumber] = text;
} else if (pDesc->CharacterPosition <= 0xf) {
- if (pDesc->CharacterPosition < 0xf && last.GetLength() > 0) {
+ if (pDesc->CharacterPosition < 0xf && !last.IsEmpty()) {
str[pDesc->PackType][pDesc->TrackNumber] = last + text;
} else {
str[pDesc->PackType][pDesc->TrackNumber] += text;
diff --git a/src/filters/reader/CDXAReader/CDXAReader.cpp b/src/filters/reader/CDXAReader/CDXAReader.cpp index f2b17e183..b98611854 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.cpp +++ b/src/filters/reader/CDXAReader/CDXAReader.cpp @@ -493,7 +493,7 @@ bool CCDXAStream::LookForMediaSubType() }
if (nTries >= 0 && (nTries & 3) == 3) {
- if (cb > 0 && val.GetCount() > 0 && cb == val.GetCount()) {
+ if (cb > 0 && !val.IsEmpty() && cb == val.GetCount()) {
if (offset >= 0 && S_OK == SetPointer(offset)
|| S_OK == SetPointer(m_llLength + offset)) {
CAutoVectorPtr<BYTE> pData;
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index aa4c9089a..e459e617e 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -2802,7 +2802,7 @@ void CEVRAllocatorPresenter::FlushSamples() void CEVRAllocatorPresenter::FlushSamplesInternal()
{
- while (m_ScheduledSamples.GetCount() > 0) {
+ while (!m_ScheduledSamples.IsEmpty()) {
CComPtr<IMFSample> pMFSample;
pMFSample = m_ScheduledSamples.RemoveHead();
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index 28842cb8a..58a126ad6 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -3898,7 +3898,7 @@ void CSyncAP::FlushSamples() void CSyncAP::FlushSamplesInternal()
{
m_bPrerolled = false;
- while (m_ScheduledSamples.GetCount() > 0) {
+ while (!m_ScheduledSamples.IsEmpty()) {
CComPtr<IMFSample> pMFSample;
pMFSample = m_ScheduledSamples.RemoveHead();
MoveToFreeList(pMFSample, true);
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp index 93cef40c7..be3675094 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp @@ -468,7 +468,7 @@ CMediaType CAudioSwitcherFilter::CreateNewOutputMediaType(CMediaType mt, long& c }
}
- if (m_chs[wfe->nChannels - 1].GetCount() > 0) {
+ if (!m_chs[wfe->nChannels - 1].IsEmpty()) {
mt.ReallocFormatBuffer(sizeof(WAVEFORMATEXTENSIBLE));
WAVEFORMATEXTENSIBLE* wfex = (WAVEFORMATEXTENSIBLE*)mt.pbFormat;
wfex->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index b874d942b..4c235e65e 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -811,9 +811,9 @@ HRESULT CMpaDecFilter::ProcessFFmpeg(enum AVCodecID nCodecId) m_bResync = true;
p += size;
continue;
- } else if (output.GetCount() > 0) { // && SUCCEEDED(hr)
+ } else if (!output.IsEmpty()) { // && SUCCEEDED(hr)
hr = Deliver(output.GetData(), (int)output.GetCount(), avsamplefmt, m_FFAudioDec.GetSampleRate(), m_FFAudioDec.GetChannels(), m_FFAudioDec.GetChannelMask());
- } else if (size == 0) { // && pBuffOut.GetCount() == 0
+ } else if (size == 0) { // && pBuffOut.IsEmpty()
break;
}
@@ -883,9 +883,9 @@ HRESULT CMpaDecFilter::ProcessAC3() m_bResync = true;
p += size;
continue;
- } else if (output.GetCount() > 0) { // && SUCCEEDED(hr)
+ } else if (!output.IsEmpty()) { // && SUCCEEDED(hr)
hr = Deliver(output.GetData(), (int)output.GetCount(), avsamplefmt, m_FFAudioDec.GetSampleRate(), m_FFAudioDec.GetChannels(), m_FFAudioDec.GetChannelMask());
- } else if (size == 0) { // && pBuffOut.GetCount() == 0
+ } else if (size == 0) { // && pBuffOut.IsEmpty()
break;
}
}
diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp index 1315bc172..56b4b261c 100644 --- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp @@ -1499,7 +1499,7 @@ bool CDirectVobSubFilter::Open() m_frd.RefreshEvent.Set();
- return (m_pSubStreams.GetCount() > 0);
+ return !m_pSubStreams.IsEmpty();
}
void CDirectVobSubFilter::UpdateSubtitle(bool fApplyDefStyle)
diff --git a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp index 0144a1aad..e556402ae 100644 --- a/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubPropPage.cpp @@ -1061,7 +1061,7 @@ bool CDVSPathsPPage::OnMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) if (i >= 0) {
m_pathlist.DeleteString(i);
i = min(i, m_pathlist.GetCount() - 1);
- if (i >= 0 && m_pathlist.GetCount() > 0) {
+ if (i >= 0 && !m_pathlist.IsEmpty()) {
m_pathlist.SetCurSel(i);
m_remove.EnableWindow(i >= 3 ? TRUE : FALSE);
}
diff --git a/src/mpc-hc/DVBChannel.cpp b/src/mpc-hc/DVBChannel.cpp index ec77bef45..9a6ee95ae 100644 --- a/src/mpc-hc/DVBChannel.cpp +++ b/src/mpc-hc/DVBChannel.cpp @@ -131,14 +131,14 @@ CString CDVBChannel::ToString() m_nDefaultSubtitle);
for (int i = 0; i < m_nAudioCount; i++) {
- if (m_Audios[i].Language.GetLength() == 0) {
+ if (m_Audios[i].Language.IsEmpty()) {
m_Audios[i].Language = " ";
}
strValue.AppendFormat(_T("|%ld|%d|%d|%s"), m_Audios[i].PID, m_Audios[i].Type, m_Audios[i].PesType, m_Audios[i].Language);
}
for (int i = 0; i < m_nSubtitleCount; i++) {
- if (m_Subtitles[i].Language.GetLength() == 0) {
+ if (m_Subtitles[i].Language.IsEmpty()) {
m_Subtitles[i].Language = " ";
}
strValue.AppendFormat(_T("|%ld|%d|%d|%s"), m_Subtitles[i].PID, m_Subtitles[i].Type, m_Subtitles[i].PesType, m_Subtitles[i].Language);
diff --git a/src/mpc-hc/EditListEditor.cpp b/src/mpc-hc/EditListEditor.cpp index e4b72f9ea..a735a1677 100644 --- a/src/mpc-hc/EditListEditor.cpp +++ b/src/mpc-hc/EditListEditor.cpp @@ -166,7 +166,7 @@ void CEditListEditor::ResizeListColumn() void CEditListEditor::SaveEditListToFile()
{
- if ((m_bFileOpen || m_EditList.GetCount() > 0) && !m_strFileName.IsEmpty()) {
+ if ((m_bFileOpen || !m_EditList.IsEmpty()) && !m_strFileName.IsEmpty()) {
CStdioFile EditListFile;
if (EditListFile.Open(m_strFileName, CFile::modeCreate | CFile::modeWrite)) {
CString strLine;
@@ -255,7 +255,7 @@ void CEditListEditor::OpenFile(LPCTSTR lpFileName) m_bFileOpen = false;
}
- if (m_NameList.GetCount() == 0) {
+ if (m_NameList.IsEmpty()) {
CStdioFile NameFile;
CString str;
if (NameFile.Open(_T("EditListNames.txt"), CFile::modeRead)) {
diff --git a/src/mpc-hc/FGManager.cpp b/src/mpc-hc/FGManager.cpp index 248b8ea90..e18b92b5d 100644 --- a/src/mpc-hc/FGManager.cpp +++ b/src/mpc-hc/FGManager.cpp @@ -732,7 +732,7 @@ HRESULT CFGManager::Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender) }
CComPtr<IEnumMoniker> pEM;
- if (types.GetCount() > 0
+ if (!types.IsEmpty()
&& SUCCEEDED(m_pFM->EnumMatchingFilters(
&pEM, 0, FALSE, MERIT_DO_NOT_USE + 1,
TRUE, (DWORD)types.GetCount() / 2, types.GetData(), nullptr, nullptr, FALSE,
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 99987ab46..8369a94dc 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -3122,7 +3122,7 @@ void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu) if (firstSubItemID == ID_NAVIGATE_SKIPBACK) { // is "Navigate" submenu {
UINT fState = (m_iMediaLoadState == MLS_LOADED
- && (1/*GetPlaybackMode() == PM_DVD *//*|| (GetPlaybackMode() == PM_FILE && m_PlayList.GetCount() > 0)*/))
+ && (1/*GetPlaybackMode() == PM_DVD *//*|| (GetPlaybackMode() == PM_FILE && !m_PlayList.IsEmpty())*/))
? MF_ENABLED
: (MF_DISABLED | MF_GRAYED);
pPopupMenu->EnableMenuItem(i, MF_BYPOSITION | fState);
@@ -4075,7 +4075,7 @@ void CMainFrame::OnFileOpenmedia() dlg.SetForegroundWindow();
return;
}
- if (dlg.DoModal() != IDOK || dlg.m_fns.GetCount() == 0) {
+ if (dlg.DoModal() != IDOK || dlg.m_fns.IsEmpty()) {
return;
}
@@ -4267,7 +4267,7 @@ BOOL CMainFrame::OnCopyData(CWnd* pWnd, COPYDATASTRUCT* pCDS) }
m_dwLastRun = GetTickCount();
- if ((s.nCLSwitches & CLSW_ADD) && m_wndPlaylistBar.GetCount() > 0) {
+ if ((s.nCLSwitches & CLSW_ADD) && !IsPlaylistEmpty()) {
m_wndPlaylistBar.Append(sl, fMulti, &s.slSubs);
if (s.nCLSwitches & (CLSW_OPEN | CLSW_PLAY)) {
@@ -5401,7 +5401,7 @@ void CMainFrame::OnFileISDBUpload() void CMainFrame::OnUpdateFileISDBUpload(CCmdUI* pCmdUI)
{
- pCmdUI->Enable(m_wndPlaylistBar.GetCount() > 0);
+ pCmdUI->Enable(!IsPlaylistEmpty());
}
void CMainFrame::OnFileISDBDownload()
@@ -7257,7 +7257,7 @@ void CMainFrame::OnUpdatePlayPauseStop(CCmdUI* pCmdUI) fEnable = false;
}
}
- } else if (pCmdUI->m_nID == ID_PLAY_PLAY && m_wndPlaylistBar.GetCount() > 0) {
+ } else if (pCmdUI->m_nID == ID_PLAY_PLAY && !IsPlaylistEmpty()) {
fEnable = true;
}
@@ -7447,7 +7447,7 @@ static int rangebsearch(REFERENCE_TIME val, CAtlArray<REFERENCE_TIME>& rta) void CMainFrame::OnPlaySeekKey(UINT nID)
{
- if (m_kfs.GetCount() > 0) {
+ if (!m_kfs.IsEmpty()) {
if (GetMediaState() == State_Stopped) {
SendMessage(WM_COMMAND, ID_PLAY_PAUSE);
@@ -14489,7 +14489,7 @@ void CMainFrame::SendStatusMessage(CString msg, int nTimeOut) void CMainFrame::OpenCurPlaylistItem(REFERENCE_TIME rtStart)
{
- if (m_wndPlaylistBar.GetCount() == 0) {
+ if (IsPlaylistEmpty()) {
return;
}
@@ -14547,7 +14547,7 @@ void CMainFrame::OpenMedia(CAutoPtr<OpenMediaData> pOMD) && (!s.IsD3DFullscreen() || s.iDSVideoRendererType == VIDRNDT_DS_MADVR);
if (OpenFileData* p = dynamic_cast<OpenFileData*>(pOMD.m_p)) {
- if (p->fns.GetCount() > 0) {
+ if (!p->fns.IsEmpty()) {
engine_t e = s.m_Formats.GetEngine(p->fns.GetHead());
if (e != DirectShow /*&& e != RealMedia && e != QuickTime*/) {
fUseThread = false;
diff --git a/src/mpc-hc/MainFrm.h b/src/mpc-hc/MainFrm.h index 747da1c67..a8b4a462f 100644 --- a/src/mpc-hc/MainFrm.h +++ b/src/mpc-hc/MainFrm.h @@ -362,7 +362,7 @@ public: bool IsSomethingLoaded() const {
return ((m_iMediaLoadState == MLS_LOADING || m_iMediaLoadState == MLS_LOADED) && !IsD3DFullScreenMode());
}
- bool IsPlaylistEmpty() {
+ bool IsPlaylistEmpty() const {
return (m_wndPlaylistBar.GetCount() == 0);
}
bool IsInteractiveVideo() const {
diff --git a/src/mpc-hc/MediaPositionList.h b/src/mpc-hc/MediaPositionList.h index ef4048647..721f1564a 100644 --- a/src/mpc-hc/MediaPositionList.h +++ b/src/mpc-hc/MediaPositionList.h @@ -1,5 +1,5 @@ /* - * (C) 2012 see Authors.txt + * (C) 2012-2013 see Authors.txt * * This file is part of MPC-HC. * @@ -54,13 +54,13 @@ public: virtual void Empty() = 0; T* GetLatestEntry() { - return (GetCount() > 0) ? &GetHead() : NULL; + return !IsEmpty() ? &GetHead() : NULL; }; }; struct FILE_POSITION { - CString strFile; - LONGLONG llPosition; + CString strFile; + LONGLONG llPosition; }; class CFilePositionList : public CMediaPositionList<FILE_POSITION> diff --git a/src/mpc-hc/PlayerCaptureDialog.cpp b/src/mpc-hc/PlayerCaptureDialog.cpp index 74dc3b31a..75cec0a72 100644 --- a/src/mpc-hc/PlayerCaptureDialog.cpp +++ b/src/mpc-hc/PlayerCaptureDialog.cpp @@ -321,7 +321,7 @@ static void SetupMediaTypes(IAMStreamConfig* pAMSC, CFormatArray<T>& tfa, CCombo }
}
- if (tfa.GetCount() == 0) {
+ if (tfa.IsEmpty()) {
if (pcurmt && (pcurmt->majortype == MEDIATYPE_Video || pcurmt->majortype == MEDIATYPE_Audio)) {
AM_MEDIA_TYPE* pmt = (AM_MEDIA_TYPE*)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE));
CopyMediaType(pmt, pcurmt);
@@ -1133,7 +1133,7 @@ void CPlayerCaptureDialog::SetupAudioControls( // input selection
- if (pAMAIM.GetCount() > 0) {
+ if (!pAMAIM.IsEmpty()) {
m_pAMAIM.Copy(pAMAIM);
size_t iSel = -1;
@@ -1174,7 +1174,7 @@ void CPlayerCaptureDialog::SetupAudioControls( SetupMediaTypes(pAMSC, m_afa, m_audtype, m_auddimension, m_mta);
}
- // if (m_audtype.GetCount() > 0)
+ //if (!m_audtype.IsEmpty())
{
m_audoutput.EnableWindow(TRUE);
m_audpreview.EnableWindow(TRUE);
diff --git a/src/mpc-hc/PlayerPlaylistBar.cpp b/src/mpc-hc/PlayerPlaylistBar.cpp index f0f99e308..c63dc8462 100644 --- a/src/mpc-hc/PlayerPlaylistBar.cpp +++ b/src/mpc-hc/PlayerPlaylistBar.cpp @@ -226,7 +226,7 @@ static bool SearchFiles(CString mask, CAtlList<CString>& sl) FindClose(h);
- if (sl.GetCount() == 0 && mask.Find(_T(":\\")) == 1) {
+ if (sl.IsEmpty() && mask.Find(_T(":\\")) == 1) {
if (CDROM_VideoCD == GetCDROMType(mask[0], sl)) {
sl.RemoveAll(); // need to open VideoCD as disk
}
@@ -236,7 +236,7 @@ static bool SearchFiles(CString mask, CAtlList<CString>& sl) return (sl.GetCount() > 1
|| sl.GetCount() == 1 && sl.GetHead().CompareNoCase(mask)
- || sl.GetCount() == 0 && mask.FindOneOf(_T("?*")) >= 0);
+ || sl.IsEmpty() && mask.FindOneOf(_T("?*")) >= 0);
}
void CPlayerPlaylistBar::ParsePlayList(CString fn, CAtlList<CString>* subs)
@@ -346,7 +346,7 @@ bool CPlayerPlaylistBar::ParseBDMVPlayList(CString fn) Append(strFiles, MainPlaylist.GetCount() > 1, nullptr);
}
- return m_pl.GetCount() > 0;
+ return !m_pl.IsEmpty();
}
bool CPlayerPlaylistBar::ParseMPCPlayList(CString fn)
@@ -416,7 +416,7 @@ bool CPlayerPlaylistBar::ParseMPCPlayList(CString fn) m_pl.AddTail(pli[idx[i]]);
}
- return pli.GetCount() > 0;
+ return !pli.IsEmpty();
}
bool CPlayerPlaylistBar::SaveMPCPlayList(CString fn, CTextFile::enc e, bool fRemovePath)
@@ -510,7 +510,7 @@ void CPlayerPlaylistBar::Append(CAtlList<CString>& fns, bool fMulti, CAtlList<CS int iFirstAdded = (int)m_pl.GetCount();
if (fMulti) {
- ASSERT(subs == nullptr || subs->GetCount() == 0);
+ ASSERT(subs == nullptr || subs->IsEmpty());
POSITION pos = fns.GetHeadPosition();
while (pos) {
ParsePlayList(fns.GetNext(pos), nullptr);
@@ -920,7 +920,7 @@ void CPlayerPlaylistBar::OnLvnKeyDown(NMHDR* pNMHDR, LRESULT* pResult) items.AddHead(m_list.GetNextSelectedItem(pos));
}
- if (pLVKeyDown->wVKey == VK_DELETE && items.GetCount() > 0) {
+ if (pLVKeyDown->wVKey == VK_DELETE && !items.IsEmpty()) {
pos = items.GetHeadPosition();
while (pos) {
int i = items.GetNext(pos);
@@ -1040,7 +1040,7 @@ void CPlayerPlaylistBar::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruc CString time = !pli.m_fInvalid ? m_list.GetItemText(nItem, COL_TIME) : _T("Invalid");
CSize timesize(0, 0);
CPoint timept(rcItem.right, 0);
- if (time.GetLength() > 0) {
+ if (!time.IsEmpty()) {
timesize = pDC->GetTextExtent(time);
if ((3 + timesize.cx + 3) < rcItem.Width() / 2) {
timept = CPoint(rcItem.right - (3 + timesize.cx + 3), (rcItem.top + rcItem.bottom - timesize.cy) / 2);
diff --git a/src/mpc-hc/PlayerSubresyncBar.cpp b/src/mpc-hc/PlayerSubresyncBar.cpp index 1b7939f6d..157d1ce46 100644 --- a/src/mpc-hc/PlayerSubresyncBar.cpp +++ b/src/mpc-hc/PlayerSubresyncBar.cpp @@ -287,7 +287,7 @@ void CPlayerSubresyncBar::UpdatePreview() }
}
- if (schk.GetCount() == 0) {
+ if (schk.IsEmpty()) {
for (; start < end; start++) {
m_sts[start].start = m_subtimes[start].orgstart;
m_sts[start].end = m_subtimes[start].orgend;
@@ -575,7 +575,7 @@ static bool ParseTime(CString str, int& ret, bool fWarn = true) TCHAR c;
str.Trim();
- if (str.GetLength() > 0 && str[0] == '-') {
+ if (!str.IsEmpty() && str[0] == '-') {
sign = -1;
}
@@ -844,7 +844,7 @@ void CPlayerSubresyncBar::OnRclickList(NMHDR* pNMHDR, LRESULT* pResult) actormap.RemoveKey(_T(""));
- if (actormap.GetCount() > 0) {
+ if (!actormap.IsEmpty()) {
m.AppendMenu(MF_SEPARATOR);
int id = ACTORFIRST;
@@ -872,7 +872,7 @@ void CPlayerSubresyncBar::OnRclickList(NMHDR* pNMHDR, LRESULT* pResult) effectmap.RemoveKey(_T(""));
- if (effectmap.GetCount() > 0) {
+ if (!effectmap.IsEmpty()) {
m.AppendMenu(MF_SEPARATOR);
int id = EFFECTFIRST;
@@ -1301,7 +1301,7 @@ int CPlayerSubresyncBar::FindNearestSub(__int64& rtPos, bool bForward) {
int lCurTime = (int)(rtPos / 10000) + (bForward ? 1 : -1);
- if (m_subtimes.GetCount() == 0) {
+ if (m_subtimes.IsEmpty()) {
rtPos = max(0, rtPos + (bForward ? 1 : -1) * 50000000);
return -2;
}
diff --git a/src/mpc-hc/QuicktimeGraph.cpp b/src/mpc-hc/QuicktimeGraph.cpp index 3894366fc..442e56bee 100644 --- a/src/mpc-hc/QuicktimeGraph.cpp +++ b/src/mpc-hc/QuicktimeGraph.cpp @@ -482,7 +482,7 @@ bool CQuicktimeWindow::OpenMovie(CString fn) return false;
}
} else {
- if (!(fn.GetLength() > 0 && fn.GetLength() < 255)) {
+ if (fn.IsEmpty() || fn.GetLength() >= 255) {
return false;
}
diff --git a/src/mpc-hc/SubtitleDlDlg.cpp b/src/mpc-hc/SubtitleDlDlg.cpp index e2fdd9c76..6065d0108 100644 --- a/src/mpc-hc/SubtitleDlDlg.cpp +++ b/src/mpc-hc/SubtitleDlDlg.cpp @@ -258,7 +258,7 @@ bool CSubtitleDlDlg::Parse() }
bool ret = true;
- if (m_parsed_movies.GetCount() == 0) {
+ if (m_parsed_movies.IsEmpty()) {
ret = false;
}
diff --git a/src/mpc-hc/WebClientSocket.cpp b/src/mpc-hc/WebClientSocket.cpp index 6844924d9..1ca84852a 100644 --- a/src/mpc-hc/WebClientSocket.cpp +++ b/src/mpc-hc/WebClientSocket.cpp @@ -132,7 +132,7 @@ void CWebClientSocket::HandleRequest() }
m_path = UrlDecode(m_path);
- if (m_query.GetLength() > 0) {
+ if (!m_query.IsEmpty()) {
int k = m_query.Find('#');
if (k >= 0) {
m_query.Truncate(k);
diff --git a/src/mpc-hc/mpcresources/mplayerc.br.rc b/src/mpc-hc/mpcresources/mplayerc.br.rc Binary files differindex eb9155f48..64d1bf23c 100644 --- a/src/mpc-hc/mpcresources/mplayerc.br.rc +++ b/src/mpc-hc/mpcresources/mplayerc.br.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.by.rc b/src/mpc-hc/mpcresources/mplayerc.by.rc Binary files differindex 52c3f8bbe..626c003bf 100644 --- a/src/mpc-hc/mpcresources/mplayerc.by.rc +++ b/src/mpc-hc/mpcresources/mplayerc.by.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ca.rc b/src/mpc-hc/mpcresources/mplayerc.ca.rc Binary files differindex 25cba004d..41e1fb961 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ca.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ca.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.cz.rc b/src/mpc-hc/mpcresources/mplayerc.cz.rc Binary files differindex 699e5328e..a10dda587 100644 --- a/src/mpc-hc/mpcresources/mplayerc.cz.rc +++ b/src/mpc-hc/mpcresources/mplayerc.cz.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.de.rc b/src/mpc-hc/mpcresources/mplayerc.de.rc Binary files differindex 558790c81..f0f869140 100644 --- a/src/mpc-hc/mpcresources/mplayerc.de.rc +++ b/src/mpc-hc/mpcresources/mplayerc.de.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.el.rc b/src/mpc-hc/mpcresources/mplayerc.el.rc Binary files differindex 54382c81b..724335025 100644 --- a/src/mpc-hc/mpcresources/mplayerc.el.rc +++ b/src/mpc-hc/mpcresources/mplayerc.el.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.es.rc b/src/mpc-hc/mpcresources/mplayerc.es.rc Binary files differindex 894fee930..f86090f3e 100644 --- a/src/mpc-hc/mpcresources/mplayerc.es.rc +++ b/src/mpc-hc/mpcresources/mplayerc.es.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.eu.rc b/src/mpc-hc/mpcresources/mplayerc.eu.rc Binary files differindex a5628a456..22b098b96 100644 --- a/src/mpc-hc/mpcresources/mplayerc.eu.rc +++ b/src/mpc-hc/mpcresources/mplayerc.eu.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.fr.rc b/src/mpc-hc/mpcresources/mplayerc.fr.rc Binary files differindex 2d9663ffc..ac90ce321 100644 --- a/src/mpc-hc/mpcresources/mplayerc.fr.rc +++ b/src/mpc-hc/mpcresources/mplayerc.fr.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.he.rc b/src/mpc-hc/mpcresources/mplayerc.he.rc Binary files differindex 85ea2d47f..df6ab3966 100644 --- a/src/mpc-hc/mpcresources/mplayerc.he.rc +++ b/src/mpc-hc/mpcresources/mplayerc.he.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.hu.rc b/src/mpc-hc/mpcresources/mplayerc.hu.rc Binary files differindex 6ae330e9c..6a568bd9b 100644 --- a/src/mpc-hc/mpcresources/mplayerc.hu.rc +++ b/src/mpc-hc/mpcresources/mplayerc.hu.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.hy.rc b/src/mpc-hc/mpcresources/mplayerc.hy.rc Binary files differindex 795df61d8..0ac585a50 100644 --- a/src/mpc-hc/mpcresources/mplayerc.hy.rc +++ b/src/mpc-hc/mpcresources/mplayerc.hy.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.it.rc b/src/mpc-hc/mpcresources/mplayerc.it.rc Binary files differindex da95bf3a4..a6a5e4611 100644 --- a/src/mpc-hc/mpcresources/mplayerc.it.rc +++ b/src/mpc-hc/mpcresources/mplayerc.it.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ja.rc b/src/mpc-hc/mpcresources/mplayerc.ja.rc Binary files differindex 8c4c3d8d6..1b2fa6231 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ja.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ja.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.kr.rc b/src/mpc-hc/mpcresources/mplayerc.kr.rc Binary files differindex 09fa20f60..c0a27a2a0 100644 --- a/src/mpc-hc/mpcresources/mplayerc.kr.rc +++ b/src/mpc-hc/mpcresources/mplayerc.kr.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.nl.rc b/src/mpc-hc/mpcresources/mplayerc.nl.rc Binary files differindex 4625b792a..d92e5511f 100644 --- a/src/mpc-hc/mpcresources/mplayerc.nl.rc +++ b/src/mpc-hc/mpcresources/mplayerc.nl.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.pl.rc b/src/mpc-hc/mpcresources/mplayerc.pl.rc Binary files differindex 5db5528a4..e1b564461 100644 --- a/src/mpc-hc/mpcresources/mplayerc.pl.rc +++ b/src/mpc-hc/mpcresources/mplayerc.pl.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ro.rc b/src/mpc-hc/mpcresources/mplayerc.ro.rc Binary files differindex 8ed1e0984..da4fe17ec 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ro.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ro.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ru.rc b/src/mpc-hc/mpcresources/mplayerc.ru.rc Binary files differindex 9124704c3..a445806ac 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ru.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ru.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.sc.rc b/src/mpc-hc/mpcresources/mplayerc.sc.rc Binary files differindex 5792b25de..c2aee6995 100644 --- a/src/mpc-hc/mpcresources/mplayerc.sc.rc +++ b/src/mpc-hc/mpcresources/mplayerc.sc.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.sk.rc b/src/mpc-hc/mpcresources/mplayerc.sk.rc Binary files differindex 6c271dac0..ea637ac22 100644 --- a/src/mpc-hc/mpcresources/mplayerc.sk.rc +++ b/src/mpc-hc/mpcresources/mplayerc.sk.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.sv.rc b/src/mpc-hc/mpcresources/mplayerc.sv.rc Binary files differindex cf20d3799..1f8bd2791 100644 --- a/src/mpc-hc/mpcresources/mplayerc.sv.rc +++ b/src/mpc-hc/mpcresources/mplayerc.sv.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.tc.rc b/src/mpc-hc/mpcresources/mplayerc.tc.rc Binary files differindex 119c0d5a0..397c58a0b 100644 --- a/src/mpc-hc/mpcresources/mplayerc.tc.rc +++ b/src/mpc-hc/mpcresources/mplayerc.tc.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.tr.rc b/src/mpc-hc/mpcresources/mplayerc.tr.rc Binary files differindex 5765d46df..6959648ff 100644 --- a/src/mpc-hc/mpcresources/mplayerc.tr.rc +++ b/src/mpc-hc/mpcresources/mplayerc.tr.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ua.rc b/src/mpc-hc/mpcresources/mplayerc.ua.rc Binary files differindex 6a108860f..3a1023531 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ua.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ua.rc diff --git a/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt index 1d76ec04b..a6905a7cd 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt @@ -1916,6 +1916,6 @@ STRING ID_PLAY_INCRATE "Aumentar velocidade\nAumentar velocidade" STRING ID_PLAY_PAUSE "Pausa\nPausa"
STRING ID_PLAY_PLAY "Reproduzir\nReproduzir"
STRING ID_PLAY_STOP "Parar\nParar"
-STRING ID_VOLUME_MUTE "Mudo\nMudo"
-STRING ID_VOLUME_MUTE_DISABLED "Sem áudio\nSem áudio"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Mudo"
+STRING ID_VOLUME_MUTE_DISABLED "Sem áudio"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt index 65510716c..7da08d4f1 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Павялічыць хуткасць\nПавялічы STRING ID_PLAY_PAUSE "Паўза\nПаўза"
STRING ID_PLAY_PLAY "Прайграванне\nПрайграванне"
STRING ID_PLAY_STOP "Стоп\nСтоп"
-STRING ID_VOLUME_MUTE "Адключыць гук\nАдключыць гук"
-STRING ID_VOLUME_MUTE_DISABLED "Без гуку\nБез гуку"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Адключыць гук"
+STRING ID_VOLUME_MUTE_DISABLED "Без гуку"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt index 95e8d37f2..bf852d506 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Augmentar Velocitat\nDisminuir Velocitat" STRING ID_PLAY_PAUSE "Pausa\nPausa"
STRING ID_PLAY_PLAY "Reproduir\nReproduir"
STRING ID_PLAY_STOP "Aturar\nAturar"
-STRING ID_VOLUME_MUTE "Fer Mutis\nFer Mutis"
-STRING ID_VOLUME_MUTE_DISABLED "Sense àudio\nSense àudio"
-STRING ID_VOLUME_MUTE_ON "No fer Mutis\nNo fer Mutis"
+STRING ID_VOLUME_MUTE "Fer Mutis"
+STRING ID_VOLUME_MUTE_DISABLED "Sense àudio"
+STRING ID_VOLUME_MUTE_ON "No fer Mutis"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt index 67f25f1c4..d9501361c 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Zvýšit rychlost\nZvýšit rychlost" STRING ID_PLAY_PAUSE "Pozastavit\nPozastavit"
STRING ID_PLAY_PLAY "Přehrát\nPřehrát"
STRING ID_PLAY_STOP "Zastavit\nZastavit"
-STRING ID_VOLUME_MUTE "Ztlumit\nZtlumit"
-STRING ID_VOLUME_MUTE_DISABLED "Bez zvuku\nBez zvuku"
-STRING ID_VOLUME_MUTE_ON "Zrušit ztlumení\nZrušit ztlumení"
+STRING ID_VOLUME_MUTE "Ztlumit"
+STRING ID_VOLUME_MUTE_DISABLED "Bez zvuku"
+STRING ID_VOLUME_MUTE_ON "Zrušit ztlumení"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt index da52e9568..83d211e27 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt @@ -1916,6 +1916,6 @@ STRING ID_PLAY_INCRATE "Geschwindigkeit erhöhen\nGeschwindigkeit erhöhen" STRING ID_PLAY_PAUSE "Pause\nPause"
STRING ID_PLAY_PLAY "Wiedergabe\nWiedergabe"
STRING ID_PLAY_STOP "Stopp\nStopp"
-STRING ID_VOLUME_MUTE "Stummschaltung\nStummschaltung"
-STRING ID_VOLUME_MUTE_DISABLED "Kein Audio\nKein Audio"
-STRING ID_VOLUME_MUTE_ON "Stummschaltung aufheben\nStummschaltung aufheben"
+STRING ID_VOLUME_MUTE "Stummschaltung"
+STRING ID_VOLUME_MUTE_DISABLED "Kein Audio"
+STRING ID_VOLUME_MUTE_ON "Stummschaltung aufheben"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt index 647343e89..ee93de7a0 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Αύξηση ταχύτητας\nΑύξηση ταχύ STRING ID_PLAY_PAUSE "Παύση\nΠαύση" STRING ID_PLAY_PLAY "Αναπαραγωγή\nΑναπαραγωγή" STRING ID_PLAY_STOP "Διακοπή\nΔιακοπή" -STRING ID_VOLUME_MUTE "Σίγαση\nΣίγαση" -STRING ID_VOLUME_MUTE_DISABLED "Χωρίς ήχο\nΧωρίς ήχο" -STRING ID_VOLUME_MUTE_ON "Διακοπή σίγασης\nΔιακοπή σίγασης" +STRING ID_VOLUME_MUTE "Σίγαση" +STRING ID_VOLUME_MUTE_DISABLED "Χωρίς ήχο" +STRING ID_VOLUME_MUTE_ON "Διακοπή σίγασης" diff --git a/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt index e0189eac1..bcc375d50 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Incrementar velocidad\nIncrementar velocidad" STRING ID_PLAY_PAUSE "Pausa\nPausa"
STRING ID_PLAY_PLAY "Reproducir\nReproducir"
STRING ID_PLAY_STOP "Detener\nDetener"
-STRING ID_VOLUME_MUTE "Silencio\nSilencio"
-STRING ID_VOLUME_MUTE_DISABLED "Sin audio\nSin audio"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Silencio"
+STRING ID_VOLUME_MUTE_DISABLED "Sin audio"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt index b400c29a7..c57ca2095 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.eu.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Gehitu abidura\nGehitu abidura" STRING ID_PLAY_PAUSE "Pausatu\nPausatu"
STRING ID_PLAY_PLAY "Irakurri\nIrakurri"
STRING ID_PLAY_STOP "Gelditu\nGelditu"
-STRING ID_VOLUME_MUTE "Mututu\nMututu"
-STRING ID_VOLUME_MUTE_DISABLED "Audiorik ez\nAudiorik ez"
-STRING ID_VOLUME_MUTE_ON "Desmututu\nMututu"
+STRING ID_VOLUME_MUTE "Mututu"
+STRING ID_VOLUME_MUTE_DISABLED "Audiorik ez"
+STRING ID_VOLUME_MUTE_ON "Desmututu"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt index 249f536a4..365b4d1d3 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Accélérer\nAccélérer" STRING ID_PLAY_PAUSE "Pause\nPause"
STRING ID_PLAY_PLAY "Lecture\nLecture"
STRING ID_PLAY_STOP "Arrêter\nArrêter"
-STRING ID_VOLUME_MUTE "Muet\nMuet"
-STRING ID_VOLUME_MUTE_DISABLED "Pas d'audio\nPas d'audio"
-STRING ID_VOLUME_MUTE_ON "Non muet\nNon muet"
+STRING ID_VOLUME_MUTE "Muet"
+STRING ID_VOLUME_MUTE_DISABLED "Pas d'audio"
+STRING ID_VOLUME_MUTE_ON "Non muet"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt index fb4d6146e..bd6c95bfa 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "הגדל מהירות\nהגדל מהירות" STRING ID_PLAY_PAUSE "השהה\nהשהה"
STRING ID_PLAY_PLAY "נגן\nנגן"
STRING ID_PLAY_STOP "עצור\nעצור"
-STRING ID_VOLUME_MUTE "השתק\nהשתק"
-STRING ID_VOLUME_MUTE_DISABLED "אין שמע\nאין שמע"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "השתק"
+STRING ID_VOLUME_MUTE_DISABLED "אין שמע"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt index 76cd57d98..1aa675da0 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Sebesség növelése\nSebesség növelése" STRING ID_PLAY_PAUSE "Szünet\nSzünet"
STRING ID_PLAY_PLAY "Lejátszás\nLejátszás"
STRING ID_PLAY_STOP "Leállítás\nLeállítás"
-STRING ID_VOLUME_MUTE "Elnémítás\nElnémítás"
-STRING ID_VOLUME_MUTE_DISABLED "Nincs audió\nNincs audió"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Elnémítás"
+STRING ID_VOLUME_MUTE_DISABLED "Nincs audió"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt index 2ad56950b..5cc2198b7 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Մեծացնել արագությունը\nՄեծացն STRING ID_PLAY_PAUSE "Դադար\Դադար"
STRING ID_PLAY_PLAY "Վերարտադրում\nՎերարտադրում"
STRING ID_PLAY_STOP "Կանգնեցնել\nԿանգնեցնել"
-STRING ID_VOLUME_MUTE "Անձայն\nԱնձայն"
-STRING ID_VOLUME_MUTE_DISABLED "Առանց ձայնի\nԱռանց ձայնի"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Անձայն"
+STRING ID_VOLUME_MUTE_DISABLED "Առանց ձայնի"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt index 99d79ad18..ebebf357d 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Aumenta velocità\nAumenta velocità" STRING ID_PLAY_PAUSE "Pausa\nPausa"
STRING ID_PLAY_PLAY "Play\nPlay"
STRING ID_PLAY_STOP "Stop\nStop"
-STRING ID_VOLUME_MUTE "Muto\nMuto"
-STRING ID_VOLUME_MUTE_DISABLED "Nessun audio\nNessun audio"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Muto"
+STRING ID_VOLUME_MUTE_DISABLED "Nessun audio"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt index 046a380f9..e212aaa0f 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "再生速度増加\n再生速度増加" STRING ID_PLAY_PAUSE "一時停止\n一時停止"
STRING ID_PLAY_PLAY "再生\n再生"
STRING ID_PLAY_STOP "停止\n停止"
-STRING ID_VOLUME_MUTE "ミュート\nミュート"
-STRING ID_VOLUME_MUTE_DISABLED "音声なし\n音声なし"
-STRING ID_VOLUME_MUTE_ON "ミュート解除\nミュート解除"
+STRING ID_VOLUME_MUTE "ミュート"
+STRING ID_VOLUME_MUTE_DISABLED "音声なし"
+STRING ID_VOLUME_MUTE_ON "ミュート解除"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt index 47463e0d2..222d4c818 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "재생속도 증가\n재생속도 증가" STRING ID_PLAY_PAUSE "잠깐멈춤\n잠깐멈춤"
STRING ID_PLAY_PLAY "재생\n재생"
STRING ID_PLAY_STOP "멈춤\n멈춤"
-STRING ID_VOLUME_MUTE "음소거\n음소거"
-STRING ID_VOLUME_MUTE_DISABLED "오디오 없음\n오디오 없음"
-STRING ID_VOLUME_MUTE_ON "음복원\n음복원"
+STRING ID_VOLUME_MUTE "음소거"
+STRING ID_VOLUME_MUTE_DISABLED "오디오 없음"
+STRING ID_VOLUME_MUTE_ON "음복원"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt index 5bec08244..4fefd36f7 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Snelheid verhogen\nSnelheid verhogen" STRING ID_PLAY_PAUSE "Pauze\nPauze"
STRING ID_PLAY_PLAY "Weergave\nWeergave"
STRING ID_PLAY_STOP "Stoppen\nStoppen"
-STRING ID_VOLUME_MUTE "Dempen\nDempen"
-STRING ID_VOLUME_MUTE_DISABLED "Geen audio\nGeen audio"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Dempen"
+STRING ID_VOLUME_MUTE_DISABLED "Geen audio"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt index d9c619848..8b6f457a5 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt @@ -1916,6 +1916,6 @@ STRING ID_PLAY_INCRATE "Zwiększono tempo odtwarzania\nZwiększ tempo odtwarzan STRING ID_PLAY_PAUSE "Wstrzymano\nWstrzymaj odtwarzanie"
STRING ID_PLAY_PLAY "Odtwarzanie\nRozpocznij odtwarzanie"
STRING ID_PLAY_STOP "Zatrzymano\nZatrzymaj odtwarzanie"
-STRING ID_VOLUME_MUTE "Wycisz\nWycisz"
-STRING ID_VOLUME_MUTE_DISABLED "Brak audio\nBrak ścieżki dźwiękowej"
-STRING ID_VOLUME_MUTE_ON "Wyłącz wyciszenie\nWyłącz wyciszenie"
+STRING ID_VOLUME_MUTE "Wycisz"
+STRING ID_VOLUME_MUTE_DISABLED "Brak audio"
+STRING ID_VOLUME_MUTE_ON "Wyłącz wyciszenie"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.rc.txt index 9c0e7af71..c74030cf8 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Increase speed\nIncrease speed" STRING ID_PLAY_PAUSE "Pause\nPause"
STRING ID_PLAY_PLAY "Play\nPlay"
STRING ID_PLAY_STOP "Stop\nStop"
-STRING ID_VOLUME_MUTE "Mute\nMute"
-STRING ID_VOLUME_MUTE_DISABLED "No audio\nNo audio"
-STRING ID_VOLUME_MUTE_ON "Unmute\nUnmute"
+STRING ID_VOLUME_MUTE "Mute"
+STRING ID_VOLUME_MUTE_DISABLED "No audio"
+STRING ID_VOLUME_MUTE_ON "Unmute"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt index 0d01c2f50..f0ad3c38b 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Mărește viteză\nMărește viteză" STRING ID_PLAY_PAUSE "Pauză\nPauză" STRING ID_PLAY_PLAY "Redă\nRedă" STRING ID_PLAY_STOP "Stop\nStop" -STRING ID_VOLUME_MUTE "Silenţios\nSilenţios" -STRING ID_VOLUME_MUTE_DISABLED "Fără audio\nFără audio" -STRING ID_VOLUME_MUTE_ON "Activare sunet\nActivare sunet" +STRING ID_VOLUME_MUTE "Silenţios" +STRING ID_VOLUME_MUTE_DISABLED "Fără audio" +STRING ID_VOLUME_MUTE_ON "Activare sunet" diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt index 9f7235a90..bb8bed7c6 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Увеличить скорость\nУвеличить STRING ID_PLAY_PAUSE "Пауза\nПауза"
STRING ID_PLAY_PLAY "Воспроизведение\nВоспроизведение"
STRING ID_PLAY_STOP "Стоп\nСтоп"
-STRING ID_VOLUME_MUTE "Отключить звук\nОтключить звук"
-STRING ID_VOLUME_MUTE_DISABLED "Без звука\nБез звука"
-STRING ID_VOLUME_MUTE_ON "Включить звук\nВключить звук"
+STRING ID_VOLUME_MUTE "Отключить звук"
+STRING ID_VOLUME_MUTE_DISABLED "Без звука"
+STRING ID_VOLUME_MUTE_ON "Включить звук"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt index d9873b495..ef683db1e 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "增加速度\n增加速度" STRING ID_PLAY_PAUSE "暂停\n暂停"
STRING ID_PLAY_PLAY "播放\n播放"
STRING ID_PLAY_STOP "停止\n停止"
-STRING ID_VOLUME_MUTE "静音\n静音"
-STRING ID_VOLUME_MUTE_DISABLED "无音频\n无音频"
-STRING ID_VOLUME_MUTE_ON "取消静音\n取消静音"
+STRING ID_VOLUME_MUTE "静音"
+STRING ID_VOLUME_MUTE_DISABLED "无音频"
+STRING ID_VOLUME_MUTE_ON "取消静音"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt index 1cc7ea7c7..d8c930c40 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Zvýšiť rýchlosť\nZvýšiť rýchlosť" STRING ID_PLAY_PAUSE "Pozastaviť\nPozastaviť"
STRING ID_PLAY_PLAY "Prehrať\nPrehrať"
STRING ID_PLAY_STOP "Stop\nStop"
-STRING ID_VOLUME_MUTE "Stlmiť\nStlmiť"
-STRING ID_VOLUME_MUTE_DISABLED "Bez zvuku\nBez zvuku"
-STRING ID_VOLUME_MUTE_ON "Nestlmiť\Nestlmiť"
+STRING ID_VOLUME_MUTE "Stlmiť"
+STRING ID_VOLUME_MUTE_DISABLED "Bez zvuku"
+STRING ID_VOLUME_MUTE_ON "Nestlmiť"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt index 02ff286cc..78eca157d 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Öka hastigheten\nÖka hastigheten" STRING ID_PLAY_PAUSE "Pausa\nPausa"
STRING ID_PLAY_PLAY "Spela\nSpela"
STRING ID_PLAY_STOP "Stoppa\nStoppa"
-STRING ID_VOLUME_MUTE "Ljud av\nLjud av"
-STRING ID_VOLUME_MUTE_DISABLED "Inget ljud\nInget ljud"
-STRING ID_VOLUME_MUTE_ON "Ljud av\nLjud av"
+STRING ID_VOLUME_MUTE "Ljud av"
+STRING ID_VOLUME_MUTE_DISABLED "Inget ljud"
+STRING ID_VOLUME_MUTE_ON "Ljud av"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt index 0a29bb2a7..3957cd0b9 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "提升速度\n提升速度" STRING ID_PLAY_PAUSE "暫停\n暫停"
STRING ID_PLAY_PLAY "播放\n播放"
STRING ID_PLAY_STOP "停止\n停止"
-STRING ID_VOLUME_MUTE "靜音\n靜音"
-STRING ID_VOLUME_MUTE_DISABLED "無音訊\n無音訊"
-STRING ID_VOLUME_MUTE_ON "解除靜音\n解除靜音"
+STRING ID_VOLUME_MUTE "靜音"
+STRING ID_VOLUME_MUTE_DISABLED "無音訊"
+STRING ID_VOLUME_MUTE_ON "解除靜音"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt index b24fae611..69517bce9 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Hızı arttır\nHızı arttır" STRING ID_PLAY_PAUSE "Duraklat\nDuraklat"
STRING ID_PLAY_PLAY "Yürüt\nYürüt"
STRING ID_PLAY_STOP "Durdur\nDurdur"
-STRING ID_VOLUME_MUTE "Sesi Kıs\nSesi Kıs"
-STRING ID_VOLUME_MUTE_DISABLED "Ses Yok\nSes Yok"
-STRING ID_VOLUME_MUTE_ON "Sesi Aç\nSesi Aç"
+STRING ID_VOLUME_MUTE "Sesi Kıs"
+STRING ID_VOLUME_MUTE_DISABLED "Ses Yok"
+STRING ID_VOLUME_MUTE_ON "Sesi Aç"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt index cae0b4c37..2c5f06365 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt @@ -1917,6 +1917,6 @@ STRING ID_PLAY_INCRATE "Швидше\nШвидше" STRING ID_PLAY_PAUSE "Пауза\nПауза"
STRING ID_PLAY_PLAY "Відтворення\nВідтворення"
STRING ID_PLAY_STOP "Стоп\nСтоп"
-STRING ID_VOLUME_MUTE "Вимкнути звук\nВимкнути звук"
-STRING ID_VOLUME_MUTE_DISABLED "Без звуку\nБез звуку"
-STRING ID_VOLUME_MUTE_ON "Ввімкнути звук\nВвімкнути звук"
+STRING ID_VOLUME_MUTE "Вимкнути звук"
+STRING ID_VOLUME_MUTE_DISABLED "Без звуку"
+STRING ID_VOLUME_MUTE_ON "Ввімкнути звук"
diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp index 8afc5badf..93987c195 100644 --- a/src/mpc-hc/mplayerc.cpp +++ b/src/mpc-hc/mplayerc.cpp @@ -1954,7 +1954,7 @@ bool FindRedir(CUrl& src, CString ct, CString& body, CAtlList<CString>& urls, CA }
}
- return urls.GetCount() > 0;
+ return !urls.IsEmpty();
}
bool FindRedir(CString& fn, CString ct, CAtlList<CString>& fns, CAutoPtrList<CAtlRegExpT>& res)
@@ -2005,7 +2005,7 @@ bool FindRedir(CString& fn, CString ct, CAtlList<CString>& fns, CAutoPtrList<CAt }
}
- return fns.GetCount() > 0;
+ return !fns.IsEmpty();
}
CStringA GetContentType(CString fn, CAtlList<CString>* redir)
diff --git a/src/mpc-hc/mplayerc.rc b/src/mpc-hc/mplayerc.rc index 0caed5e65..c09df5e78 100644 --- a/src/mpc-hc/mplayerc.rc +++ b/src/mpc-hc/mplayerc.rc @@ -2311,9 +2311,9 @@ END STRINGTABLE
BEGIN
- ID_VOLUME_MUTE "Mute\nMute"
- ID_VOLUME_MUTE_ON "Unmute\nUnmute"
- ID_VOLUME_MUTE_DISABLED "No audio\nNo audio"
+ ID_VOLUME_MUTE "Mute"
+ ID_VOLUME_MUTE_ON "Unmute"
+ ID_VOLUME_MUTE_DISABLED "No audio"
END
STRINGTABLE
|