diff options
68 files changed, 463 insertions, 391 deletions
diff --git a/src/DSUtil/vd.cpp b/src/DSUtil/vd.cpp index 2e63d89ed..91daebacd 100644 --- a/src/DSUtil/vd.cpp +++ b/src/DSUtil/vd.cpp @@ -645,7 +645,6 @@ void AvgLines555(BYTE* dst, DWORD h, DWORD pitch) if(h <= 1)
return;
- unsigned __int64 __0x7c007c007c007c00 = 0x7c007c007c007c00;
unsigned __int64 __0x03e003e003e003e0 = 0x03e003e003e003e0;
unsigned __int64 __0x001f001f001f001f = 0x001f001f001f001f;
@@ -736,7 +735,6 @@ void AvgLines565(BYTE* dst, DWORD h, DWORD pitch) if(h <= 1)
return;
- unsigned __int64 __0xf800f800f800f800 = 0xf800f800f800f800;
unsigned __int64 __0x07e007e007e007e0 = 0x07e007e007e007e0;
unsigned __int64 __0x001f001f001f001f = 0x001f001f001f001f;
diff --git a/src/SubPic/CoordGeom.cpp b/src/SubPic/CoordGeom.cpp index 2cfc8d08d..47dfcf5bd 100644 --- a/src/SubPic/CoordGeom.cpp +++ b/src/SubPic/CoordGeom.cpp @@ -366,7 +366,8 @@ void XForm::Initalize(Ray& r, Vector& s, bool isWorldToLocal) {
Initalize();
- if(m_isWorldToLocal = isWorldToLocal)
+ m_isWorldToLocal = isWorldToLocal;
+ if(isWorldToLocal)
{
*this -= r.p;
*this >>= r.d;
diff --git a/src/SubPic/DX7SubPic.cpp b/src/SubPic/DX7SubPic.cpp index 25384abcd..60953b2cf 100644 --- a/src/SubPic/DX7SubPic.cpp +++ b/src/SubPic/DX7SubPic.cpp @@ -284,7 +284,8 @@ bool CDX7SubPicAllocator::Alloc(bool fStatic, ISubPic** ppSubPic) if(FAILED(pDD->CreateSurface(&ddsd, &pSurface, NULL)))
return(false);
- if(!(*ppSubPic = DNew CDX7SubPic(m_pD3DDev, pSurface)))
+ *ppSubPic = DNew CDX7SubPic(m_pD3DDev, pSurface);
+ if(!(*ppSubPic))
return(false);
(*ppSubPic)->AddRef();
diff --git a/src/SubPic/DX9SubPic.cpp b/src/SubPic/DX9SubPic.cpp index 79b2b0f14..a20cde3e0 100644 --- a/src/SubPic/DX9SubPic.cpp +++ b/src/SubPic/DX9SubPic.cpp @@ -334,8 +334,6 @@ CDX9SubPicAllocator::CDX9SubPicAllocator(IDirect3DDevice9* pD3DDev, SIZE maxsize , m_pD3DDev(pD3DDev)
, m_maxsize(maxsize)
{
- m_pD3DDev = pD3DDev;
- m_maxsize = maxsize;
}
CCritSec CDX9SubPicAllocator::ms_SurfaceQueueLock;
@@ -434,7 +432,8 @@ bool CDX9SubPicAllocator::Alloc(bool fStatic, ISubPic** ppSubPic) return(false);
}
- if(!(*ppSubPic = DNew CDX9SubPic(pSurface, fStatic ? 0 : this)))
+ *ppSubPic = DNew CDX9SubPic(pSurface, fStatic ? 0 : this);
+ if(!(*ppSubPic))
return(false);
(*ppSubPic)->AddRef();
diff --git a/src/SubPic/ISubPic.cpp b/src/SubPic/ISubPic.cpp index d1ea06335..befefc18a 100644 --- a/src/SubPic/ISubPic.cpp +++ b/src/SubPic/ISubPic.cpp @@ -350,7 +350,10 @@ STDMETHODIMP ISubPicQueueImpl::GetSubPicProvider(ISubPicProvider** pSubPicProvid CAutoLock cAutoLock(&m_csSubPicProvider);
if(m_pSubPicProvider)
- (*pSubPicProvider = m_pSubPicProvider)->AddRef();
+ {
+ *pSubPicProvider = m_pSubPicProvider;
+ (*pSubPicProvider)->AddRef();
+ }
return !!*pSubPicProvider ? S_OK : E_FAIL;
}
@@ -877,12 +880,13 @@ STDMETHODIMP_(bool) CSubPicQueueNoThread::LookupSubPic(REFERENCE_TIME rtNow, CCo else
{
CComPtr<ISubPicProvider> pSubPicProvider;
- if(SUCCEEDED(GetSubPicProvider(&pSubPicProvider)) && pSubPicProvider
- && SUCCEEDED(pSubPicProvider->Lock()))
+ GetSubPicProvider(&pSubPicProvider);
+ if (pSubPicProvider && SUCCEEDED(pSubPicProvider->Lock()))
{
double fps = m_fps;
- if(POSITION pos = pSubPicProvider->GetStartPosition(rtNow, fps))
+ POSITION pos = pSubPicProvider->GetStartPosition(rtNow, fps);
+ if(pos != 0)
{
REFERENCE_TIME rtStart = pSubPicProvider->GetStart(pos, fps);
REFERENCE_TIME rtStop = pSubPicProvider->GetStop(pos, fps);
diff --git a/src/SubPic/MemSubPic.cpp b/src/SubPic/MemSubPic.cpp index 23ae14449..1b1f9158b 100644 --- a/src/SubPic/MemSubPic.cpp +++ b/src/SubPic/MemSubPic.cpp @@ -533,7 +533,7 @@ STDMETHODIMP CMemSubPic::AlphaBlt(RECT* pSrc, RECT* pDst, SubPicDesc* pTarget) if(dst.type == MSP_YV12 || dst.type == MSP_IYUV)
{
- int w2 = w/2, h2 = h/2;
+ int h2 = h/2;
if(!dst.pitchUV)
{
@@ -624,10 +624,12 @@ bool CMemSubPicAllocator::Alloc(bool fStatic, ISubPic** ppSubPic) spd.bpp = 32;
spd.pitch = (spd.w*spd.bpp)>>3;
spd.type = m_type;
- if(!(spd.bits = DNew BYTE[spd.pitch*spd.h]))
+ spd.bits = DNew BYTE[spd.pitch*spd.h];
+ if(!spd.bits)
return(false);
- if(!(*ppSubPic = DNew CMemSubPic(spd)))
+ *ppSubPic = DNew CMemSubPic(spd);
+ if(!(*ppSubPic))
return(false);
(*ppSubPic)->AddRef();
diff --git a/src/apps/mplayerc/ConvertDlg.cpp b/src/apps/mplayerc/ConvertDlg.cpp index 6dbf4a4bb..c66117814 100644 --- a/src/apps/mplayerc/ConvertDlg.cpp +++ b/src/apps/mplayerc/ConvertDlg.cpp @@ -71,7 +71,7 @@ void CConvertDlg::AddFile(CString fn) EndEnumPins;
if(!nConnected)
{
- MessageBeep(-1);
+ MessageBeep((UINT)-1);
DeleteFilter(pBF);
return;
}
@@ -828,7 +828,7 @@ BOOL CConvertDlg::OnInitDialog() || !(m_pMC = m_pGB) || !(m_pME = m_pGB) || !(m_pMS = m_pMux)
|| FAILED(m_pME->SetNotifyWindow((OAHWND)m_hWnd, WM_GRAPHNOTIFY, 0)))
{
- MessageBeep(-1);
+ MessageBeep((UINT)-1);
SendMessage(WM_CLOSE);
return TRUE;
}
diff --git a/src/apps/mplayerc/ConvertPropsDlg.cpp b/src/apps/mplayerc/ConvertPropsDlg.cpp index 51525859b..29e02cefd 100644 --- a/src/apps/mplayerc/ConvertPropsDlg.cpp +++ b/src/apps/mplayerc/ConvertPropsDlg.cpp @@ -196,7 +196,8 @@ void CConvertPropsDlg::OnCbnSelchangeCombo1() void CConvertPropsDlg::OnLvnKeydownList1(NMHDR *pNMHDR, LRESULT *pResult)
{
- LPNMLVKEYDOWN pLVKeyDow = reinterpret_cast<LPNMLVKEYDOWN>(pNMHDR);
+ LPNMLVKEYDOWN pLVKeyDow = reinterpret_cast<LPNMLVKEYDOWN>(pNMHDR);
+ UNUSED_ALWAYS(pLVKeyDow);
int i = m_fcc.GetCurSel();
if(i >= 0) m_list.DeleteItem(i);
diff --git a/src/apps/mplayerc/EditListEditor.cpp b/src/apps/mplayerc/EditListEditor.cpp index 10eb6fefc..c14c8aee9 100644 --- a/src/apps/mplayerc/EditListEditor.cpp +++ b/src/apps/mplayerc/EditListEditor.cpp @@ -317,7 +317,8 @@ void CEditListEditor::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct) if (pos != NULL)
{
- bool fSelected = (pos == m_CurPos);
+ bool fSelected = (pos == m_CurPos);
+ UNUSED_ALWAYS(fSelected);
CClip& CurClip = m_EditList.GetAt(pos);
CString strTemp;
diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp index 85ed71417..ae2de3abb 100644 --- a/src/apps/mplayerc/FGFilter.cpp +++ b/src/apps/mplayerc/FGFilter.cpp @@ -372,7 +372,8 @@ void CFGFilterRegistry::ExtractFilterData(BYTE* p, UINT len) {
ChkLen(1)
BYTE n = *p-0x30;
- p++;
+ p++;
+ UNUSED_ALWAYS(n);
ChkLen(2)
WORD pi = *(WORD*)p;
@@ -395,7 +396,8 @@ void CFGFilterRegistry::ExtractFilterData(BYTE* p, UINT len) {
ChkLen(1)
BYTE n = *p-0x30;
- p++;
+ p++;
+ UNUSED_ALWAYS(n);
ChkLen(2)
WORD ty = *(WORD*)p;
diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index fb69cee0b..8e4d4ca58 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -120,7 +120,6 @@ bool CFGManager::CheckBytes(HANDLE hFile, CString chkbytes) LARGE_INTEGER size = {0, 0};
size.LowPart = GetFileSize(hFile, (DWORD*)&size.HighPart);
- POSITION pos = sl.GetHeadPosition();
while(sl.GetCount() >= 4)
{
CString offsetstr = sl.RemoveHead();
@@ -1048,15 +1047,16 @@ STDMETHODIMP CFGManager::ConnectFilter(IPin* pPinOut, IBaseFilter* pBF) if(S_OK != IsPinDirection(pPinOut, PINDIR_OUTPUT))
return VFW_E_INVALID_DIRECTION;
- HRESULT hr;
-
BeginEnumPins(pBF, pEP, pPin)
{
if(GetPinName(pPin)[0] != '~'
&& S_OK == IsPinDirection(pPin, PINDIR_INPUT)
- && S_OK != IsPinConnected(pPin)
- && SUCCEEDED(hr = Connect(pPinOut, pPin)))
- return hr;
+ && S_OK != IsPinConnected(pPin))
+ {
+ HRESULT hr = Connect(pPinOut, pPin);
+ if(SUCCEEDED(hr))
+ return hr;
+ }
}
EndEnumPins;
@@ -1073,15 +1073,16 @@ STDMETHODIMP CFGManager::ConnectFilterDirect(IPin* pPinOut, IBaseFilter* pBF, co if(S_OK != IsPinDirection(pPinOut, PINDIR_OUTPUT))
return VFW_E_INVALID_DIRECTION;
- HRESULT hr;
-
BeginEnumPins(pBF, pEP, pPin)
{
if(GetPinName(pPin)[0] != '~'
&& S_OK == IsPinDirection(pPin, PINDIR_INPUT)
- && S_OK != IsPinConnected(pPin)
- && SUCCEEDED(hr = ConnectDirect(pPinOut, pPin, pmt)))
- return hr;
+ && S_OK != IsPinConnected(pPin))
+ {
+ HRESULT hr = ConnectDirect(pPinOut, pPin, pmt);
+ if(SUCCEEDED(hr))
+ return hr;
+ }
}
EndEnumPins;
@@ -2710,8 +2711,6 @@ STDMETHODIMP CFGManagerDVD::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpc CFGManagerCapture::CFGManagerCapture(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd)
: CFGManagerPlayer(pName, pUnk, hWnd)
{
- AppSettings& s = AfxGetAppSettings();
-
CFGFilter* pFGF = DNew CFGFilterInternal<CDeinterlacerFilter>(L"Deinterlacer", m_vrmerit + 0x100);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_NULL);
m_transform.AddTail(pFGF);
diff --git a/src/apps/mplayerc/Ifo.cpp b/src/apps/mplayerc/Ifo.cpp index b7e0d1b92..ef24a3dfc 100644 --- a/src/apps/mplayerc/Ifo.cpp +++ b/src/apps/mplayerc/Ifo.cpp @@ -120,7 +120,8 @@ void CIfo::RemovePgciUOPs (uint8_t *ptr) for (i=1; i<=num; i++)
{
- lu_sub_t *lu_sub = (lu_sub_t *) ptr;
+ lu_sub_t *lu_sub = (lu_sub_t *) ptr;
+ UNUSED_ALWAYS(lu_sub);
ptr += LU_SUB_LEN;
}
@@ -225,7 +226,8 @@ bool CIfo::RemoveUOPs() for (int i=0; i<be2me_16(m_pPGCI->num); i++)
{
- if (pgc = GetPGCI(i, m_pPGCI))
+ pgc = GetPGCI(i, m_pPGCI);
+ if (pgc)
RemovePgciUOPs ((uint8_t*)pgc);
}
}
@@ -233,7 +235,8 @@ bool CIfo::RemoveUOPs() {
for (int i=0; i<be2me_16(m_pPGCIT->num); i++)
{
- if (pgc = GetPGCI(i, m_pPGCIT))
+ pgc = GetPGCI(i, m_pPGCIT);
+ if (pgc)
pgc->prohibited_ops = 0;
}
}
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index c419821e0..ad9760435 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -769,7 +769,7 @@ void CMainFrame::OnDestroy() if( !e.Wait(5000) )
{
TRACE(_T("ERROR: Must call TerminateThread() on CMainFrame::m_pGraphThread->m_hThread\n"));
- TerminateThread( m_pGraphThread->m_hThread, -1 );
+ TerminateThread( m_pGraphThread->m_hThread, (DWORD)-1 );
}
}
@@ -1547,7 +1547,6 @@ LRESULT CMainFrame::OnAppCommand(WPARAM wParam, LPARAM lParam) {
UINT cmd = GET_APPCOMMAND_LPARAM(lParam);
UINT uDevice = GET_DEVICE_LPARAM(lParam);
- UINT dwKeys = GET_KEYSTATE_LPARAM(lParam);
if(uDevice != FAPPCOMMAND_OEM ||
cmd == APPCOMMAND_MEDIA_PLAY || cmd == APPCOMMAND_MEDIA_PAUSE || cmd == APPCOMMAND_MEDIA_CHANNEL_UP ||
@@ -3238,7 +3237,6 @@ BOOL CMainFrame::OnMenu(CMenu* pMenu) KillTimer(TIMER_FULLSCREENMOUSEHIDER);
m_fHideCursor = false;
- CWnd *pModalParent = GetModalParent();
CPoint point;
GetCursorPos(&point);
@@ -4224,8 +4222,8 @@ void CMainFrame::OnFileOpendvd() bi.iImage = 0;
static LPITEMIDLIST iil;
-
- if(iil = SHBrowseForFolder(&bi))
+ iil = SHBrowseForFolder(&bi);
+ if(iil)
{
CHdmvClipInfo ClipInfo;
CString strPlaylistFile;
@@ -4468,7 +4466,8 @@ bool CMainFrame::GetDIB(BYTE** ppData, long& size, bool fSilent) break;
}
- if(!(*ppData = DNew BYTE[size])) return false;
+ *ppData = DNew BYTE[size];
+ if(!(*ppData)) return false;
hr = m_pCAP->GetDIB(*ppData, (DWORD*)&size);
// if(FAILED(hr)) {errmsg.Format(_T("GetDIB failed, hr = %08x"), hr); break;}
@@ -4506,7 +4505,8 @@ bool CMainFrame::GetDIB(BYTE** ppData, long& size, bool fSilent) }
size = (long)dwSize+sizeof(BITMAPINFOHEADER);
- if(!(*ppData = DNew BYTE[size])) return false;
+ *ppData = DNew BYTE[size];
+ if(!(*ppData)) return false;
memcpy_s (*ppData, size, &bih, sizeof(BITMAPINFOHEADER));
memcpy_s (*ppData+sizeof(BITMAPINFOHEADER), size-sizeof(BITMAPINFOHEADER), pDib, dwSize);
CoTaskMemFree (pDib);
@@ -4519,8 +4519,9 @@ bool CMainFrame::GetDIB(BYTE** ppData, long& size, bool fSilent) errmsg.Format(ResStr(IDS_MAINFRM_51), hr);
break;
}
-
- if(!(*ppData = DNew BYTE[size])) return false;
+
+ *ppData = DNew BYTE[size];
+ if(!(*ppData)) return false;
hr = pBV->GetCurrentImage(&size, (long*)*ppData);
if(FAILED(hr))
@@ -4848,8 +4849,6 @@ void CMainFrame::SaveThumbnails(LPCTSTR fn) sp = -sp;
}
- int dw = spd.w;
- int dh = spd.h;
int dp = spd.pitch;
BYTE* dst = (BYTE*)spd.bits + spd.pitch*r.top + r.left*4;
@@ -5053,7 +5052,11 @@ void CMainFrame::OnFileSaveImage() if(fd.m_pOFN->nFilterIndex == 1) s.SnapShotExt = _T(".bmp");
else if(fd.m_pOFN->nFilterIndex == 2) s.SnapShotExt = _T(".jpg");
- else if(fd.m_pOFN->nFilterIndex = 3) s.SnapShotExt = _T(".png");
+ else
+ {
+ fd.m_pOFN->nFilterIndex = 3;
+ s.SnapShotExt = _T(".png");
+ }
CPath pdst(fd.GetPathName());
if(pdst.GetExtension().MakeLower() != s.SnapShotExt) pdst.RenameExtension(s.SnapShotExt);
@@ -5087,7 +5090,7 @@ void CMainFrame::OnFileSaveImageAuto() }
CString fn;
- fn.Format(_T("%s\\%s"), AfxGetAppSettings().SnapShotPath, MakeSnapshotFileName(prefix));
+ fn.Format(_T("%s\\%s"), s.SnapShotPath, MakeSnapshotFileName(prefix));
SaveImage(fn);
}
@@ -5130,7 +5133,11 @@ void CMainFrame::OnFileSaveThumbnails() if(fd.m_pOFN->nFilterIndex == 1) s.SnapShotExt = _T(".bmp");
else if(fd.m_pOFN->nFilterIndex == 2) s.SnapShotExt = _T(".jpg");
- else if(fd.m_pOFN->nFilterIndex = 3) s.SnapShotExt = _T(".png");
+ else
+ {
+ fd.m_pOFN->nFilterIndex = 3;
+ s.SnapShotExt = _T(".png");
+ }
s.ThumbRows = fd.m_rows;
s.ThumbCols = fd.m_cols;
@@ -5147,7 +5154,8 @@ void CMainFrame::OnFileSaveThumbnails() void CMainFrame::OnUpdateFileSaveThumbnails(CCmdUI* pCmdUI)
{
- OAFilterState fs = GetMediaState();
+ OAFilterState fs = GetMediaState();
+ UNUSED_ALWAYS(fs);
pCmdUI->Enable(m_iMediaLoadState == MLS_LOADED && !m_fAudioOnly && (GetPlaybackMode() == PM_FILE /*|| GetPlaybackMode() == PM_DVD*/));
}
@@ -5306,7 +5314,7 @@ void CMainFrame::OnFileISDBDownload() filehash fh;
if(!::hash((CString)m_wndPlaylistBar.GetCurFileName(), fh))
{
- MessageBeep(-1);
+ MessageBeep((UINT)-1);
return;
}
@@ -6262,7 +6270,8 @@ void CMainFrame::OnViewDefaultVideoFrame(UINT nID) void CMainFrame::OnUpdateViewDefaultVideoFrame(CCmdUI* pCmdUI)
{
pCmdUI->Enable(m_iMediaLoadState == MLS_LOADED && !m_fAudioOnly);
- pCmdUI->SetRadio(AfxGetAppSettings().iDefaultVideoSize == (pCmdUI->m_nID - ID_VIEW_VF_HALF));
+ int dvs = pCmdUI->m_nID - ID_VIEW_VF_HALF;
+ pCmdUI->SetRadio(AfxGetAppSettings().iDefaultVideoSize == dvs);
}
void CMainFrame::OnViewSwitchVideoFrame()
@@ -6415,7 +6424,7 @@ void CMainFrame::OnViewPanNScanPresets(UINT nID) nID -= ID_PANNSCAN_PRESETS_START;
- if(nID == s.m_pnspresets.GetCount())
+ if((INT_PTR)nID == s.m_pnspresets.GetCount())
{
CPnSPresetsDlg dlg;
dlg.m_pnspresets.Copy(s.m_pnspresets);
@@ -6562,14 +6571,15 @@ void CMainFrame::OnViewAspectRatioNext() void CMainFrame::OnViewOntop(UINT nID)
{
nID -= ID_ONTOP_NEVER;
- if(AfxGetAppSettings().iOnTop == nID)
+ if(AfxGetAppSettings().iOnTop == (int)nID)
nID = !nID;
SetAlwaysOnTop(nID);
}
void CMainFrame::OnUpdateViewOntop(CCmdUI* pCmdUI)
{
- pCmdUI->SetRadio(AfxGetAppSettings().iOnTop == (pCmdUI->m_nID - ID_ONTOP_NEVER));
+ int onTop = pCmdUI->m_nID - ID_ONTOP_NEVER;
+ pCmdUI->SetRadio(AfxGetAppSettings().iOnTop == onTop);
}
void CMainFrame::OnViewOptions()
@@ -6808,7 +6818,6 @@ void CMainFrame::OnUpdatePlayPauseStop(CCmdUI* pCmdUI) void CMainFrame::OnPlayFramestep(UINT nID)
{
REFERENCE_TIME rt;
- AppSettings& s = AfxGetAppSettings();
if(pFS && m_fQuicktimeGraph)
{
@@ -6851,7 +6860,7 @@ void CMainFrame::OnPlayFramestep(UINT nID) if(GetMediaState() != State_Paused)
SendMessage(WM_COMMAND, ID_PLAY_PAUSE);
- REFERENCE_TIME rtAvgTime;
+ REFERENCE_TIME rtAvgTime = 0;
BeginEnumFilters(pGB, pEF, pBF)
{
BeginEnumPins(pBF, pEP, pPin)
@@ -6891,20 +6900,21 @@ void CMainFrame::OnPlayFramestep(UINT nID) void CMainFrame::OnUpdatePlayFramestep(CCmdUI* pCmdUI)
{
- bool fEnable = false;
+ bool fEnable = false;
- if(m_iMediaLoadState == MLS_LOADED && !m_fAudioOnly
- && (GetPlaybackMode() != PM_DVD || m_iDVDDomain == DVD_DOMAIN_Title)
- && GetPlaybackMode() != PM_CAPTURE
- && !m_fLiveWM)
+ if(m_iMediaLoadState == MLS_LOADED && !m_fAudioOnly &&
+ (GetPlaybackMode() != PM_DVD || m_iDVDDomain == DVD_DOMAIN_Title) &&
+ GetPlaybackMode() != PM_CAPTURE &&
+ !m_fLiveWM)
{
- REFTIME AvgTimePerFrame = 0;
- if(S_OK == pMS->IsFormatSupported(&TIME_FORMAT_FRAME)
- || pCmdUI->m_nID == ID_PLAY_FRAMESTEP || pCmdUI->m_nID == ID_PLAY_FRAMESTEPCANCEL && pFS && pFS->CanStep(0, NULL) == S_OK
- || m_fQuicktimeGraph && pFS)
- {
+ if(S_OK == pMS->IsFormatSupported(&TIME_FORMAT_FRAME))
fEnable = true;
- }
+ else if(pCmdUI->m_nID == ID_PLAY_FRAMESTEP)
+ fEnable = true;
+ else if(pCmdUI->m_nID == ID_PLAY_FRAMESTEPCANCEL && pFS && pFS->CanStep(0, NULL) == S_OK)
+ fEnable = true;
+ else if(m_fQuicktimeGraph && pFS)
+ fEnable = true;
}
pCmdUI->Enable(fEnable);
@@ -7138,7 +7148,7 @@ void CMainFrame::OnPlayChangeRate(UINT nID) }
else
{
- double dRate;
+ double dRate = 1.0;
if(GetMediaState() != State_Running)
SendMessage(WM_COMMAND, ID_PLAY_PLAY);
@@ -7601,7 +7611,7 @@ void CMainFrame::OnPlayLanguage(UINT nID) UINT i = nID;
while(i > 0 && pAMSS == m_ssarray[i-1]) i--;
if(FAILED(pAMSS->Enable(nID-i, AMSTREAMSELECTENABLE_ENABLE)))
- MessageBeep(-1);
+ MessageBeep((UINT)-1);
OpenSetupStatusBar();
}
@@ -7770,7 +7780,7 @@ void CMainFrame::OnNavigateSkip(UINT nID) REFERENCE_TIME rt = rtCur;
CComBSTR name;
- long i;
+ long i = 0;
if(nID == ID_NAVIGATE_SKIPBACK)
{
@@ -8137,7 +8147,6 @@ void CMainFrame::OnNavigateMenuItem(UINT nID) void CMainFrame::OnUpdateNavigateMenuItem(CCmdUI* pCmdUI)
{
- UINT nID = pCmdUI->m_nID - ID_NAVIGATE_MENU_LEFT;
pCmdUI->Enable((m_iMediaLoadState == MLS_LOADED) && ((GetPlaybackMode() == PM_DVD) || (GetPlaybackMode() == PM_FILE)));
}
@@ -8190,7 +8199,7 @@ public: STDMETHODIMP Write(const void* pv, ULONG cb, ULONG* pcbWritten)
{
BYTE* p = (BYTE*)pv;
- ULONG cbWritten = -1;
+ ULONG cbWritten = (ULONG)-1;
while(++cbWritten < cb)
m_data.Add(*p++);
if(pcbWritten) *pcbWritten = cbWritten;
@@ -8546,7 +8555,8 @@ void CMainFrame::OnFavoritesFile(UINT nID) void CMainFrame::OnUpdateFavoritesFile(CCmdUI* pCmdUI)
{
- UINT nID = pCmdUI->m_nID - ID_FAVORITES_FILE_START;
+ UINT nID = pCmdUI->m_nID - ID_FAVORITES_FILE_START;
+ UNUSED_ALWAYS(nID);
}
void CMainFrame::OnRecentFile(UINT nID)
@@ -8562,7 +8572,8 @@ void CMainFrame::OnRecentFile(UINT nID) void CMainFrame::OnUpdateRecentFile(CCmdUI* pCmdUI)
{
- UINT nID = pCmdUI->m_nID - ID_RECENT_FILE_START;
+ UINT nID = pCmdUI->m_nID - ID_RECENT_FILE_START;
+ UNUSED_ALWAYS(nID);
}
void CMainFrame::OnFavoritesDVD(UINT nID)
@@ -8595,7 +8606,8 @@ void CMainFrame::OnFavoritesDVD(UINT nID) SendMessage(WM_COMMAND, ID_FILE_CLOSEMEDIA);
CComPtr<IDvdState> pDvdState;
- HRESULT hr = OleLoadFromStream((IStream*)&stream, IID_IDvdState, (void**)&pDvdState);
+ HRESULT hr = OleLoadFromStream((IStream*)&stream, IID_IDvdState, (void**)&pDvdState);
+ UNUSED_ALWAYS(hr);
CAutoPtr<OpenDVDData> p(DNew OpenDVDData());
if(p)
@@ -8609,7 +8621,8 @@ void CMainFrame::OnFavoritesDVD(UINT nID) void CMainFrame::OnUpdateFavoritesDVD(CCmdUI* pCmdUI)
{
- UINT nID = pCmdUI->m_nID - ID_FAVORITES_DVD_START;
+ UINT nID = pCmdUI->m_nID - ID_FAVORITES_DVD_START;
+ UNUSED_ALWAYS(nID);
}
void CMainFrame::OnFavoritesDevice(UINT nID)
@@ -8619,7 +8632,8 @@ void CMainFrame::OnFavoritesDevice(UINT nID) void CMainFrame::OnUpdateFavoritesDevice(CCmdUI* pCmdUI)
{
- UINT nID = pCmdUI->m_nID - ID_FAVORITES_DEVICE_START;
+ UINT nID = pCmdUI->m_nID - ID_FAVORITES_DEVICE_START;
+ UNUSED_ALWAYS(nID);
}
// help
@@ -9089,7 +9103,7 @@ void CMainFrame::ToggleFullscreen(bool fToNearest, bool fSwitchScreenResWhenHasT void CMainFrame::AutoChangeMonitorMode()
{
CStringW mf_hmonitor = AfxGetAppSettings().f_hmonitor;
- double MediaFPS;
+ double MediaFPS = 0.0;
if (GetPlaybackMode() == PM_FILE)
{
@@ -9125,16 +9139,19 @@ void CMainFrame::AutoChangeMonitorMode() }
}
- if ((MediaFPS > 23.971) && (MediaFPS < 23.981) && IsVistaOrAbove())
- {
- SetDispMode(AfxGetAppSettings().AutoChangeFullscrRes.dmFullscreenRes23d976Hz, mf_hmonitor);
- return;
- }
- if ((MediaFPS > 29.965) && (MediaFPS < 29.975) && IsVistaOrAbove())
- {
- SetDispMode(AfxGetAppSettings().AutoChangeFullscrRes.dmFullscreenRes29d97Hz, mf_hmonitor);
- return;
- }
+ if (IsVistaOrAbove())
+ {
+ if ((MediaFPS > 23.971) && (MediaFPS < 23.981) && IsVistaOrAbove())
+ {
+ SetDispMode(AfxGetAppSettings().AutoChangeFullscrRes.dmFullscreenRes23d976Hz, mf_hmonitor);
+ return;
+ }
+ if ((MediaFPS > 29.965) && (MediaFPS < 29.975) && IsVistaOrAbove())
+ {
+ SetDispMode(AfxGetAppSettings().AutoChangeFullscrRes.dmFullscreenRes29d97Hz, mf_hmonitor);
+ return;
+ }
+ }
switch ((int)(MediaFPS + 0.5))
{
@@ -9615,7 +9632,6 @@ void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD) m_fRealMediaGraph = m_fShockwaveGraph = m_fQuicktimeGraph = false;
AppSettings& s = AfxGetAppSettings();
- CRenderersSettings& r = s.m_RenderersSettings;
// CASIMIR666 todo
if (s.IsD3DFullscreen() &&
@@ -9662,7 +9678,7 @@ void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD) engine = QuickTime;
}
- HRESULT hr;
+ HRESULT hr = E_FAIL;
CComPtr<IUnknown> pUnk;
if(engine == RealMedia)
@@ -9671,21 +9687,29 @@ void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD) //if (!IsRealEngineCompatible(p->fns.GetHead()))
// throw ResStr(IDS_REALVIDEO_INCOMPATIBLE);
- if(!(pUnk = (IUnknown*)(INonDelegatingUnknown*)DNew CRealMediaGraph(m_pVideoWnd->m_hWnd, hr)))
+ pUnk = (IUnknown*)(INonDelegatingUnknown*)DNew CRealMediaGraph(m_pVideoWnd->m_hWnd, hr);
+ if(!pUnk)
throw ResStr(IDS_AG_OUT_OF_MEMORY);
- if(SUCCEEDED(hr) && !!(pGB = CComQIPtr<IGraphBuilder>(pUnk)))
- m_fRealMediaGraph = true;
+ if(SUCCEEDED(hr))
+ {
+ pGB = CComQIPtr<IGraphBuilder>(pUnk);
+ if(pGB)
+ m_fRealMediaGraph = true;
+ }
}
else if(engine == ShockWave)
{
#ifdef _WIN64 // No flash on x64
MessageBox(ResStr(IDS_MAINFRM_76), _T(""), MB_OK);
#else
- if(!(pUnk = (IUnknown*)(INonDelegatingUnknown*)DNew CShockwaveGraph(m_pVideoWnd->m_hWnd, hr)))
+ pUnk = (IUnknown*)(INonDelegatingUnknown*)DNew CShockwaveGraph(m_pVideoWnd->m_hWnd, hr);
+ if(!pUnk)
throw ResStr(IDS_AG_OUT_OF_MEMORY);
- if(FAILED(hr) || !(pGB = CComQIPtr<IGraphBuilder>(pUnk)))
+ if(SUCCEEDED(hr))
+ pGB = CComQIPtr<IGraphBuilder>(pUnk);
+ if(FAILED(hr) || !pGB)
throw ResStr(IDS_MAINFRM_77);
m_fShockwaveGraph = true;
#endif
@@ -9695,11 +9719,16 @@ void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD) #ifdef _WIN64 // TODOX64
// MessageBox (ResStr(IDS_MAINFRM_78), _T(""), MB_OK);
#else
- if(!(pUnk = (IUnknown*)(INonDelegatingUnknown*)DNew CQuicktimeGraph(m_pVideoWnd->m_hWnd, hr)))
+ pUnk = (IUnknown*)(INonDelegatingUnknown*)DNew CQuicktimeGraph(m_pVideoWnd->m_hWnd, hr);
+ if(!pUnk)
throw ResStr(IDS_AG_OUT_OF_MEMORY);
- if(SUCCEEDED(hr) && !!(pGB = CComQIPtr<IGraphBuilder>(pUnk)))
- m_fQuicktimeGraph = true;
+ if(SUCCEEDED(hr))
+ {
+ pGB = CComQIPtr<IGraphBuilder>(pUnk);
+ if(pGB)
+ m_fQuicktimeGraph = true;
+ }
#endif
}
@@ -10332,21 +10361,21 @@ void CMainFrame::OpenCustomizeGraph() {
CStringW name(pszName), sound(ResStr(IDS_AG_SOUND)), subtitle(L"Subtitle");
- if(idAudio != -1 && (idAudio&0x3ff) == (lcid&0x3ff) // sublang seems to be zeroed out in ogm...
+ if(idAudio != (LCID)-1 && (idAudio&0x3ff) == (lcid&0x3ff) // sublang seems to be zeroed out in ogm...
&& name.GetLength() > sound.GetLength()
&& !name.Left(sound.GetLength()).CompareNoCase(sound))
{
if(SUCCEEDED(pSS->Enable(i, AMSTREAMSELECTENABLE_ENABLE)))
- idAudio = -1;
+ idAudio = (LCID)-1;
}
- if(idSub != -1 && (idSub&0x3ff) == (lcid&0x3ff) // sublang seems to be zeroed out in ogm...
+ if(idSub != (LCID)-1 && (idSub&0x3ff) == (lcid&0x3ff) // sublang seems to be zeroed out in ogm...
&& name.GetLength() > subtitle.GetLength()
&& !name.Left(subtitle.GetLength()).CompareNoCase(subtitle)
&& name.Mid(subtitle.GetLength()).Trim().CompareNoCase(L"off"))
{
if(SUCCEEDED(pSS->Enable(i, AMSTREAMSELECTENABLE_ENABLE)))
- idSub = -1;
+ idSub = (LCID)-1;
}
if(pmt) DeleteMediaType(pmt);
@@ -10745,8 +10774,6 @@ bool DoesAudioPrecede(const CComPtr<IAMStreamSelect> &pSS, int a, int b) if(ia != -1 && ib == -1)
return true;
return false;
-
- return false;
}
// foxX: does the naive insertion, in a separate list of audio streams indexes, of stream number i
@@ -11169,14 +11196,8 @@ int CMainFrame::SearchInDir(bool DirForward) CString fn = fd.cFileName;
CString ext = fn.Mid(fn.ReverseFind('.')).MakeLower();
CString path = dir + fd.cFileName;
- if(mf.FindExt(ext))
- {
- for(int i = 0; i < mf.GetCount(); i++)
- {
- sl.AddTail(path);
- break;
- }
- }
+ if(mf.FindExt(ext) && mf.GetCount() > 0)
+ sl.AddTail(path);
}
while(FindNextFile(h, &fd));
FindClose(h);
@@ -11307,9 +11328,12 @@ void CMainFrame::SendNowPlayingToMSN() data.lpData = (PVOID)(LPCWSTR)buff;
data.cbData = buff.GetLength() * 2 + 2;
- HWND hWnd = NULL;
- while(hWnd = ::FindWindowEx(NULL, hWnd, _T("MsnMsgrUIManager"), NULL))
+ HWND hWnd = ::FindWindowEx(NULL, NULL, _T("MsnMsgrUIManager"), NULL);
+ while(hWnd)
+ {
::SendMessage(hWnd, WM_COPYDATA, (WPARAM)NULL, (LPARAM)&data);
+ hWnd = ::FindWindowEx(NULL, hWnd, _T("MsnMsgrUIManager"), NULL);
+ }
}
// mIRC
@@ -11507,8 +11531,11 @@ void CMainFrame::SetupFiltersSubMenu() CComQIPtr<IAMStreamSelect> pSS = pBF;
if(pSS)
- {
- DWORD nStreams = 0, flags, group, prevgroup = -1;
+ {
+ DWORD nStreams = 0;
+ DWORD flags = (DWORD)-1;
+ DWORD group = (DWORD)-1;
+ DWORD prevgroup = (DWORD)-1;
LCID lcid;
WCHAR* wname = NULL;
CComPtr<IUnknown> pObj, pUnk;
@@ -12045,7 +12072,7 @@ void CMainFrame::SetupNavStreamSelectSubMenu(CMenu* pSub, UINT id, DWORD dwSelGr if(FAILED(pSS->Count(&cStreams)))
return;
- DWORD dwPrevGroup = -1;
+ DWORD dwPrevGroup = (DWORD)-1;
for(int i = 0, j = cStreams; i < j; i++)
{
@@ -12245,7 +12272,7 @@ void CMainFrame::SetupFavoritesSubMenu() id = ID_FAVORITES_DVD_START;
- AfxGetAppSettings().GetFav(FAV_DVD, sl);
+ s.GetFav(FAV_DVD, sl);
pos = sl.GetHeadPosition();
while(pos)
@@ -12278,7 +12305,7 @@ void CMainFrame::SetupFavoritesSubMenu() id = ID_FAVORITES_DEVICE_START;
- AfxGetAppSettings().GetFav(FAV_DEVICE, sl);
+ s.GetFav(FAV_DEVICE, sl);
pos = sl.GetHeadPosition();
while(pos)
@@ -12308,8 +12335,6 @@ void CMainFrame::SetupShadersSubMenu() if(!IsMenu(pSub->m_hMenu)) pSub->CreatePopupMenu();
else while(pSub->RemoveMenu(0, MF_BYPOSITION));
- CWinApp* pApp = AfxGetApp();
-
pSub->AppendMenu(MF_BYCOMMAND|MF_STRING|MF_ENABLED, ID_SHADERS_OFF, ResStr(IDS_SHADER_OFF));
@@ -12617,7 +12642,8 @@ void CMainFrame::SetSubtitle(ISubStream* pSubStream, bool fApplyDefStyle) style.marginRect.right = w - (style.marginRect.left + mw);
}
- bool res = pRTS->SetDefaultStyle(style);
+ bool res = pRTS->SetDefaultStyle(style);
+ UNUSED_ALWAYS(res);
}
if(pRTS->GetDefaultStyle(style) && style.relativeTo == 2)
@@ -12750,7 +12776,6 @@ void CMainFrame::SeekTo(REFERENCE_TIME rtPos, bool fSeekToKeyFrame) if(rtPos < 0) rtPos = 0;
m_nStepForwardCount = 0;
- AppSettings &s = AfxGetAppSettings();
if(GetPlaybackMode() != PM_CAPTURE)
{
__int64 start, stop;
@@ -13089,7 +13114,8 @@ bool CMainFrame::BuildGraphVideoAudio(int fVPreview, bool fVCapture, int fAPrevi if(fVidCap)
{
IBaseFilter* pBF[3] = {pVidBuffer, pVidEnc, pMux};
- HRESULT hr = BuildCapture(pVidCapPin, pBF, MEDIATYPE_Video, &m_wndCaptureBar.m_capdlg.m_mtcv);
+ HRESULT hr = BuildCapture(pVidCapPin, pBF, MEDIATYPE_Video, &m_wndCaptureBar.m_capdlg.m_mtcv);
+ UNUSED_ALWAYS(hr);
}
pAMDF = NULL;
@@ -13115,7 +13141,8 @@ bool CMainFrame::BuildGraphVideoAudio(int fVPreview, bool fVCapture, int fAPrevi if(fAudCap)
{
IBaseFilter* pBF[3] = {pAudBuffer, pAudEnc, pAudMux ? pAudMux : pMux};
- HRESULT hr = BuildCapture(pAudCapPin, pBF, MEDIATYPE_Audio, &m_wndCaptureBar.m_capdlg.m_mtca);
+ HRESULT hr = BuildCapture(pAudCapPin, pBF, MEDIATYPE_Audio, &m_wndCaptureBar.m_capdlg.m_mtca);
+ UNUSED_ALWAYS(hr);
}
}
@@ -13378,7 +13405,7 @@ void CMainFrame::CloseMedia() {
MessageBeep(MB_ICONEXCLAMATION);
TRACE(_T("CRITICAL ERROR: !!! Must kill opener thread !!!"));
- TerminateThread(m_pGraphThread->m_hThread, -1);
+ TerminateThread(m_pGraphThread->m_hThread, (DWORD)-1);
m_pGraphThread = (CGraphThread*)AfxBeginThread(RUNTIME_CLASS(CGraphThread));
m_bOpenedThruThread = false;
break;
@@ -13451,7 +13478,7 @@ IMPLEMENT_DYNCREATE(CGraphThread, CWinThread) BOOL CGraphThread::InitInstance()
{
- SetThreadName(-1, "GraphThread");
+ SetThreadName((DWORD)-1, "GraphThread");
AfxSocketInit();
return SUCCEEDED(CoInitialize(0)) ? TRUE : FALSE;
}
@@ -14318,8 +14345,8 @@ void CMainFrame::OnFileOpendirectory() bi.iImage = 0;
static LPITEMIDLIST iil;
-
- if(iil = SHBrowseForFolder(&bi))
+ iil = SHBrowseForFolder(&bi);
+ if(iil)
{
SHGetPathFromIDList(iil, path);
CString _path = path;
diff --git a/src/apps/mplayerc/MiniDump.cpp b/src/apps/mplayerc/MiniDump.cpp index 8996656a4..617eaf8ea 100644 --- a/src/apps/mplayerc/MiniDump.cpp +++ b/src/apps/mplayerc/MiniDump.cpp @@ -85,7 +85,6 @@ BOOL CMiniDump::PreventSetUnhandledExceptionFilter() LONG WINAPI CMiniDump::UnhandledExceptionFilter( _EXCEPTION_POINTERS *lpTopLevelExceptionFilter )
{
LONG retval = EXCEPTION_CONTINUE_SEARCH;
- HWND hParent = NULL;
HMODULE hDll = NULL;
_TCHAR szResult[ 800 ];
_TCHAR szDbgHelpPath[ _MAX_PATH ];
diff --git a/src/apps/mplayerc/Mpeg2SectionData.cpp b/src/apps/mplayerc/Mpeg2SectionData.cpp index 7d0b216d2..539a195f6 100644 --- a/src/apps/mplayerc/Mpeg2SectionData.cpp +++ b/src/apps/mplayerc/Mpeg2SectionData.cpp @@ -330,8 +330,10 @@ HRESULT CMpeg2DataParser::ParseNIT() transport_stream_loop_length = gb.BitRead(12); // network_descriptors_length
while (gb.GetSize() - gb.GetPos() > 4)
{
- WORD transport_stream_id = gb.BitRead(16); // transport_stream_id
- WORD original_network_id = gb.BitRead(16); // original_network_id
+ WORD transport_stream_id = gb.BitRead(16); // transport_stream_id
+ UNUSED_ALWAYS(transport_stream_id);
+ WORD original_network_id = gb.BitRead(16); // original_network_id
+ UNUSED_ALWAYS(original_network_id);
gb.BitRead(4); // reserved_future_use
BeginEnumDescriptors (gb, nType, nLength)
{
diff --git a/src/apps/mplayerc/PPageAccelTbl.cpp b/src/apps/mplayerc/PPageAccelTbl.cpp index 752801522..9b18994a6 100644 --- a/src/apps/mplayerc/PPageAccelTbl.cpp +++ b/src/apps/mplayerc/PPageAccelTbl.cpp @@ -1407,11 +1407,11 @@ void CPPageAccelTbl::OnBnClickedButton2() POSITION pos = m_list.GetFirstSelectedItemPosition();
if(!pos) return;
- AppSettings& s = AfxGetAppSettings();
-
while(pos)
{
- wmcmd& wc = m_wmcmds.GetAt((POSITION)m_list.GetItemData(m_list.GetNextSelectedItem(pos)));
+ int ni = m_list.GetNextSelectedItem(pos);
+ POSITION pi = (POSITION)m_list.GetItemData(ni);
+ wmcmd& wc = m_wmcmds.GetAt(pi);
wc.Restore();
}
diff --git a/src/apps/mplayerc/PPageAudioSwitcher.cpp b/src/apps/mplayerc/PPageAudioSwitcher.cpp index d20ad396a..63d2a2170 100644 --- a/src/apps/mplayerc/PPageAudioSwitcher.cpp +++ b/src/apps/mplayerc/PPageAudioSwitcher.cpp @@ -296,7 +296,8 @@ void CPPageAudioSwitcher::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStru pDC->SetTextColor(0xe0e0e0);
CFont f;
f.CreatePointFont(MulDiv(100, 96, pDC->GetDeviceCaps(LOGPIXELSX)), _T("Marlett"));
- CFont* old = pDC->SelectObject(&f);
+ CFont* old = pDC->SelectObject(&f);
+ UNUSED_ALWAYS(old);
s = pDC->GetTextExtent(_T("g"));
pDC->TextOut((r.left+r.right-s.cx)/2, (r.top+r.bottom-s.cy)/2, _T("g"));
diff --git a/src/apps/mplayerc/PPageCasimir.cpp b/src/apps/mplayerc/PPageCasimir.cpp index 37dccc184..06364247d 100644 --- a/src/apps/mplayerc/PPageCasimir.cpp +++ b/src/apps/mplayerc/PPageCasimir.cpp @@ -160,8 +160,6 @@ void CPPageCasimir::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) void CPPageCasimir::OnBnClickedReset()
{
- AppSettings& s = AfxGetAppSettings();
-
UpdateData(FALSE);
m_dContrast = AfxGetMyApp()->GetColorControl (Contrast)->DefaultValue;
diff --git a/src/apps/mplayerc/PPageDVD.cpp b/src/apps/mplayerc/PPageDVD.cpp index 319f10575..1b5193421 100644 --- a/src/apps/mplayerc/PPageDVD.cpp +++ b/src/apps/mplayerc/PPageDVD.cpp @@ -293,8 +293,8 @@ void CPPageDVD::OnBnClickedButton1() bi.lParam = 0;
bi.iImage = 0;
- LPITEMIDLIST iil;
- if(iil = SHBrowseForFolder(&bi))
+ LPITEMIDLIST iil = SHBrowseForFolder(&bi);
+ if(iil)
{
SHGetPathFromIDList(iil, path);
m_dvdpath = path;
diff --git a/src/apps/mplayerc/PPageFileInfoClip.cpp b/src/apps/mplayerc/PPageFileInfoClip.cpp index 584f03c90..a25c9a517 100644 --- a/src/apps/mplayerc/PPageFileInfoClip.cpp +++ b/src/apps/mplayerc/PPageFileInfoClip.cpp @@ -73,7 +73,8 @@ BOOL CPPageFileInfoClip::OnInitDialog() {
__super::OnInitDialog();
- if(m_hIcon = LoadIcon(m_fn, false))
+ m_hIcon = LoadIcon(m_fn, false);
+ if(m_hIcon)
m_icon.SetIcon(m_hIcon);
m_fn.TrimRight('/');
diff --git a/src/apps/mplayerc/PPageFileInfoDetails.cpp b/src/apps/mplayerc/PPageFileInfoDetails.cpp index bda4b265c..a3e50a62e 100644 --- a/src/apps/mplayerc/PPageFileInfoDetails.cpp +++ b/src/apps/mplayerc/PPageFileInfoDetails.cpp @@ -119,7 +119,8 @@ BOOL CPPageFileInfoDetails::OnInitDialog() if(ext.IsEmpty() || !ext.CompareNoCase(_T("file")))
ext = _T(".") + m_fn.Mid(m_fn.ReverseFind('.')+1);
- if(m_hIcon = LoadIcon(m_fn, false))
+ m_hIcon = LoadIcon(m_fn, false);
+ if(m_hIcon)
m_icon.SetIcon(m_hIcon);
if(!LoadType(ext, m_type))
@@ -172,7 +173,6 @@ BOOL CPPageFileInfoDetails::OnInitDialog() }
CSize wh(0, 0), arxy(0, 0);
- long fps = 0;
if(m_pCAP)
{
diff --git a/src/apps/mplayerc/PPageFileInfoRes.cpp b/src/apps/mplayerc/PPageFileInfoRes.cpp index 9600d4473..3e4ae164e 100644 --- a/src/apps/mplayerc/PPageFileInfoRes.cpp +++ b/src/apps/mplayerc/PPageFileInfoRes.cpp @@ -62,7 +62,8 @@ BOOL CPPageFileInfoRes::OnInitDialog() {
__super::OnInitDialog();
- if(m_hIcon = LoadIcon(m_fn, false))
+ m_hIcon = LoadIcon(m_fn, false);
+ if(m_hIcon)
m_icon.SetIcon(m_hIcon);
m_fn.TrimRight('/');
diff --git a/src/apps/mplayerc/PPageFormats.cpp b/src/apps/mplayerc/PPageFormats.cpp index e555074a0..9da4a0fa8 100644 --- a/src/apps/mplayerc/PPageFormats.cpp +++ b/src/apps/mplayerc/PPageFormats.cpp @@ -58,7 +58,8 @@ CPPageFormats::CPPageFormats() NULL,
CLSCTX_INPROC,
__uuidof(IApplicationAssociationRegistration),
- (void**)&m_pAAR);
+ (void**)&m_pAAR);
+ UNUSED_ALWAYS(hr);
}
}
@@ -130,13 +131,14 @@ CString CPPageFormats::GetOpenCommand() bool CPPageFormats::IsRegistered(CString ext)
{
+ HRESULT hr;
BOOL bIsDefault = FALSE;
CString strProgID = _T("mplayerc") + ext;
if (m_pAAR == NULL)
{
// Default manager (requires at least Vista)
- HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
+ hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
NULL,
CLSCTX_INPROC,
__uuidof(IApplicationAssociationRegistration),
@@ -146,7 +148,6 @@ bool CPPageFormats::IsRegistered(CString ext) if (m_pAAR)
{
// The Vista way
- HRESULT hr;
hr = m_pAAR->QueryAppIsDefault(ext, AT_FILEEXTENSION, AL_EFFECTIVE, g_strRegisteredAppName, &bIsDefault);
}
else
@@ -440,7 +441,9 @@ void CPPageFormats::SetListItemState(int nItem) POSITION pos = exts.GetHeadPosition();
while(pos) if(IsRegistered(exts.GetNext(pos))) cnt++;
- SetChecked(nItem, cnt == 0 ? 0 : cnt == exts.GetCount() ? 1 : 2);
+ if (cnt != 0)
+ cnt = (cnt == (int)exts.GetCount() ? 1 : 2);
+ SetChecked(nItem, cnt);
}
BEGIN_MESSAGE_MAP(CPPageFormats, CPPageBase)
@@ -591,7 +594,8 @@ BOOL CPPageFormats::SetFileAssociation(CString strExt, CString strProgID, bool f NULL,
CLSCTX_INPROC,
__uuidof(IApplicationAssociationRegistration),
- (void**)&m_pAAR);
+ (void**)&m_pAAR);
+ UNUSED_ALWAYS(hr);
}
if (m_pAAR)
@@ -987,11 +991,8 @@ void CPPageFormats::OnBnVistaModify() AfxGetMyApp()->RunAsAdministrator (strApp, strCmd, true);
- CMediaFormats& mf = AfxGetAppSettings().Formats;
for(int i = 0; i < m_list.GetItemCount(); i++)
- {
SetListItemState(i);
- }
}
void CPPageFormats::OnBnClickedButton12()
diff --git a/src/apps/mplayerc/PPageFullscreen.cpp b/src/apps/mplayerc/PPageFullscreen.cpp index 1389506cc..b7321bc28 100644 --- a/src/apps/mplayerc/PPageFullscreen.cpp +++ b/src/apps/mplayerc/PPageFullscreen.cpp @@ -166,7 +166,8 @@ BOOL CPPageFullscreen::OnApply() int iSel_23 = m_dispmode23d976combo.GetCurSel();
int iSel_29 = m_dispmode29d97combo.GetCurSel();
- if (m_AutoChangeFullscrRes.bEnabled = !!m_fSetFullscreenRes)
+ m_AutoChangeFullscrRes.bEnabled = !!m_fSetFullscreenRes;
+ if (m_AutoChangeFullscrRes.bEnabled)
{
if(iSel_24 >= 0 && iSel_24 < m_dms.GetCount())
m_AutoChangeFullscrRes.dmFullscreenRes24Hz = m_dms[m_dispmode24combo.GetCurSel()];
diff --git a/src/apps/mplayerc/PPageOutput.cpp b/src/apps/mplayerc/PPageOutput.cpp index 1fc479e4c..54f0baed1 100644 --- a/src/apps/mplayerc/PPageOutput.cpp +++ b/src/apps/mplayerc/PPageOutput.cpp @@ -198,8 +198,8 @@ BOOL CPPageOutput::OnInitDialog() CorrectComboListWidth(m_iAudioRendererTypeCtrl, GetFont());
//
- IDirect3D9* pD3D;
- if (pD3D = Direct3DCreate9(D3D_SDK_VERSION))
+ IDirect3D9* pD3D = Direct3DCreate9(D3D_SDK_VERSION);
+ if (pD3D)
{
TCHAR strGUID[50];
CString cstrGUID;
diff --git a/src/apps/mplayerc/PPageSheet.cpp b/src/apps/mplayerc/PPageSheet.cpp index a82c18561..e52777594 100644 --- a/src/apps/mplayerc/PPageSheet.cpp +++ b/src/apps/mplayerc/PPageSheet.cpp @@ -60,7 +60,9 @@ CPPageSheet::CPPageSheet(LPCTSTR pszCaption, IFilterGraph* pFG, CWnd* pParentWnd SetTreeViewMode(TRUE, TRUE, FALSE);
- if(idPage || (idPage = AfxGetApp()->GetProfileInt(IDS_R_SETTINGS, _T("LastUsedPage"), 0)))
+ if(!idPage)
+ idPage = AfxGetApp()->GetProfileInt(IDS_R_SETTINGS, _T("LastUsedPage"), 0);
+ if(idPage)
{
for(int i = 0; i < GetPageCount(); i++)
{
diff --git a/src/apps/mplayerc/PPageWebServer.cpp b/src/apps/mplayerc/PPageWebServer.cpp index 8ace1a99a..e49165e5b 100644 --- a/src/apps/mplayerc/PPageWebServer.cpp +++ b/src/apps/mplayerc/PPageWebServer.cpp @@ -193,8 +193,8 @@ bool CPPageWebServer::PickDir(CString& dir) bi.lParam = (LPARAM)(LPCTSTR)dir;
bi.iImage = 0;
- LPITEMIDLIST iil;
- if(iil = SHBrowseForFolder(&bi))
+ LPITEMIDLIST iil = SHBrowseForFolder(&bi);
+ if(iil)
{
SHGetPathFromIDList(iil, buff);
dir = buff;
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index f60c9b931..021e9d239 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -135,7 +135,8 @@ static void SetupDefaultCaps(AM_MEDIA_TYPE* pmt, VIDEO_STREAM_CONFIG_CAPS& caps) if(!pmt) return;
- VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)pmt->pbFormat;
+ VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)pmt->pbFormat;
+ UNUSED_ALWAYS(vih);
BITMAPINFOHEADER* bih = (pmt->formattype == FORMAT_VideoInfo)
? &((VIDEOINFOHEADER*)pmt->pbFormat)->bmiHeader
@@ -761,7 +762,9 @@ void CPlayerCaptureDialog::UpdateUserDefinableControls() UDACCEL ua[3] = {{0,0},{2,0},{4,0}};
- int w = m_vidhor.GetPos(), h = m_vidver.GetPos();
+ int w = m_vidhor.GetPos(), h = m_vidver.GetPos();
+ UNUSED_ALWAYS(w);
+ UNUSED_ALWAYS(h);
m_vidhor.SetRange((short)pvfe->caps.MinOutputSize.cx, (short)pvfe->caps.MaxOutputSize.cx);
/* if(bih->biCompression == mmioFOURCC('Y','U','Y','2')) // FIXME: bt8x8 drivers seem to crop the right side in yuv2 mode if the width is not divisable by 64
@@ -987,7 +990,7 @@ void CPlayerCaptureDialog::SetupVideoControls( {
for(int j = 0; j < m_vidinput.GetCount(); j++)
{
- if(m_vidinput.GetItemData(j) == InputPinIndex)
+ if(m_vidinput.GetItemData(j) == (DWORD_PTR)InputPinIndex)
{
m_vidinput.SetCurSel(j);
i = OutputPinCount;
@@ -1133,7 +1136,7 @@ void CPlayerCaptureDialog::SetupAudioControls( {
for(int i = 0; i < m_audinput.GetCount(); i++)
{
- if(m_audinput.GetItemData(i) == iSel)
+ if(m_audinput.GetItemData(i) == (DWORD_PTR)iSel)
{
m_audinput.SetCurSel(i);
break;
@@ -1192,7 +1195,7 @@ bool CPlayerCaptureDialog::SetVideoInput(int input) for(int i = 0; i < m_vidinput.GetCount(); i++)
{
- if(m_vidinput.GetItemData(i) == input)
+ if(m_vidinput.GetItemData(i) == (DWORD_PTR)input)
{
m_vidinput.SetCurSel(i);
OnVideoInput();
@@ -1216,7 +1219,7 @@ bool CPlayerCaptureDialog::SetAudioInput(int input) for(int i = 0; i < m_audinput.GetCount(); i++)
{
- if(m_audinput.GetItemData(i) == input)
+ if(m_audinput.GetItemData(i) == (DWORD_PTR)input)
{
m_audinput.SetCurSel(i);
OnAudioInput();
diff --git a/src/apps/mplayerc/PlayerListCtrl.cpp b/src/apps/mplayerc/PlayerListCtrl.cpp index 6fd3d26a7..e37ef2471 100644 --- a/src/apps/mplayerc/PlayerListCtrl.cpp +++ b/src/apps/mplayerc/PlayerListCtrl.cpp @@ -756,20 +756,23 @@ void CPlayerListCtrl::OnLButtonDblClk(UINT nFlags, CPoint point) void CPlayerListCtrl::OnLvnMarqueeBegin(NMHDR* pNMHDR, LRESULT* pResult)
{
- LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ UNUSED_ALWAYS(pNMLV);
*pResult = 1;
}
void CPlayerListCtrl::OnLvnInsertitem(NMHDR* pNMHDR, LRESULT* pResult)
{
- LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ UNUSED_ALWAYS(pNMLV);
m_nItemClicked = -1;
*pResult = 0;
}
void CPlayerListCtrl::OnLvnDeleteitem(NMHDR* pNMHDR, LRESULT* pResult)
{
- LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ UNUSED_ALWAYS(pNMLV);
m_nItemClicked = -1;
*pResult = 0;
}
@@ -806,7 +809,8 @@ void CPlayerListCtrl::OnLbnSelChangeList1() BOOL CPlayerListCtrl::OnHdnItemchanging(UINT id, NMHDR* pNMHDR, LRESULT* pResult)
{
- LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
+ LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
+ UNUSED_ALWAYS(phdr);
// SetFocus();
*pResult = 0;
return FALSE;
diff --git a/src/apps/mplayerc/PlayerNavigationBar.cpp b/src/apps/mplayerc/PlayerNavigationBar.cpp index 82ab38452..d4827175a 100644 --- a/src/apps/mplayerc/PlayerNavigationBar.cpp +++ b/src/apps/mplayerc/PlayerNavigationBar.cpp @@ -109,10 +109,7 @@ void CPlayerNavigationBar::OnSize(UINT nType, int cx, int cy) void CPlayerNavigationBar::ShowControls(CWnd* pMainfrm, bool bShow)
{
- int hbefore = 0, hafter = 0;
-
CSize s = this->CalcFixedLayout(FALSE, TRUE);
- hafter += s.cx;
((CMainFrame*) pMainfrm) ->ShowControlBar(this, bShow, TRUE);
WINDOWPLACEMENT wp;
diff --git a/src/apps/mplayerc/PlayerNavigationDialog.cpp b/src/apps/mplayerc/PlayerNavigationDialog.cpp index ba5124726..473cf2d38 100644 --- a/src/apps/mplayerc/PlayerNavigationDialog.cpp +++ b/src/apps/mplayerc/PlayerNavigationDialog.cpp @@ -66,6 +66,7 @@ BOOL CPlayerNavigationDialog::PreTranslateMessage(MSG* pMsg) if(pMsg->wParam == VK_RETURN)
{
CWnd* pFocused = GetFocus();
+ UNUSED_ALWAYS(pFocused);
}
}
return __super::PreTranslateMessage(pMsg);
@@ -148,7 +149,7 @@ void CPlayerNavigationDialog::UpdateElementList() int nCurrentChannel;
AppSettings& s = AfxGetAppSettings();
- if (s.iDefaultCaptureDevice = 1)
+ if (s.iDefaultCaptureDevice == 1)
{
m_ChannelList.ResetContent();
diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp index 828bc3a6a..b700232fd 100644 --- a/src/apps/mplayerc/PlayerPlaylistBar.cpp +++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp @@ -140,12 +140,11 @@ static bool SearchFiles(CString mask, CAtlList<CString>& sl) CMediaFormats& mf = AfxGetAppSettings().Formats;
- bool fFilterKnownExts;
- WIN32_FILE_ATTRIBUTE_DATA fad;
- mask = (fFilterKnownExts = (GetFileAttributesEx(mask, GetFileExInfoStandard, &fad)
- && (fad.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)))
- ? CString(mask).TrimRight(_T("\\/")) + _T("\\*.*")
- : mask;
+ WIN32_FILE_ATTRIBUTE_DATA fad;
+ bool fFilterKnownExts = (GetFileAttributesEx(mask, GetFileExInfoStandard, &fad)
+ && (fad.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY));
+ if (fFilterKnownExts)
+ mask = CString(mask).TrimRight(_T("\\/")) + _T("\\*.*");
{
CString dir = mask.Left(max(mask.ReverseFind('\\'), mask.ReverseFind('/'))+1);
@@ -646,9 +645,11 @@ void CPlayerPlaylistBar::SetLast() void CPlayerPlaylistBar::SetCurValid(bool fValid)
{
- if(POSITION pos = m_pl.GetPos())
+ POSITION pos = m_pl.GetPos();
+ if(pos)
{
- if(m_pl.GetAt(pos).m_fInvalid = !fValid)
+ m_pl.GetAt(pos).m_fInvalid = !fValid;
+ if(!fValid)
{
int i = FindItem(pos);
m_list.RedrawItems(i, i);
@@ -658,7 +659,8 @@ void CPlayerPlaylistBar::SetCurValid(bool fValid) void CPlayerPlaylistBar::SetCurTime(REFERENCE_TIME rt)
{
- if(POSITION pos = m_pl.GetPos())
+ POSITION pos = m_pl.GetPos();
+ if(pos)
{
CPlaylistItem& pli = m_pl.GetAt(pos);
pli.m_duration = rt;
@@ -1153,7 +1155,7 @@ void CPlayerPlaylistBar::DropItemOnList() m_list.DeleteItem(m_nDragIndex);
CList<CPlaylistItem> tmp;
- UINT id = -1;
+ UINT id = (UINT)-1;
for(int i = 0; i < m_list.GetItemCount(); i++)
{
POSITION pos = (POSITION)m_list.GetItemData(i);
diff --git a/src/apps/mplayerc/PlayerSubresyncBar.cpp b/src/apps/mplayerc/PlayerSubresyncBar.cpp index 03f3a0989..1beff5075 100644 --- a/src/apps/mplayerc/PlayerSubresyncBar.cpp +++ b/src/apps/mplayerc/PlayerSubresyncBar.cpp @@ -157,7 +157,8 @@ void CPlayerSubresyncBar::SetSubtitle(ISubStream* pSubStream, double fps) m_list.SetFont(&m_font);
}
#endif
- for(int i = 0, j = m_list.GetHeaderCtrl()->GetItemCount(); i < j; i++) m_list.DeleteColumn(0);
+ for(int i = 0, j = m_list.GetHeaderCtrl()->GetItemCount(); i < j; i++)
+ m_list.DeleteColumn(0);
m_list.InsertColumn(COL_START, _T("Time"), LVCFMT_LEFT, 90);
m_list.InsertColumn(COL_END, _T("End"), LVCFMT_LEFT, 4);
m_list.InsertColumn(COL_PREVSTART, _T("Preview"), LVCFMT_LEFT, 80);
@@ -202,7 +203,8 @@ void CPlayerSubresyncBar::ResetSubtitle() FormatTime(i, buff, 0, true);
m_list.SetItemText(i, COL_END, buff);
- if(prevstart > m_subtimes[i].orgstart) m_list.SetItemData(i, TSEP);
+ if(prevstart > m_subtimes[i].orgstart)
+ m_list.SetItemData(i, (DWORD_PTR)TSEP);
prevstart = m_subtimes[i].orgstart;
SetCheck(i, false, false);
@@ -313,14 +315,18 @@ void CPlayerSubresyncBar::UpdatePreview() m_sts[start].end = (m_list.GetItemData(start)&TEMOD)
? m_subtimes[start].newend
: (m_subtimes[start].orgend + dt);
- }
+ }
}
else if(schk.GetCount() >= 2)
{
- int i0, i1, ti0, ds;
+ int i0 = 0;
+ int i1 = 0;
+ int ti0 = 0;
+ int ds = 0;
double m = 0;
- for(int k = 0, l = schk.GetCount()-1; k < l; k++)
+ int k, l;
+ for(k = 0, l = schk.GetCount()-1; k < l; k++)
{
i0 = schk[k];
i1 = schk[k+1];
@@ -328,54 +334,21 @@ void CPlayerSubresyncBar::UpdatePreview() ti0 = m_subtimes[i0].orgstart;
ds = m_subtimes[i1].orgstart - ti0;
- if(ds == 0)
- {
- for(; start < i1; start++)
- {
- m_sts[start].start = ti0;
- m_sts[start].end = (m_list.GetItemData(start)&TEMOD)
- ? m_subtimes[start].newend
- : (ti0 + m_subtimes[start].orgend - m_subtimes[start].orgstart);
- }
- }
- else
- {
- m = double(m_subtimes[i1].newstart - m_subtimes[i0].newstart) / ds;
+ if (ds == 0)
+ SetSTS0(start, i1, ti0);
+ else
+ {
+ m = double(m_subtimes[i1].newstart - m_subtimes[i0].newstart) / ds;
+ SetSTS1(start, i1, ti0, m, i0);
+ }
- for(; start < i1; start++)
- {
- m_sts[start].start = int((m_subtimes[start].orgstart - ti0)*m + m_subtimes[i0].newstart);
- m_sts[start].end = (m_list.GetItemData(start)&TEMOD)
- ? m_subtimes[start].newend
- : m_mode == VOBSUB
- ? (m_sts[start].start + m_subtimes[start].orgend - m_subtimes[start].orgstart)
- : (m_sts[start].start + int((m_subtimes[start].orgend - m_subtimes[start].orgstart)*m));
- }
- }
}
- if(ds == 0)
- {
- for(; start < end; start++)
- {
- m_sts[start].start = ti0;
- m_sts[start].end = (m_list.GetItemData(start)&TEMOD)
- ? m_subtimes[start].newend
- : (ti0 + (m_subtimes[start].orgend - m_subtimes[start].orgstart));
- }
- }
- else
- {
- for(; start < end; start++)
- {
- m_sts[start].start = int((m_subtimes[start].orgstart - ti0)*m + m_subtimes[i0].newstart);
- m_sts[start].end = (m_list.GetItemData(start)&TEMOD)
- ? m_subtimes[start].newend
- : m_mode == VOBSUB
- ? (m_sts[start].start + m_subtimes[start].orgend - m_subtimes[start].orgstart)
- : (m_sts[start].start + int((m_subtimes[start].orgend - m_subtimes[start].orgstart)*m));
- }
- }
+ ASSERT(k > 0);
+ if (ds == 0)
+ SetSTS0(start, end, ti0);
+ else
+ SetSTS1(start, end, ti0, m, i0);
}
i = end;
@@ -400,6 +373,40 @@ void CPlayerSubresyncBar::UpdatePreview() }
}
+void CPlayerSubresyncBar::SetSTS0( int &start, int end, int ti0 )
+{
+ for(; start < end; start++)
+ {
+ m_sts[start].start = ti0;
+ int endpos;
+ if (m_list.GetItemData(start)&TEMOD)
+ endpos = m_subtimes[start].newend;
+ else
+ endpos = ti0 + m_subtimes[start].orgend - m_subtimes[start].orgstart;
+ m_sts[start].end = endpos;
+ }
+}
+
+void CPlayerSubresyncBar::SetSTS1( int &start, int end, int ti0, double m, int i0 )
+{
+ for(; start < end; start++)
+ {
+ m_sts[start].start = int((m_subtimes[start].orgstart - ti0)*m + m_subtimes[i0].newstart);
+ int endpos;
+ if (m_list.GetItemData(start)&TEMOD)
+ endpos = m_subtimes[start].newend;
+ else
+ {
+ int diff = m_subtimes[start].orgend - m_subtimes[start].orgstart;
+ if (m_mode == VOBSUB)
+ endpos = m_sts[start].start + diff;
+ else
+ endpos = m_sts[start].start + int(diff*m);
+ }
+ m_sts[start].end = endpos;
+ }
+}
+
void CPlayerSubresyncBar::UpdateStrings()
{
CString str;
@@ -1159,7 +1166,8 @@ void CPlayerSubresyncBar::OnNMDblclkList(NMHDR* pNMHDR, LRESULT* pResult) void CPlayerSubresyncBar::OnLvnKeydownList(NMHDR* pNMHDR, LRESULT* pResult)
{
- LPNMLVKEYDOWN pLVKeyDown = reinterpret_cast<LPNMLVKEYDOWN>(pNMHDR);
+ LPNMLVKEYDOWN pLVKeyDown = reinterpret_cast<LPNMLVKEYDOWN>(pNMHDR);
+ UNUSED_ALWAYS(pLVKeyDown);
*pResult = 0;
}
diff --git a/src/apps/mplayerc/PlayerSubresyncBar.h b/src/apps/mplayerc/PlayerSubresyncBar.h index ef806bdea..356f1514e 100644 --- a/src/apps/mplayerc/PlayerSubresyncBar.h +++ b/src/apps/mplayerc/PlayerSubresyncBar.h @@ -73,7 +73,10 @@ private: void UpdatePreview(), UpdateStrings();
- enum {TSMOD=1, TEMOD=2, TSADJ=4, TEADJ=8, TSEP=0x80000000};
+ enum {TSMOD=1, TEMOD=2, TSADJ=4, TEADJ=8, TSEP=0x80000000};
+
+ void SetSTS0( int &start, int end, int ti0 );
+ void SetSTS1( int &start, int end, int ti0, double m, int i0 );
void GetCheck(int iItem, bool& fStartMod, bool& fEndMod, bool& fStartAdj, bool& fEndAdj);
void SetCheck(int iItem, bool fStart, bool fEnd);
diff --git a/src/apps/mplayerc/QuicktimeGraph.cpp b/src/apps/mplayerc/QuicktimeGraph.cpp index 50d6592ef..81cc3d021 100644 --- a/src/apps/mplayerc/QuicktimeGraph.cpp +++ b/src/apps/mplayerc/QuicktimeGraph.cpp @@ -443,8 +443,8 @@ bool CQuicktimeWindow::OpenMovie(CString fn) {
Handle myHandle = NULL;
Size mySize = fn.GetLength()+1;
-
- if(!(myHandle = NewHandleClear(mySize)))
+ myHandle = NewHandleClear(mySize);
+ if(!myHandle)
return(false);
BlockMove((LPSTR)(LPCSTR)CStringA(fn), *myHandle, mySize);
@@ -515,7 +515,7 @@ bool CQuicktimeWindow::OpenMovie(CString fn) memset(&bmi, 0, sizeof(bmi));
- int bpp = m_dc.GetDeviceCaps(BITSPIXEL);
+ //int bpp = m_dc.GetDeviceCaps(BITSPIXEL);
bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bmi.bmiHeader.biCompression = BI_BITFIELDS/*BI_RGB*/;
@@ -531,7 +531,8 @@ bool CQuicktimeWindow::OpenMovie(CString fn) void* bits;
m_bm.Attach(CreateDIBSection(m_dc, (BITMAPINFO*)&bmi, DIB_RGB_COLORS, &bits, NULL, 0));
- QDErr err = NewGWorldFromHBITMAP(&m_offscreenGWorld, NULL, NULL, 0, m_bm.m_hObject, m_dc.m_hDC);
+ QDErr err = NewGWorldFromHBITMAP(&m_offscreenGWorld, NULL, NULL, 0, m_bm.m_hObject, m_dc.m_hDC);
+ UNUSED_ALWAYS(err);
SetMovieGWorld(theMovie, m_offscreenGWorld, GetGWorldDevice(m_offscreenGWorld));
diff --git a/src/apps/mplayerc/RealMediaGraph.cpp b/src/apps/mplayerc/RealMediaGraph.cpp index 355fc35b8..d609ed0f3 100644 --- a/src/apps/mplayerc/RealMediaGraph.cpp +++ b/src/apps/mplayerc/RealMediaGraph.cpp @@ -71,7 +71,8 @@ bool CRealMediaPlayer::Init() key.Close();
- if(!(m_hRealMediaCore = LoadLibrary(CString(buff) + _T("pnen3260.dll"))))
+ m_hRealMediaCore = LoadLibrary(CString(buff) + _T("pnen3260.dll"));
+ if(!m_hRealMediaCore)
return(false);
m_fpCreateEngine = (FPRMCREATEENGINE)GetProcAddress(m_hRealMediaCore, "CreateEngine");
@@ -221,6 +222,19 @@ STDMETHODIMP CRealMediaPlayer::NonDelegatingQueryInterface(REFIID riid, void** p __super::NonDelegatingQueryInterface(riid, ppv);
}
+char* AllocateErrorMessage(const char* msg)
+{
+ char* errmsg = NULL;
+ int len = strlen(msg);
+ if(len > 0)
+ {
+ errmsg = (char*)CoTaskMemAlloc(len+1);
+ if (errmsg)
+ strcpy(errmsg, msg);
+ }
+ return errmsg;
+}
+
// IRMAErrorSink
STDMETHODIMP CRealMediaPlayer::ErrorOccurred(const UINT8 unSeverity, const UINT32 ulRMACode, const UINT32 ulUserCode, const char* pUserString, const char* pMoreInfoURL)
{
@@ -233,16 +247,14 @@ STDMETHODIMP CRealMediaPlayer::ErrorOccurred(const UINT8 unSeverity, const UINT3 CComPtr<IRMABuffer> pBuffer = pErrorMessages->GetErrorText(ulRMACode);
if(pBuffer)
{
- char* buff = (char*)pBuffer->GetBuffer();
- int len = strlen(buff);
- if(len > 0 && (errmsg = (char*)CoTaskMemAlloc(len+1)))
- strcpy(errmsg, buff);
+ char* buff = (char*)pBuffer->GetBuffer();
+ errmsg = AllocateErrorMessage(buff);
}
}
- if(!errmsg && (errmsg = (char*)CoTaskMemAlloc(strlen("RealMedia error")+1)))
+ if(!errmsg)
{
- strcpy(errmsg, "RealMedia error");
+ errmsg = AllocateErrorMessage("RealMedia error");
TRACE("RealMedia error\n");
}
@@ -492,7 +504,8 @@ bool CRealMediaPlayerWindowed::CreateSite(IRMASite** ppSite) if(PNR_OK != pSiteWindowed->Create(m_wndDestFrame.m_hWnd, style))
return(false);
- return !!(*ppSite = CComQIPtr<IRMASite, &IID_IRMASite>(pSiteWindowed).Detach());
+ *ppSite = CComQIPtr<IRMASite, &IID_IRMASite>(pSiteWindowed).Detach();
+ return !!(*ppSite);
}
void CRealMediaPlayerWindowed::DestroySite(IRMASite* pSite)
@@ -553,7 +566,8 @@ bool CRealMediaPlayerWindowless::CreateSite(IRMASite** ppSite) pWMWlS->SetBltService(CComQIPtr<IRMAVideoSurface, &IID_IRMAVideoSurface>(m_pRMAP));
- return !!(*ppSite = CComQIPtr<IRMASite, &IID_IRMASite>(pSiteWindowless).Detach());
+ *ppSite = CComQIPtr<IRMASite, &IID_IRMASite>(pSiteWindowless).Detach();
+ return !!(*ppSite);
}
void CRealMediaPlayerWindowless::DestroySite(IRMASite* pSite)
diff --git a/src/apps/mplayerc/RealMediaWindowlessSite.cpp b/src/apps/mplayerc/RealMediaWindowlessSite.cpp index 4e528ca87..f15999ebe 100644 --- a/src/apps/mplayerc/RealMediaWindowlessSite.cpp +++ b/src/apps/mplayerc/RealMediaWindowlessSite.cpp @@ -37,7 +37,8 @@ void DSObjects::ExtractRects(REGION* pRegion) DWORD sizeNeeed = GetRegionData((HRGN)pRegion->pOSRegion, 0, NULL);
lpRgnData = (LPRGNDATA)DNew char[sizeNeeed];
- DWORD returnValue = GetRegionData((HRGN)pRegion->pOSRegion, sizeNeeed, lpRgnData);
+ DWORD returnValue = GetRegionData((HRGN)pRegion->pOSRegion, sizeNeeed, lpRgnData);
+ UNUSED_ALWAYS(returnValue);
PN_VECTOR_DELETE(pRegion->rects);
diff --git a/src/apps/mplayerc/SaveDlg.cpp b/src/apps/mplayerc/SaveDlg.cpp index 7484a3e24..546419e67 100644 --- a/src/apps/mplayerc/SaveDlg.cpp +++ b/src/apps/mplayerc/SaveDlg.cpp @@ -34,7 +34,7 @@ IMPLEMENT_DYNAMIC(CSaveDlg, CCmdUIDialog) CSaveDlg::CSaveDlg(CString in, CString out, CWnd* pParent /*=NULL*/)
: CCmdUIDialog(CSaveDlg::IDD, pParent)
, m_in(in), m_out(out)
- , m_nIDTimerEvent(-1)
+ , m_nIDTimerEvent((UINT_PTR)-1)
{
}
@@ -66,7 +66,7 @@ BOOL CSaveDlg::OnInitDialog() CCmdUIDialog::OnInitDialog();
m_anim.Open(IDR_AVI_FILECOPY);
- m_anim.Play(0, -1, -1);
+ m_anim.Play(0, (UINT)-1, (UINT)-1);
CString str, in = m_in, out = m_out;
if(in.GetLength() > 60) in = in.Left(17) + _T("..") + in.Right(43);
@@ -204,7 +204,8 @@ LRESULT CSaveDlg::OnGraphNotify(WPARAM wParam, LPARAM lParam) LONG evCode, evParam1, evParam2;
while(pME && SUCCEEDED(pME->GetEvent(&evCode, (LONG_PTR*)&evParam1, (LONG_PTR*)&evParam2, 0)))
{
- HRESULT hr = pME->FreeEventParams(evCode, evParam1, evParam2);
+ HRESULT hr = pME->FreeEventParams(evCode, evParam1, evParam2);
+ UNUSED_ALWAYS(hr);
if(EC_COMPLETE == evCode)
{
diff --git a/src/apps/mplayerc/ShaderEditorDlg.cpp b/src/apps/mplayerc/ShaderEditorDlg.cpp index 8a228e2f5..72d6beafd 100644 --- a/src/apps/mplayerc/ShaderEditorDlg.cpp +++ b/src/apps/mplayerc/ShaderEditorDlg.cpp @@ -63,7 +63,7 @@ CShaderEdit::CShaderEdit() m_acdlg.Create(CShaderAutoCompleteDlg::IDD, NULL);
m_nEndChar = -1;
- m_nIDEvent = -1;
+ m_nIDEvent = (UINT_PTR)-1;
}
CShaderEdit::~CShaderEdit()
@@ -122,7 +122,7 @@ END_MESSAGE_MAP() void CShaderEdit::OnUpdate()
{
- if(m_nIDEvent == -1)
+ if(m_nIDEvent == (UINT_PTR)-1)
{
m_nIDEvent = SetTimer(1, 100, NULL);
}
diff --git a/src/apps/mplayerc/ShaderEditorDlg.h b/src/apps/mplayerc/ShaderEditorDlg.h index 535ac8f88..13f2cec96 100644 --- a/src/apps/mplayerc/ShaderEditorDlg.h +++ b/src/apps/mplayerc/ShaderEditorDlg.h @@ -44,7 +44,7 @@ public: class CShaderEdit : public CLineNumberEdit
{
int m_nEndChar;
- UINT m_nIDEvent;
+ UINT_PTR m_nIDEvent;
public:
CShaderEdit();
diff --git a/src/apps/mplayerc/VolumeCtrl.cpp b/src/apps/mplayerc/VolumeCtrl.cpp index ddca751f0..a4eeb3934 100644 --- a/src/apps/mplayerc/VolumeCtrl.cpp +++ b/src/apps/mplayerc/VolumeCtrl.cpp @@ -151,8 +151,6 @@ void CVolumeCtrl::OnLButtonDown(UINT nFlags, CPoint point) int start, stop;
GetRange(start, stop);
- int pos = GetPos();
-
r.left += 3;
r.right -= 4;
diff --git a/src/apps/mplayerc/WebClientSocket.cpp b/src/apps/mplayerc/WebClientSocket.cpp index dcbb3bb8a..80eda246c 100644 --- a/src/apps/mplayerc/WebClientSocket.cpp +++ b/src/apps/mplayerc/WebClientSocket.cpp @@ -153,7 +153,7 @@ void CWebClientSocket::Header() int len = _tcstol(str, NULL, 10);
str.Empty();
- int err;
+ int err = 0;
char c;
int timeout = 1000;
diff --git a/src/apps/mplayerc/WebServer.cpp b/src/apps/mplayerc/WebServer.cpp index 7e9a57853..1719e0c5e 100644 --- a/src/apps/mplayerc/WebServer.cpp +++ b/src/apps/mplayerc/WebServer.cpp @@ -163,7 +163,7 @@ DWORD WINAPI CWebServer::StaticThreadProc(LPVOID lpParam) DWORD CWebServer::ThreadProc()
{
if(!AfxSocketInit(NULL))
- return -1;
+ return (DWORD)-1;
CWebServerSocket s(this, m_nPort);
@@ -529,12 +529,14 @@ bool CWebServer::CallCGI(CWebClientSocket* pClient, CStringA& hdr, CStringA& bod if(CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &saAttr, 0))
{
BOOL fSuccess = DuplicateHandle(hProcess, hChildStdoutRd, hProcess, &hChildStdoutRdDup, 0, FALSE, DUPLICATE_SAME_ACCESS);
+ UNUSED_ALWAYS(fSuccess);
CloseHandle(hChildStdoutRd);
}
if(CreatePipe(&hChildStdinRd, &hChildStdinWr, &saAttr, 0))
{
- BOOL fSuccess = DuplicateHandle(hProcess, hChildStdinWr, hProcess, &hChildStdinWrDup, 0, FALSE, DUPLICATE_SAME_ACCESS);
+ BOOL fSuccess = DuplicateHandle(hProcess, hChildStdinWr, hProcess, &hChildStdinWrDup, 0, FALSE, DUPLICATE_SAME_ACCESS);
+ UNUSED_ALWAYS(fSuccess);
CloseHandle(hChildStdinWr);
}
diff --git a/src/apps/mplayerc/jpeg.cpp b/src/apps/mplayerc/jpeg.cpp index 328876565..efaaad560 100644 --- a/src/apps/mplayerc/jpeg.cpp +++ b/src/apps/mplayerc/jpeg.cpp @@ -359,14 +359,16 @@ bool CJpegEncoderFile::PutByte(BYTE b) return fputc(b, m_file) != EOF;
}
-bool CJpegEncoderFile::PutBytes(const void* pData, int len)
+bool CJpegEncoderFile::PutBytes(const void* pData, size_t len)
{
return fwrite(pData, 1, len, m_file) == len;
}
bool CJpegEncoderFile::Encode(const BYTE* dib)
{
- if(!(m_file = _tfopen(m_fn, _T("wb")))) return false;
+ m_file = _tfopen(m_fn, _T("wb"));
+ if(!m_file)
+ return false;
bool ret = __super::Encode(dib);
fclose(m_file);
m_file = NULL;
@@ -385,7 +387,7 @@ bool CJpegEncoderMem::PutByte(BYTE b) return true;
}
-bool CJpegEncoderMem::PutBytes(const void* pData, int len)
+bool CJpegEncoderMem::PutBytes(const void* pData, size_t len)
{
CAtlArray<BYTE> moredata;
moredata.SetCount(len);
diff --git a/src/apps/mplayerc/jpeg.h b/src/apps/mplayerc/jpeg.h index 45bf7a8ea..4f2e4c8f4 100644 --- a/src/apps/mplayerc/jpeg.h +++ b/src/apps/mplayerc/jpeg.h @@ -44,7 +44,7 @@ class CJpegEncoder protected:
virtual bool PutByte(BYTE b) = 0;
- virtual bool PutBytes(const void* pData, int len) = 0;
+ virtual bool PutBytes(const void* pData, size_t len) = 0;
virtual bool Encode(const BYTE* dib);
public:
@@ -58,7 +58,7 @@ class CJpegEncoderFile : public CJpegEncoder protected:
bool PutByte(BYTE b);
- bool PutBytes(const void* pData, int len);
+ bool PutBytes(const void* pData, size_t len);
public:
CJpegEncoderFile(LPCTSTR fn);
@@ -72,7 +72,7 @@ class CJpegEncoderMem : public CJpegEncoder protected:
bool PutByte(BYTE b);
- bool PutBytes(const void* pData, int len);
+ bool PutBytes(const void* pData, size_t len);
public:
CJpegEncoderMem();
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index bf26c2fee..f08a8a6f7 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -126,7 +126,8 @@ HICON LoadIcon(CString fn, bool fSmall) HICON hIcon = NULL;
UINT cnt = fSmall
? ExtractIconEx(icon, id, NULL, &hIcon, 1)
- : ExtractIconEx(icon, id, &hIcon, NULL, 1);
+ : ExtractIconEx(icon, id, &hIcon, NULL, 1);
+ UNUSED_ALWAYS(cnt);
if(hIcon) return hIcon;
}
while(0);
@@ -711,7 +712,7 @@ public: {
Sleep(10000);
- MessageBeep(-1);
+ MessageBeep((UINT)-1);
// 8; //
SubPicDesc spd;
spd.w = 640;
@@ -794,7 +795,8 @@ BOOL CMPlayerCApp::InitInstance() DetourAttach(&(PVOID&)Real_mixerSetControlDetails, (PVOID)Mine_mixerSetControlDetails);
DetourAttach(&(PVOID&)Real_DeviceIoControl, (PVOID)Mine_DeviceIoControl);
- HMODULE hNTDLL = LoadLibrary (_T("ntdll.dll"));
+ HMODULE hNTDLL = LoadLibrary (_T("ntdll.dll"));
+ UNUSED_ALWAYS(hNTDLL);
#ifndef _DEBUG // Disable NtQueryInformationProcess in debug (prevent VS debugger to stop on crash address)
if (hNTDLL)
{
@@ -2366,7 +2368,8 @@ void CMPlayerCApp::Settings::UpdateData(bool fSave) double _4p3 = 4.0/3.0;
double _16p9 = 16.0/9.0;
double _185p1 = 1.85/1.0;
- double _235p1 = 2.35/1.0;
+ double _235p1 = 2.35/1.0;
+ UNUSED_ALWAYS(_185p1);
CString str;
str.Format(ResStr(IDS_SCALE_16_9), 0.5, 0.5, _4p3/_4p3, _16p9/_4p3);
@@ -2993,7 +2996,8 @@ void GetCurDispMode(dispmode& dm, CString& DisplayName) monitor = monitors.GetNearestMonitor(AfxGetApp()->m_pMainWnd);
monitor.GetName(DisplayName1);
}
- if(hDC = CreateDC(DisplayName1, NULL, NULL, NULL))
+ hDC = CreateDC(DisplayName1, NULL, NULL, NULL);
+ if(hDC)
{
dm.fValid = true;
dm.size = CSize(GetDeviceCaps(hDC, HORZRES), GetDeviceCaps(hDC, VERTRES));
diff --git a/src/common.vsprops b/src/common.vsprops index dde8c5d7d..b3e6a9f51 100644 --- a/src/common.vsprops +++ b/src/common.vsprops @@ -8,9 +8,9 @@ >
<Tool
Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WINVER=0x0600"
EnableFunctionLevelLinking="true"
WarningLevel="3"
- DisableSpecificWarnings=""
- PreprocessorDefinitions="WINVER=0x0600"
+ DisableSpecificWarnings="4239;4510;4610"
/>
</VisualStudioPropertySheet>
diff --git a/src/filters/InternalPropertyPage.cpp b/src/filters/InternalPropertyPage.cpp index 5f5f1c7c9..3f2dad87f 100644 --- a/src/filters/InternalPropertyPage.cpp +++ b/src/filters/InternalPropertyPage.cpp @@ -220,7 +220,8 @@ STDMETHODIMP CInternalPropertyPage::SetObjects(ULONG cObjects, LPUNKNOWN* ppUnk) for(ULONG i = 0; i < cObjects; i++)
m_pUnks.AddTail(ppUnk[i]);
- if(!(m_pWnd = GetWindow()))
+ m_pWnd = GetWindow();
+ if(!m_pWnd)
return E_OUTOFMEMORY;
if(!m_pWnd->OnConnect(m_pUnks))
diff --git a/src/filters/muxer/BaseMuxer/BitStream.cpp b/src/filters/muxer/BaseMuxer/BitStream.cpp index 3481740fa..abb18055f 100644 --- a/src/filters/muxer/BaseMuxer/BitStream.cpp +++ b/src/filters/muxer/BaseMuxer/BitStream.cpp @@ -75,9 +75,9 @@ STDMETHODIMP_(UINT64) CBitStream::Seek(UINT64 pos) LARGE_INTEGER li;
li.QuadPart = pos;
ULARGE_INTEGER linew;
- linew.QuadPart = -1;
+ linew.QuadPart = (ULONGLONG)-1;
m_pStream->Seek(li, STREAM_SEEK_SET, &linew);
- ASSERT(li.QuadPart == linew.QuadPart);
+ ASSERT(li.QuadPart == (LONGLONG)linew.QuadPart);
return linew.QuadPart;
}
diff --git a/src/filters/parser/BaseSplitter/AsyncReader.cpp b/src/filters/parser/BaseSplitter/AsyncReader.cpp index 2231aa440..ac940a118 100644 --- a/src/filters/parser/BaseSplitter/AsyncReader.cpp +++ b/src/filters/parser/BaseSplitter/AsyncReader.cpp @@ -32,7 +32,7 @@ CAsyncFileReader::CAsyncFileReader(CString fn, HRESULT& hr)
: CUnknown(NAME("CAsyncFileReader"), NULL, &hr)
- , m_len(-1)
+ , m_len((ULONGLONG)-1)
, m_hBreakEvent(NULL)
, m_lOsError(0)
{
@@ -42,7 +42,7 @@ CAsyncFileReader::CAsyncFileReader(CString fn, HRESULT& hr) CAsyncFileReader::CAsyncFileReader(CAtlList<CHdmvClipInfo::PlaylistItem>& Items, HRESULT& hr)
: CUnknown(NAME("CAsyncFileReader"), NULL, &hr)
- , m_len(-1)
+ , m_len((ULONGLONG)-1)
, m_hBreakEvent(NULL)
, m_lOsError(0)
{
@@ -68,8 +68,8 @@ STDMETHODIMP CAsyncFileReader::SyncRead(LONGLONG llPosition, LONG lLength, BYTE* {
try
{
- if(llPosition+lLength > GetLength()) return E_FAIL; // strange, but the Seek below can return llPosition even if the file is not that big (?)
- if(llPosition != Seek(llPosition, begin)) return E_FAIL;
+ if((ULONGLONG)llPosition+lLength > GetLength()) return E_FAIL; // strange, but the Seek below can return llPosition even if the file is not that big (?)
+ if((ULONGLONG)llPosition != Seek(llPosition, begin)) return E_FAIL;
if((UINT)lLength < Read(pBuffer, lLength)) return E_FAIL;
#if 0 // def DEBUG
@@ -133,7 +133,7 @@ CAsyncUrlReader::CAsyncUrlReader(CString url, HRESULT& hr) CallWorker(CMD_INIT);
hr = Open(m_fn, modeRead|shareDenyRead|typeBinary|osSequentialScan) ? S_OK : E_FAIL;
- m_len = -1; // force GetLength() return actual length always
+ m_len = (ULONGLONG)-1; // force GetLength() return actual length always
}
CAsyncUrlReader::~CAsyncUrlReader()
@@ -163,7 +163,7 @@ DWORD CAsyncUrlReader::ThreadProc() AfxSocketInit(NULL);
DWORD cmd = GetRequest();
- if(cmd != CMD_INIT) {Reply(E_FAIL); return E_FAIL;}
+ if(cmd != CMD_INIT) {Reply((DWORD)E_FAIL); return (DWORD)-1;}
try
{
@@ -191,7 +191,7 @@ DWORD CAsyncUrlReader::ThreadProc() }
else
{
- Reply(E_FAIL);
+ Reply((DWORD)E_FAIL);
}
fin->Close(); // must close it because the destructor doesn't seem to do it and we will get an exception when "is" is destroying
@@ -199,7 +199,7 @@ DWORD CAsyncUrlReader::ThreadProc() catch(CInternetException* ie)
{
ie->Delete();
- Reply(E_FAIL);
+ Reply((DWORD)E_FAIL);
}
//
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index ebd29f347..50e89c493 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -412,7 +412,7 @@ bool CBaseSplitterOutputPin::IsActive() DWORD CBaseSplitterOutputPin::ThreadProc()
{
- SetThreadName(-1, "CBaseSplitterOutputPin");
+ SetThreadName((DWORD)-1, "CBaseSplitterOutputPin");
m_hrDeliver = S_OK;
m_fFlushing = m_fFlushed = false;
m_eEndFlush.Set();
@@ -875,7 +875,7 @@ DWORD CBaseSplitterFilter::ThreadProc() m_eEndFlush.Set();
m_fFlushing = false;
- for(DWORD cmd = -1; ; cmd = GetRequest())
+ for(DWORD cmd = (DWORD)-1; ; cmd = GetRequest())
{
if(cmd == CMD_EXIT)
{
@@ -891,7 +891,7 @@ DWORD CBaseSplitterFilter::ThreadProc() DemuxSeek(m_rtStart);
- if(cmd != -1)
+ if(cmd != (DWORD)-1)
Reply(S_OK);
m_eEndFlush.Wait();
@@ -1091,7 +1091,7 @@ CBasePin* CBaseSplitterFilter::GetPin(int n) return m_pOutputs.GetAt(pos);
}
- if(n == m_pOutputs.GetCount() && m_pInput)
+ if(n == (int)m_pOutputs.GetCount() && m_pInput)
{
return m_pInput;
}
@@ -1175,7 +1175,8 @@ STDMETHODIMP CBaseSplitterFilter::Load(LPCOLESTR pszFileName, const AM_MEDIA_TYP STDMETHODIMP CBaseSplitterFilter::GetCurFile(LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt)
{
CheckPointer(ppszFileName, E_POINTER);
- if(!(*ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR))))
+ *ppszFileName = (LPOLESTR)CoTaskMemAlloc((m_fn.GetLength()+1)*sizeof(WCHAR));
+ if(!(*ppszFileName))
return E_OUTOFMEMORY;
wcscpy(*ppszFileName, m_fn);
return S_OK;
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.h b/src/filters/parser/BaseSplitter/BaseSplitter.h index 68114f7e7..e9e8e231d 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.h +++ b/src/filters/parser/BaseSplitter/BaseSplitter.h @@ -256,7 +256,7 @@ protected: void DeliverEndFlush();
HRESULT DeliverPacket(CAutoPtr<Packet> p);
- DWORD m_priority;
+ int m_priority;
CFontInstaller m_fontinst;
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index acb44acef..10f117bd8 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -49,7 +49,7 @@ CBaseSplitterFileEx::~CBaseSplitterFileEx() bool CBaseSplitterFileEx::NextMpegStartCode(BYTE& code, __int64 len)
{
BitByteAlign();
- DWORD dw = -1;
+ DWORD dw = (DWORD)-1;
do
{
if(len-- == 0 || !GetRemaining()) return(false);
@@ -284,11 +284,13 @@ bool CBaseSplitterFileEx::Read(seqhdr& h, int len, CMediaType* pmt) h.vbv = (DWORD)BitRead(10);
h.constrained = BitRead(1);
- if(h.fiqm = BitRead(1))
+ h.fiqm = BitRead(1);
+ if(h.fiqm)
for(int i = 0; i < countof(h.iqm); i++)
h.iqm[i] = (BYTE)BitRead(8);
- if(h.fniqm = BitRead(1))
+ h.fniqm = BitRead(1);
+ if(h.fniqm)
for(int i = 0; i < countof(h.niqm); i++)
h.niqm[i] = (BYTE)BitRead(8);
@@ -1097,7 +1099,9 @@ bool CBaseSplitterFileEx::Read(pvahdr& h, bool fSync) if(!NextMpegStartCode(b, 4)) return(false);
peshdr h2;
if(!Read(h2, b)) return(false);
- if(h.fpts = h2.fpts) h.pts = h2.pts;
+ // Maybe bug, code before: if(h.fpts = h2.fpts) h.pts = h2.pts;
+ h.fpts = h2.fpts;
+ if(h.fpts) h.pts = h2.pts;
}
BitRead(8*h.prebytes);
@@ -1633,10 +1637,6 @@ bool CBaseSplitterFileEx::Read(vc1hdr& h, int len, CMediaType* pmt) bool CBaseSplitterFileEx::Read(dvbsub& h, int len, CMediaType* pmt)
{
- __int64 endpos = GetPos() + len; // - sequence header length
- __int64 extrapos = 0, extralen = 0;
- int nFrameRateNum = 0, nFrameRateDen = 1;
-
if ((BitRead(32, true) & 0xFFFFFF00) == 0x20000f00)
{
static const SUBTITLEINFO SubFormat = { 0, "", L"" };
diff --git a/src/filters/parser/BaseSplitter/MultiFiles.cpp b/src/filters/parser/BaseSplitter/MultiFiles.cpp index c40610d85..beb3a2e84 100644 --- a/src/filters/parser/BaseSplitter/MultiFiles.cpp +++ b/src/filters/parser/BaseSplitter/MultiFiles.cpp @@ -135,7 +135,6 @@ ULONGLONG CMultiFiles::GetLength() const {
if (m_strFiles.GetCount() == 1)
{
- ULONGLONG llTotalSize = 0;
LARGE_INTEGER llSize;
GetFileSizeEx (m_hFile, &llSize);
return llSize.QuadPart;
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.cpp b/src/filters/parser/FLVSplitter/FLVSplitter.cpp index f68083b9f..51c773902 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.cpp +++ b/src/filters/parser/FLVSplitter/FLVSplitter.cpp @@ -569,7 +569,7 @@ HRESULT CFLVSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) bool CFLVSplitterFilter::DemuxInit()
{
- SetThreadName(-1, "CFLVSplitterFilter");
+ SetThreadName((DWORD)-1, "CFLVSplitterFilter");
return true;
}
@@ -652,7 +652,7 @@ void CFLVSplitterFilter::AlternateSeek(REFERENCE_TIME rt) while (true) {
bool foundAudio = false;
bool foundVideo = false;
- __int64 bestPos;
+ __int64 bestPos = 0;
estimPos = max(estimPos - seekBack, m_DataOffset);
seekBack *= 2;
@@ -711,14 +711,17 @@ bool CFLVSplitterFilter::DemuxLoop() if((t.DataSize > 0) && (t.TagType == 8 && ReadTag(at) || t.TagType == 9 && ReadTag(vt)))
{
UINT32 tsOffset = 0;
- if(t.TagType == 9 && vt.FrameType == 5) goto NextTag; // video info/command frame
- if(t.TagType == 9 && vt.CodecID == 4) m_pFile->BitRead(8);
- if(t.TagType == 9 && vt.CodecID == 5) m_pFile->BitRead(32);
- if(t.TagType == 9 && vt.CodecID == 7) {
- if (m_pFile->BitRead(8) != 1) goto NextTag;
- // Tag timestamps specify decode time, this is the display time offset
- tsOffset = m_pFile->BitRead(24);
- tsOffset = (tsOffset + 0xff800000) ^ 0xff800000; // sign extension
+ if(t.TagType == 9)
+ {
+ if(vt.FrameType == 5) goto NextTag; // video info/command frame
+ if(vt.CodecID == 4) m_pFile->BitRead(8);
+ else if(vt.CodecID == 5) m_pFile->BitRead(32);
+ else if(vt.CodecID == 7) {
+ if (m_pFile->BitRead(8) != 1) goto NextTag;
+ // Tag timestamps specify decode time, this is the display time offset
+ tsOffset = m_pFile->BitRead(24);
+ tsOffset = (tsOffset + 0xff800000) ^ 0xff800000; // sign extension
+ }
}
if(t.TagType == 8 && at.SoundFormat == 10) {
if (m_pFile->BitRead(8) != 1) goto NextTag;
diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.cpp b/src/filters/parser/SSFSplitter/SSFSplitter.cpp index b273aed2e..0ddbab434 100644 --- a/src/filters/parser/SSFSplitter/SSFSplitter.cpp +++ b/src/filters/parser/SSFSplitter/SSFSplitter.cpp @@ -204,7 +204,7 @@ HRESULT CSSFSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) bool CSSFSplitterFilter::DemuxInit()
{
- SetThreadName(-1, "CSSFSplitterFilter");
+ SetThreadName((DWORD)-1, "CSSFSplitterFilter");
return true;
}
diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp index 93e91fcd5..ac9f2a811 100644 --- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp +++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp @@ -39,10 +39,12 @@ CBaseVideoFilter::CBaseVideoFilter(TCHAR* pName, LPUNKNOWN lpunk, HRESULT* phr, {
if(phr) *phr = S_OK;
- if(!(m_pInput = DNew CBaseVideoInputPin(NAME("CBaseVideoInputPin"), this, phr, L"Video"))) *phr = E_OUTOFMEMORY;
+ m_pInput = DNew CBaseVideoInputPin(NAME("CBaseVideoInputPin"), this, phr, L"Video");
+ if(!m_pInput) *phr = E_OUTOFMEMORY;
if(FAILED(*phr)) return;
- if(!(m_pOutput = DNew CBaseVideoOutputPin(NAME("CBaseVideoOutputPin"), this, phr, L"Output"))) *phr = E_OUTOFMEMORY;
+ m_pOutput = DNew CBaseVideoOutputPin(NAME("CBaseVideoOutputPin"), this, phr, L"Output");
+ if(!m_pOutput) *phr = E_OUTOFMEMORY;
if(FAILED(*phr)) {delete m_pInput, m_pInput = NULL; return;}
m_wout = m_win = m_w = 0;
diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h index 298cc615b..9324978bc 100644 --- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h +++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h @@ -36,8 +36,8 @@ private: HRESULT Receive(IMediaSample* pIn);
// these are private for a reason, don't bother them
- DWORD m_win, m_hin, m_arxin, m_aryin;
- DWORD m_wout, m_hout, m_arxout, m_aryout;
+ int m_win, m_hin, m_arxin, m_aryin;
+ int m_wout, m_hout, m_arxout, m_aryout;
long m_cBuffers;
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp index de1aecbd7..acf57627c 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp @@ -193,7 +193,6 @@ HRESULT CDXVADecoderH264::DecodeFrame (BYTE* pDataIn, UINT nSize, REFERENCE_TIME int nFramePOC;
CComPtr<IMediaSample> pSampleToDeliver;
CComQIPtr<IMPCDXVA2Sample> pDXVA2Sample;
- int nDXIndex = 0;
UINT nNalOffset = 0;
int nOutPOC;
REFERENCE_TIME rtOutStart;
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp index 6d986fa42..7070b70ee 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp @@ -216,7 +216,6 @@ void CDXVADecoderMpeg2::Flush() int CDXVADecoderMpeg2::FindOldestFrame()
{
- REFERENCE_TIME rtMin = _I64_MAX;
int nPos = -1;
for (int i=0; i<m_nPicEntryNumber; i++)
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp index 09d8019e9..e270f8e67 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp @@ -570,7 +570,8 @@ CMPCVideoDecFilter::CMPCVideoDecFilter(LPUNKNOWN lpunk, HRESULT* phr) if(phr) *phr = S_OK;
if (m_pOutput) delete m_pOutput;
- if(!(m_pOutput = DNew CVideoDecOutputPin(NAME("CVideoDecOutputPin"), this, phr, L"Output"))) *phr = E_OUTOFMEMORY;
+ m_pOutput = DNew CVideoDecOutputPin(NAME("CVideoDecOutputPin"), this, phr, L"Output");
+ if(!m_pOutput) *phr = E_OUTOFMEMORY;
m_pCpuId = DNew CCpuId();
m_pAVCodec = NULL;
@@ -677,7 +678,8 @@ void CMPCVideoDecFilter::DetectVideoCard(HWND hWnd) m_VideoDriverVersion.HighPart = 0;
m_VideoDriverVersion.LowPart = 0;
- if (pD3D9 = Direct3DCreate9(D3D_SDK_VERSION))
+ pD3D9 = Direct3DCreate9(D3D_SDK_VERSION);
+ if (pD3D9)
{
D3DADAPTER_IDENTIFIER9 adapterIdentifier;
if (pD3D9->GetAdapterIdentifier(GetAdapter(pD3D9, hWnd), 0, &adapterIdentifier) == S_OK)
@@ -1484,7 +1486,7 @@ template<class T> inline T odd2even(T x) HRESULT CMPCVideoDecFilter::SoftwareDecode(IMediaSample* pIn, BYTE* pDataIn, int nSize, REFERENCE_TIME& rtStart, REFERENCE_TIME& rtStop)
{
- HRESULT hr;
+ HRESULT hr = S_OK;
int got_picture;
int used_bytes;
@@ -1671,7 +1673,7 @@ bool CMPCVideoDecFilter::FindPicture(int nIndex, int nStartCode) if (m_nFFPicEnd == INT_MIN)
{
if ( (dw & 0xffffff00) == 0x00000100 &&
- (dw & 0x000000FF) == nStartCode )
+ (dw & 0x000000FF) == (DWORD)nStartCode )
{
m_nFFPicEnd = i+nIndex-3;
}
@@ -1679,7 +1681,7 @@ bool CMPCVideoDecFilter::FindPicture(int nIndex, int nStartCode) else
{
if ( (dw & 0xffffff00) == 0x00000100 &&
- ( (dw & 0x000000FF) == nStartCode || (dw & 0x000000FF) == 0xB3 ))
+ ( (dw & 0x000000FF) == (DWORD)nStartCode || (dw & 0x000000FF) == 0xB3 ))
{
m_nFFPicEnd = i+nIndex-3;
return true;
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp index 4e308f2e2..cdb11e155 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp @@ -82,18 +82,17 @@ void CMPCVideoDecSettingsWnd::OnDisconnect() bool CMPCVideoDecSettingsWnd::OnActivate()
{
- DWORD dwStyle = WS_VISIBLE|WS_CHILD|WS_BORDER;
int nPosY = 10;
GUID* DxvaGui = NULL;
#if INCLUDE_MPC_VIDEO_DECODER
- m_grpFFMpeg.Create (ResStr (IDS_VDF_FFSETTINGS), WS_VISIBLE|WS_CHILD | BS_GROUPBOX, CRect (10, nPosY, 350, nPosY+150), this, IDC_STATIC);
+ m_grpFFMpeg.Create (ResStr (IDS_VDF_FFSETTINGS), WS_VISIBLE|WS_CHILD | BS_GROUPBOX, CRect (10, nPosY, 350, nPosY+150), this, (UINT)IDC_STATIC);
#if INTERNAL_DECODER_H264
// Decoding threads
nPosY += VERTICAL_SPACING;
- m_txtThreadNumber.Create (ResStr (IDS_VDF_THREADNUMBER), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, IDC_STATIC);
+ m_txtThreadNumber.Create (ResStr (IDS_VDF_THREADNUMBER), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, (UINT)IDC_STATIC);
m_cbThreadNumber.Create (WS_VISIBLE|WS_CHILD|CBS_DROPDOWNLIST|WS_VSCROLL, CRect (200, nPosY-4, 260, nPosY+90), this, IDC_PP_THREAD_NUMBER);
m_cbThreadNumber.AddString (_T("1"));
m_cbThreadNumber.AddString (_T("2"));
@@ -110,7 +109,7 @@ bool CMPCVideoDecSettingsWnd::OnActivate() // H264 deblocking mode
nPosY += VERTICAL_SPACING;
- m_txtDiscardMode.Create (ResStr (IDS_VDF_SKIPDEBLOCK), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, IDC_STATIC);
+ m_txtDiscardMode.Create (ResStr (IDS_VDF_SKIPDEBLOCK), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, (UINT)IDC_STATIC);
m_cbDiscardMode.Create (WS_VISIBLE|WS_CHILD|CBS_DROPDOWNLIST|WS_VSCROLL, CRect (200, nPosY-4, 315, nPosY+90), this, IDC_PP_DISCARD_MODE);
m_cbDiscardMode.AddString (ResStr (IDS_VDF_DBLK_NONE));
m_cbDiscardMode.AddString (ResStr (IDS_VDF_DBLK_DEFAULT));
@@ -123,7 +122,7 @@ bool CMPCVideoDecSettingsWnd::OnActivate() // Error recognition
nPosY += VERTICAL_SPACING;
- m_txtErrorRecognition.Create (ResStr (IDS_VDF_ERROR_RECOGNITION), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, IDC_STATIC);
+ m_txtErrorRecognition.Create (ResStr (IDS_VDF_ERROR_RECOGNITION), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, (UINT)IDC_STATIC);
m_cbErrorRecognition.Create (WS_VISIBLE|WS_CHILD|CBS_DROPDOWNLIST|WS_VSCROLL, CRect (200, nPosY-4, 315, nPosY+90), this, IDC_PP_DISCARD_MODE);
m_cbErrorRecognition.AddString (ResStr (IDS_VDF_ERR_CAREFUL));
m_cbErrorRecognition.AddString (ResStr (IDS_VDF_ERR_COMPLIANT));
@@ -132,7 +131,7 @@ bool CMPCVideoDecSettingsWnd::OnActivate() // IDCT Algo
nPosY += VERTICAL_SPACING;
- m_txtIDCTAlgo.Create (ResStr (IDS_VDF_IDCT_ALGO), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, IDC_STATIC);
+ m_txtIDCTAlgo.Create (ResStr (IDS_VDF_IDCT_ALGO), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, (UINT)IDC_STATIC);
m_cbIDCTAlgo.Create (WS_VISIBLE|WS_CHILD|CBS_DROPDOWNLIST|WS_VSCROLL, CRect (200, nPosY-4, 315, nPosY+90), this, IDC_PP_DISCARD_MODE);
m_cbIDCTAlgo.AddString (ResStr (IDS_VDF_IDCT_AUTO));
m_cbIDCTAlgo.AddString (ResStr (IDS_VDF_IDCT_LIBMPEG2));
@@ -147,11 +146,11 @@ bool CMPCVideoDecSettingsWnd::OnActivate() nPosY = 170;
#endif /* INCLUDE_MPC_VIDEO_DECODER */
- m_grpDXVA.Create (ResStr (IDS_VDF_DXVA_SETTING), WS_VISIBLE|WS_CHILD | BS_GROUPBOX, CRect (10, nPosY, 350, nPosY+135), this, IDC_STATIC);
+ m_grpDXVA.Create (ResStr (IDS_VDF_DXVA_SETTING), WS_VISIBLE|WS_CHILD | BS_GROUPBOX, CRect (10, nPosY, 350, nPosY+135), this, (UINT)IDC_STATIC);
// DXVA Compatibility check
nPosY += VERTICAL_SPACING;
- m_txtDXVACompatibilityCheck.Create (ResStr (IDS_VDF_DXVACOMPATIBILITY), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, IDC_STATIC);
+ m_txtDXVACompatibilityCheck.Create (ResStr (IDS_VDF_DXVACOMPATIBILITY), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 190, nPosY+15), this, (UINT)IDC_STATIC);
m_cbDXVACompatibilityCheck.Create (WS_VISIBLE|WS_CHILD|CBS_DROPDOWNLIST|WS_VSCROLL, CRect (200, nPosY-4, 315, nPosY+90), this, IDC_PP_DXVA_CHECK);
m_cbDXVACompatibilityCheck.AddString(ResStr(IDS_VDF_DXVA_FULLCHECK));
m_cbDXVACompatibilityCheck.AddString(ResStr(IDS_VDF_DXVA_SKIP_LEVELCHECK));
@@ -164,12 +163,12 @@ bool CMPCVideoDecSettingsWnd::OnActivate() // DXVA mode
nPosY += VERTICAL_SPACING;
- m_txtDXVAMode.Create (ResStr (IDS_VDF_DXVA_MODE), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 120, nPosY+15), this, IDC_STATIC);
+ m_txtDXVAMode.Create (ResStr (IDS_VDF_DXVA_MODE), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 120, nPosY+15), this, (UINT)IDC_STATIC);
m_edtDXVAMode.Create (WS_CHILD|WS_VISIBLE|WS_DISABLED, CRect (120, nPosY, 315, nPosY+20), this, 0);
// Video card description
nPosY += VERTICAL_SPACING;
- m_txtVideoCardDescription.Create (ResStr (IDS_VDF_VIDEOCARD), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 120, nPosY+15), this, IDC_STATIC);
+ m_txtVideoCardDescription.Create (ResStr (IDS_VDF_VIDEOCARD), WS_VISIBLE|WS_CHILD, CRect (LEFT_SPACING, nPosY, 120, nPosY+15), this, (UINT)IDC_STATIC);
m_edtVideoCardDescription.Create (WS_CHILD|WS_VISIBLE|WS_DISABLED, CRect (120, nPosY, 315, nPosY+20), this, 0);
m_edtVideoCardDescription.SetWindowText (m_pMDF->GetVideoCardDescription());
@@ -279,7 +278,7 @@ bool CMPCVideoDecCodecWnd::OnActivate() int nPos = 0;
MPC_VIDEO_CODEC nActiveCodecs = (MPC_VIDEO_CODEC)(m_pMDF ? m_pMDF->GetActiveCodecs() : 0);
- m_grpSelectedCodec.Create (_T("Selected codecs"), WS_VISIBLE|WS_CHILD | BS_GROUPBOX, CRect (10, 10, 330, 280), this, IDC_STATIC);
+ m_grpSelectedCodec.Create (_T("Selected codecs"), WS_VISIBLE|WS_CHILD | BS_GROUPBOX, CRect (10, 10, 330, 280), this, (UINT)IDC_STATIC);
m_lstCodecs.Create (dwStyle | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, CRect (20,30, 320, 270), this, 0);
diff --git a/src/subtitles/VobSubFile.cpp b/src/subtitles/VobSubFile.cpp index f2490c9ae..b9d1f1059 100644 --- a/src/subtitles/VobSubFile.cpp +++ b/src/subtitles/VobSubFile.cpp @@ -236,7 +236,7 @@ bool CVobSubFile::Copy(CVobSubFile& vsf) SubPos& sp = src.subpos[j];
if(!sp.fValid) continue;
- if(sp.filepos != vsf.m_sub.Seek(sp.filepos, CFile::begin))
+ if(sp.filepos != (__int64)vsf.m_sub.Seek(sp.filepos, CFile::begin))
continue;
sp.filepos = m_sub.GetPosition();
@@ -1025,7 +1025,7 @@ BYTE* CVobSubFile::GetPacket(int idx, int& packetsize, int& datasize, int iLang) if(idx < 0 || idx >= sp.GetCount())
break;
- if(m_sub.Seek(sp[idx].filepos, CFile::begin) != sp[idx].filepos)
+ if((__int64)m_sub.Seek(sp[idx].filepos, CFile::begin) != sp[idx].filepos)
break;
BYTE buff[0x800];
@@ -1951,26 +1951,6 @@ bool CVobSubFile::SaveMaestro(CString fn) f.Flush();
- RGBQUAD pal[16] =
- {
- {255, 0, 0, 0},
- {0, 0, 255, 0},
- {0, 0, 0, 0},
- {255, 255, 255, 0},
- {0, 255, 0, 0},
- {255, 0, 255, 0},
- {0, 255, 255, 0},
- {125, 125, 0, 0},
- {125, 125, 125, 0},
- {225, 225, 225, 0},
- {0, 0, 125, 0},
- {0, 125, 0, 0},
- {125, 0, 0, 0},
- {255, 0, 222, 0},
- {0, 125, 222, 0},
- {125, 0, 125, 0},
- };
-
BITMAPFILEHEADER fhdr =
{
0x4d42,
diff --git a/src/subtitles/VobSubFileRipper.cpp b/src/subtitles/VobSubFileRipper.cpp index cf793d09a..b006c9992 100644 --- a/src/subtitles/VobSubFileRipper.cpp +++ b/src/subtitles/VobSubFileRipper.cpp @@ -485,7 +485,7 @@ DWORD CVobSubFileRipper::ThreadProc() default:
Reply(E_FAIL);
- return -1;
+ return (DWORD)-1;
}
m_fBreakThread = false;
@@ -555,7 +555,7 @@ bool CVobSubFileRipper::Create() if(m_rd.fResetTime)
{
- for(ptrdiff_t i = 0; i < angle.GetCount() && ((angle[i].vob<<16)|angle[i].cell) != m_rd.selvcs[0]; i++)
+ for(size_t i = 0; i < angle.GetCount() && ((angle[i].vob<<16)|angle[i].cell) != m_rd.selvcs[0]; i++)
tStart += angle[i].tTime;
Log(LOG_INFO, _T("Counting timestamps from %I64dms (v%02dc%02d)"),
@@ -732,7 +732,7 @@ bool CVobSubFileRipper::Create() }
}
- if(curchunk.vc != ((vob<<16)|cell))
+ if(curchunk.vc != (DWORD)((vob<<16)|cell))
{
if(curchunk.vc != 0) foundchunks.Add(curchunk);
curchunk.start = curchunk.end = curpos;
@@ -804,7 +804,7 @@ bool CVobSubFileRipper::Create() }
}
- if(curchunk.vc != ((vob<<16)|cell))
+ if(curchunk.vc != (DWORD)((vob<<16)|cell))
{
if(curchunk.vc != 0) foundchunks.Add(curchunk);
curchunk.start = curchunk.end = curpos;
diff --git a/src/subtitles/VobSubImage.cpp b/src/subtitles/VobSubImage.cpp index b1ddea6ba..c0cebde2e 100644 --- a/src/subtitles/VobSubImage.cpp +++ b/src/subtitles/VobSubImage.cpp @@ -345,7 +345,8 @@ CAutoPtrList<COutline>* CVobSubImage::GetOutlineList(CPoint& topleft) {
cp = p;
- int x, y;
+ int x = 0;
+ int y = 0;
for(y = 0; y < h; y++)
{
@@ -371,7 +372,9 @@ CAutoPtrList<COutline>* CVobSubImage::GetOutlineList(CPoint& topleft) do
{
CPoint pp;
- BYTE fl, fr, br;
+ BYTE fl = 0;
+ BYTE fr = 0;
+ BYTE br = 0;
prevdir = dir;
@@ -756,7 +759,7 @@ int CVobSubImage::GrabSegment(int start, COutline& o, COutline& ret) int len = int(o.pa.GetCount());
int cur = (start)%len, first = -1, last = -1;
- int curDir = 0, lastDir = 0;
+ int lastDir = 0;
for(ptrdiff_t i = 0; i < len; i++)
{
diff --git a/src/subtitles/libssf/Rasterizer.cpp b/src/subtitles/libssf/Rasterizer.cpp index 6cb9e2838..5081b1553 100644 --- a/src/subtitles/libssf/Rasterizer.cpp +++ b/src/subtitles/libssf/Rasterizer.cpp @@ -297,23 +297,21 @@ namespace ssf std::vector<int>::iterator itX1 = heap.begin();
std::vector<int>::iterator itX2 = heap.end();
- int x1, x2;
+ int x1 = 0;
for(; itX1 != itX2; ++itX1)
{
int x = *itX1;
if(!count)
- {
x1 = x >> 1;
- }
if(x&1) ++count;
else --count;
if(!count)
{
- x2 = x >> 1;
+ int x2 = x >> 1;
if(x2 > x1)
{
@@ -564,7 +562,7 @@ namespace ssf int pitch = w*4;
BYTE* q0 = DNew BYTE[w*h];
- for(int pass = 0, limit = (int)(n + 0.5); pass < n; pass++)
+ for(int pass = 0; pass < n; pass++)
{
BYTE* p = mpOverlayBuffer + plane;
BYTE* q = q0;
diff --git a/src/subtitles/libssf/Renderer.cpp b/src/subtitles/libssf/Renderer.cpp index 80a4b4865..7597b5b4f 100644 --- a/src/subtitles/libssf/Renderer.cpp +++ b/src/subtitles/libssf/Renderer.cpp @@ -175,13 +175,14 @@ namespace ssf lf.lfQuality = ANTIALIASED_QUALITY;
lf.lfPitchAndFamily = DEFAULT_PITCH|FF_DONTCARE;
- FontWrapper* font;
+ FontWrapper* font = m_fc.Create(m_hDC, lf);
- if(!(font = m_fc.Create(m_hDC, lf)))
+ if(!font)
{
_tcscpy_s(lf.lfFaceName, _T("Arial"));
- if(!(font = m_fc.Create(m_hDC, lf)))
+ font = m_fc.Create(m_hDC, lf);
+ if(!font)
{
ASSERT(0);
continue;
@@ -623,7 +624,7 @@ namespace ssf if(g->style.shadow.depth <= 0) continue;
DWORD c = g->style.shadow.color;
- DWORD sw[6] = {c, -1};
+ DWORD sw[6] = {c, (DWORD)-1};
bool outline = g->style.background.type == L"outline" && g->style.background.size > 0;
@@ -638,7 +639,7 @@ namespace ssf Glyph* g = m_glyphs.GetNext(pos);
DWORD c = g->style.background.color;
- DWORD sw[6] = {c, -1};
+ DWORD sw[6] = {c, (DWORD)-1};
if(g->style.background.type == L"outline" && g->style.background.size > 0)
{
@@ -659,7 +660,7 @@ namespace ssf Glyph* g = m_glyphs.GetNext(pos);
DWORD c = g->style.font.color;
- DWORD sw[6] = {c, -1}; // TODO: fill
+ DWORD sw[6] = {c, (DWORD)-1}; // TODO: fill
bbox |= g->ras.Draw(spd, m_clip, g->tl.x, g->tl.y, sw, 0);
}
@@ -762,9 +763,9 @@ namespace ssf return pFW;
}
- HFONT hFont;
+ HFONT hFont = CreateFontIndirect(&lf);
- if(!(hFont = CreateFontIndirect(&lf)))
+ if(!hFont)
{
ASSERT(0);
return NULL;
diff --git a/src/ui/TreePropSheet/TreePropSheet.cpp b/src/ui/TreePropSheet/TreePropSheet.cpp index 687226860..750976305 100644 --- a/src/ui/TreePropSheet/TreePropSheet.cpp +++ b/src/ui/TreePropSheet/TreePropSheet.cpp @@ -390,7 +390,7 @@ HTREEITEM CTreePropSheet::CreatePageTreeItem(LPCTSTR lpszPath, HTREEITEM hParent if (!hItem)
{
hItem = m_pwndPageTree->InsertItem(strTopMostItem, hParent);
- m_pwndPageTree->SetItemData(hItem, -1);
+ m_pwndPageTree->SetItemData(hItem, (DWORD_PTR)-1);
if (!strPath.IsEmpty() && m_bTreeImages && m_DefaultImages.GetSafeHandle())
// set folder image
m_pwndPageTree->SetItemImage(hItem, m_Images.GetImageCount()-2, m_Images.GetImageCount()-2);
@@ -621,8 +621,8 @@ void CTreePropSheet::ActivatePreviousPage() if (!hItem)
return;
- HTREEITEM hPrevItem = NULL;
- if (hPrevItem=m_pwndPageTree->GetPrevSiblingItem(hItem))
+ HTREEITEM hPrevItem = m_pwndPageTree->GetPrevSiblingItem(hItem);
+ if (hPrevItem)
{
while (m_pwndPageTree->ItemHasChildren(hPrevItem))
{
@@ -632,7 +632,7 @@ void CTreePropSheet::ActivatePreviousPage() }
}
else
- hPrevItem=m_pwndPageTree->GetParentItem(hItem);
+ hPrevItem = m_pwndPageTree->GetParentItem(hItem);
if (!hPrevItem)
{
@@ -683,20 +683,20 @@ void CTreePropSheet::ActivateNextPage() if (!hItem)
return;
- HTREEITEM hNextItem = NULL;
- if (hNextItem=m_pwndPageTree->GetChildItem(hItem))
- ;
- else if (hNextItem=m_pwndPageTree->GetNextSiblingItem(hItem))
- ;
- else if (m_pwndPageTree->GetParentItem(hItem))
+ HTREEITEM hNextItem = m_pwndPageTree->GetChildItem(hItem);
+ if (!hNextItem)
{
- while (!hNextItem)
+ hNextItem = m_pwndPageTree->GetNextSiblingItem(hItem);
+ if (!hNextItem && m_pwndPageTree->GetParentItem(hItem))
{
- hItem = m_pwndPageTree->GetParentItem(hItem);
- if (!hItem)
- break;
-
- hNextItem = m_pwndPageTree->GetNextSiblingItem(hItem);
+ while (!hNextItem)
+ {
+ hItem = m_pwndPageTree->GetParentItem(hItem);
+ if (!hItem)
+ break;
+
+ hNextItem = m_pwndPageTree->GetNextSiblingItem(hItem);
+ }
}
}
|