diff options
62 files changed, 135 insertions, 151 deletions
diff --git a/include/IBitRateInfo.h b/include/IBitRateInfo.h index a7f10924e..b9375efb4 100644 --- a/include/IBitRateInfo.h +++ b/include/IBitRateInfo.h @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -24,6 +24,6 @@ interface __declspec(uuid("EB2CD9E6-BA08-4acb-AA0F-3D8D0DD521CA"))
IBitRateInfo :
public IUnknown {
- STDMETHOD_(DWORD, GetCurrentBitRate)() = 0;
- STDMETHOD_(DWORD, GetAverageBitRate)() = 0;
+ STDMETHOD_(DWORD, GetCurrentBitRate)() PURE;
+ STDMETHOD_(DWORD, GetAverageBitRate)() PURE;
};
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 358a99a42..9a09a375c 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2013 see Authors.txt
+ * (C) 2006-2014 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -202,8 +202,6 @@ CBaseSplitterOutputPin::CBaseSplitterOutputPin(CAtlArray<CMediaType>& mts, LPCWS {
m_mts.Copy(mts);
m_nBuffers = std::max(nBuffers, 1);
- ZeroMemory(&m_brs, sizeof(m_brs));
- m_brs.rtLastDeliverTime = Packet::INVALID_TIME;
}
CBaseSplitterOutputPin::CBaseSplitterOutputPin(LPCWSTR pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr, int nBuffers, int QueueMaxPackets)
@@ -216,8 +214,6 @@ CBaseSplitterOutputPin::CBaseSplitterOutputPin(LPCWSTR pName, CBaseFilter* pFilt , m_rtStart(0)
{
m_nBuffers = std::max(nBuffers, 1);
- ZeroMemory(&m_brs, sizeof(m_brs));
- m_brs.rtLastDeliverTime = Packet::INVALID_TIME;
}
CBaseSplitterOutputPin::~CBaseSplitterOutputPin()
@@ -364,7 +360,7 @@ HRESULT CBaseSplitterOutputPin::DeliverEndFlush() HRESULT CBaseSplitterOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{
- m_brs.rtLastDeliverTime = Packet::INVALID_TIME;
+ m_BitRate.rtLastDeliverTime = Packet::INVALID_TIME;
if (m_fFlushing) {
return S_FALSE;
}
@@ -521,32 +517,32 @@ HRESULT CBaseSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p) return S_OK;
}
- m_brs.nBytesSinceLastDeliverTime += nBytes;
+ m_BitRate.nBytesSinceLastDeliverTime += nBytes;
if (p->rtStart != Packet::INVALID_TIME) {
- if (m_brs.rtLastDeliverTime == Packet::INVALID_TIME) {
- m_brs.rtLastDeliverTime = p->rtStart;
- m_brs.nBytesSinceLastDeliverTime = 0;
+ if (m_BitRate.rtLastDeliverTime == Packet::INVALID_TIME) {
+ m_BitRate.rtLastDeliverTime = p->rtStart;
+ m_BitRate.nBytesSinceLastDeliverTime = 0;
}
- if (m_brs.rtLastDeliverTime + 10000000 < p->rtStart) {
- REFERENCE_TIME rtDiff = p->rtStart - m_brs.rtLastDeliverTime;
+ if (m_BitRate.rtLastDeliverTime + 10000000 < p->rtStart) {
+ REFERENCE_TIME rtDiff = p->rtStart - m_BitRate.rtLastDeliverTime;
- double secs, bits;
+ double dSecs, dBits;
- secs = (double)rtDiff / 10000000;
- bits = 8.0 * m_brs.nBytesSinceLastDeliverTime;
- m_brs.nCurrentBitRate = (DWORD)(bits / secs);
+ dSecs = rtDiff / 10000000.0;
+ dBits = 8.0 * m_BitRate.nBytesSinceLastDeliverTime;
+ m_BitRate.nCurrentBitRate = (DWORD)(dBits / dSecs);
- m_brs.rtTotalTimeDelivered += rtDiff;
- m_brs.nTotalBytesDelivered += m_brs.nBytesSinceLastDeliverTime;
+ m_BitRate.rtTotalTimeDelivered += rtDiff;
+ m_BitRate.nTotalBytesDelivered += m_BitRate.nBytesSinceLastDeliverTime;
- secs = (double)m_brs.rtTotalTimeDelivered / 10000000;
- bits = 8.0 * m_brs.nTotalBytesDelivered;
- m_brs.nAverageBitRate = (DWORD)(bits / secs);
+ dSecs = m_BitRate.rtTotalTimeDelivered / 10000000.0;
+ dBits = 8.0 * m_BitRate.nTotalBytesDelivered;
+ m_BitRate.nAverageBitRate = (DWORD)(dBits / dSecs);
- m_brs.rtLastDeliverTime = p->rtStart;
- m_brs.nBytesSinceLastDeliverTime = 0;
+ m_BitRate.rtLastDeliverTime = p->rtStart;
+ m_BitRate.nBytesSinceLastDeliverTime = 0;
/*
TRACE(_T("[%d] c: %d kbps, a: %d kbps\n"),
p->TrackNumber,
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.h b/src/filters/parser/BaseSplitter/BaseSplitter.h index 5f01343e1..55eaba8da 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.h +++ b/src/filters/parser/BaseSplitter/BaseSplitter.h @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2013 see Authors.txt
+ * (C) 2006-2014 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -134,16 +134,15 @@ private: HRESULT GetDeliveryBuffer(IMediaSample** ppSample, REFERENCE_TIME* pStartTime, REFERENCE_TIME* pEndTime, DWORD dwFlags);
HRESULT Deliver(IMediaSample* pSample);
- // bitrate stats
-
- struct {
- UINT64 nTotalBytesDelivered;
- REFERENCE_TIME rtTotalTimeDelivered;
- UINT64 nBytesSinceLastDeliverTime;
- REFERENCE_TIME rtLastDeliverTime;
- DWORD nCurrentBitRate;
- DWORD nAverageBitRate;
- } m_brs;
+ // IBitRateInfo
+ struct BitRateInfo {
+ UINT64 nTotalBytesDelivered = 0;
+ REFERENCE_TIME rtTotalTimeDelivered = 0;
+ UINT64 nBytesSinceLastDeliverTime = 0;
+ REFERENCE_TIME rtLastDeliverTime = Packet::INVALID_TIME;
+ DWORD nCurrentBitRate = 0;
+ DWORD nAverageBitRate = 0;
+ } m_BitRate;
int m_QueueMaxPackets;
@@ -231,8 +230,8 @@ public: // IBitRateInfo
- STDMETHODIMP_(DWORD) GetCurrentBitRate() { return m_brs.nCurrentBitRate; }
- STDMETHODIMP_(DWORD) GetAverageBitRate() { return m_brs.nAverageBitRate; }
+ STDMETHODIMP_(DWORD) GetCurrentBitRate() { return m_BitRate.nCurrentBitRate; }
+ STDMETHODIMP_(DWORD) GetAverageBitRate() { return m_BitRate.nAverageBitRate; }
};
class CBaseSplitterFilter
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 588a77ce6..68fd92fbf 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -1911,92 +1911,81 @@ void CMainFrame::OnTimer(UINT_PTR nIDEvent) rate.Format(_T("%.2fx"), m_dSpeedRate);
if (m_pQP) {
CString info;
- int val = 0;
+ int tmp, tmp1;
- m_pQP->get_AvgFrameRate(&val); // We hang here due to a lock that never gets released.
- info.Format(_T("%d.%02d (%s)"), val / 100, val % 100, rate);
+ if (SUCCEEDED(m_pQP->get_AvgFrameRate(&tmp))) { // We hang here due to a lock that never gets released.
+ info.Format(_T("%d.%02d (%s)"), tmp / 100, tmp % 100, rate);
+ } else {
+ info = _T("-");
+ }
m_wndStatsBar.SetLine(ResStr(IDS_AG_FRAMERATE), info);
- int avg, dev;
- m_pQP->get_AvgSyncOffset(&avg);
- m_pQP->get_DevSyncOffset(&dev);
- info.Format(ResStr(IDS_STATSBAR_SYNC_OFFSET_FORMAT), avg, dev);
+ if (SUCCEEDED(m_pQP->get_AvgSyncOffset(&tmp))
+ && SUCCEEDED(m_pQP->get_DevSyncOffset(&tmp1))) {
+ info.Format(IDS_STATSBAR_SYNC_OFFSET_FORMAT, tmp, tmp1);
+ } else {
+ info = _T("-");
+ }
m_wndStatsBar.SetLine(ResStr(IDS_STATSBAR_SYNC_OFFSET), info);
- int drawn, dropped;
- m_pQP->get_FramesDrawn(&drawn);
- m_pQP->get_FramesDroppedInRenderer(&dropped);
- info.Format(IDS_MAINFRM_6, drawn, dropped);
+ if (SUCCEEDED(m_pQP->get_FramesDrawn(&tmp))
+ && SUCCEEDED(m_pQP->get_FramesDroppedInRenderer(&tmp1))) {
+ info.Format(IDS_MAINFRM_6, tmp, tmp1);
+ } else {
+ info = _T("-");
+ }
m_wndStatsBar.SetLine(ResStr(IDS_AG_FRAMES), info);
- m_pQP->get_Jitter(&val);
- info.Format(_T("%d ms"), val);
+ if (SUCCEEDED(m_pQP->get_Jitter(&tmp))) {
+ info.Format(_T("%d ms"), tmp);
+ } else {
+ info = _T("-");
+ }
m_wndStatsBar.SetLine(ResStr(IDS_STATSBAR_JITTER), info);
} else {
m_wndStatsBar.SetLine(ResStr(IDS_STATSBAR_PLAYBACK_RATE), rate);
}
if (m_pBI) {
- CAtlList<CString> sl;
+ CString sInfo;
for (int i = 0, j = m_pBI->GetCount(); i < j; i++) {
int samples, size;
if (S_OK == m_pBI->GetStatus(i, samples, size)) {
- CString str;
- str.Format(_T("[%d]: %03d/%d KB"), i, samples, size / 1024);
- sl.AddTail(str);
+ sInfo.AppendFormat(_T("[%d]: %03d/%d KB "), i, samples, size / 1024);
}
}
- if (!sl.IsEmpty()) {
- CString str;
- str.Format(_T("%s (p%u)"), Implode(sl, ' '), m_pBI->GetPriority());
-
- m_wndStatsBar.SetLine(ResStr(IDS_AG_BUFFERS), str);
+ if (!sInfo.IsEmpty()) {
+ sInfo.AppendFormat(_T("(p%lu)"), m_pBI->GetPriority());
+ m_wndStatsBar.SetLine(ResStr(IDS_AG_BUFFERS), sInfo);
}
}
- CInterfaceList<IBitRateInfo> pBRIs;
-
- BeginEnumFilters(m_pGB, pEF, pBF) {
- BeginEnumPins(pBF, pEP, pPin) {
- if (CComQIPtr<IBitRateInfo> pBRI = pPin) {
- pBRIs.AddTail(pBRI);
- }
- }
- EndEnumPins;
-
- if (!pBRIs.IsEmpty()) {
- CAtlList<CString> sl;
-
- POSITION pos = pBRIs.GetHeadPosition();
- for (int i = 0; pos; i++) {
- IBitRateInfo* pBRI = pBRIs.GetNext(pos);
-
- DWORD cur = pBRI->GetCurrentBitRate() / 1000;
- DWORD avg = pBRI->GetAverageBitRate() / 1000;
-
- if (avg == 0) {
- continue;
- }
+ {
+ // IBitRateInfo
+ CString sInfo;
+ BeginEnumFilters(m_pGB, pEF, pBF) {
+ unsigned i = 0;
+ BeginEnumPins(pBF, pEP, pPin) {
+ if (CComQIPtr<IBitRateInfo> pBRI = pPin) {
+ DWORD nAvg = pBRI->GetAverageBitRate() / 1000;
- CString str;
- if (cur != avg) {
- str.Format(_T("[%d]: %lu/%lu Kb/s"), i, avg, cur);
- } else {
- str.Format(_T("[%d]: %lu Kb/s"), i, avg);
+ if (nAvg > 0) {
+ sInfo.AppendFormat(_T("[%d]: %lu/%lu Kb/s "), i, nAvg, pBRI->GetCurrentBitRate() / 1000);
+ }
}
- sl.AddTail(str);
+ i++;
}
+ EndEnumPins;
- if (!sl.IsEmpty()) {
- m_wndStatsBar.SetLine(ResStr(IDS_STATSBAR_BITRATE), Implode(sl, ' ') + ResStr(IDS_STATSBAR_BITRATE_AVG_CUR));
+ if (!sInfo.IsEmpty()) {
+ m_wndStatsBar.SetLine(ResStr(IDS_STATSBAR_BITRATE), sInfo + ResStr(IDS_STATSBAR_BITRATE_AVG_CUR));
+ sInfo.Empty();
}
-
- break;
}
+ EndEnumFilters;
}
- EndEnumFilters;
if (GetPlaybackMode() == PM_DVD) { // we also use this timer to update the info panel for DVD playback
ULONG ulAvailable, ulCurrent;
diff --git a/src/mpc-hc/mpc-hc.rc b/src/mpc-hc/mpc-hc.rc index 5d5db3f72..5b416df16 100644 --- a/src/mpc-hc/mpc-hc.rc +++ b/src/mpc-hc/mpc-hc.rc @@ -2075,7 +2075,7 @@ BEGIN IDS_STATSBAR_SYNC_OFFSET_FORMAT "avg: %d ms, dev: %d ms"
IDS_STATSBAR_JITTER "Jitter"
IDS_STATSBAR_BITRATE "Bitrate"
- IDS_STATSBAR_BITRATE_AVG_CUR " (avg/cur)"
+ IDS_STATSBAR_BITRATE_AVG_CUR "(avg/cur)"
IDS_STATSBAR_SIGNAL "Signal"
IDS_STATSBAR_SIGNAL_FORMAT "Strength: %d dB, Quality: %d%%"
IDS_SUBTITLES_STYLES_CAPTION "Styles"
diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.be.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.be.strings.po index 5b68bb6ce..19f40886e 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.be.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.be.strings.po @@ -97,7 +97,7 @@ msgid "Bitrate" msgstr "" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.bn.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.bn.strings.po index b662721c0..996ef17c6 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.bn.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.bn.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "বিটরেট" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (গড়/চলতি)" +msgid "(avg/cur)" +msgstr "(গড়/চলতি)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.ca.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.ca.strings.po index bc564026a..12de753f8 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.ca.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.ca.strings.po @@ -98,7 +98,7 @@ msgid "Bitrate" msgstr "Taxa de bits" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(mitjana/actual)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.cs.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.cs.strings.po index 26ef1dcff..0ee86664b 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.cs.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.cs.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "Datový tok" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (prům./akt.)" +msgid "(avg/cur)" +msgstr "(prům./akt.)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.de.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.de.strings.po index 01ceca3c8..bdef83d87 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.de.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.de.strings.po @@ -102,8 +102,8 @@ msgid "Bitrate" msgstr "Bitrate" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (avg/cur)" +msgid "(avg/cur)" +msgstr "(avg/cur)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.el.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.el.strings.po index e24548a2e..ec26230b9 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.el.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.el.strings.po @@ -98,8 +98,8 @@ msgid "Bitrate" msgstr "Ρυθμός μετάδοσης bit" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (μέσος/τρέχων)" +msgid "(avg/cur)" +msgstr "(μέσος/τρέχων)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.en_GB.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.en_GB.strings.po index 83fc01cd1..e5bf852b2 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.en_GB.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.en_GB.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "Bitrate" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (avg/cur)" +msgid "(avg/cur)" +msgstr "(avg/cur)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.es.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.es.strings.po index 6ef9d95f4..bfbac7109 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.es.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.es.strings.po @@ -102,7 +102,7 @@ msgid "Bitrate" msgstr "Tasa de bits" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(promedio/actual)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.eu.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.eu.strings.po index 4de247c69..34095662d 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.eu.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.eu.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "Bitneurria" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (bat-best/oraingoa)" +msgid "(avg/cur)" +msgstr "(bat-best/oraingoa)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.fr.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.fr.strings.po index 2eee626af..27b6bf0dd 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.fr.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.fr.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "Débit" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (moyen/actuel)" +msgid "(avg/cur)" +msgstr "(moyen/actuel)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.gl.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.gl.strings.po index a24d515b5..3d8772143 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.gl.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.gl.strings.po @@ -98,7 +98,7 @@ msgid "Bitrate" msgstr "Taxa de bits" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(promedio/actual)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.he.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.he.strings.po index 7ab0a96d5..74c485948 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.he.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.he.strings.po @@ -98,7 +98,7 @@ msgid "Bitrate" msgstr "קצב ביטים" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(ממוצע/נוכחי)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.hr.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.hr.strings.po index 331124a87..6e5c7da1f 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.hr.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.hr.strings.po @@ -100,7 +100,7 @@ msgid "Bitrate" msgstr "Bitrate" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(prosječno/trenutno)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.hu.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.hu.strings.po index 727cea954..5dd567f1f 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.hu.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.hu.strings.po @@ -97,7 +97,7 @@ msgid "Bitrate" msgstr "Bitráta" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(átlag/jelenlegi)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.hy.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.hy.strings.po index 7be120150..0bd4dba5f 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.hy.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.hy.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "Բիթրեյթ" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (միջ./ընթ.)" +msgid "(avg/cur)" +msgstr "(միջ./ընթ.)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.it.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.it.strings.po index e080f47d3..2e35db0a9 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.it.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.it.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "Bitrate" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (avg/cur)" +msgid "(avg/cur)" +msgstr "(avg/cur)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.ja.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.ja.strings.po index 611c2ad24..b5bbfc03c 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.ja.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.ja.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "ビットレート" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (平均/現在)" +msgid "(avg/cur)" +msgstr "(平均/現在)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.ko.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.ko.strings.po index 5ecdcb503..26c7e0266 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.ko.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.ko.strings.po @@ -97,7 +97,7 @@ msgid "Bitrate" msgstr "비트레이트" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(avg/cur)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.ms_MY.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.ms_MY.strings.po index 9ecb30a3f..e8b108570 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.ms_MY.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.ms_MY.strings.po @@ -97,7 +97,7 @@ msgid "Bitrate" msgstr "Kadar Bit" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(pur/cur)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.nl.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.nl.strings.po index 3872a7e1c..33f2341bf 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.nl.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.nl.strings.po @@ -97,7 +97,7 @@ msgid "Bitrate" msgstr "" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.pl.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.pl.strings.po index a4777319f..ecc9dda6e 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.pl.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.pl.strings.po @@ -98,8 +98,8 @@ msgid "Bitrate" msgstr "Bitrate" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (śr./akt.)" +msgid "(avg/cur)" +msgstr "(śr./akt.)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.pt_BR.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.pt_BR.strings.po index 9ae091ca9..155883950 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.pt_BR.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.pt_BR.strings.po @@ -102,8 +102,8 @@ msgid "Bitrate" msgstr "Taxa de bits" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (Média/Atual)" +msgid "(avg/cur)" +msgstr "(Média/Atual)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.ro.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.ro.strings.po index c652c5c3d..235959145 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.ro.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.ro.strings.po @@ -98,8 +98,8 @@ msgid "Bitrate" msgstr "Rată de biţi" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (medie/curentă)" +msgid "(avg/cur)" +msgstr "(medie/curentă)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.ru.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.ru.strings.po index 6ce7361dd..7fd25681e 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.ru.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.ru.strings.po @@ -100,8 +100,8 @@ msgid "Bitrate" msgstr "Битрейт" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (сред/тек)" +msgid "(avg/cur)" +msgstr "(сред/тек)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.sk.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.sk.strings.po index 043198438..b21e5b9fa 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.sk.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.sk.strings.po @@ -98,8 +98,8 @@ msgid "Bitrate" msgstr "Dátový tok" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (priemerný/aktuálny)" +msgid "(avg/cur)" +msgstr "(priemerný/aktuálny)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.sl.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.sl.strings.po index c085bb8cc..43ef7974f 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.sl.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.sl.strings.po @@ -98,8 +98,8 @@ msgid "Bitrate" msgstr "Bitna hitrost" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (povpr./trenu.)" +msgid "(avg/cur)" +msgstr "(povpr./trenu.)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.strings.pot b/src/mpc-hc/mpcresources/PO/mpc-hc.strings.pot index 8b12576da..c083fa3b2 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.strings.pot +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.strings.pot @@ -94,7 +94,7 @@ msgid "Bitrate" msgstr "" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.sv.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.sv.strings.po index 14d0cf48c..1fe1c7e6b 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.sv.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.sv.strings.po @@ -98,7 +98,7 @@ msgid "Bitrate" msgstr "Bitrate" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(med/akt)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.tr.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.tr.strings.po index 123d039d4..35f58f523 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.tr.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.tr.strings.po @@ -99,8 +99,8 @@ msgid "Bitrate" msgstr "Bit oranı" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (ort/boy)" +msgid "(avg/cur)" +msgstr "(ort/boy)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.tt.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.tt.strings.po index 511ecac04..55858db12 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.tt.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.tt.strings.po @@ -100,8 +100,8 @@ msgid "Bitrate" msgstr "Битрейт" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (урта/тек)" +msgid "(avg/cur)" +msgstr "(урта/тек)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.uk.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.uk.strings.po index 6d9d2109e..a85cff748 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.uk.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.uk.strings.po @@ -97,8 +97,8 @@ msgid "Bitrate" msgstr "Бітрейт" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (усеред./поточ.)" +msgid "(avg/cur)" +msgstr "(усеред./поточ.)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.vi.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.vi.strings.po index 9954d4d44..b6ed4ebd6 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.vi.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.vi.strings.po @@ -98,7 +98,7 @@ msgid "Bitrate" msgstr "Tốc độ bit" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" +msgid "(avg/cur)" msgstr "(trung bình/giây)" msgctxt "IDS_STATSBAR_SIGNAL" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.zh_CN.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.zh_CN.strings.po index fe180d4ef..b8200b874 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.zh_CN.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.zh_CN.strings.po @@ -98,8 +98,8 @@ msgid "Bitrate" msgstr "码率" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (平均/当前)" +msgid "(avg/cur)" +msgstr "(平均/当前)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/PO/mpc-hc.zh_TW.strings.po b/src/mpc-hc/mpcresources/PO/mpc-hc.zh_TW.strings.po index b70808381..6a829ffe2 100644 --- a/src/mpc-hc/mpcresources/PO/mpc-hc.zh_TW.strings.po +++ b/src/mpc-hc/mpcresources/PO/mpc-hc.zh_TW.strings.po @@ -101,8 +101,8 @@ msgid "Bitrate" msgstr "位元率" msgctxt "IDS_STATSBAR_BITRATE_AVG_CUR" -msgid " (avg/cur)" -msgstr " (平均/現時)" +msgid "(avg/cur)" +msgstr "(平均/現時)" msgctxt "IDS_STATSBAR_SIGNAL" msgid "Signal" diff --git a/src/mpc-hc/mpcresources/mpc-hc.be.rc b/src/mpc-hc/mpcresources/mpc-hc.be.rc Binary files differindex e12b5cc2b..0cf3fbb21 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.be.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.be.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.bn.rc b/src/mpc-hc/mpcresources/mpc-hc.bn.rc Binary files differindex b4d6d2173..36f71f517 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.bn.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.bn.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.cs.rc b/src/mpc-hc/mpcresources/mpc-hc.cs.rc Binary files differindex 3abb51b04..5fc435db6 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.cs.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.cs.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.de.rc b/src/mpc-hc/mpcresources/mpc-hc.de.rc Binary files differindex 6dd5d171b..262cb68a5 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.de.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.de.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.el.rc b/src/mpc-hc/mpcresources/mpc-hc.el.rc Binary files differindex e9a34466a..318ce9651 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.el.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.el.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.en_GB.rc b/src/mpc-hc/mpcresources/mpc-hc.en_GB.rc Binary files differindex 818603260..7470c26fb 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.en_GB.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.en_GB.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.eu.rc b/src/mpc-hc/mpcresources/mpc-hc.eu.rc Binary files differindex 06b56c88f..e8a1922eb 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.eu.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.eu.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.fr.rc b/src/mpc-hc/mpcresources/mpc-hc.fr.rc Binary files differindex 00b18d9a8..92084090d 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.fr.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.fr.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.hy.rc b/src/mpc-hc/mpcresources/mpc-hc.hy.rc Binary files differindex 78bb05075..39173c2fe 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.hy.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.hy.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.it.rc b/src/mpc-hc/mpcresources/mpc-hc.it.rc Binary files differindex 432a27fe3..776a7881e 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.it.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.it.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.ja.rc b/src/mpc-hc/mpcresources/mpc-hc.ja.rc Binary files differindex 1d29f9970..8b15e969a 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.ja.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.ja.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.nl.rc b/src/mpc-hc/mpcresources/mpc-hc.nl.rc Binary files differindex a6c667919..6000dc061 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.nl.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.nl.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.pl.rc b/src/mpc-hc/mpcresources/mpc-hc.pl.rc Binary files differindex 3711c872b..d16368140 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.pl.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.pl.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.pt_BR.rc b/src/mpc-hc/mpcresources/mpc-hc.pt_BR.rc Binary files differindex 3a1c4790c..42f34ea17 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.pt_BR.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.pt_BR.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.ro.rc b/src/mpc-hc/mpcresources/mpc-hc.ro.rc Binary files differindex 75539a464..37e042b8b 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.ro.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.ro.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.ru.rc b/src/mpc-hc/mpcresources/mpc-hc.ru.rc Binary files differindex 1a21136c0..b7b61462e 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.ru.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.ru.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.sk.rc b/src/mpc-hc/mpcresources/mpc-hc.sk.rc Binary files differindex a95430f12..9ad8d329b 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.sk.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.sk.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.sl.rc b/src/mpc-hc/mpcresources/mpc-hc.sl.rc Binary files differindex 24aa01596..17e6504f7 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.sl.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.sl.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.tr.rc b/src/mpc-hc/mpcresources/mpc-hc.tr.rc Binary files differindex 4aba594e9..58a8a18a7 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.tr.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.tr.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.tt.rc b/src/mpc-hc/mpcresources/mpc-hc.tt.rc Binary files differindex 179d295d3..2ac0d81db 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.tt.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.tt.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.uk.rc b/src/mpc-hc/mpcresources/mpc-hc.uk.rc Binary files differindex 1b852a0b8..ad2bb4f74 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.uk.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.uk.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.zh_CN.rc b/src/mpc-hc/mpcresources/mpc-hc.zh_CN.rc Binary files differindex aeab0841e..71c7c06d2 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.zh_CN.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.zh_CN.rc diff --git a/src/mpc-hc/mpcresources/mpc-hc.zh_TW.rc b/src/mpc-hc/mpcresources/mpc-hc.zh_TW.rc Binary files differindex f271c2ffd..11c30c3c4 100644 --- a/src/mpc-hc/mpcresources/mpc-hc.zh_TW.rc +++ b/src/mpc-hc/mpcresources/mpc-hc.zh_TW.rc |