diff options
author | Underground78 <underground78@users.sourceforge.net> | 2011-08-10 16:17:36 +0400 |
---|---|---|
committer | Underground78 <underground78@users.sourceforge.net> | 2011-08-10 16:17:36 +0400 |
commit | a08c92d2a6c360bbbba811ca0f406a1a4b30633d (patch) | |
tree | 961a22d6dcaff79316956705fdcdc581dd8440ce /src/apps/mplayerc | |
parent | 8b25c67390734a4fc19202723978786a62d0bfe3 (diff) |
Fix some warnings:
- constify a reference so that temporary objects can be used without issuing a warning.
- fix a few C4018 warnings (signed/unsigned mismatch).
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3632 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc')
-rw-r--r-- | src/apps/mplayerc/PlayerCaptureDialog.cpp | 10 | ||||
-rw-r--r-- | src/apps/mplayerc/PlayerCaptureDialog.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index ecf30d7cd..143f748e3 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -1125,7 +1125,7 @@ void CPlayerCaptureDialog::SetupVideoControls( void CPlayerCaptureDialog::SetupAudioControls(
CStringW DisplayName,
- IAMStreamConfig* pAMSC, CInterfaceArray<IAMAudioInputMixer>& pAMAIM)
+ IAMStreamConfig* pAMSC, const CInterfaceArray<IAMAudioInputMixer>& pAMAIM)
{
EmptyAudio();
@@ -1134,11 +1134,11 @@ void CPlayerCaptureDialog::SetupAudioControls( if (pAMAIM.GetCount() > 0) {
m_pAMAIM.Copy(pAMAIM);
- int iSel = -1;
+ size_t iSel = -1;
- for (int i = 0; i < (int)m_pAMAIM.GetCount(); i++) {
+ for (size_t i = 0; i < m_pAMAIM.GetCount(); i++) {
CComQIPtr<IPin> pPin = m_pAMAIM[i];
- m_audinput.SetItemData(m_audinput.AddString(CString(GetPinName(pPin))), (DWORD_PTR)i);
+ m_audinput.SetItemData(m_audinput.AddString(CString(GetPinName(pPin))), i);
BOOL fEnable;
if (SUCCEEDED(m_pAMAIM[i]->get_Enable(&fEnable)) && fEnable) {
@@ -1148,7 +1148,7 @@ void CPlayerCaptureDialog::SetupAudioControls( if (m_audinput.GetCount() > 0) {
for (int i = 0; i < m_audinput.GetCount(); i++) {
- if (m_audinput.GetItemData(i) == (DWORD_PTR)iSel) {
+ if (m_audinput.GetItemData(i) == iSel) {
m_audinput.SetCurSel(i);
break;
}
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.h b/src/apps/mplayerc/PlayerCaptureDialog.h index 4f3da8e35..7f056a2d7 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.h +++ b/src/apps/mplayerc/PlayerCaptureDialog.h @@ -443,7 +443,7 @@ public: public:
void SetupVideoControls(CStringW DisplayName, IAMStreamConfig* pAMSC, IAMCrossbar* pAMXB, IAMTVTuner* pAMTuner);
void SetupVideoControls(CStringW DisplayName, IAMStreamConfig* pAMSC, IAMVfwCaptureDialogs* pAMVfwCD);
- void SetupAudioControls(CStringW DisplayName, IAMStreamConfig* pAMSC, CInterfaceArray<IAMAudioInputMixer>& pAMAIM);
+ void SetupAudioControls(CStringW DisplayName, IAMStreamConfig* pAMSC, const CInterfaceArray<IAMAudioInputMixer>& pAMAIM);
bool IsTunerActive();
|