From 56eabe24c67e4e7756cdc101153891b693289cd2 Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Fri, 4 Jan 2013 03:07:03 +0000 Subject: [PATCH] Fix a few new compiler warnings. --- lib-src/FileDialog/FileDialog.cpp | 2 +- lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c | 2 +- src/effects/BassTreble.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib-src/FileDialog/FileDialog.cpp b/lib-src/FileDialog/FileDialog.cpp index 01073ac35..a0a8c2764 100644 --- a/lib-src/FileDialog/FileDialog.cpp +++ b/lib-src/FileDialog/FileDialog.cpp @@ -106,7 +106,7 @@ wxString FileSelector(const wxChar *title, { if (filters[n].Contains(defaultExtension)) { - filterIndex = n; + filterIndex = (int)n; // Convert to int to avoid compiler warning, because we probably do not need many tens of thousands of filters. break; } } diff --git a/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c b/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c index 2436d8de1..54b14c0f8 100644 --- a/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c +++ b/lib-src/portaudio-v19/src/hostapi/wmme/pa_win_wmme.c @@ -820,7 +820,6 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme MMRESULT mmresult; WAVEOUTCAPS woc; PaDeviceInfo *deviceInfo = &winMmeDeviceInfo->inheritedDeviceInfo; - int wdmksDeviceOutputChannelCountIsKnown; *success = 0; @@ -886,6 +885,7 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme } #ifdef PAWIN_USE_WDMKS_DEVICE_INFO + int wdmksDeviceOutputChannelCountIsKnown; wdmksDeviceOutputChannelCountIsKnown = QueryWaveOutKSFilterMaxChannels( winMmeOutputDeviceId, &deviceInfo->maxOutputChannels ); if( wdmksDeviceOutputChannelCountIsKnown && !winMmeDeviceInfo->deviceOutputChannelCountIsKnown ) diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index fafd0ab22..c7695ebe1 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -53,7 +53,7 @@ wxString EffectBassTreble::GetEffectDescription() { bool EffectBassTreble::NewTrackSimpleMono() { - const float slope = 0.4; // same slope for both filters + const float slope = 0.4f; // same slope for both filters //(re)initialise filter parameters for low shelf xn1Bass=0; xn2Bass=0;