diff options
71 files changed, 430 insertions, 431 deletions
diff --git a/src/CmdUI/CmdUI.cpp b/src/CmdUI/CmdUI.cpp index e9857e87a..50e3e5e71 100644 --- a/src/CmdUI/CmdUI.cpp +++ b/src/CmdUI/CmdUI.cpp @@ -58,7 +58,7 @@ LRESULT CCmdUIDialog::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam) SendMessage(WM_KICKIDLE);
}
- return(ret);
+ return ret;
}
BEGIN_MESSAGE_MAP(CCmdUIDialog, CDialog)
@@ -180,7 +180,7 @@ LRESULT CCmdUIPropertyPage::DefWindowProc(UINT message, WPARAM wParam, LPARAM lP SendMessage(WM_KICKIDLE);
}
- return(ret);
+ return ret;
}
BEGIN_MESSAGE_MAP(CCmdUIPropertyPage, CPropertyPage)
diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp index 1d85016d0..fd88ddf1a 100644 --- a/src/DSUtil/DSUtil.cpp +++ b/src/DSUtil/DSUtil.cpp @@ -152,21 +152,21 @@ int CountPins(IBaseFilter* pBF, int& nIn, int& nOut, int& nInC, int& nOutC) }
EndEnumPins
- return(nIn+nOut);
+ return (nIn + nOut);
}
bool IsSplitter(IBaseFilter* pBF, bool fCountConnectedOnly)
{
int nIn, nOut, nInC, nOutC;
CountPins(pBF, nIn, nOut, nInC, nOutC);
- return(fCountConnectedOnly ? nOutC > 1 : nOut > 1);
+ return (fCountConnectedOnly ? nOutC > 1 : nOut > 1);
}
bool IsMultiplexer(IBaseFilter* pBF, bool fCountConnectedOnly)
{
int nIn, nOut, nInC, nOutC;
CountPins(pBF, nIn, nOut, nInC, nOutC);
- return(fCountConnectedOnly ? nInC > 1 : nIn > 1);
+ return (fCountConnectedOnly ? nInC > 1 : nIn > 1);
}
bool IsStreamStart(IBaseFilter* pBF)
@@ -180,7 +180,7 @@ bool IsStreamStart(IBaseFilter* pBF) CountPins(pBF, nIn, nOut, nInC, nOutC);
AM_MEDIA_TYPE mt;
CComPtr<IPin> pIn = GetFirstPin(pBF);
- return((nOut > 1)
+ return ((nOut > 1)
|| (nOut > 0 && nIn == 1 && pIn && SUCCEEDED(pIn->ConnectionMediaType(&mt)) && mt.majortype == MEDIATYPE_Stream));
}
@@ -188,7 +188,7 @@ bool IsStreamEnd(IBaseFilter* pBF) {
int nIn, nOut, nInC, nOutC;
CountPins(pBF, nIn, nOut, nInC, nOutC);
- return(nOut == 0);
+ return (nOut == 0);
}
bool IsVideoRenderer(IBaseFilter* pBF)
@@ -205,7 +205,7 @@ bool IsVideoRenderer(IBaseFilter* pBF) FreeMediaType(mt);
- return(!!(mt.majortype == MEDIATYPE_Video));
+ return !!(mt.majortype == MEDIATYPE_Video);
/*&& (mt.formattype == FORMAT_VideoInfo || mt.formattype == FORMAT_VideoInfo2));*/
}
EndEnumPins
@@ -215,7 +215,7 @@ bool IsVideoRenderer(IBaseFilter* pBF) memcpy(&clsid, &GUID_NULL, sizeof(clsid));
pBF->GetClassID(&clsid);
- return(clsid == CLSID_VideoRenderer || clsid == CLSID_VideoRendererDefault);
+ return (clsid == CLSID_VideoRenderer || clsid == CLSID_VideoRendererDefault);
}
DEFINE_GUID(CLSID_ReClock,
@@ -235,8 +235,8 @@ bool IsAudioWaveRenderer(IBaseFilter* pBF) FreeMediaType(mt);
- return(!!(mt.majortype == MEDIATYPE_Audio)
- /*&& mt.formattype == FORMAT_WaveFormatEx*/);
+ return !!(mt.majortype == MEDIATYPE_Audio);
+ /*&& mt.formattype == FORMAT_WaveFormatEx);*/
}
EndEnumPins
}
@@ -245,7 +245,7 @@ bool IsAudioWaveRenderer(IBaseFilter* pBF) memcpy(&clsid, &GUID_NULL, sizeof(clsid));
pBF->GetClassID(&clsid);
- return(clsid == CLSID_DSoundRender || clsid == CLSID_AudioRender || clsid == CLSID_ReClock
+ return (clsid == CLSID_DSoundRender || clsid == CLSID_AudioRender || clsid == CLSID_ReClock
|| clsid == __uuidof(CNullAudioRenderer) || clsid == __uuidof(CNullUAudioRenderer));
}
@@ -267,18 +267,18 @@ IPin* GetUpStreamPin(IBaseFilter* pBF, IPin* pInputPin) && SUCCEEDED(pPin->ConnectedTo(&pPinConnectedTo))) {
IPin* pRet = pPinConnectedTo.Detach();
pRet->Release();
- return(pRet);
+ return pRet;
}
}
EndEnumPins
- return(NULL);
+ return NULL;
}
IPin* GetFirstPin(IBaseFilter* pBF, PIN_DIRECTION dir)
{
if (!pBF) {
- return(NULL);
+ return NULL;
}
BeginEnumPins(pBF, pEP, pPin) {
@@ -287,18 +287,18 @@ IPin* GetFirstPin(IBaseFilter* pBF, PIN_DIRECTION dir) if (dir == dir2) {
IPin* pRet = pPin.Detach();
pRet->Release();
- return(pRet);
+ return pRet;
}
}
EndEnumPins
- return(NULL);
+ return NULL;
}
IPin* GetFirstDisconnectedPin(IBaseFilter* pBF, PIN_DIRECTION dir)
{
if (!pBF) {
- return(NULL);
+ return NULL;
}
BeginEnumPins(pBF, pEP, pPin) {
@@ -308,19 +308,19 @@ IPin* GetFirstDisconnectedPin(IBaseFilter* pBF, PIN_DIRECTION dir) if (dir == dir2 && (S_OK != pPin->ConnectedTo(&pPinTo))) {
IPin* pRet = pPin.Detach();
pRet->Release();
- return(pRet);
+ return pRet;
}
}
EndEnumPins
- return(NULL);
+ return NULL;
}
IBaseFilter* FindFilter(LPCWSTR clsid, IFilterGraph* pFG)
{
CLSID clsid2;
CLSIDFromString(CComBSTR(clsid), &clsid2);
- return(FindFilter(clsid2, pFG));
+ return FindFilter(clsid2, pFG);
}
IBaseFilter* FindFilter(const CLSID& clsid, IFilterGraph* pFG)
@@ -328,7 +328,7 @@ IBaseFilter* FindFilter(const CLSID& clsid, IFilterGraph* pFG) BeginEnumFilters(pFG, pEF, pBF) {
CLSID clsid2;
if (SUCCEEDED(pBF->GetClassID(&clsid2)) && clsid == clsid2) {
- return(pBF);
+ return pBF;
}
}
EndEnumFilters
@@ -383,7 +383,7 @@ CStringW GetFilterName(IBaseFilter* pBF) }
}
- return(name);
+ return name;
}
CStringW GetPinName(IPin* pPin)
@@ -394,7 +394,7 @@ CStringW GetPinName(IPin* pPin) name = pi.achName;
}
- return(name);
+ return name;
}
IFilterGraph* GetGraphFromFilter(IBaseFilter* pBF)
@@ -407,7 +407,7 @@ IFilterGraph* GetGraphFromFilter(IBaseFilter* pBF) if (pBF && SUCCEEDED(pBF->QueryFilterInfo(&fi))) {
pGraph = fi.pGraph;
}
- return(pGraph);
+ return pGraph;
}
IBaseFilter* GetFilterFromPin(IPin* pPin)
@@ -420,7 +420,7 @@ IBaseFilter* GetFilterFromPin(IPin* pPin) if (pPin && SUCCEEDED(pPin->QueryPinInfo(&pi))) {
pBF = pi.pFilter;
}
- return(pBF);
+ return pBF;
}
IPin* AppendFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB)
@@ -506,7 +506,7 @@ IPin* AppendFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB) }
} while (false);
- return(pRet);
+ return pRet;
}
IPin* InsertFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB)
@@ -598,7 +598,7 @@ IPin* InsertFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB) pPin = pToFrom;
} while (false);
- return(pPin);
+ return pPin;
}
void ExtractMediaTypes(IPin* pPin, CAtlArray<GUID>& types)
@@ -725,12 +725,12 @@ CLSID GetCLSID(IBaseFilter* pBF) if (pBF) {
pBF->GetClassID(&clsid);
}
- return(clsid);
+ return clsid;
}
CLSID GetCLSID(IPin* pPin)
{
- return(GetCLSID(GetFilterFromPin(pPin)));
+ return GetCLSID(GetFilterFromPin(pPin));
}
bool IsCLSIDRegistered(LPCTSTR clsid)
@@ -752,7 +752,7 @@ bool IsCLSIDRegistered(const CLSID& clsid) CoTaskMemFree(pStr);
}
- return(fRet);
+ return fRet;
}
void CStringToBin(CString str, CAtlArray<BYTE>& data)
@@ -895,7 +895,7 @@ CString GetDriveLabel(TCHAR drive) label = VolumeNameBuffer;
}
- return(label);
+ return label;
}
bool GetKeyFrames(CString fn, CUIntArray& kfs)
@@ -943,7 +943,7 @@ bool GetKeyFrames(CString fn, CUIntArray& kfs) AVIFileExit();
}
- return(kfs.GetCount() > 0);
+ return (kfs.GetCount() > 0);
}
DVD_HMSF_TIMECODE RT2HMSF(REFERENCE_TIME rt, double fps) // use to remember the current position
@@ -1085,7 +1085,7 @@ bool ExtractBIH(IMediaSample* pMS, BITMAPINFOHEADER* bih) if (pmt) {
bool fRet = ExtractBIH(pmt, bih);
DeleteMediaType(pmt);
- return(fRet);
+ return fRet;
}
return false;
@@ -1334,7 +1334,7 @@ IBaseFilter* AppendFilter(IPin* pPin, IMoniker* pMoniker, IGraphBuilder* pGB) }
if (SUCCEEDED(pGB->ConnectDirect(pPin, pPinTo, NULL))) {
- return(pBF);
+ return pBF;
}
}
EndEnumFilters
@@ -1342,7 +1342,7 @@ IBaseFilter* AppendFilter(IPin* pPin, IMoniker* pMoniker, IGraphBuilder* pGB) pGB->RemoveFilter(pBF);
} while (false);
- return(NULL);
+ return NULL;
}
CStringW GetFriendlyName(CStringW DisplayName)
@@ -2185,7 +2185,7 @@ CString ISO6391ToLanguage(LPCSTR code) }
return ret;
}
- return(_T(""));
+ return _T("");
}
CString ISO6392ToLanguage(LPCSTR code)
@@ -2349,7 +2349,7 @@ int MakeAACInitData(BYTE* pData, int profile, int freq, int channels) ret = 5;
}
- return(ret);
+ return ret;
}
BOOL CFileGetStatus(LPCTSTR lpszFileName, CFileStatus& status)
diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h index 4df6dea7b..3065c1a86 100644 --- a/src/DSUtil/DSUtil.h +++ b/src/DSUtil/DSUtil.h @@ -241,5 +241,5 @@ inline int LNKO(int a, int b) a -= b;
}
}
- return(a);
+ return a;
}
diff --git a/src/DSUtil/MediaTypes.cpp b/src/DSUtil/MediaTypes.cpp index 9e08e8f01..bd0004d15 100644 --- a/src/DSUtil/MediaTypes.cpp +++ b/src/DSUtil/MediaTypes.cpp @@ -333,7 +333,7 @@ CString VIH2String(int i) if (*vihs[i].subtype == MEDIASUBTYPE_I420) {
ret = _T("I420"); // FIXME
}
- return(ret);
+ return ret;
}
CString Subtype2String(const GUID& subtype)
@@ -345,7 +345,7 @@ CString Subtype2String(const GUID& subtype) if (subtype == MEDIASUBTYPE_I420) {
ret = _T("I420"); // FIXME
}
- return(ret);
+ return ret;
}
void CorrectMediaType(AM_MEDIA_TYPE* pmt)
diff --git a/src/DSUtil/text.cpp b/src/DSUtil/text.cpp index 5bded09c2..18803ec9a 100644 --- a/src/DSUtil/text.cpp +++ b/src/DSUtil/text.cpp @@ -87,7 +87,7 @@ CString Implode(CAtlList<CString>& sl, TCHAR sep) ret += sl.GetNext(pos);
if (pos) ret += sep;
}
- return(ret);
+ return ret;
}
*/
@@ -234,7 +234,7 @@ CString ExtractTag(CString tag, CMapStringToString& attribs, bool& fClosing) tag = i+1 < tag.GetLength() ? tag.Mid(i+1) : _T("");
}
- return(type);
+ return type;
}
CAtlList<CString>& MakeLower(CAtlList<CString>& sl)
diff --git a/src/DSUtil/text.h b/src/DSUtil/text.h index 840b41bef..893f3a761 100644 --- a/src/DSUtil/text.h +++ b/src/DSUtil/text.h @@ -77,7 +77,7 @@ T Implode(const CAtlList<T>& sl, SEP sep) ret += sep;
}
}
- return(ret);
+ return ret;
}
extern CString ExtractTag(CString tag, CMapStringToString& attribs, bool& fClosing);
diff --git a/src/DeCSS/VobDec.cpp b/src/DeCSS/VobDec.cpp index 6f50c944a..03f1d1370 100644 --- a/src/DeCSS/VobDec.cpp +++ b/src/DeCSS/VobDec.cpp @@ -139,7 +139,7 @@ bool CVobDec::FindKey(BYTE* buff) }
}
- return(m_fFoundKey);
+ return m_fFoundKey;
}
void CVobDec::Decrypt(BYTE* buff)
diff --git a/src/DeCSS/VobFile.cpp b/src/DeCSS/VobFile.cpp index e8d9b7c29..25d7142f4 100644 --- a/src/DeCSS/VobFile.cpp +++ b/src/DeCSS/VobFile.cpp @@ -224,7 +224,7 @@ bool CDVDSession::SendKey(DVD_KEY_TYPE KeyType, BYTE* pKeyData) key->KeyFlags = 0;
DWORD BytesReturned;
- return(!!DeviceIoControl(m_hDrive, IOCTL_DVD_SEND_KEY, key, key->KeyLength, NULL, 0, &BytesReturned, NULL));
+ return !!DeviceIoControl(m_hDrive, IOCTL_DVD_SEND_KEY, key, key->KeyLength, NULL, 0, &BytesReturned, NULL);
}
bool CDVDSession::ReadKey(DVD_KEY_TYPE KeyType, BYTE* pKeyData, int lba)
@@ -311,14 +311,14 @@ CLBAFile::~CLBAFile() bool CLBAFile::IsOpen()
{
- return(m_hFile != hFileNull);
+ return (m_hFile != hFileNull);
}
bool CLBAFile::Open(LPCTSTR path)
{
Close();
- return(!!CFile::Open(path, modeRead|typeBinary|shareDenyNone|osSequentialScan));
+ return !!CFile::Open(path, modeRead|typeBinary|shareDenyNone|osSequentialScan);
}
void CLBAFile::Close()
@@ -694,12 +694,12 @@ void CVobFile::Close() int CVobFile::GetLength()
{
- return(m_size - m_offset);
+ return (m_size - m_offset);
}
int CVobFile::GetPosition()
{
- return(m_pos - m_offset);
+ return (m_pos - m_offset);
}
int CVobFile::Seek(int pos)
@@ -716,7 +716,7 @@ int CVobFile::Seek(int pos) if(i != m_iFile && i < (int)m_files.GetCount()) {
if(!m_file.Open(m_files[i].fn)) {
- return(m_pos);
+ return m_pos;
}
m_iFile = i;
@@ -727,7 +727,7 @@ int CVobFile::Seek(int pos) pos -= (size - m_files[i].size);
m_file.Seek(pos);
- return(GetPosition());
+ return GetPosition();
}
bool CVobFile::Read(BYTE* buff)
diff --git a/src/SubPic/CoordGeom.cpp b/src/SubPic/CoordGeom.cpp index e2f4b1a28..3f1c0cc72 100644 --- a/src/SubPic/CoordGeom.cpp +++ b/src/SubPic/CoordGeom.cpp @@ -49,57 +49,57 @@ void Vector::Set(float x, float y, float z) float Vector::Length()
{
- return(sqrt(x * x + y * y + z * z));
+ return sqrt(x * x + y * y + z * z);
}
float Vector::Sum()
{
- return(x + y + z);
+ return (x + y + z);
}
float Vector::CrossSum()
{
- return(x*y + x*z + y*z);
+ return (x*y + x*z + y*z);
}
Vector Vector::Cross()
{
- return(Vector(x*y, x*z, y*z));
+ return Vector(x*y, x*z, y*z);
}
Vector Vector::Pow(float exp)
{
- return(exp == 0 ? Vector(1, 1, 1) : exp == 1 ? *this : Vector(pow(x, exp), pow(y, exp), pow(z, exp)));
+ return (exp == 0 ? Vector(1, 1, 1) : exp == 1 ? *this : Vector(pow(x, exp), pow(y, exp), pow(z, exp)));
}
Vector Vector::Unit()
{
float l = Length();
if (!l || l == 1) {
- return(*this);
+ return *this;
}
- return(*this * (1 / l));
+ return (*this * (1 / l));
}
Vector& Vector::Unitalize()
{
- return(*this = Unit());
+ return (*this = Unit());
}
Vector Vector::Normal(Vector& a, Vector& b)
{
- return((a - *this) % (b - a));
+ return ((a - *this) % (b - a));
}
float Vector::Angle(Vector& a, Vector& b)
{
- return(((a - *this).Unit()).Angle((b - *this).Unit()));
+ return (((a - *this).Unit()).Angle((b - *this).Unit()));
}
float Vector::Angle(Vector& a)
{
float angle = *this | a;
- return((angle > 1) ? 0 : (angle < -1) ? (float)M_PI : acos(angle));
+ return ((angle > 1) ? 0 : (angle < -1) ? (float)M_PI : acos(angle));
}
void Vector::Angle(float& u, float& v)
@@ -122,7 +122,7 @@ Vector Vector::Angle() Vector ret;
Angle(ret.x, ret.y);
ret.z = 0;
- return(ret);
+ return ret;
}
Vector& Vector::Min(Vector& a)
@@ -130,7 +130,7 @@ Vector& Vector::Min(Vector& a) x = (x < a.x) ? x : a.x;
y = (y < a.y) ? y : a.y;
z = (z < a.z) ? z : a.z;
- return(*this);
+ return *this;
}
Vector& Vector::Max(Vector& a)
@@ -138,17 +138,17 @@ Vector& Vector::Max(Vector& a) x = (x > a.x) ? x : a.x;
y = (y > a.y) ? y : a.y;
z = (z > a.z) ? z : a.z;
- return(*this);
+ return *this;
}
Vector Vector::Abs()
{
- return(Vector(fabs(x), fabs(y), fabs(z)));
+ return Vector(fabs(x), fabs(y), fabs(z));
}
Vector Vector::Reflect(Vector& n)
{
- return(n * ((-*this) | n) * 2 - (-*this));
+ return (n * ((-*this) | n) * 2 - (-*this));
}
Vector Vector::Refract(Vector& N, float nFront, float nBack, float* nOut)
@@ -167,7 +167,7 @@ Vector Vector::Refract(Vector& N, float nFront, float nBack, float* nOut) if (nOut) {
*nOut = N_dot_D >= 0 ? nFront : nBack;
}
- return((*this).Reflect(N));
+ return this->Reflect(N);
}
float N_dot_T = (float)sqrt(1.0 - len_sin_T);
@@ -179,7 +179,7 @@ Vector Vector::Refract(Vector& N, float nFront, float nBack, float* nOut) *nOut = N_dot_D >= 0 ? nBack : nFront;
}
- return(sin_T - (N * N_dot_T));
+ return (sin_T - (N * N_dot_T));
}
Vector Vector::Refract2(Vector& N, float nFrom, float nTo, float* nOut)
@@ -198,7 +198,7 @@ Vector Vector::Refract2(Vector& N, float nFrom, float nTo, float* nOut) if (nOut) {
*nOut = nFrom;
}
- return((*this).Reflect(N));
+ return this->Reflect(N);
}
float N_dot_T = (float)sqrt(1.0 - len_sin_T);
@@ -210,27 +210,27 @@ Vector Vector::Refract2(Vector& N, float nFrom, float nTo, float* nOut) *nOut = nTo;
}
- return(sin_T - (N * N_dot_T));
+ return (sin_T - (N * N_dot_T));
}
float Vector::operator | (Vector& v)
{
- return(x * v.x + y * v.y + z * v.z);
+ return (x * v.x + y * v.y + z * v.z);
}
Vector Vector::operator % (Vector& v)
{
- return(Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x));
+ return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x);
}
float& Vector::operator [] (size_t i)
{
- return(!i ? x : (i == 1) ? y : z);
+ return (!i ? x : (i == 1) ? y : z);
}
Vector Vector::operator - ()
{
- return(Vector(-x, -y, -z));
+ return Vector(-x, -y, -z);
}
bool Vector::operator == (const Vector& v) const
@@ -243,47 +243,47 @@ bool Vector::operator == (const Vector& v) const bool Vector::operator != (const Vector& v) const
{
- return((*this == v) ? false : true);
+ return ((*this == v) ? false : true);
}
Vector Vector::operator + (float d)
{
- return(Vector(x + d, y + d, z + d));
+ return Vector(x + d, y + d, z + d);
}
Vector Vector::operator + (Vector& v)
{
- return(Vector(x + v.x, y + v.y, z + v.z));
+ return Vector(x + v.x, y + v.y, z + v.z);
}
Vector Vector::operator - (float d)
{
- return(Vector(x - d, y - d, z - d));
+ return Vector(x - d, y - d, z - d);
}
Vector Vector::operator - (Vector& v)
{
- return(Vector(x - v.x, y - v.y, z - v.z));
+ return Vector(x - v.x, y - v.y, z - v.z);
}
Vector Vector::operator * (float d)
{
- return(Vector(x * d, y * d, z * d));
+ return Vector(x * d, y * d, z * d);
}
Vector Vector::operator * (Vector& v)
{
- return(Vector(x * v.x, y * v.y, z * v.z));
+ return Vector(x * v.x, y * v.y, z * v.z);
}
Vector Vector::operator / (float d)
{
- return(Vector(x / d, y / d, z / d));
+ return Vector(x / d, y / d, z / d);
}
Vector Vector::operator / (Vector& v)
{
- return(Vector(x / v.x, y / v.y, z / v.z));
+ return Vector(x / v.x, y / v.y, z / v.z);
}
Vector& Vector::operator += (float d)
@@ -291,7 +291,7 @@ Vector& Vector::operator += (float d) x += d;
y += d;
z += d;
- return(*this);
+ return *this;
}
Vector& Vector::operator += (Vector& v)
@@ -299,7 +299,7 @@ Vector& Vector::operator += (Vector& v) x += v.x;
y += v.y;
z += v.z;
- return(*this);
+ return *this;
}
Vector& Vector::operator -= (float d)
@@ -307,7 +307,7 @@ Vector& Vector::operator -= (float d) x -= d;
y -= d;
z -= d;
- return(*this);
+ return *this;
}
Vector& Vector::operator -= (Vector& v)
@@ -315,7 +315,7 @@ Vector& Vector::operator -= (Vector& v) x -= v.x;
y -= v.y;
z -= v.z;
- return(*this);
+ return *this;
}
Vector& Vector::operator *= (float d)
@@ -323,7 +323,7 @@ Vector& Vector::operator *= (float d) x *= d;
y *= d;
z *= d;
- return(*this);
+ return *this;
}
Vector& Vector::operator *= (Vector& v)
@@ -331,7 +331,7 @@ Vector& Vector::operator *= (Vector& v) x *= v.x;
y *= v.y;
z *= v.z;
- return(*this);
+ return *this;
}
Vector& Vector::operator /= (float d)
@@ -339,7 +339,7 @@ Vector& Vector::operator /= (float d) x /= d;
y /= d;
z /= d;
- return(*this);
+ return *this;
}
Vector& Vector::operator /= (Vector& v)
@@ -347,7 +347,7 @@ Vector& Vector::operator /= (Vector& v) x /= v.x;
y /= v.y;
z /= v.z;
- return(*this);
+ return *this;
}
//
@@ -370,20 +370,20 @@ float Ray::GetDistanceFrom(Ray& r) {
float t = (d | r.d);
if (IsZero(t)) {
- return(-BIGNUMBER); // plane is paralell to the ray, return -infinite
+ return -BIGNUMBER; // plane is paralell to the ray, return -infinite
}
- return(((r.p - p) | r.d) / t);
+ return (((r.p - p) | r.d) / t);
}
float Ray::GetDistanceFrom(Vector& v)
{
float t = ((v - p) | d) / (d | d);
- return(((p + d*t) - v).Length());
+ return ((p + d*t) - v).Length();
}
Vector Ray::operator [] (float t)
{
- return(p + d*t);
+ return (p + d*t);
}
//
@@ -491,7 +491,7 @@ Vector XForm::operator < (Vector& n) n.y * m.mat[1][2] +
n.z * m.mat[2][2];
- return(ret);
+ return ret;
}
Vector XForm::operator << (Vector& v)
@@ -511,12 +511,12 @@ Vector XForm::operator << (Vector& v) v.z * m.mat[2][2] +
m.mat[3][2];
- return(ret);
+ return ret;
}
Ray XForm::operator << (Ray& r)
{
- return(Ray(*this << r.p, *this < r.d));
+ return Ray(*this << r.p, *this < r.d);
}
//
@@ -565,10 +565,10 @@ XForm::Matrix XForm::Matrix::operator * (Matrix& m) }
}
- return(ret);
+ return ret;
}
XForm::Matrix& XForm::Matrix::operator *= (XForm::Matrix& m)
{
- return(*this = *this * m);
+ return (*this = *this * m);
}
diff --git a/src/SubPic/SubPicAllocatorPresenterImpl.cpp b/src/SubPic/SubPicAllocatorPresenterImpl.cpp index 031f41581..655080a16 100644 --- a/src/SubPic/SubPicAllocatorPresenterImpl.cpp +++ b/src/SubPic/SubPicAllocatorPresenterImpl.cpp @@ -101,7 +101,7 @@ STDMETHODIMP_(SIZE) CSubPicAllocatorPresenterImpl::GetVideoSize(bool fCorrectAR) VideoSize.cx = (LONGLONG(VideoSize.cy)*LONGLONG(m_AspectRatio.cx))/LONGLONG(m_AspectRatio.cy);
}
- return(VideoSize);
+ return VideoSize;
}
STDMETHODIMP_(void) CSubPicAllocatorPresenterImpl::SetPosition(RECT w, RECT v)
@@ -156,7 +156,7 @@ STDMETHODIMP_(int) CSubPicAllocatorPresenterImpl::GetSubtitleDelay() STDMETHODIMP_(double) CSubPicAllocatorPresenterImpl::GetFPS()
{
- return(m_fps);
+ return m_fps;
}
STDMETHODIMP_(void) CSubPicAllocatorPresenterImpl::SetSubPicProvider(ISubPicProvider* pSubPicProvider)
diff --git a/src/SubPic/SubPicImpl.cpp b/src/SubPic/SubPicImpl.cpp index 15c1a6551..30ca96ff0 100644 --- a/src/SubPic/SubPicImpl.cpp +++ b/src/SubPic/SubPicImpl.cpp @@ -49,28 +49,28 @@ STDMETHODIMP CSubPicImpl::NonDelegatingQueryInterface(REFIID riid, void** ppv) STDMETHODIMP_(REFERENCE_TIME) CSubPicImpl::GetStart()
{
- return(m_rtStart);
+ return m_rtStart;
}
STDMETHODIMP_(REFERENCE_TIME) CSubPicImpl::GetStop()
{
- return(m_rtStop);
+ return m_rtStop;
}
STDMETHODIMP_(REFERENCE_TIME) CSubPicImpl::GetSegmentStart()
{
if (m_rtSegmentStart) {
- return(m_rtSegmentStart);
+ return m_rtSegmentStart;
}
- return(m_rtStart);
+ return m_rtStart;
}
STDMETHODIMP_(REFERENCE_TIME) CSubPicImpl::GetSegmentStop()
{
if (m_rtSegmentStop) {
- return(m_rtSegmentStop);
+ return m_rtSegmentStop;
}
- return(m_rtStop);
+ return m_rtStop;
}
STDMETHODIMP_(void) CSubPicImpl::SetSegmentStart(REFERENCE_TIME rtStart)
@@ -256,7 +256,7 @@ STDMETHODIMP CSubPicAllocatorImpl::AllocDynamic(ISubPic** ppSubPic) STDMETHODIMP_(bool) CSubPicAllocatorImpl::IsDynamicWriteOnly()
{
- return(m_fDynamicWriteOnly);
+ return m_fDynamicWriteOnly;
}
STDMETHODIMP CSubPicAllocatorImpl::ChangeDevice(IUnknown* pDev)
diff --git a/src/SubPic/SubPicQueueImpl.cpp b/src/SubPic/SubPicQueueImpl.cpp index 7bbdce194..f4ccb82a4 100644 --- a/src/SubPic/SubPicQueueImpl.cpp +++ b/src/SubPic/SubPicQueueImpl.cpp @@ -273,7 +273,7 @@ STDMETHODIMP_(bool) CSubPicQueue::LookupSubPic(REFERENCE_TIME rtNow, CComPtr<ISu #endif
}
- return(!!ppSubPic);
+ return !!ppSubPic;
}
STDMETHODIMP CSubPicQueue::GetStats(int& nSubPics, REFERENCE_TIME& rtNow, REFERENCE_TIME& rtStart, REFERENCE_TIME& rtStop)
@@ -383,7 +383,7 @@ REFERENCE_TIME CSubPicQueue::UpdateQueue() }
}
- return(rtNow);
+ return rtNow;
}
int CSubPicQueue::GetQueueCount()
@@ -657,7 +657,7 @@ STDMETHODIMP_(bool) CSubPicQueueNoThread::LookupSubPic(REFERENCE_TIME rtNow, CCo }
}
- return(!!ppSubPic);
+ return !!ppSubPic;
}
STDMETHODIMP CSubPicQueueNoThread::GetStats(int& nSubPics, REFERENCE_TIME& rtNow, REFERENCE_TIME& rtStart, REFERENCE_TIME& rtStop)
diff --git a/src/Subtitles/DVBSub.cpp b/src/Subtitles/DVBSub.cpp index 5007a8953..e755222d4 100644 --- a/src/Subtitles/DVBSub.cpp +++ b/src/Subtitles/DVBSub.cpp @@ -142,7 +142,7 @@ HRESULT CDVBSub::AddToBuffer(BYTE* pData, int nSize) return S_FALSE;
}
-#define MARKER if (gb.BitRead(1) != 1) {ASSERT(0); return(E_FAIL);}
+#define MARKER if (gb.BitRead(1) != 1) {ASSERT(0); return E_FAIL;}
HRESULT CDVBSub::ParseSample(IMediaSample* pSample)
{
@@ -188,7 +188,7 @@ HRESULT CDVBSub::ParseSample(IMediaSample* pSample) BYTE b = (BYTE)gb.BitRead(4);
if (!(fdts && b == 3 || !fdts && b == 2)) {
ASSERT(0);
- return(E_FAIL);
+ return E_FAIL;
}
REFERENCE_TIME pts = 0;
diff --git a/src/Subtitles/GFN.cpp b/src/Subtitles/GFN.cpp index 79c374b36..5fe78babb 100644 --- a/src/Subtitles/GFN.cpp +++ b/src/Subtitles/GFN.cpp @@ -54,7 +54,7 @@ static TCHAR* ext[3][_countof(exttypestr)] = { static int SubFileCompare(const void* elem1, const void* elem2)
{
- return(((SubFile*)elem1)->fn.CompareNoCase(((SubFile*)elem2)->fn));
+ return ((SubFile*)elem1)->fn.CompareNoCase(((SubFile*)elem2)->fn);
}
void GetSubFileNames(CString fn, CAtlArray<CString>& paths, CAtlArray<SubFile>& ret)
diff --git a/src/Subtitles/RTS.cpp b/src/Subtitles/RTS.cpp index dd7b8f696..117ac3bb5 100644 --- a/src/Subtitles/RTS.cpp +++ b/src/Subtitles/RTS.cpp @@ -191,7 +191,7 @@ bool CWord::CreateOpaqueBox() m_pOpaqueBox = DNew CPolygon(style, str, 0, 0, 0, 1.0/8, 1.0/8, 0);
- return(!!m_pOpaqueBox);
+ return !!m_pOpaqueBox;
}
void CWord::Transform_C( CPoint &org )
@@ -430,7 +430,7 @@ CWord* CText::Copy() bool CText::Append(CWord* w)
{
- return(dynamic_cast<CText*>(w) && CWord::Append(w));
+ return (dynamic_cast<CText*>(w) && CWord::Append(w));
}
bool CText::CreatePath()
@@ -504,7 +504,7 @@ CPolygon::~CPolygon() CWord* CPolygon::Copy()
{
- return(DNew CPolygon(*this));
+ return (DNew CPolygon(*this));
}
bool CPolygon::Append(CWord* w)
@@ -525,12 +525,12 @@ bool CPolygon::GetLONG(CStringW& str, LONG& ret) LPWSTR s = (LPWSTR)(LPCWSTR)str, e = s;
ret = wcstol(str, &e, 10);
str.Delete(0,int(e-s));
- return(e > s);
+ return (e > s);
}
bool CPolygon::GetPOINT(CStringW& str, POINT& ret)
{
- return(GetLONG(str, ret.x) && GetLONG(str, ret.y));
+ return (GetLONG(str, ret.x) && GetLONG(str, ret.y));
}
bool CPolygon::ParseStr()
@@ -876,7 +876,7 @@ CRect CLine::PaintShadow(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPo CWord* w = GetNext(pos);
if (w->m_fLineBreak) {
- return(bbox); // should not happen since this class is just a line of text without any breaks
+ return bbox; // should not happen since this class is just a line of text without any breaks
}
if (w->m_style.shadowDepthX != 0 || w->m_style.shadowDepthY != 0) {
@@ -904,7 +904,7 @@ CRect CLine::PaintShadow(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPo p.x += w->m_width;
}
- return(bbox);
+ return bbox;
}
CRect CLine::PaintOutline(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha)
@@ -916,7 +916,7 @@ CRect CLine::PaintOutline(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CP CWord* w = GetNext(pos);
if (w->m_fLineBreak) {
- return(bbox); // should not happen since this class is just a line of text without any breaks
+ return bbox; // should not happen since this class is just a line of text without any breaks
}
if (w->m_style.outlineWidthX+w->m_style.outlineWidthY > 0 && !(w->m_ktype == 2 && time < w->m_kstart)) {
@@ -941,7 +941,7 @@ CRect CLine::PaintOutline(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CP p.x += w->m_width;
}
- return(bbox);
+ return bbox;
}
CRect CLine::PaintBody(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoint p, CPoint org, int time, int alpha)
@@ -953,7 +953,7 @@ CRect CLine::PaintBody(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoin CWord* w = GetNext(pos);
if (w->m_fLineBreak) {
- return(bbox); // should not happen since this class is just a line of text without any breaks
+ return bbox; // should not happen since this class is just a line of text without any breaks
}
int x = p.x;
@@ -1020,7 +1020,7 @@ CRect CLine::PaintBody(SubPicDesc& spd, CRect& clipRect, BYTE* pAlphaMask, CPoin p.x += w->m_width;
}
- return(bbox);
+ return bbox;
}
@@ -1078,7 +1078,7 @@ int CSubtitle::GetFullWidth() width += m_words.GetNext(pos)->m_width;
}
- return(width);
+ return width;
}
int CSubtitle::GetFullLineWidth(POSITION pos)
@@ -1093,7 +1093,7 @@ int CSubtitle::GetFullLineWidth(POSITION pos) width += w->m_width;
}
- return(width);
+ return width;
}
int CSubtitle::GetWrapWidth(POSITION pos, int maxwidth)
@@ -1127,18 +1127,18 @@ int CSubtitle::GetWrapWidth(POSITION pos, int maxwidth) maxwidth = INT_MAX;
}
- return(maxwidth);
+ return maxwidth;
}
CLine* CSubtitle::GetNextLine(POSITION& pos, int maxwidth)
{
if (pos == NULL) {
- return(NULL);
+ return NULL;
}
CLine* ret = DNew CLine();
if (!ret) {
- return(NULL);
+ return NULL;
}
ret->m_width = ret->m_ascent = ret->m_descent = ret->m_borderX = ret->m_borderY = 0;
@@ -1172,7 +1172,7 @@ CLine* CSubtitle::GetNextLine(POSITION& pos, int maxwidth) ret->Compact();
- return(ret);
+ return ret;
}
fEmptyLine = false;
@@ -1214,7 +1214,7 @@ CLine* CSubtitle::GetNextLine(POSITION& pos, int maxwidth) ret->Compact();
- return(ret);
+ return ret;
}
void CSubtitle::CreateClippers(CSize size)
@@ -1406,7 +1406,7 @@ CRect CScreenLayoutAllocator::AllocRect(CSubtitle* s, int segment, int entry, in while (pos) {
SubRect& sr = m_subrects.GetNext(pos);
if (sr.segment == segment && sr.entry == entry) {
- return(sr.r + CRect(0, -s->m_topborder, 0, -s->m_bottomborder));
+ return (sr.r + CRect(0, -s->m_topborder, 0, -s->m_bottomborder));
}
}
@@ -1444,7 +1444,7 @@ CRect CScreenLayoutAllocator::AllocRect(CSubtitle* s, int segment, int entry, in sr.layer = layer;
m_subrects.AddTail(sr);
- return(sr.r + CRect(0, -s->m_topborder, 0, -s->m_bottomborder));
+ return (sr.r + CRect(0, -s->m_topborder, 0, -s->m_bottomborder));
}
// CRenderedTextSubtitle
@@ -2151,7 +2151,7 @@ bool CRenderedTextSubtitle::ParseSSATag(CSubtitle* sub, CStringW str, STSStyle& }
}
- // return(nUnrecognizedTags < nTags);
+ // return (nUnrecognizedTags < nTags);
return true; // there are ppl keeping coments inside {}, lets make them happy now
}
@@ -2276,7 +2276,7 @@ double CRenderedTextSubtitle::CalcAnimation(double dst, double src, bool fAnimat // else dst = dst;
}
- return(dst);
+ return dst;
}
CSubtitle* CRenderedTextSubtitle::GetSubtitle(int entry)
@@ -2287,13 +2287,13 @@ CSubtitle* CRenderedTextSubtitle::GetSubtitle(int entry) delete sub;
sub = NULL;
} else {
- return(sub);
+ return sub;
}
}
sub = DNew CSubtitle();
if (!sub) {
- return(NULL);
+ return NULL;
}
CStringW str = GetStrW(entry, true);
@@ -2451,7 +2451,7 @@ CSubtitle* CRenderedTextSubtitle::GetSubtitle(int entry) m_subtitleCache[entry] = sub;
- return(sub);
+ return sub;
}
//
@@ -2479,7 +2479,7 @@ STDMETHODIMP_(POSITION) CRenderedTextSubtitle::GetStartPosition(REFERENCE_TIME r iSegment = 0;
}
- return(GetNext((POSITION)iSegment));
+ return GetNext((POSITION)iSegment);
}
STDMETHODIMP_(POSITION) CRenderedTextSubtitle::GetNext(POSITION pos)
@@ -2492,17 +2492,17 @@ STDMETHODIMP_(POSITION) CRenderedTextSubtitle::GetNext(POSITION pos) stss = GetSegment(iSegment);
}
- return(stss ? (POSITION)(iSegment+1) : NULL);
+ return (stss ? (POSITION)(iSegment+1) : NULL);
}
STDMETHODIMP_(REFERENCE_TIME) CRenderedTextSubtitle::GetStart(POSITION pos, double fps)
{
- return(10000i64 * TranslateSegmentStart((int)pos-1, fps));
+ return (10000i64 * TranslateSegmentStart((int)pos-1, fps));
}
STDMETHODIMP_(REFERENCE_TIME) CRenderedTextSubtitle::GetStop(POSITION pos, double fps)
{
- return(10000i64 * TranslateSegmentEnd((int)pos-1, fps));
+ return (10000i64 * TranslateSegmentEnd((int)pos-1, fps));
}
STDMETHODIMP_(bool) CRenderedTextSubtitle::IsAnimated(POSITION pos)
@@ -2520,7 +2520,7 @@ static int lscomp(const void* ls1, const void* ls2) if (!ret) {
ret = ((LSub*)ls1)->readorder - ((LSub*)ls2)->readorder;
}
- return(ret);
+ return ret;
}
STDMETHODIMP CRenderedTextSubtitle::Render(SubPicDesc& spd, REFERENCE_TIME rt, double fps, RECT& bbox)
diff --git a/src/Subtitles/Rasterizer.cpp b/src/Subtitles/Rasterizer.cpp index 9b625271e..289f9f696 100644 --- a/src/Subtitles/Rasterizer.cpp +++ b/src/Subtitles/Rasterizer.cpp @@ -1454,7 +1454,7 @@ CRect Rasterizer::Draw(SubPicDesc& spd, CRect& clipRect, byte* pAlphaMask, int x CRect bbox(0, 0, 0, 0);
if (!switchpts || !fBody && !fBorder) {
- return(bbox);
+ return bbox;
}
// Limit drawn area to intersection of rendering surface and rectangular clip area
@@ -1490,7 +1490,7 @@ CRect Rasterizer::Draw(SubPicDesc& spd, CRect& clipRect, byte* pAlphaMask, int x // Check if there's actually anything to render
if (w <= 0 || h <= 0) {
- return(bbox);
+ return bbox;
}
bbox.SetRect(x, y, x+w, y+h);
diff --git a/src/Subtitles/STS.cpp b/src/Subtitles/STS.cpp index 81da40940..a8de09ca2 100644 --- a/src/Subtitles/STS.cpp +++ b/src/Subtitles/STS.cpp @@ -252,7 +252,7 @@ static DWORD CharSetToCodePage(DWORD dwCharSet) int FindChar(CStringW str, WCHAR c, int pos, bool fUnicode, int CharSet)
{
if (fUnicode) {
- return(str.Find(c, pos));
+ return str.Find(c, pos);
}
int fStyleMod = 0;
@@ -267,7 +267,7 @@ int FindChar(CStringW str, WCHAR c, int pos, bool fUnicode, int CharSet) i++;
} else if (i >= pos) {
if (c2 == c) {
- return(i);
+ return i;
}
}
@@ -297,7 +297,7 @@ int FindChar(CStringA str, char c, int pos, bool fUnicode, int CharSet) {
ASSERT(!fUnicode);
- return(FindChar(AToW(str), c, pos, false, CharSet));
+ return FindChar(AToW(str), c, pos, false, CharSet);
}
*/
static CStringW ToMBCS(CStringW str, DWORD CharSet)
@@ -320,7 +320,7 @@ static CStringW ToMBCS(CStringW str, DWORD CharSet) }
}
- return(ret);
+ return ret;
}
static CStringW UnicodeSSAToMBCS(CStringW str, DWORD CharSet)
@@ -364,7 +364,7 @@ static CStringW UnicodeSSAToMBCS(CStringW str, DWORD CharSet) }
}
- return(ret);
+ return ret;
}
static CStringW ToUnicode(CStringW str, DWORD CharSet)
@@ -394,7 +394,7 @@ static CStringW ToUnicode(CStringW str, DWORD CharSet) ret += wc;
}
- return(ret);
+ return ret;
}
static CStringW MBCSSSAToUnicode(CStringW str, int CharSet)
@@ -440,7 +440,7 @@ static CStringW MBCSSSAToUnicode(CStringW str, int CharSet) }
}
- return(ret);
+ return ret;
}
CStringW RemoveSSATags(CStringW str, bool fUnicode, int CharSet)
@@ -462,7 +462,7 @@ CStringW RemoveSSATags(CStringW str, bool fUnicode, int CharSet) str.Replace(L"\\n", L"\n");
str.Replace(L"\\h", L" ");
- return(str);
+ return str;
}
//
@@ -476,7 +476,7 @@ static CStringW SubRipper2SSA(CStringW str, int CharSet) str.Replace(L"<u>", L"{\\u1}");
str.Replace(L"</u>", L"{\\u}");
- return(str);
+ return str;
}
static bool OpenSubRipper(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -529,7 +529,7 @@ static bool OpenSubRipper(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
}
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
static bool OpenOldSubRipper(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -562,7 +562,7 @@ static bool OpenOldSubRipper(CTextFile* file, CSimpleTextSubtitle& ret, int Char }
}
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
static bool OpenSubViewer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -672,14 +672,14 @@ static bool OpenSubViewer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
}
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
static STSStyle* GetMicroDVDStyle(CString str, int CharSet)
{
STSStyle* ret = DNew STSStyle();
if (!ret) {
- return(NULL);
+ return NULL;
}
for (int i = 0, len = str.GetLength(); i < len; i++) {
@@ -736,7 +736,7 @@ static STSStyle* GetMicroDVDStyle(CString str, int CharSet) i = k;
}
- return(ret);
+ return ret;
}
static CStringW MicroDVD2SSA(CStringW str, bool fUnicode, int CharSet)
@@ -885,7 +885,7 @@ static CStringW MicroDVD2SSA(CStringW str, bool fUnicode, int CharSet) ret += L"\\N";
}
- return(ret);
+ return ret;
}
static bool OpenMicroDVD(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -950,7 +950,7 @@ static bool OpenMicroDVD(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) }
}
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
static void ReplaceNoCase(CStringW& str, CStringW from, CStringW to)
@@ -1100,7 +1100,7 @@ static CStringW SMI2SSA(CStringW str, int CharSet) j = str.GetLength();
}
- return(str);
+ return str;
}
static bool OpenSami(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -1212,7 +1212,7 @@ static bool OpenVPlayer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) }
}
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
CStringW GetStr(CStringW& buff, char sep = ',') //throw(...)
@@ -1232,7 +1232,7 @@ CStringW GetStr(CStringW& buff, char sep = ',') //throw(...) buff = buff.Mid(pos+1);
}
- return(ret);
+ return ret;
}
int GetInt(CStringW& buff, char sep = ',') //throw(...)
@@ -1251,7 +1251,7 @@ int GetInt(CStringW& buff, char sep = ',') //throw(...) throw 1;
}
- return(ret);
+ return ret;
}
double GetFloat(CStringW& buff, char sep = ',') //throw(...)
@@ -1617,7 +1617,7 @@ static bool OpenSubStationAlpha(CTextFile* file, CSimpleTextSubtitle& ret, int C }
}
- return(fRet);
+ return fRet;
}
static bool OpenXombieSub(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -1767,7 +1767,7 @@ static bool OpenXombieSub(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
}
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
static bool OpenUSF(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -1825,7 +1825,7 @@ static bool OpenMPL2(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) }
}
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
typedef bool (*STSOpenFunct)(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet);
@@ -1883,7 +1883,7 @@ CSimpleTextSubtitle& CSimpleTextSubtitle::operator = (CSimpleTextSubtitle& sts) {
Copy(sts);
- return(*this);
+ return *this;
}
*/
@@ -2236,7 +2236,7 @@ int CSimpleTextSubtitle::SearchSub(int t, double fps) int i = 0, j = (int)GetCount() - 1, ret = -1;
if (j >= 0 && t >= TranslateStart(j, fps)) {
- return(j);
+ return j;
}
while (i < j) {
@@ -2281,7 +2281,7 @@ const STSSegment* CSimpleTextSubtitle::SearchSubs(int t, double fps, /*[out]*/ i if (iSegment) {
*iSegment = j;
}
- return(&m_segments[j]);
+ return &m_segments[j];
}
// after last segment
@@ -2289,7 +2289,7 @@ const STSSegment* CSimpleTextSubtitle::SearchSubs(int t, double fps, /*[out]*/ i if (iSegment) {
*iSegment = j+1;
}
- return(NULL);
+ return NULL;
}
// before first segment
@@ -2297,7 +2297,7 @@ const STSSegment* CSimpleTextSubtitle::SearchSubs(int t, double fps, /*[out]*/ i if (iSegment) {
*iSegment = -1;
}
- return(NULL);
+ return NULL;
}
while (i < j) {
@@ -2332,15 +2332,15 @@ 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
&& TranslateSegmentStart(ret, fps) <= t && t < TranslateSegmentEnd(ret, fps)) {
- return(&m_segments[ret]);
+ return &m_segments[ret];
}
- return(NULL);
+ return NULL;
}
int CSimpleTextSubtitle::TranslateStart(int i, double fps)
{
- return(i < 0 || GetCount() <= (size_t)i ? -1 :
+ return (i < 0 || GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? GetAt(i).start :
m_mode == FRAME ? (int)(GetAt(i).start*1000/fps) :
0);
@@ -2348,7 +2348,7 @@ int CSimpleTextSubtitle::TranslateStart(int i, double fps) int CSimpleTextSubtitle::TranslateEnd(int i, double fps)
{
- return(i < 0 || GetCount() <= (size_t)i ? -1 :
+ return (i < 0 || GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? GetAt(i).end :
m_mode == FRAME ? (int)(GetAt(i).end*1000/fps) :
0);
@@ -2356,7 +2356,7 @@ int CSimpleTextSubtitle::TranslateEnd(int i, double fps) int CSimpleTextSubtitle::TranslateSegmentStart(int i, double fps)
{
- return(i < 0 || m_segments.GetCount() <= (size_t)i ? -1 :
+ return (i < 0 || m_segments.GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? m_segments[i].start :
m_mode == FRAME ? (int)(m_segments[i].start*1000/fps) :
0);
@@ -2364,7 +2364,7 @@ int CSimpleTextSubtitle::TranslateSegmentStart(int i, double fps) int CSimpleTextSubtitle::TranslateSegmentEnd(int i, double fps)
{
- return(i < 0 || m_segments.GetCount() <= (size_t)i ? -1 :
+ return (i < 0 || m_segments.GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? m_segments[i].end :
m_mode == FRAME ? (int)(m_segments[i].end*1000/fps) :
0);
@@ -2424,12 +2424,12 @@ int CSimpleTextSubtitle::GetCharSet(int i) {
STSStyle stss;
GetStyle(i, stss);
- return(stss.charSet);
+ return stss.charSet;
}
bool CSimpleTextSubtitle::IsEntryUnicode(int i)
{
- return(GetAt(i).fUnicode);
+ return GetAt(i).fUnicode;
}
void CSimpleTextSubtitle::ConvertUnicode(int i, bool fUnicode)
@@ -2449,7 +2449,7 @@ void CSimpleTextSubtitle::ConvertUnicode(int i, bool fUnicode) CStringA CSimpleTextSubtitle::GetStrA(int i, bool fSSA)
{
- return(WToA(GetStrWA(i, fSSA)));
+ return WToA(GetStrWA(i, fSSA));
}
CStringW CSimpleTextSubtitle::GetStrW(int i, bool fSSA)
@@ -2467,7 +2467,7 @@ CStringW CSimpleTextSubtitle::GetStrW(int i, bool fSSA) str = RemoveSSATags(str, fUnicode, CharSet);
}
- return(str);
+ return str;
}
CStringW CSimpleTextSubtitle::GetStrWA(int i, bool fSSA)
@@ -2485,7 +2485,7 @@ CStringW CSimpleTextSubtitle::GetStrWA(int i, bool fSSA) str = RemoveSSATags(str, fUnicode, CharSet);
}
- return(str);
+ return str;
}
void CSimpleTextSubtitle::SetStr(int i, CStringA str, bool fUnicode)
@@ -2517,12 +2517,12 @@ static int comp1(const void* a, const void* b) if (ret == 0) {
ret = ((STSEntry*)a)->readorder - ((STSEntry*)b)->readorder;
}
- return(ret);
+ return ret;
}
static int comp2(const void* a, const void* b)
{
- return(((STSEntry*)a)->readorder - ((STSEntry*)b)->readorder);
+ return (((STSEntry*)a)->readorder - ((STSEntry*)b)->readorder);
}
void CSimpleTextSubtitle::Sort(bool fRestoreReadorder)
@@ -2533,7 +2533,7 @@ void CSimpleTextSubtitle::Sort(bool fRestoreReadorder) static int intcomp(const void* i1, const void* i2)
{
- return(*((int*)i1) - *((int*)i2));
+ return (*((int*)i1) - *((int*)i2));
}
void CSimpleTextSubtitle::CreateSegments()
@@ -2609,7 +2609,7 @@ bool CSimpleTextSubtitle::Open(CString fn, int CharSet, CString name) }
}
- return(Open(&f, CharSet, name));
+ return Open(&f, CharSet, name);
}
static int CountLines(CTextFile* f, ULONGLONG from, ULONGLONG to)
@@ -2620,7 +2620,7 @@ static int CountLines(CTextFile* f, ULONGLONG from, ULONGLONG to) while (f->ReadString(s) && f->GetPosition() < to) {
n++;
}
- return(n);
+ return n;
}
bool CSimpleTextSubtitle::Open(CTextFile* f, int CharSet, CString name)
@@ -2703,7 +2703,7 @@ bool CSimpleTextSubtitle::Open(BYTE* data, int len, int CharSet, CString name) _tremove(fn);
- return(fRet);
+ return fRet;
}
bool CSimpleTextSubtitle::SaveAs(CString fn, exttype et, double fps, CTextFile::enc e)
@@ -2982,7 +2982,7 @@ void STSStyle::SetDefault() bool STSStyle::operator == (STSStyle& s)
{
- return(marginRect == s.marginRect
+ return (marginRect == s.marginRect
&& scrAlignment == s.scrAlignment
&& borderStyle == s.borderStyle
&& outlineWidthX == s.outlineWidthX
@@ -3005,7 +3005,7 @@ bool STSStyle::operator == (STSStyle& s) bool STSStyle::IsFontStyleEqual(STSStyle& s)
{
- return(
+ return (
charSet == s.charSet
&& fontName == s.fontName
&& fontSize == s.fontSize
@@ -3050,7 +3050,7 @@ LOGFONTA& operator <<= (LOGFONTA& lfa, STSStyle& s) lfa.lfItalic = s.fItalic?-1:0;
lfa.lfUnderline = s.fUnderline?-1:0;
lfa.lfStrikeOut = s.fStrikeOut?-1:0;
- return(lfa);
+ return lfa;
}
LOGFONTW& operator <<= (LOGFONTW& lfw, STSStyle& s)
@@ -3064,7 +3064,7 @@ LOGFONTW& operator <<= (LOGFONTW& lfw, STSStyle& s) lfw.lfItalic = s.fItalic?-1:0;
lfw.lfUnderline = s.fUnderline?-1:0;
lfw.lfStrikeOut = s.fStrikeOut?-1:0;
- return(lfw);
+ return lfw;
}
CString& operator <<= (CString& style, STSStyle& s)
@@ -3083,7 +3083,7 @@ CString& operator <<= (CString& style, STSStyle& s) s.fontAngleZ, s.fontAngleX, s.fontAngleY,
s.relativeTo);
- return(style);
+ return style;
}
STSStyle& operator <<= (STSStyle& s, CString& style)
@@ -3130,7 +3130,7 @@ STSStyle& operator <<= (STSStyle& s, CString& style) s.SetDefault();
}
- return(s);
+ return s;
}
static bool OpenRealText(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
@@ -3167,5 +3167,5 @@ static bool OpenRealText(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) // std::wofstream wofsOut(L"c:/zzz.srt");
// RealTextParser.OutputSRT(wofsOut);
- return(ret.GetCount() > 0);
+ return (ret.GetCount() > 0);
}
diff --git a/src/Subtitles/TextFile.cpp b/src/Subtitles/TextFile.cpp index b5c8e0787..26c56a274 100644 --- a/src/Subtitles/TextFile.cpp +++ b/src/Subtitles/TextFile.cpp @@ -125,12 +125,12 @@ CString CTextFile::GetFilePath() const ULONGLONG CTextFile::GetPosition() const
{
- return(CStdioFile::GetPosition() - m_offset);
+ return (CStdioFile::GetPosition() - m_offset);
}
ULONGLONG CTextFile::GetLength() const
{
- return(CStdioFile::GetLength() - m_offset);
+ return (CStdioFile::GetLength() - m_offset);
}
ULONGLONG CTextFile::Seek(LONGLONG lOff, UINT nFrom)
@@ -154,7 +154,7 @@ ULONGLONG CTextFile::Seek(LONGLONG lOff, UINT nFrom) pos = CStdioFile::Seek(lOff, begin) - m_offset;
- return(pos);
+ return pos;
}
void CTextFile::WriteString(LPCSTR lpsz/*CStringA str*/)
@@ -301,7 +301,7 @@ BOOL CTextFile::ReadString(CStringA& str) }
}
- return(!fEOF);
+ return !fEOF;
}
BOOL CTextFile::ReadString(CStringW& str)
@@ -387,7 +387,7 @@ BOOL CTextFile::ReadString(CStringW& str) }
}
- return(!fEOF);
+ return !fEOF;
}
//
@@ -474,7 +474,7 @@ CStringW AToW(CStringA str) for (int i = 0, j = str.GetLength(); i < j; i++) {
ret += (WCHAR)(BYTE)str[i];
}
- return(ret);
+ return ret;
}
CStringA WToA(CStringW str)
@@ -483,7 +483,7 @@ CStringA WToA(CStringW str) for (int i = 0, j = str.GetLength(); i < j; i++) {
ret += (CHAR)(WORD)str[i];
}
- return(ret);
+ return ret;
}
CString AToT(CStringA str)
@@ -492,7 +492,7 @@ CString AToT(CStringA str) for (int i = 0, j = str.GetLength(); i < j; i++) {
ret += (TCHAR)(BYTE)str[i];
}
- return(ret);
+ return ret;
}
CString WToT(CStringW str)
@@ -501,7 +501,7 @@ CString WToT(CStringW str) for (int i = 0, j = str.GetLength(); i < j; i++) {
ret += (TCHAR)(WORD)str[i];
}
- return(ret);
+ return ret;
}
CStringA TToA(CString str)
@@ -514,7 +514,7 @@ CStringA TToA(CString str) #else
ret = str;
#endif
- return(ret);
+ return ret;
}
CStringW TToW(CString str)
@@ -527,5 +527,5 @@ CStringW TToW(CString str) ret += (WCHAR)(BYTE)str[i];
}
#endif
- return(ret);
+ return ret;
}
diff --git a/src/Subtitles/USFSubtitles.cpp b/src/Subtitles/USFSubtitles.cpp index 653d64a60..61fd5327d 100644 --- a/src/Subtitles/USFSubtitles.cpp +++ b/src/Subtitles/USFSubtitles.cpp @@ -54,7 +54,7 @@ static CStringW GetText(CComPtr<IXMLDOMNode> pNode) CComBSTR bstr;
pNode->get_text(&bstr);
- return(CStringW(bstr));
+ return CStringW(bstr);
}
static CStringW GetXML(CComPtr<IXMLDOMNode> pNode)
@@ -69,7 +69,7 @@ static CStringW GetXML(CComPtr<IXMLDOMNode> pNode) str.Delete(i);
}
}
- return(str);
+ return str;
}
static CStringW GetAttrib(CStringW attrib, CComPtr<IXMLDOMNode> pNode)
@@ -86,7 +86,7 @@ static CStringW GetAttrib(CStringW attrib, CComPtr<IXMLDOMNode> pNode) }
EndEnumAttribs
- return(ret);
+ return ret;
}
static int TimeToInt(CStringW str)
@@ -115,7 +115,7 @@ static int TimeToInt(CStringW str) time += t * mul[i];
}
- return(time);
+ return time;
}
static DWORD StringToDWORD(CStringW str)
@@ -124,9 +124,9 @@ static DWORD StringToDWORD(CStringW str) return 0;
}
if (str[0] == '#') {
- return((DWORD)wcstol(str, NULL, 16));
+ return (DWORD)wcstol(str, NULL, 16);
} else {
- return((DWORD)wcstol(str, NULL, 10));
+ return (DWORD)wcstol(str, NULL, 10);
}
}
@@ -146,7 +146,7 @@ static DWORD ColorToDWORD(CStringW str) ret = ((ret&0xff)<<16)|(ret&0xff00ff00)|((ret>>16)&0xff);
- return(ret);
+ return ret;
}
static int TranslateAlignment(CStringW alignment)
@@ -175,7 +175,7 @@ static int TranslateMargin(CStringW margin, int wndsize) }
}
- return(ret);
+ return ret;
}
////////////////
diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp index 17bd2d27c..7b940144d 100644 --- a/src/Subtitles/VobSubFile.cpp +++ b/src/Subtitles/VobSubFile.cpp @@ -191,11 +191,11 @@ int find_lang(unsigned short id) } else if (id > lang_tbl[mid].id) {
lo = mid + 1;
} else {
- return(mid);
+ return mid;
}
}
- return(id == lang_tbl[lo].id ? lo : 0);
+ return (id == lang_tbl[lo].id ? lo : 0);
}
CString FindLangFromId(WORD id)
@@ -718,7 +718,7 @@ bool CVobSubFile::ReadIdx(CString fn, int& ver) }
}
- return(!fError);
+ return !fError;
}
bool CVobSubFile::ReadSub(CString fn)
@@ -1141,7 +1141,7 @@ BYTE* CVobSubFile::GetPacket(int idx, int& packetsize, int& datasize, int iLang) }
} while (false);
- return(ret);
+ return ret;
}
bool CVobSubFile::GetFrame(int idx, int iLang)
@@ -1182,12 +1182,12 @@ bool CVobSubFile::GetFrame(int idx, int iLang) m_img.iLang = iLang;
}
- return(m_fOnlyShowForcedSubs ? m_img.fForced : true);
+ return (m_fOnlyShowForcedSubs ? m_img.fForced : true);
}
bool CVobSubFile::GetFrameByTimeStamp(__int64 time)
{
- return(GetFrame(GetFrameIdxByTimeStamp(time)));
+ return GetFrame(GetFrameIdxByTimeStamp(time));
}
int CVobSubFile::GetFrameIdxByTimeStamp(__int64 time)
@@ -1201,7 +1201,7 @@ int CVobSubFile::GetFrameIdxByTimeStamp(__int64 time) int i = 0, j = (int)sp.GetCount() - 1, ret = -1;
if (j >= 0 && time >= sp[j].start) {
- return(j);
+ return j;
}
while (i < j) {
@@ -1226,7 +1226,7 @@ int CVobSubFile::GetFrameIdxByTimeStamp(__int64 time) }
}
- return(ret);
+ return ret;
}
//
@@ -1254,34 +1254,34 @@ STDMETHODIMP_(POSITION) CVobSubFile::GetStartPosition(REFERENCE_TIME rt, double int i = GetFrameIdxByTimeStamp(rt);
if (!GetFrame(i)) {
- return(NULL);
+ return NULL;
}
if (rt >= (m_img.start + m_img.delay)) {
if (!GetFrame(++i)) {
- return(NULL);
+ return NULL;
}
}
- return((POSITION)(i+1));
+ return (POSITION)(i+1);
}
STDMETHODIMP_(POSITION) CVobSubFile::GetNext(POSITION pos)
{
int i = (int)pos;
- return(GetFrame(i) ? (POSITION)(i+1) : NULL);
+ return (GetFrame(i) ? (POSITION)(i+1) : NULL);
}
STDMETHODIMP_(REFERENCE_TIME) CVobSubFile::GetStart(POSITION pos, double fps)
{
int i = (int)pos-1;
- return(GetFrame(i) ? 10000i64*m_img.start : 0);
+ return (GetFrame(i) ? 10000i64*m_img.start : 0);
}
STDMETHODIMP_(REFERENCE_TIME) CVobSubFile::GetStop(POSITION pos, double fps)
{
int i = (int)pos-1;
- return(GetFrame(i) ? 10000i64*(m_img.start + m_img.delay) : 0);
+ return (GetFrame(i) ? 10000i64*(m_img.start + m_img.delay) : 0);
}
STDMETHODIMP_(bool) CVobSubFile::IsAnimated(POSITION pos)
@@ -1324,7 +1324,7 @@ STDMETHODIMP_(int) CVobSubFile::GetStreamCount() if (m_langs[i].subpos.GetCount()) {
iStreamCount++;
}
- return(iStreamCount);
+ return iStreamCount;
}
STDMETHODIMP CVobSubFile::GetStreamInfo(int iStream, WCHAR** ppName, LCID* pLCID)
@@ -1364,7 +1364,7 @@ STDMETHODIMP_(int) CVobSubFile::GetStream() iStream++;
}
- return(iStream);
+ return iStream;
}
STDMETHODIMP CVobSubFile::SetStream(int iStream)
@@ -1525,7 +1525,7 @@ bool CVobSubSettings::GetCustomPal(RGBQUAD* cuspal, int& tridx) {
memcpy(cuspal, m_cuspal, sizeof(RGBQUAD)*4);
tridx = m_tridx;
- return(m_fCustomPal);
+ return m_fCustomPal;
}
void CVobSubSettings::SetCustomPal(RGBQUAD* cuspal, int tridx)
@@ -1653,7 +1653,7 @@ static bool CompressFile(CString fn) CloseHandle(h);
}
- return(!!b);
+ return !!b;
}
bool CVobSubFile::SaveVobSub(CString fn)
@@ -2427,7 +2427,7 @@ STDMETHODIMP_(POSITION) CVobSubStream::GetStartPosition(REFERENCE_TIME rt, doubl break;
}
}
- return(pos);
+ return pos;
}
STDMETHODIMP_(POSITION) CVobSubStream::GetNext(POSITION pos)
diff --git a/src/Subtitles/VobSubFile.h b/src/Subtitles/VobSubFile.h index 4dbbd7f8c..e2c6f86dc 100644 --- a/src/Subtitles/VobSubFile.h +++ b/src/Subtitles/VobSubFile.h @@ -122,7 +122,7 @@ public: void Close();
CString GetTitle() {
- return(m_title);
+ return m_title;
}
DECLARE_IUNKNOWN
diff --git a/src/Subtitles/VobSubFileRipper.cpp b/src/Subtitles/VobSubFileRipper.cpp index 6128d50f4..102a9aa51 100644 --- a/src/Subtitles/VobSubFileRipper.cpp +++ b/src/Subtitles/VobSubFileRipper.cpp @@ -515,7 +515,7 @@ DWORD CVobSubFileRipper::ThreadProc() static int SubPosSortProc(const void* e1, const void* e2)
{
- return((int)(((CVobSubFile::SubPos*)e1)->start - ((CVobSubFile::SubPos*)e2)->start));
+ return ((int)(((CVobSubFile::SubPos*)e1)->start - ((CVobSubFile::SubPos*)e2)->start));
}
bool CVobSubFileRipper::Create()
diff --git a/src/Subtitles/VobSubImage.cpp b/src/Subtitles/VobSubImage.cpp index 7898afad1..f3c03f000 100644 --- a/src/Subtitles/VobSubImage.cpp +++ b/src/Subtitles/VobSubImage.cpp @@ -257,7 +257,7 @@ BYTE CVobSubImage::GetNibble(BYTE* lpData) BYTE ret = (lpData[off] >> (fAligned << 2)) & 0x0f;
fAligned = !fAligned;
off += fAligned;
- return(ret);
+ return ret;
}
void CVobSubImage::DrawPixels(CPoint p, int length, int colorid)
@@ -532,7 +532,7 @@ CAutoPtrList<COutline>* CVobSubImage::GetOutlineList(CPoint& topleft) }
}
- return(ol);
+ return ol;
}
static bool FitLine(COutline& o, int& start, int& end)
@@ -656,7 +656,7 @@ static bool FitLine(COutline& o, int& start, int& end) }
}
- return((maxerr-minerr)/l < 0.1 || err/l < 1.5 || (fabs(maxerr) < 8 && fabs(minerr) < 8));
+ return ((maxerr-minerr)/l < 0.1 || err/l < 1.5 || (fabs(maxerr) < 8 && fabs(minerr) < 8));
}
static int CalcPossibleCurveDegree(COutline& o)
@@ -715,17 +715,17 @@ static int CalcPossibleCurveDegree(COutline& o) }
}
- return(ret);
+ return ret;
}
inline double vectlen(CPoint p)
{
- return(sqrt((double)(p.x*p.x+p.y*p.y)));
+ return sqrt((double)(p.x*p.x+p.y*p.y));
}
inline double vectlen(CPoint p1, CPoint p2)
{
- return(vectlen(p2 - p1));
+ return vectlen(p2 - p1);
}
static bool MinMaxCosfi(COutline& o, double& mincf, double& maxcf) // not really cosfi, it is weighted by the distance from the segment endpoints, and since it would be always between -1 and 0, the applied sign marks side
@@ -925,7 +925,7 @@ int CVobSubImage::GrabSegment(int start, COutline& o, COutline& ret) ret.Add(endp, 0);
- return(last);
+ return last;
}
lastDir = o.da[cur];
@@ -934,11 +934,10 @@ int CVobSubImage::GrabSegment(int start, COutline& o, COutline& ret) ASSERT(0);
- return(start);
+ return start;
}
-void CVobSubImage::SplitOutline(COutline& o, COutline& o1, COutline& o2)
-{
+void CVobSubImage::SplitOutline(COutline& o, COutline& o1, COutline& o2){
size_t len = o.pa.GetCount();
if (len < 4) {
return;
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaFile.h b/src/filters/muxer/MatroskaMuxer/MatroskaFile.h index d86d7a715..1da6ad4b4 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaFile.h +++ b/src/filters/muxer/MatroskaMuxer/MatroskaFile.h @@ -64,7 +64,7 @@ namespace MatroskaWriter CBinary(DWORD id) : CID(id) {}
CBinary& operator = (const CBinary& b) {
Copy(b);
- return(*this);
+ return *this;
}
operator BYTE*() {
return (BYTE*)GetData();
@@ -72,9 +72,9 @@ namespace MatroskaWriter CBinary& Set(CStringA str) {
SetCount(str.GetLength()+1);
strcpy_s((char*)GetData(), str.GetLength() + 1, str);
- return(*this);
+ return *this;
}
- // CBinary& Set(CStringA str) {SetCount(str.GetLength()); memcpy((char*)GetData(), str, str.GetLength()); return(*this);}
+ // CBinary& Set(CStringA str) {SetCount(str.GetLength()); memcpy((char*)GetData(), str, str.GetLength()); return *this;}
QWORD Size(bool fWithHeader = true);
HRESULT Write(IStream* pStream);
};
@@ -85,7 +85,7 @@ namespace MatroskaWriter CANSI(DWORD id) : CID(id) {}
CANSI& Set(CStringA str) {
CStringA::operator = (str);
- return(*this);
+ return *this;
}
QWORD Size(bool fWithHeader = true);
HRESULT Write(IStream* pStream);
@@ -97,7 +97,7 @@ namespace MatroskaWriter CUTF8(DWORD id) : CID(id) {}
CUTF8& Set(CStringW str) {
CStringW::operator = (str);
- return(*this);
+ return *this;
}
QWORD Size(bool fWithHeader = true);
HRESULT Write(IStream* pStream);
@@ -119,7 +119,7 @@ namespace MatroskaWriter BASE& Set(T val) {
m_val = val;
m_fSet = true;
- return(*(BASE*)this);
+ return (*(BASE*)this);
}
void UnSet() {
m_fSet = false;
diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp index 3685d1be2..418be117e 100644 --- a/src/filters/parser/AviSplitter/AviFile.cpp +++ b/src/filters/parser/AviSplitter/AviFile.cpp @@ -332,7 +332,7 @@ REFERENCE_TIME CAviFile::GetTotalTime() t = 10i64*m_avih.dwMicroSecPerFrame*m_avih.dwTotalFrames;
}
- return(t);
+ return t;
}
HRESULT CAviFile::BuildIndex()
@@ -571,7 +571,7 @@ bool CAviFile::IsInterleaved(bool fKeepInfo) }
}
- return(fInterleaved);
+ return fInterleaved;
}
REFERENCE_TIME CAviFile::strm_t::GetRefTime(DWORD frame, UINT64 size)
@@ -630,7 +630,7 @@ DWORD CAviFile::strm_t::GetKeyFrame(REFERENCE_TIME rt) break;
}
}
- return(i);
+ return i;
}
DWORD CAviFile::strm_t::GetChunkSize(DWORD size)
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 9796727c3..c6bf35946 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -343,7 +343,7 @@ HRESULT CBaseSplitterOutputPin::DeliverBeginFlush() if (S_OK != hr) {
m_eEndFlush.Set();
}
- return(hr);
+ return hr;
}
HRESULT CBaseSplitterOutputPin::DeliverEndFlush()
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp index 5c439e209..9055df19e 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp @@ -286,7 +286,7 @@ UINT64 Segment::GetMasterTrack() ChapterAtom* ChapterAtom::FindChapterAtom(UINT64 id)
{
if (ChapterUID == id) {
- return(this);
+ return this;
}
POSITION pos = ChapterAtoms.GetHeadPosition();
@@ -297,7 +297,7 @@ ChapterAtom* ChapterAtom::FindChapterAtom(UINT64 id) }
}
- return(NULL);
+ return NULL;
}
ChapterAtom* Segment::FindChapterAtom(UINT64 id, int nEditionEntry)
@@ -316,7 +316,7 @@ ChapterAtom* Segment::FindChapterAtom(UINT64 id, int nEditionEntry) }
}
- return(NULL);
+ return NULL;
}
HRESULT Info::Parse(CMatroskaNode* pMN0)
@@ -1106,7 +1106,7 @@ HRESULT CANSI::Parse(CMatroskaNode* pMN) *this += c;
}
- return(len == -1 ? S_OK : E_FAIL);
+ return (len == -1 ? S_OK : E_FAIL);
}
HRESULT CUTF8::Parse(CMatroskaNode* pMN)
@@ -1445,7 +1445,7 @@ bool CMatroskaNode::Find(DWORD id, bool fSearch) }
}
- return(m_id == id);
+ return (m_id == id);
}
void CMatroskaNode::SeekTo(MatroskaReader::QWORD pos)
@@ -1502,7 +1502,7 @@ CAutoPtr<CMatroskaNode> CMatroskaNode::Copy() pNewNode->m_len.Set(m_len);
pNewNode->m_filepos = m_filepos;
pNewNode->m_start = m_start;
- return(pNewNode);
+ return pNewNode;
}
CAutoPtr<CMatroskaNode> CMatroskaNode::GetFirstBlock()
@@ -1565,7 +1565,7 @@ bool CMatroskaNode::Resync() case 0x1043A770: // Chapters
case 0x1254C367: // Tags
SeekTo(GetPos()-4);
- return(SUCCEEDED(Parse()));
+ return SUCCEEDED(Parse());
default:
SeekTo(GetPos()-3);
break;
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.h b/src/filters/parser/MatroskaSplitter/MatroskaFile.h index 2252a00d6..b9335d7c6 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaFile.h +++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.h @@ -55,12 +55,12 @@ namespace MatroskaReader BASE& operator = (const BASE& v) {
m_val = v.m_val;
m_fValid = true;
- return(*this);
+ return *this;
}
BASE& operator = (T val) {
m_val = val;
m_fValid = true;
- return(*this);
+ return *this;
}
operator T() const {
return m_val;
@@ -68,7 +68,7 @@ namespace MatroskaReader BASE& Set(T val) {
m_val = val;
m_fValid = true;
- return(*(BASE*)this);
+ return (*(BASE*)this);
}
bool IsValid() const {
return m_fValid;
@@ -117,7 +117,7 @@ namespace MatroskaReader public:
CBinary& operator = (const CBinary& b) {
Copy(b);
- return(*this);
+ return *this;
}
CStringA ToString() {
return CStringA((LPCSTR)GetData(), GetCount());
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index d56e555ef..fc161b4fb 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -97,7 +97,7 @@ public: }
bool hasbits(int cnt) {
int pos = m_pos+cnt;
- return(pos >= 0 && pos < m_len);
+ return (pos >= 0 && pos < m_len);
}
unsigned int showbits(int cnt) { // a bit unclean, but works and can read backwards too! :P
if (!hasbits(cnt)) {
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 201717431..9668d7999 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -2553,7 +2553,7 @@ HRESULT CRealAudioDecoder::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/reader/VTSReader/VTSReader.cpp b/src/filters/reader/VTSReader/VTSReader.cpp index 45d7490b1..e6573878c 100644 --- a/src/filters/reader/VTSReader/VTSReader.cpp +++ b/src/filters/reader/VTSReader/VTSReader.cpp @@ -210,7 +210,7 @@ CVTSStream::~CVTSStream() bool CVTSStream::Load(const WCHAR* fnw)
{
CAtlList<CString> sl;
- return(m_vob && m_vob->Open(CString(fnw), sl) /*&& m_vob->IsDVD()*/);
+ return (m_vob && m_vob->Open(CString(fnw), sl) /*&& m_vob->IsDVD()*/);
}
HRESULT CVTSStream::SetPointer(LONGLONG llPos)
@@ -261,7 +261,7 @@ LONGLONG CVTSStream::Size(LONGLONG* pSizeAvailable) if (pSizeAvailable) {
*pSizeAvailable = len;
}
- return(len);
+ return len;
}
DWORD CVTSStream::Alignment()
diff --git a/src/filters/source/D2VSource/MPEG2Dec.cpp b/src/filters/source/D2VSource/MPEG2Dec.cpp index 980eda9b4..3c4094357 100644 --- a/src/filters/source/D2VSource/MPEG2Dec.cpp +++ b/src/filters/source/D2VSource/MPEG2Dec.cpp @@ -1115,7 +1115,7 @@ int CMPEG2Dec::extra_bit_information() Byte_Count ++;
}
- return(Byte_Count);
+ return Byte_Count;
}
/* Copyright extension */
@@ -3762,7 +3762,7 @@ static char* myfgets(char* buff, int len, FILE* file) ret = fgets(buff, len, file);
}
- return(ret);
+ return ret;
}
int CMPEG2Dec::Open(LPCTSTR path, DstFormat dstFormat)
diff --git a/src/filters/source/FLICSource/FLICSource.cpp b/src/filters/source/FLICSource/FLICSource.cpp index a5635f822..733294321 100644 --- a/src/filters/source/FLICSource/FLICSource.cpp +++ b/src/filters/source/FLICSource/FLICSource.cpp @@ -652,7 +652,7 @@ bool CFLICStream::_colorchunk(bool f64) }
}
- return(nColorsUpdated == 256);
+ return (nColorsUpdated == 256);
}
void CFLICStream::_brunchunk()
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp index f2be74206..6e60c9236 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp @@ -74,7 +74,7 @@ typedef struct { channels = s_channels[(buff[3]>>6)&3];
framesize = freq ? ((((version&1)?144:72) * bitrate / freq) + ((buff[2]>>1)&1)) : 0;
- return(sync == 0xfff && layer == 3 && bitrate != 0 && freq != 0);
+ return (sync == 0xfff && layer == 3 && bitrate != 0 && freq != 0);
}
} mp3hdr;
@@ -318,13 +318,13 @@ LONGLONG CShoutcastStream::GetBufferFullness() return 0;
}
LONGLONG ret = 100i64*(m_queue.GetTail().rtStart - m_queue.GetHead().rtStart) / AVGBUFFERLENGTH;
- return(min(ret, 100));
+ return min(ret, 100);
}
CString CShoutcastStream::GetTitle()
{
CAutoLock cAutoLock(&m_queue);
- return(m_title);
+ return m_title;
}
HRESULT CShoutcastStream::DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties)
@@ -698,7 +698,7 @@ bool CShoutcastStream::CShoutcastSocket::Connect(CUrl& url) m_metaint = metaint;
m_nBytesRead = 0;
- return(FindSync());
+ return FindSync();
}
bool CShoutcastStream::CShoutcastSocket::FindSync()
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index 5bfcc754d..f720b6b3b 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -439,7 +439,7 @@ STDMETHODIMP CStreamSwitcherInputPin::DynamicDisconnect() STDMETHODIMP_(bool) CStreamSwitcherInputPin::IsActive()
{
// TODO: lock onto something here
- return(this == (static_cast<CStreamSwitcherFilter*>(m_pFilter))->GetInputPin());
+ return (this == (static_cast<CStreamSwitcherFilter*>(m_pFilter))->GetInputPin());
}
//
@@ -1033,7 +1033,7 @@ HRESULT CStreamSwitcherOutputPin::DecideBufferSize(IMemAllocator* pAllocator, AL return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
@@ -1221,7 +1221,7 @@ int CStreamSwitcherFilter::GetPinCount() {
CAutoLock cAutoLock(&m_csPins);
- return(1 + (int)m_pInputs.GetCount());
+ return (1 + (int)m_pInputs.GetCount());
}
CBasePin* CStreamSwitcherFilter::GetPin(int n)
@@ -1250,7 +1250,7 @@ int CStreamSwitcherFilter::GetConnectedInputPinCount() }
}
- return(nConnected);
+ return nConnected;
}
CStreamSwitcherInputPin* CStreamSwitcherFilter::GetConnectedInputPin(int n)
@@ -1261,7 +1261,7 @@ CStreamSwitcherInputPin* CStreamSwitcherFilter::GetConnectedInputPin(int n) CStreamSwitcherInputPin* pPin = m_pInputs.GetNext(pos);
if (pPin->IsConnected()) {
if (n == 0) {
- return(pPin);
+ return pPin;
}
n--;
}
diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp index 0c1309ade..c09432751 100644 --- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp +++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.cpp @@ -402,7 +402,7 @@ HRESULT CAVI2AC3Filter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PR return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/transform/BufferFilter/BufferFilter.cpp b/src/filters/transform/BufferFilter/BufferFilter.cpp index ec2526e5b..70602083d 100644 --- a/src/filters/transform/BufferFilter/BufferFilter.cpp +++ b/src/filters/transform/BufferFilter/BufferFilter.cpp @@ -130,19 +130,19 @@ STDMETHODIMP CBufferFilter::SetBuffers(int nBuffers) STDMETHODIMP_(int) CBufferFilter::GetBuffers()
{
- return(m_nSamplesToBuffer);
+ return m_nSamplesToBuffer;
}
STDMETHODIMP_(int) CBufferFilter::GetFreeBuffers()
{
CBufferFilterOutputPin* pPin = static_cast<CBufferFilterOutputPin*>(m_pOutput);
- return(pPin && pPin->m_pOutputQueue ? (m_nSamplesToBuffer - pPin->m_pOutputQueue->GetQueueCount()) : 0);
+ return (pPin && pPin->m_pOutputQueue ? (m_nSamplesToBuffer - pPin->m_pOutputQueue->GetQueueCount()) : 0);
}
STDMETHODIMP CBufferFilter::SetPriority(DWORD dwPriority)
{
CBufferFilterOutputPin* pPin = static_cast<CBufferFilterOutputPin*>(m_pOutput);
- return(pPin && pPin->m_pOutputQueue ? (pPin->m_pOutputQueue->SetPriority(dwPriority) ? S_OK : E_FAIL) : E_UNEXPECTED);
+ return (pPin && pPin->m_pOutputQueue ? (pPin->m_pOutputQueue->SetPriority(dwPriority) ? S_OK : E_FAIL) : E_UNEXPECTED);
}
//
@@ -269,7 +269,7 @@ HRESULT CBufferFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PRO return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp b/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp index 2431a61e5..f8d02d3a1 100644 --- a/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp +++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.cpp @@ -222,7 +222,7 @@ HRESULT CDeCSSFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PROP return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp index 90476e616..7a7dfa48f 100644 --- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp @@ -632,7 +632,7 @@ bool CDirectVobSubFilter::AdjustFrameSize(CSize& s) s.cy = (s.cy + 1) & ~1;
}
- return(fRet);
+ return fRet;
}
STDMETHODIMP CDirectVobSubFilter::Count(DWORD* pcStreams)
@@ -683,7 +683,7 @@ int CDirectVobSubFilter::FindPreferedLanguage(bool fHideToo) CoTaskMemFree(pName);
if (!l.CompareNoCase(lang)) {
- return(ret);
+ return ret;
}
}
}
@@ -1145,13 +1145,13 @@ STDMETHODIMP CDirectVobSubFilter::HasConfigDialog(int iSelected) }
return E_FAIL;
// TODO: temporally disabled since we don't have a new textsub/vobsub editor dlg for dvs yet
- // return(nLangs >= 0 && iSelected < nLangs ? S_OK : E_FAIL);
+ // return (nLangs >= 0 && iSelected < nLangs ? S_OK : E_FAIL);
}
STDMETHODIMP CDirectVobSubFilter::ShowConfigDialog(int iSelected, HWND hWndParent)
{
// TODO: temporally disabled since we don't have a new textsub/vobsub editor dlg for dvs yet
- return(E_FAIL);
+ return E_FAIL;
}
///////////////////////////////////////////////////////////////////////////
@@ -1176,7 +1176,7 @@ HRESULT CDirectVobSubFilter2::CheckConnect(PIN_DIRECTION dir, IPin* pPin) CFilterInfo fi;
if (SUCCEEDED(pi.pFilter->QueryFilterInfo(&fi))
&& !_wcsnicmp(fi.achName, L"Overlay Mixer", 13)) {
- return(E_FAIL);
+ return E_FAIL;
}
} else {
}
@@ -1392,7 +1392,7 @@ bool CDirectVobSubFilter2::ShouldWeAutoload(IFilterGraph* pGraph) }
}
- return(fRet);
+ return fRet;
}
void CDirectVobSubFilter2::GetRidOfInternalScriptRenderer()
@@ -1484,7 +1484,7 @@ bool CDirectVobSubFilter::Open() m_frd.RefreshEvent.Set();
- return(m_pSubStreams.GetCount() > 0);
+ return (m_pSubStreams.GetCount() > 0);
}
void CDirectVobSubFilter::UpdateSubtitle(bool fApplyDefStyle)
diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp index a4ff114b8..8678c00f0 100644 --- a/src/filters/transform/VSFilter/Systray.cpp +++ b/src/filters/transform/VSFilter/Systray.cpp @@ -392,5 +392,5 @@ static TCHAR* CallPPage(IFilterGraph* pGraph, int idx, HWND hWnd) free(wstr);
}
- return(ret);
+ return ret;
}
diff --git a/src/filters/transform/VSFilter/plugins.cpp b/src/filters/transform/VSFilter/plugins.cpp index 85440c8b6..7a9dbecea 100644 --- a/src/filters/transform/VSFilter/plugins.cpp +++ b/src/filters/transform/VSFilter/plugins.cpp @@ -206,7 +206,7 @@ namespace Plugin }
int GetCharSet() {
- return(m_CharSet);
+ return m_CharSet;
}
bool Open(CString fn, int CharSet = DEFAULT_CHARSET) {
@@ -806,7 +806,7 @@ namespace Plugin Render(dst, (REFERENCE_TIME)(10000000i64 * n / fps), fps);
- return(frame);
+ return frame;
}
};
@@ -824,7 +824,7 @@ namespace Plugin AVSValue __cdecl VobSubCreateS(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
+ return (DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
}
class CTextSubAvisynthFilter : public CTextSubFilter, public CAvisynthFilter
@@ -840,17 +840,17 @@ namespace Plugin AVSValue __cdecl TextSubCreateS(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString()));
+ return (DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString()));
}
AVSValue __cdecl TextSubCreateSI(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt()));
+ return (DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt()));
}
AVSValue __cdecl TextSubCreateSIF(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt(), (float)args[3].AsFloat()));
+ return (DNew CTextSubAvisynthFilter(args[0].AsClip(), env, args[1].AsString(), args[2].AsInt(), (float)args[3].AsFloat()));
}
AVSValue __cdecl MaskSubCreateSIIFI(AVSValue args, void* user_data, IScriptEnvironment* env)
@@ -873,7 +873,7 @@ namespace Plugin };
AVSValue clip(env->Invoke("Blackness",value,nom));
env->SetVar(env->SaveString("RGBA"),true);
- return(DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
+ return (DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
}
extern "C" __declspec(dllexport) const char* __stdcall AvisynthPluginInit(IScriptEnvironment* env)
@@ -884,7 +884,7 @@ namespace Plugin env->AddFunction("TextSub", "csif", TextSubCreateSIF, 0);
env->AddFunction("MaskSub", "siifi", MaskSubCreateSIIFI, 0);
env->SetVar(env->SaveString("RGBA"),false);
- return(NULL);
+ return NULL;
}
}
@@ -935,7 +935,7 @@ namespace Plugin Render(dst, timestamp, fps);
- return(frame);
+ return frame;
}
};
@@ -953,7 +953,7 @@ namespace Plugin AVSValue __cdecl VobSubCreateS(AVSValue args, void* user_data, IScriptEnvironment* env)
{
- return(DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
+ return (DNew CVobSubAvisynthFilter(args[0].AsClip(), args[1].AsString(), env));
}
class CTextSubAvisynthFilter : public CTextSubFilter, public CAvisynthFilter
@@ -976,7 +976,7 @@ namespace Plugin vfr = GetVFRTranslator(args[4].AsString());
}
- return(DNew CTextSubAvisynthFilter(
+ return (DNew CTextSubAvisynthFilter(
args[0].AsClip(),
env,
args[1].AsString(),
@@ -988,7 +988,7 @@ namespace Plugin AVSValue __cdecl TextSubSwapUV(AVSValue args, void* user_data, IScriptEnvironment* env)
{
s_fSwapUV = args[0].AsBool(false);
- return(AVSValue());
+ return AVSValue();
}
AVSValue __cdecl MaskSubCreate(AVSValue args, void* user_data, IScriptEnvironment* env)/*SIIFI*/
@@ -1021,8 +1021,8 @@ namespace Plugin };
AVSValue clip(env->Invoke("Blackness",value,nom));
env->SetVar(env->SaveString("RGBA"),true);
- //return(DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
- return(DNew CTextSubAvisynthFilter(
+ //return (DNew CTextSubAvisynthFilter(clip.AsClip(), env, args[0].AsString()));
+ return (DNew CTextSubAvisynthFilter(
clip.AsClip(),
env,
args[0].AsString(),
@@ -1038,7 +1038,7 @@ namespace Plugin env->AddFunction("TextSubSwapUV", "b", TextSubSwapUV, 0);
env->AddFunction("MaskSub", "[file]s[width]i[height]i[fps]f[length]i[charset]i[vfr]s", MaskSubCreate, 0);
env->SetVar(env->SaveString("RGBA"),false);
- return(NULL);
+ return NULL;
}
}
diff --git a/src/mpc-hc/AppSettings.h b/src/mpc-hc/AppSettings.h index 59469b67a..b88d0db4a 100644 --- a/src/mpc-hc/AppSettings.h +++ b/src/mpc-hc/AppSettings.h @@ -230,7 +230,7 @@ public: }
bool operator == (const wmcmd& wc) const {
- return(cmd > 0 && cmd == wc.cmd);
+ return (cmd > 0 && cmd == wc.cmd);
}
CString GetName() const {
@@ -272,7 +272,7 @@ public: void SetHWND(HWND hWnd);
void Connect(CString addr);
void DisConnect();
- int GetStatus() const { return(m_nStatus); }
+ int GetStatus() const { return m_nStatus; }
};
class CWinLircClient : public CRemoteCtrlClient
diff --git a/src/mpc-hc/ChildView.h b/src/mpc-hc/ChildView.h index f28b6e7b9..71e1c31a4 100644 --- a/src/mpc-hc/ChildView.h +++ b/src/mpc-hc/ChildView.h @@ -45,7 +45,7 @@ public: public:
void SetVideoRect(CRect r = CRect(0,0,0,0));
CRect GetVideoRect() const {
- return(m_vrect);
+ return m_vrect;
}
void LoadLogo();
diff --git a/src/mpc-hc/ComPropertySheet.cpp b/src/mpc-hc/ComPropertySheet.cpp index 50d2d3f7b..0a841d14a 100644 --- a/src/mpc-hc/ComPropertySheet.cpp +++ b/src/mpc-hc/ComPropertySheet.cpp @@ -142,7 +142,7 @@ int CComPropertySheet::AddPages(ISpecifyPropertyPages* pSPP) }
lpUnk->Release();
- return(nPages);
+ return nPages;
}
bool CComPropertySheet::AddPage(IPropertyPage* pPage, IUnknown* pUnk)
diff --git a/src/mpc-hc/FloatEdit.cpp b/src/mpc-hc/FloatEdit.cpp index 753fe7072..9613e7993 100644 --- a/src/mpc-hc/FloatEdit.cpp +++ b/src/mpc-hc/FloatEdit.cpp @@ -33,7 +33,7 @@ bool CFloatEdit::GetFloat(float& f) {
CString s;
GetWindowText(s);
- return(_stscanf_s(s, _T("%f"), &f) == 1);
+ return (_stscanf_s(s, _T("%f"), &f) == 1);
}
double CFloatEdit::operator = (double d)
@@ -41,7 +41,7 @@ double CFloatEdit::operator = (double d) CString s;
s.Format(_T("%.4f"), d);
SetWindowText(s);
- return(d);
+ return d;
}
CFloatEdit::operator double()
@@ -49,7 +49,7 @@ CFloatEdit::operator double() CString s;
GetWindowText(s);
float f = 0;
- return(_stscanf_s(s, _T("%f"), &f) == 1 ? f : 0);
+ return (_stscanf_s(s, _T("%f"), &f) == 1 ? f : 0);
}
BEGIN_MESSAGE_MAP(CFloatEdit, CEdit)
@@ -122,7 +122,7 @@ bool CHexEdit::GetDWORD(DWORD& dw) {
CString s;
GetWindowText(s);
- return(_stscanf_s(s, _T("%x"), &dw) == 1);
+ return (_stscanf_s(s, _T("%x"), &dw) == 1);
}
DWORD CHexEdit::operator = (DWORD dw)
@@ -130,7 +130,7 @@ DWORD CHexEdit::operator = (DWORD dw) CString s;
s.Format(_T("%08x"), dw);
SetWindowText(s);
- return(dw);
+ return dw;
}
CHexEdit::operator DWORD()
@@ -138,7 +138,7 @@ CHexEdit::operator DWORD() CString s;
GetWindowText(s);
DWORD dw;
- return(_stscanf_s(s, _T("%x"), &dw) == 1 ? dw : 0);
+ return (_stscanf_s(s, _T("%x"), &dw) == 1 ? dw : 0);
}
BEGIN_MESSAGE_MAP(CHexEdit, CEdit)
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 37e93f580..026eeab56 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -138,7 +138,7 @@ public: return S_OK;
}
STDMETHODIMP_(REFERENCE_TIME) GetTime() {
- return(m_rt);
+ return m_rt;
}
};
@@ -7340,7 +7340,7 @@ static int rangebsearch(REFERENCE_TIME val, CAtlArray<REFERENCE_TIME>& rta) int i = 0, j = rta.GetCount() - 1, ret = -1;
if (j >= 0 && val >= rta[j]) {
- return(j);
+ return j;
}
while (i < j) {
@@ -7364,7 +7364,7 @@ static int rangebsearch(REFERENCE_TIME val, CAtlArray<REFERENCE_TIME>& rta) }
}
- return(ret);
+ return ret;
}
void CMainFrame::OnPlaySeekKey(UINT nID)
@@ -9451,7 +9451,7 @@ OAFilterState CMainFrame::GetMediaState() const if (m_iMediaLoadState == MLS_LOADED) {
pMC->GetState(0, &ret);
}
- return(ret);
+ return ret;
}
void CMainFrame::SetPlaybackMode(int iNewStatus)
@@ -11920,7 +11920,7 @@ bool CMainFrame::OpenMediaPrivate(CAutoPtr<OpenMediaData> pOMD) }
m_bIsBDPlay = false;
- return(err.IsEmpty());
+ return err.IsEmpty();
}
void CMainFrame::CloseMediaPrivate()
@@ -12835,7 +12835,7 @@ static CString StripPath(CString path) CString p = path;
p.Replace('\\', '/');
p = p.Mid(p.ReverseFind('/')+1);
- return(p.IsEmpty() ? path : p);
+ return (p.IsEmpty() ? path : p);
}
void CMainFrame::SetupNavChaptersSubMenu()
@@ -13564,7 +13564,7 @@ bool CMainFrame::LoadSubtitle(CString fn, ISubStream **actualStream) }
}
- return(!!pSubStream);
+ return !!pSubStream;
}
void CMainFrame::UpdateSubtitle(bool fDisplayMessage, bool fApplyDefStyle)
@@ -13754,14 +13754,14 @@ void CMainFrame::SetAudioTrackIdx(int index) REFERENCE_TIME CMainFrame::GetPos() const
{
- return(m_iMediaLoadState == MLS_LOADED ? m_wndSeekBar.GetPos() : 0);
+ return (m_iMediaLoadState == MLS_LOADED ? m_wndSeekBar.GetPos() : 0);
}
REFERENCE_TIME CMainFrame::GetDur() const
{
__int64 start, stop;
m_wndSeekBar.GetRange(start, stop);
- return(m_iMediaLoadState == MLS_LOADED ? stop : 0);
+ return (m_iMediaLoadState == MLS_LOADED ? stop : 0);
}
void CMainFrame::SeekTo(REFERENCE_TIME rtPos, bool fSeekToKeyFrame)
diff --git a/src/mpc-hc/MainFrm.h b/src/mpc-hc/MainFrm.h index 6a49e1492..f91d019cc 100644 --- a/src/mpc-hc/MainFrm.h +++ b/src/mpc-hc/MainFrm.h @@ -365,22 +365,22 @@ public: CComPtr<ISyncClock> m_pSyncClock;
bool IsFrameLessWindow() const {
- return(m_fFullScreen || AfxGetAppSettings().iCaptionMenuMode==MODE_BORDERLESS);
+ return (m_fFullScreen || AfxGetAppSettings().iCaptionMenuMode==MODE_BORDERLESS);
}
bool IsCaptionHidden() const {//If no caption, there is no menu bar. But if is no menu bar, then the caption can be.
- return(!m_fFullScreen && AfxGetAppSettings().iCaptionMenuMode>MODE_HIDEMENU);//!=MODE_SHOWCAPTIONMENU && !=MODE_HIDEMENU
+ return (!m_fFullScreen && AfxGetAppSettings().iCaptionMenuMode>MODE_HIDEMENU);//!=MODE_SHOWCAPTIONMENU && !=MODE_HIDEMENU
}
bool IsMenuHidden() const {
- return(!m_fFullScreen && AfxGetAppSettings().iCaptionMenuMode!=MODE_SHOWCAPTIONMENU);
+ return (!m_fFullScreen && AfxGetAppSettings().iCaptionMenuMode!=MODE_SHOWCAPTIONMENU);
}
bool IsSomethingLoaded() const {
- return((m_iMediaLoadState == MLS_LOADING || m_iMediaLoadState == MLS_LOADED) && !IsD3DFullScreenMode());
+ return ((m_iMediaLoadState == MLS_LOADING || m_iMediaLoadState == MLS_LOADED) && !IsD3DFullScreenMode());
}
bool IsPlaylistEmpty() {
- return(m_wndPlaylistBar.GetCount() == 0);
+ return (m_wndPlaylistBar.GetCount() == 0);
}
bool IsInteractiveVideo() const {
- return(AfxGetAppSettings().fIntRealMedia && m_fRealMediaGraph || m_fShockwaveGraph);
+ return (AfxGetAppSettings().fIntRealMedia && m_fRealMediaGraph || m_fShockwaveGraph);
}
bool IsD3DFullScreenMode() const;
diff --git a/src/mpc-hc/MediaFormats.cpp b/src/mpc-hc/MediaFormats.cpp index 10a76ecf7..5cb34c837 100644 --- a/src/mpc-hc/MediaFormats.cpp +++ b/src/mpc-hc/MediaFormats.cpp @@ -138,7 +138,7 @@ CString CMediaFormatCategory::GetFilter() const filter += _T("*.") + m_exts.GetNext(pos) + _T(";");
}
filter.TrimRight(_T(';')); // cheap...
- return(filter);
+ return filter;
}
CString CMediaFormatCategory::GetExts(bool fAppendEngine) const
@@ -147,7 +147,7 @@ CString CMediaFormatCategory::GetExts(bool fAppendEngine) const if (fAppendEngine) {
exts += CString(_T(" \\")) + (TCHAR)(0x30 + (int)m_engine);
}
- return(exts);
+ return exts;
}
CString CMediaFormatCategory::GetExtsWithPeriod(bool fAppendEngine) const
@@ -161,7 +161,7 @@ CString CMediaFormatCategory::GetExtsWithPeriod(bool fAppendEngine) const if (fAppendEngine) {
exts += CString(_T(" \\")) + (TCHAR)(0x30 + (int)m_engine);
}
- return(exts);
+ return exts;
}
CString CMediaFormatCategory::GetBackupExtsWithPeriod(bool fAppendEngine) const
@@ -175,7 +175,7 @@ CString CMediaFormatCategory::GetBackupExtsWithPeriod(bool fAppendEngine) const if (fAppendEngine) {
exts += CString(_T(" \\")) + (TCHAR)(0x30 + (int)m_engine);
}
- return(exts);
+ return exts;
}
//
@@ -291,7 +291,7 @@ void CMediaFormats::SetRtspHandler(engine_t e, bool fRtspFileExtFirst) bool CMediaFormats::IsUsingEngine(CString path, engine_t e)
{
- return(GetEngine(path) == e);
+ return (GetEngine(path) == e);
}
engine_t CMediaFormats::GetEngine(CString path)
diff --git a/src/mpc-hc/PPageAccelTbl.cpp b/src/mpc-hc/PPageAccelTbl.cpp index 63a1c6aa9..aad5999ef 100644 --- a/src/mpc-hc/PPageAccelTbl.cpp +++ b/src/mpc-hc/PPageAccelTbl.cpp @@ -202,7 +202,7 @@ CString CPPageAccelTbl::MakeAccelModLabel(BYTE fVirt) if (str.IsEmpty()) {
str = ResStr(IDS_AG_NONE);
}
- return(str);
+ return str;
}
CString CPPageAccelTbl::MakeAccelVkeyLabel(WORD key, bool fVirtKey)
@@ -760,7 +760,7 @@ CString CPPageAccelTbl::MakeAccelVkeyLabel(WORD key, bool fVirtKey) break;
}
- return(str);
+ return str;
}
CString CPPageAccelTbl::MakeAccelShortcutLabel(UINT id)
@@ -770,11 +770,11 @@ CString CPPageAccelTbl::MakeAccelShortcutLabel(UINT id) while (pos) {
ACCEL& a = wmcmds.GetNext(pos);
if (a.cmd == id) {
- return(MakeAccelShortcutLabel(a));
+ return (MakeAccelShortcutLabel(a));
}
}
- return(_T(""));
+ return _T("");
}
CString CPPageAccelTbl::MakeAccelShortcutLabel(ACCEL& a)
@@ -1338,7 +1338,7 @@ CString CPPageAccelTbl::MakeAccelShortcutLabel(ACCEL& a) str.Replace(_T(" + "), _T("+"));
- return(str);
+ return str;
}
CString CPPageAccelTbl::MakeMouseButtonLabel(UINT mouse)
diff --git a/src/mpc-hc/PPageFormats.cpp b/src/mpc-hc/PPageFormats.cpp index 470ee0fb1..4fa30201b 100644 --- a/src/mpc-hc/PPageFormats.cpp +++ b/src/mpc-hc/PPageFormats.cpp @@ -99,7 +99,7 @@ int CPPageFormats::GetChecked(int iItem) lvi.iSubItem = 0;
lvi.mask = LVIF_IMAGE;
m_list.GetItem(&lvi);
- return(lvi.iImage);
+ return lvi.iImage;
}
void CPPageFormats::SetChecked(int iItem, int iChecked)
diff --git a/src/mpc-hc/PlayerCaptureDialog.cpp b/src/mpc-hc/PlayerCaptureDialog.cpp index 35a08e9bb..734f2c006 100644 --- a/src/mpc-hc/PlayerCaptureDialog.cpp +++ b/src/mpc-hc/PlayerCaptureDialog.cpp @@ -37,12 +37,12 @@ static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt) bool fRet = false;
if (!ppmt) {
- return(fRet);
+ return fRet;
}
*ppmt = (AM_MEDIA_TYPE*)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE));
if (!*ppmt) {
- return(fRet);
+ return fRet;
}
memset(*ppmt, 0, sizeof(AM_MEDIA_TYPE));
@@ -52,7 +52,7 @@ static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt) if (AfxGetApp()->GetProfileBinary(IDS_RS_CAPTURE _T("\\") + CString(DisplayName), _T("MediaType"), &pData, &len)) {
if ( len != sizeof(AM_MEDIA_TYPE) ) {
delete [] pData;
- return(fRet);
+ return fRet;
}
memcpy(*ppmt, pData, len);
delete [] pData;
@@ -65,7 +65,7 @@ static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt) if (AfxGetApp()->GetProfileBinary(IDS_RS_CAPTURE _T("\\") + CString(DisplayName), _T("Format"), &pData, &len)) {
if ( !len ) {
delete [] pData;
- return(fRet);
+ return fRet;
}
(*ppmt)->cbFormat = len;
(*ppmt)->pbFormat = (BYTE*)CoTaskMemAlloc(len);
@@ -75,7 +75,7 @@ static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt) }
}
- return(fRet);
+ return fRet;
}
static void SaveMediaType(CStringW DisplayName, AM_MEDIA_TYPE* pmt)
@@ -414,7 +414,7 @@ static bool SetupDimension(CFormatArray<T>& tfa, CComboBox& type, CComboBox& dim dim.SetCurSel(dim.FindStringExact(0, str));
dim.EnableWindow(dim.GetCount() > 0);
- return(dim.GetCurSel() >= 0);
+ return (dim.GetCurSel() >= 0);
}
static void InitCodecList(CAtlArray<Codec>& codecs, CComboBox& box, const GUID& cat)
@@ -517,7 +517,7 @@ static int ShowPPage(CAtlArray<Codec>& codecs, CComboBox& box, HWND hWnd = NULL) }
}
- return(iSel);
+ return iSel;
}
// CPlayerCaptureDialog dialog
@@ -1200,7 +1200,7 @@ bool CPlayerCaptureDialog::IsTunerActive() }
long PinIndexRelated = -1, PhysicalType = -1;
- return(m_pAMXB
+ return (m_pAMXB
&& SUCCEEDED(m_pAMXB->get_CrossbarPinInfo(TRUE, iSel, &PinIndexRelated, &PhysicalType))
&& PhysicalType == PhysConn_Video_Tuner);
}
diff --git a/src/mpc-hc/PlayerCaptureDialog.h b/src/mpc-hc/PlayerCaptureDialog.h index fbfccaf5c..ceca674a1 100644 --- a/src/mpc-hc/PlayerCaptureDialog.h +++ b/src/mpc-hc/PlayerCaptureDialog.h @@ -60,7 +60,7 @@ public: CFormat<T>* Find(CString name, bool fCreate = false) {
for (size_t i = 0; i < GetCount(); ++i) {
if (GetAt(i)->name == name) {
- return(GetAt(i));
+ return GetAt(i);
}
}
@@ -68,10 +68,10 @@ public: CAutoPtr<CFormat<T> > pf(DNew CFormat<T>(name));
CFormat<T>* tmp = pf;
Add(pf);
- return(tmp);
+ return tmp;
}
- return(NULL);
+ return NULL;
}
bool FindFormat(AM_MEDIA_TYPE* pmt, CFormat<T>** ppf) {
@@ -166,7 +166,7 @@ public: CString str(_T("Default"));
if (!pmt) {
- return(str);
+ return str;
}
BITMAPINFOHEADER* bih = (pmt->formattype == FORMAT_VideoInfo)
@@ -188,7 +188,7 @@ public: (TCHAR)((pmt->subtype.Data1>>16)&0xff), (TCHAR)((pmt->subtype.Data1>>24)&0xff));
}
- return(str);
+ return str;
}
switch (bih->biCompression) {
@@ -217,14 +217,14 @@ public: break;
}
- return(str);
+ return str;
}
CString MakeDimensionName(CVidFormatElem* pfe) {
CString str(_T("Default"));
if (!pfe) {
- return(str);
+ return str;
}
BITMAPINFOHEADER* bih = (pfe->mt.formattype == FORMAT_VideoInfo)
@@ -234,7 +234,7 @@ public: : NULL;
if (bih == NULL) {
- return(str);
+ return str;
}
str.Format(_T("%dx%d %.2f"), bih->biWidth, bih->biHeight, (float)10000000/((VIDEOINFOHEADER*)pfe->mt.pbFormat)->AvgTimePerFrame);
@@ -246,7 +246,7 @@ public: str += str2;
}
- return(str);
+ return str;
}
};
@@ -260,7 +260,7 @@ public: CString str(_T("Unknown"));
if (!pmt) {
- return(str);
+ return str;
}
WAVEFORMATEX* wfe = (pmt->formattype == FORMAT_WaveFormatEx)
@@ -276,7 +276,7 @@ public: str.Format(_T("0x%04x"), pmt->subtype.Data1);
}
- return(str);
+ return str;
}
switch (wfe->wFormatTag) {
@@ -288,14 +288,14 @@ public: break;
}
- return(str);
+ return str;
}
CString MakeDimensionName(CAudFormatElem* pfe) {
CString str(_T("Unknown"));
if (!pfe) {
- return(str);
+ return str;
}
WAVEFORMATEX* wfe = (pfe->mt.formattype == FORMAT_WaveFormatEx)
@@ -303,7 +303,7 @@ public: : NULL;
if (!wfe) {
- return(str);
+ return str;
}
str.Empty();
@@ -331,7 +331,7 @@ public: str2.Format(_T("%3dkbps "), wfe->nAvgBytesPerSec*8/1000);
str += str2;
- return(str);
+ return str;
}
};
diff --git a/src/mpc-hc/PlayerListCtrl.cpp b/src/mpc-hc/PlayerListCtrl.cpp index 86becf380..50228027b 100644 --- a/src/mpc-hc/PlayerListCtrl.cpp +++ b/src/mpc-hc/PlayerListCtrl.cpp @@ -557,7 +557,7 @@ int CPlayerListCtrl::GetBottomIndex() const }
}
- return(nBottomIndex);
+ return nBottomIndex;
}
CImageList* CPlayerListCtrl::CreateDragImageEx(LPPOINT lpPoint)
@@ -655,7 +655,7 @@ CImageList* CPlayerListCtrl::CreateDragImageEx(LPPOINT lpPoint) lpPoint->y = cCompleteRect.top;
}
- return(pCompleteImageList);
+ return pCompleteImageList;
}
bool CPlayerListCtrl::PrepareInPlaceControl(int nRow, int nCol, CRect& rect)
@@ -705,7 +705,7 @@ CWinHotkeyCtrl* CPlayerListCtrl::ShowInPlaceWinHotkey(int nItem, int nCol) {
CRect rect;
if (!PrepareInPlaceControl(nItem, nCol, rect)) {
- return(NULL);
+ return NULL;
}
DWORD dwStyle = /*WS_BORDER|*/WS_CHILD|WS_VISIBLE|ES_AUTOHSCROLL|ES_LEFT;
@@ -727,7 +727,7 @@ CEdit* CPlayerListCtrl::ShowInPlaceEdit(int nItem, int nCol) {
CRect rect;
if (!PrepareInPlaceControl(nItem, nCol, rect)) {
- return(NULL);
+ return NULL;
}
DWORD dwStyle = /*WS_BORDER|*/WS_CHILD|WS_VISIBLE|ES_AUTOHSCROLL;
@@ -751,7 +751,7 @@ CEdit* CPlayerListCtrl::ShowInPlaceFloatEdit(int nItem, int nCol) {
CRect rect;
if (!PrepareInPlaceControl(nItem, nCol, rect)) {
- return(NULL);
+ return NULL;
}
DWORD dwStyle = /*WS_BORDER|*/WS_CHILD|WS_VISIBLE|ES_AUTOHSCROLL|ES_RIGHT;
@@ -768,7 +768,7 @@ CComboBox* CPlayerListCtrl::ShowInPlaceComboBox(int nItem, int nCol, CAtlList<CS {
CRect rect;
if (!PrepareInPlaceControl(nItem, nCol, rect)) {
- return(NULL);
+ return NULL;
}
DWORD dwStyle = /*WS_BORDER|*/WS_CHILD|WS_VISIBLE|WS_VSCROLL/*|WS_HSCROLL*/
@@ -796,7 +796,7 @@ CListBox* CPlayerListCtrl::ShowInPlaceListBox(int nItem, int nCol, CAtlList<CStr {
CRect rect;
if (!PrepareInPlaceControl(nItem, nCol, rect)) {
- return(NULL);
+ return NULL;
}
DWORD dwStyle = WS_BORDER|WS_CHILD|WS_VISIBLE|WS_VSCROLL/*|WS_HSCROLL*/|LBS_NOTIFY;
diff --git a/src/mpc-hc/PlayerPlaylistBar.cpp b/src/mpc-hc/PlayerPlaylistBar.cpp index f839ce4a1..2e7779849 100644 --- a/src/mpc-hc/PlayerPlaylistBar.cpp +++ b/src/mpc-hc/PlayerPlaylistBar.cpp @@ -227,7 +227,7 @@ static bool SearchFiles(CString mask, CAtlList<CString>& sl) }
}
- return(sl.GetCount() > 1
+ return (sl.GetCount() > 1
|| sl.GetCount() == 1 && sl.GetHead().CompareNoCase(mask)
|| sl.GetCount() == 0 && mask.FindOneOf(_T("?*")) >= 0);
}
@@ -585,7 +585,7 @@ int CPlayerPlaylistBar::FindItem(POSITION pos) const {
for (int i = 0; i < m_list.GetItemCount(); i++)
if ((POSITION)m_list.GetItemData(i) == pos) {
- return(i);
+ return (i);
}
return -1;
}
@@ -593,9 +593,9 @@ int CPlayerPlaylistBar::FindItem(POSITION pos) const POSITION CPlayerPlaylistBar::FindPos(int i)
{
if (i < 0) {
- return(NULL);
+ return NULL;
}
- return((POSITION)m_list.GetItemData(i));
+ return (POSITION)m_list.GetItemData(i);
}
INT_PTR CPlayerPlaylistBar::GetCount() const
@@ -605,7 +605,7 @@ INT_PTR CPlayerPlaylistBar::GetCount() const int CPlayerPlaylistBar::GetSelIdx() const
{
- return(FindItem(m_pl.GetPos()));
+ return FindItem(m_pl.GetPos());
}
void CPlayerPlaylistBar::SetSelIdx(int i)
@@ -652,7 +652,7 @@ CString CPlayerPlaylistBar::GetCurFileName() if (pli && !pli->m_fns.IsEmpty()) {
fn = pli->m_fns.GetHead();
}
- return(fn);
+ return fn;
}
bool CPlayerPlaylistBar::SetNext()
diff --git a/src/mpc-hc/PlayerSeekBar.cpp b/src/mpc-hc/PlayerSeekBar.cpp index e47bd7190..f49a3e38a 100644 --- a/src/mpc-hc/PlayerSeekBar.cpp +++ b/src/mpc-hc/PlayerSeekBar.cpp @@ -111,12 +111,12 @@ void CPlayerSeekBar::SetRange(__int64 start, __int64 stop) __int64 CPlayerSeekBar::GetPos() const
{
- return(m_pos);
+ return m_pos;
}
__int64 CPlayerSeekBar::GetPosReal() const
{
- return(m_posreal);
+ return m_posreal;
}
void CPlayerSeekBar::SetPos(__int64 pos)
@@ -156,7 +156,7 @@ CRect CPlayerSeekBar::GetChannelRect() const GetClientRect(&r);
r.DeflateRect(8, 9, 9, 0);
r.bottom = r.top + 5;
- return(r);
+ return r;
}
CRect CPlayerSeekBar::GetThumbRect() const
@@ -171,7 +171,7 @@ CRect CPlayerSeekBar::GetThumbRect() const r.SetRect(x, y, x, y);
r.InflateRect(6, 7, 7, 8);
- return(r);
+ return r;
}
CRect CPlayerSeekBar::GetInnerThumbRect() const
@@ -181,7 +181,7 @@ CRect CPlayerSeekBar::GetInnerThumbRect() const bool fEnabled = m_fEnabled && m_start < m_stop;
r.DeflateRect(3, fEnabled ? 5 : 4, 3, fEnabled ? 5 : 4);
- return(r);
+ return r;
}
__int64 CPlayerSeekBar::CalculatePosition(CPoint point)
diff --git a/src/mpc-hc/PlayerSubresyncBar.cpp b/src/mpc-hc/PlayerSubresyncBar.cpp index 74d0b2e75..635535502 100644 --- a/src/mpc-hc/PlayerSubresyncBar.cpp +++ b/src/mpc-hc/PlayerSubresyncBar.cpp @@ -494,7 +494,7 @@ bool CPlayerSubresyncBar::ModStart(int iItem, int t, bool fReset) SetCheck(iItem, !fReset, fEndMod);
}
- return(fRet);
+ return fRet;
}
bool CPlayerSubresyncBar::ModEnd(int iItem, int t, bool fReset)
@@ -520,7 +520,7 @@ bool CPlayerSubresyncBar::ModEnd(int iItem, int t, bool fReset) SetCheck(iItem, fStartMod, !fReset);
}
- return(fRet);
+ return fRet;
}
void CPlayerSubresyncBar::FormatTime(int iItem, TCHAR* buff, size_t buffLen, int time, bool fEnd)
@@ -748,7 +748,7 @@ void CPlayerSubresyncBar::OnEndlabeleditList(NMHDR* pNMHDR, LRESULT* pResult) static int uintcomp(const void* i1, const void* i2)
{
- return(*((UINT*)i2) - *((UINT*)i1));
+ return (*((UINT*)i2) - *((UINT*)i1));
}
void CPlayerSubresyncBar::OnRclickList(NMHDR* pNMHDR, LRESULT* pResult)
diff --git a/src/mpc-hc/PlayerToolBar.cpp b/src/mpc-hc/PlayerToolBar.cpp index e862c02ec..abeecee34 100644 --- a/src/mpc-hc/PlayerToolBar.cpp +++ b/src/mpc-hc/PlayerToolBar.cpp @@ -222,7 +222,7 @@ bool CPlayerToolBar::IsMuted() const bi.cbSize = sizeof(bi);
bi.dwMask = TBIF_IMAGE;
tb.GetButtonInfo(ID_VOLUME_MUTE, &bi);
- return(bi.iImage==13);
+ return (bi.iImage == 13);
}
int CPlayerToolBar::GetVolume() const
diff --git a/src/mpc-hc/Playlist.cpp b/src/mpc-hc/Playlist.cpp index 5c3863c56..9b3e2a7c8 100644 --- a/src/mpc-hc/Playlist.cpp +++ b/src/mpc-hc/Playlist.cpp @@ -71,7 +71,7 @@ CPlaylistItem& CPlaylistItem::operator = (const CPlaylistItem& pli) m_ainput = pli.m_ainput;
m_country = pli.m_country;
}
- return(*this);
+ return *this;
}
POSITION CPlaylistItem::FindFile(LPCTSTR path)
@@ -83,7 +83,7 @@ POSITION CPlaylistItem::FindFile(LPCTSTR path) }
m_fns.GetNext(pos);
}
- return(NULL);
+ return NULL;
}
static CString StripPath(CString path)
@@ -91,7 +91,7 @@ static CString StripPath(CString path) CString p = path;
p.Replace('\\', '/');
p = p.Mid(p.ReverseFind('/')+1);
- return(p.IsEmpty() ? path : p);
+ return (p.IsEmpty() ? path : p);
}
CString CPlaylistItem::GetLabel(int i)
@@ -140,7 +140,7 @@ bool FindFileInList(CAtlList<CString>& sl, CString fn) fFound = true;
}
}
- return(fFound);
+ return fFound;
}
void CPlaylistItem::AutoLoadFiles()
@@ -352,7 +352,7 @@ void CPlaylist::Randomize() POSITION CPlaylist::GetPos() const
{
- return(m_pos);
+ return m_pos;
}
void CPlaylist::SetPos(POSITION pos)
@@ -402,7 +402,7 @@ CPlaylistItem& CPlaylist::GetNextWrap(POSITION& pos) }
}
- return(GetAt(pos));
+ return GetAt(pos);
}
CPlaylistItem& CPlaylist::GetPrevWrap(POSITION& pos)
@@ -411,5 +411,5 @@ CPlaylistItem& CPlaylist::GetPrevWrap(POSITION& pos) if (!pos) {
pos = GetTailPosition();
}
- return(GetAt(pos));
+ return GetAt(pos);
}
diff --git a/src/mpc-hc/PnSPresetsDlg.cpp b/src/mpc-hc/PnSPresetsDlg.cpp index 1cfdbf5f4..895ec6575 100644 --- a/src/mpc-hc/PnSPresetsDlg.cpp +++ b/src/mpc-hc/PnSPresetsDlg.cpp @@ -108,7 +108,7 @@ CString CPnSPresetsDlg::ParamsToString(CString label, double PosX, double PosY, {
CString str;
str.Format(_T("%s,%.3f,%.3f,%.3f,%.3f"), label, PosX, PosY, ZoomX, ZoomY);
- return(str);
+ return str;
}
BEGIN_MESSAGE_MAP(CPnSPresetsDlg, CCmdUIDialog)
diff --git a/src/mpc-hc/QuicktimeGraph.cpp b/src/mpc-hc/QuicktimeGraph.cpp index f05d1dfa6..62575eb3f 100644 --- a/src/mpc-hc/QuicktimeGraph.cpp +++ b/src/mpc-hc/QuicktimeGraph.cpp @@ -453,7 +453,7 @@ OSErr CQuicktimeWindow::MyMovieDrawingCompleteProc(Movie theMovie, long refCon) pQW->Invalidate();
}*/
- return(noErr);
+ return noErr;
}
bool CQuicktimeWindow::OpenMovie(CString fn)
@@ -564,7 +564,7 @@ bool CQuicktimeWindow::OpenMovie(CString fn) }
}
- return(theMovie != NULL);
+ return (theMovie != NULL);
}
void CQuicktimeWindow::CloseMovie()
diff --git a/src/mpc-hc/RealMediaGraph.h b/src/mpc-hc/RealMediaGraph.h index 02a3b8f17..aad9a5f4a 100644 --- a/src/mpc-hc/RealMediaGraph.h +++ b/src/mpc-hc/RealMediaGraph.h @@ -111,7 +111,7 @@ namespace DSObjects void Deinit();
virtual CSize GetVideoSize() {
- return(m_VideoSize);
+ return m_VideoSize;
}
virtual void SetWindowRect(CRect r) {}
virtual void SetDestRect(CRect r) {}
diff --git a/src/mpc-hc/RealMediaWindowlessSite.cpp b/src/mpc-hc/RealMediaWindowlessSite.cpp index 374472f2d..316d39314 100644 --- a/src/mpc-hc/RealMediaWindowlessSite.cpp +++ b/src/mpc-hc/RealMediaWindowlessSite.cpp @@ -619,7 +619,7 @@ bool CRealMediaWindowlessSite::GetBltService(IRMAVideoSurface** ppBltService) }
}
- return(fRet);
+ return fRet;
}
void CRealMediaWindowlessSite::SetBltService(IRMAVideoSurface* pBltService)
diff --git a/src/mpc-hc/SaveTextFileDialog.h b/src/mpc-hc/SaveTextFileDialog.h index 8cd657a3b..47797978c 100644 --- a/src/mpc-hc/SaveTextFileDialog.h +++ b/src/mpc-hc/SaveTextFileDialog.h @@ -45,7 +45,7 @@ public: CComboBox m_encoding;
CTextFile::enc GetEncoding() {
- return(m_e);
+ return m_e;
}
protected:
diff --git a/src/mpc-hc/TextPassThruFilter.cpp b/src/mpc-hc/TextPassThruFilter.cpp index eb8f3c36f..3f93c8667 100644 --- a/src/mpc-hc/TextPassThruFilter.cpp +++ b/src/mpc-hc/TextPassThruFilter.cpp @@ -186,7 +186,7 @@ HRESULT CTextPassThruOutputPin::DecideBufferSize(IMemAllocator* pAllocator, ALLO return hr;
}
- return(pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+ return (pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
? E_FAIL
: NOERROR);
}
diff --git a/src/mpc-hc/WinHotkeyCtrl.cpp b/src/mpc-hc/WinHotkeyCtrl.cpp index 9d70dac98..1e68d6178 100644 --- a/src/mpc-hc/WinHotkeyCtrl.cpp +++ b/src/mpc-hc/WinHotkeyCtrl.cpp @@ -76,7 +76,7 @@ LRESULT CALLBACK CWinHotkeyCtrl::LowLevelKeyboardProc(int nCode, WPARAM wParam, wParam == WM_KEYUP || wParam == WM_SYSKEYUP) && sm_pwhcFocus) {
sm_pwhcFocus->PostMessage(WM_KEY, ((PKBDLLHOOKSTRUCT)lParam)->vkCode, (wParam & 1));
}
- return(lResult);
+ return lResult;
}
BOOL CWinHotkeyCtrl::InstallKbHook()
@@ -88,7 +88,7 @@ BOOL CWinHotkeyCtrl::InstallKbHook() sm_hhookKb = ::SetWindowsHookEx(WH_KEYBOARD_LL, (HOOKPROC)LowLevelKeyboardProc, GetModuleHandle(NULL), NULL);
- return(sm_hhookKb != NULL);
+ return (sm_hhookKb != NULL);
}
BOOL CWinHotkeyCtrl::UninstallKbHook()
@@ -99,7 +99,7 @@ BOOL CWinHotkeyCtrl::UninstallKbHook() sm_hhookKb = NULL;
}
sm_pwhcFocus = NULL;
- return(fOk);
+ return fOk;
}
@@ -113,14 +113,14 @@ void CWinHotkeyCtrl::UpdateText() DWORD CWinHotkeyCtrl::GetWinHotkey()
{
- return(MAKEWORD(m_vkCode, m_fModSet));
+ return MAKEWORD(m_vkCode, m_fModSet);
}
BOOL CWinHotkeyCtrl::GetWinHotkey(UINT* pvkCode, UINT* pfModifiers)
{
*pvkCode = m_vkCode;
*pfModifiers = m_fModSet;
- return(m_vkCode != 0);
+ return (m_vkCode != 0);
}
void CWinHotkeyCtrl::SetWinHotkey(DWORD dwHk)
@@ -209,7 +209,7 @@ LRESULT CWinHotkeyCtrl::OnKey(WPARAM wParam, LPARAM lParam) UpdateText();
}
- return(0L);
+ return 0L;
}
LRESULT CWinHotkeyCtrl::OnLeftClick(WPARAM wParam, LPARAM lParam)
diff --git a/src/mpc-hc/jpeg.cpp b/src/mpc-hc/jpeg.cpp index 1bcedba8d..67f4f4a56 100644 --- a/src/mpc-hc/jpeg.cpp +++ b/src/mpc-hc/jpeg.cpp @@ -77,7 +77,7 @@ int CJpegEncoder::GetBitWidth(short q) for (; !(q&0x4000); q <<= 1, width--) {
;
}
- return(width);
+ return width;
}
///////
diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp index a5e669392..91917a709 100644 --- a/src/mpc-hc/mplayerc.cpp +++ b/src/mpc-hc/mplayerc.cpp @@ -80,7 +80,7 @@ const size_t CMPlayerCApp::languageResourcesCount = _countof(CMPlayerCApp::langu HICON LoadIcon(CString fn, bool fSmall)
{
if (fn.IsEmpty()) {
- return(NULL);
+ return NULL;
}
CString ext = fn.Left(fn.Find(_T("://"))+1).TrimRight(':');
@@ -92,13 +92,13 @@ HICON LoadIcon(CString fn, bool fSmall) if (!ext.CompareNoCase(_T(".ifo"))) {
if (HICON hIcon = (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_DVD), IMAGE_ICON, size.cx, size.cy, 0)) {
- return(hIcon);
+ return hIcon;
}
}
if (!ext.CompareNoCase(_T(".cda"))) {
if (HICON hIcon = (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_AUDIOCD), IMAGE_ICON, size.cx, size.cy, 0)) {
- return(hIcon);
+ return hIcon;
}
}
@@ -154,7 +154,7 @@ HICON LoadIcon(CString fn, bool fSmall) }
} while (0);
- return((HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_UNKNOWN), IMAGE_ICON, size.cx, size.cy, 0));
+ return (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_UNKNOWN), IMAGE_ICON, size.cx, size.cy, 0);
}
bool LoadType(CString fn, CString& type)
@@ -379,7 +379,7 @@ CString CMPlayerCApp::GetIniPath() const GetModuleFileName(AfxGetInstanceHandle(), path.GetBuffer(_MAX_PATH), _MAX_PATH);
path.ReleaseBuffer();
path = path.Left(path.ReverseFind('.')+1) + _T("ini");
- return(path);
+ return path;
}
bool CMPlayerCApp::IsIniValid() const
diff --git a/src/mpc-hc/res/shaders/denoise.psh b/src/mpc-hc/res/shaders/denoise.psh index 12d9e1295..ecd9e5b7d 100644 --- a/src/mpc-hc/res/shaders/denoise.psh +++ b/src/mpc-hc/res/shaders/denoise.psh @@ -30,5 +30,5 @@ float4 main(float2 tex : TEXCOORD0) : COLOR { fTap += 0.1f;
}
- return(cAccum / 16.0f);
+ return (cAccum / 16.0f);
}
diff --git a/src/mpc-hc/res/shaders/levels.psh b/src/mpc-hc/res/shaders/levels.psh index 5c7034b7e..f24a44c53 100644 --- a/src/mpc-hc/res/shaders/levels.psh +++ b/src/mpc-hc/res/shaders/levels.psh @@ -7,5 +7,5 @@ float4 main(float2 tex : TEXCOORD0) : COLOR { // original pixel
float4 c0 = tex2D(s0, tex);
- return((c0 - const_1) * const_2);
+ return ((c0 - const_1) * const_2);
}
diff --git a/src/mpc-hc/res/shaders/levels2.psh b/src/mpc-hc/res/shaders/levels2.psh index 0676f60e0..21c7e54b3 100644 --- a/src/mpc-hc/res/shaders/levels2.psh +++ b/src/mpc-hc/res/shaders/levels2.psh @@ -15,6 +15,6 @@ float4 main(float2 tex : TEXCOORD0) : COLOR { if (height >= 720) {
return c0;
} else {
- return((c0 - const_1) * const_2);
+ return ((c0 - const_1) * const_2);
}
}
diff --git a/src/mpc-hc/vkCodes.cpp b/src/mpc-hc/vkCodes.cpp index d09cf44d1..27526efc8 100644 --- a/src/mpc-hc/vkCodes.cpp +++ b/src/mpc-hc/vkCodes.cpp @@ -288,7 +288,7 @@ PCTSTR GetKeyName(UINT vkCode) _T("Unknown")
};
- return(s_pszKeys[vkCode]);
+ return s_pszKeys[vkCode];
}
//-----------------------------------------------------------------
@@ -310,7 +310,7 @@ BOOL HotkeyToString(UINT vkCode, UINT fModifiers, CString& s) { s.Format(_T("%s%s"), (LPCTSTR)s, GetKeyName(vkCode));
}
- return(!s.IsEmpty());
+ return !s.IsEmpty();
}
BOOL HotkeyModToString(UINT vkCode, BYTE fModifiers, CString& s)
@@ -330,9 +330,9 @@ BOOL HotkeyModToString(UINT vkCode, BYTE fModifiers, CString& s) s.Format(_T("%s%s"), (LPCTSTR)s, GetKeyName(vkCode));
}
- return(!s.IsEmpty());
+ return !s.IsEmpty();
}
BOOL HotkeyToString(DWORD dwHk, CString& s) {
- return(HotkeyToString(LOBYTE(LOWORD(dwHk)), HIBYTE(LOWORD(dwHk)), s));
+ return HotkeyToString(LOBYTE(LOWORD(dwHk)), HIBYTE(LOWORD(dwHk)), s);
}
|