diff options
author | v0lt <v0lt@users.sourceforge.net> | 2011-08-12 20:34:13 +0400 |
---|---|---|
committer | v0lt <v0lt@users.sourceforge.net> | 2011-08-12 20:34:13 +0400 |
commit | 2c9ae53e9e369b1b12dd8e6754603e67016e79da (patch) | |
tree | 4455e429f983de2a2c89e300136c746f0f00043d /src | |
parent | 76343657ad97b25486d7a2c94a224ddaf6e29e86 (diff) |
some return back after rev.3637 and update fix C4018 warnings
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3656 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
-rw-r--r-- | src/apps/mplayerc/PlayerCaptureDialog.cpp | 2 | ||||
-rw-r--r-- | src/filters/transform/MpaDecFilter/MpaDecFilter.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index 21dba8524..6363959cf 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -1134,7 +1134,7 @@ void CPlayerCaptureDialog::SetupAudioControls( if (pAMAIM.GetCount() > 0) {
m_pAMAIM.Copy(pAMAIM);
- size_t iSel = MAXSIZE_T;
+ int iSel = -1;
for (size_t i = 0; i < m_pAMAIM.GetCount(); i++) {
CComQIPtr<IPin> pPin = m_pAMAIM[i];
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index dcb008767..d51022104 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -1219,7 +1219,7 @@ HRESULT CMpaDecFilter::ProcessAAC() dwChannelMask = 0;
}
- for(unsigned long j = 0; j < info.samples; j += info.channels, dst += info.channels)
+ for(unsigned int j = 0; j < info.samples; j += info.channels, dst += info.channels)
for(int i = 0; i < info.channels; i++) {
dst[chmap[i]] = *src++;
}
@@ -1554,15 +1554,15 @@ HRESULT CMpaDecFilter::ProcessPS2ADPCM() BYTE* end = p + m_buff.GetCount();
WAVEFORMATEXPS2* wfe = (WAVEFORMATEXPS2*)m_pInput->CurrentMediaType().Format();
- DWORD size = wfe->dwInterleave*wfe->nChannels;
- DWORD samples = wfe->dwInterleave * 14 / 16 * 2;
- DWORD channels = wfe->nChannels;
+ int size = wfe->dwInterleave*wfe->nChannels;
+ int samples = wfe->dwInterleave * 14 / 16 * 2;
+ int channels = wfe->nChannels;
CAtlArray<float> pBuff;
pBuff.SetCount(samples*channels);
float* f = pBuff.GetData();
- while((DWORD)(end - p) >= size) {
+ while(end - p >= size) {
DWORD* dw = (DWORD*)p;
if(dw[0] == 'dhSS') {
@@ -1574,13 +1574,13 @@ HRESULT CMpaDecFilter::ProcessPS2ADPCM() if(m_ps2_state.sync) {
double* tmp = DNew double[samples*channels];
- for(DWORD channel = 0, j = 0, k = 0; channel < channels; channel++, j += wfe->dwInterleave)
+ for(int channel = 0, j = 0, k = 0; channel < channels; channel++, j += wfe->dwInterleave)
for(DWORD i = 0; i < wfe->dwInterleave; i += 16, k += 28) {
decodeps2adpcm(m_ps2_state, channel, p + i + j, tmp + k);
}
- for(DWORD i = 0, k = 0; i < samples; i++)
- for(DWORD j = 0; j < channels; j++, k++) {
+ for(int i = 0, k = 0; i < samples; i++)
+ for(int j = 0; j < channels; j++, k++) {
f[k] = (float)tmp[j*samples+i];
}
|