Clean up most remaining MSVC warnings.
This commit is contained in:
parent
b2f8cf180f
commit
d2fe7b1757
|
@ -0,0 +1,8 @@
|
||||||
|
// -*- mode: c++ -*-
|
||||||
|
// Indirectly include Allegro header so that we can disable warnings about unused parameters
|
||||||
|
// when compiling Audacity itself.
|
||||||
|
|
||||||
|
#pragma warning( push )
|
||||||
|
#pragma warning( disable : 4100)
|
||||||
|
#include "../portsmf/allegro.h"
|
||||||
|
#pragma warning( pop )
|
|
@ -0,0 +1,8 @@
|
||||||
|
// -*- mode: c++ -*-
|
||||||
|
// Indirectly include SBSMS header so that we can disable warnings about unused parameters
|
||||||
|
// when compiling Audacity itself.
|
||||||
|
|
||||||
|
#pragma warning( push )
|
||||||
|
#pragma warning( disable : 4100)
|
||||||
|
#include "../sbsms/include/sbsms.h"
|
||||||
|
#pragma warning( pop )
|
|
@ -1063,6 +1063,10 @@ void AudacityApp::OnFatalException()
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#pragma warning( push )
|
||||||
|
#pragma warning( disable : 4702) // unreachable code warning.
|
||||||
|
|
||||||
bool AudacityApp::OnExceptionInMainLoop()
|
bool AudacityApp::OnExceptionInMainLoop()
|
||||||
{
|
{
|
||||||
// This function is invoked from catch blocks in the wxWidgets framework,
|
// This function is invoked from catch blocks in the wxWidgets framework,
|
||||||
|
@ -1099,10 +1103,10 @@ bool AudacityApp::OnExceptionInMainLoop()
|
||||||
// Let the inherited function do throw; again and whatever else it does.
|
// Let the inherited function do throw; again and whatever else it does.
|
||||||
return wxApp::OnExceptionInMainLoop();
|
return wxApp::OnExceptionInMainLoop();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Shouldn't ever reach this line
|
// Shouldn't ever reach this line
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#pragma warning( pop )
|
||||||
|
|
||||||
#if defined(EXPERIMENTAL_CRASH_REPORT)
|
#if defined(EXPERIMENTAL_CRASH_REPORT)
|
||||||
void AudacityApp::GenerateCrashReport(wxDebugReport::Context ctx)
|
void AudacityApp::GenerateCrashReport(wxDebugReport::Context ctx)
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include "../lib-src/portmidi/pm_common/portmidi.h"
|
#include "../lib-src/portmidi/pm_common/portmidi.h"
|
||||||
#include "../lib-src/portmidi/porttime/porttime.h"
|
#include "../lib-src/portmidi/porttime/porttime.h"
|
||||||
#include <cstring> // Allegro include fails if this header isn't included do to no memcpy
|
#include <cstring> // Allegro include fails if this header isn't included do to no memcpy
|
||||||
#include "../lib-src/portsmf/allegro.h"
|
#include "../lib-src/header-substitutes/allegro.h"
|
||||||
|
|
||||||
class NoteTrack;
|
class NoteTrack;
|
||||||
using NoteTrackArray = std::vector < NoteTrack* >;
|
using NoteTrackArray = std::vector < NoteTrack* >;
|
||||||
|
|
|
@ -556,7 +556,7 @@ size_t BlockFile::CommonReadData(
|
||||||
else {
|
else {
|
||||||
auto channels = info.channels;
|
auto channels = info.channels;
|
||||||
wxASSERT(channels >= 1);
|
wxASSERT(channels >= 1);
|
||||||
wxASSERT(channel < channels);
|
wxASSERT(channel < (unsigned int)channels);
|
||||||
|
|
||||||
if (channels == 1 &&
|
if (channels == 1 &&
|
||||||
format == int16Sample &&
|
format == int16Sample &&
|
||||||
|
|
|
@ -67,7 +67,7 @@ bool Envelope::ConsistencyCheck()
|
||||||
for ( size_t ii = 0, count = mEnv.size(); ii < count; ) {
|
for ( size_t ii = 0, count = mEnv.size(); ii < count; ) {
|
||||||
// Find range of points with equal T
|
// Find range of points with equal T
|
||||||
const double thisT = mEnv[ii].GetT();
|
const double thisT = mEnv[ii].GetT();
|
||||||
double nextT;
|
double nextT = 0.0f;
|
||||||
auto nextI = ii + 1;
|
auto nextI = ii + 1;
|
||||||
while ( nextI < count && thisT == ( nextT = mEnv[nextI].GetT() ) )
|
while ( nextI < count && thisT == ( nextT = mEnv[nextI].GetT() ) )
|
||||||
++nextI;
|
++nextI;
|
||||||
|
@ -1080,7 +1080,7 @@ void Envelope::SetTrackLen( double trackLen, double sampleDur )
|
||||||
// Preserve the left-side limit at trackLen.
|
// Preserve the left-side limit at trackLen.
|
||||||
auto range = EqualRange( trackLen, sampleDur );
|
auto range = EqualRange( trackLen, sampleDur );
|
||||||
bool needPoint = ( range.first == range.second && trackLen < mTrackLen );
|
bool needPoint = ( range.first == range.second && trackLen < mTrackLen );
|
||||||
double value;
|
double value=0.0;
|
||||||
if ( needPoint )
|
if ( needPoint )
|
||||||
value = GetValueRelative( trackLen );
|
value = GetValueRelative( trackLen );
|
||||||
|
|
||||||
|
@ -1344,7 +1344,7 @@ void Envelope::GetValues
|
||||||
// Getting many envelope values, corresponding to pixel columns, which may
|
// Getting many envelope values, corresponding to pixel columns, which may
|
||||||
// not be uniformly spaced in time when there is a fisheye.
|
// not be uniformly spaced in time when there is a fisheye.
|
||||||
|
|
||||||
double prevDiscreteTime, prevSampleVal, nextSampleVal;
|
double prevDiscreteTime=0.0, prevSampleVal=0.0, nextSampleVal=0.0;
|
||||||
for ( int xx = 0; xx < bufferLen; ++xx ) {
|
for ( int xx = 0; xx < bufferLen; ++xx ) {
|
||||||
auto time = zoomInfo.PositionToTime( xx, -leftOffset );
|
auto time = zoomInfo.PositionToTime( xx, -leftOffset );
|
||||||
if ( sampleDur <= 0 )
|
if ( sampleDur <= 0 )
|
||||||
|
|
17
src/FFT.cpp
17
src/FFT.cpp
|
@ -357,8 +357,9 @@ const wxChar *WindowFuncName(int whichFunction)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NewWindowFunc(int whichFunction, size_t NumSamples, bool extraSample, float *in)
|
void NewWindowFunc(int whichFunction, size_t NumSamplesIn, bool extraSample, float *in)
|
||||||
{
|
{
|
||||||
|
int NumSamples = (int)NumSamplesIn;
|
||||||
if (extraSample) {
|
if (extraSample) {
|
||||||
wxASSERT(NumSamples > 0);
|
wxASSERT(NumSamples > 0);
|
||||||
--NumSamples;
|
--NumSamples;
|
||||||
|
@ -533,7 +534,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
|
||||||
wxASSERT(NumSamples > 0);
|
wxASSERT(NumSamples > 0);
|
||||||
--NumSamples;
|
--NumSamples;
|
||||||
// in[0] *= 1.0f;
|
// in[0] *= 1.0f;
|
||||||
for (int ii = 1; ii < NumSamples; ++ii)
|
for (int ii = 1; ii < (int)NumSamples; ++ii)
|
||||||
in[ii] = 0.0f;
|
in[ii] = 0.0f;
|
||||||
in[NumSamples] *= -1.0f;
|
in[NumSamples] *= -1.0f;
|
||||||
return;
|
return;
|
||||||
|
@ -585,7 +586,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
|
||||||
in[0] *= coeff0;
|
in[0] *= coeff0;
|
||||||
if (!extraSample)
|
if (!extraSample)
|
||||||
--NumSamples;
|
--NumSamples;
|
||||||
for (int ii = 0; ii < NumSamples; ++ii)
|
for (int ii = 0; ii < (int)NumSamples; ++ii)
|
||||||
in[ii] *= - coeff1 * sin(ii * multiplier);
|
in[ii] *= - coeff1 * sin(ii * multiplier);
|
||||||
if (extraSample)
|
if (extraSample)
|
||||||
in[NumSamples] *= - coeff0;
|
in[NumSamples] *= - coeff0;
|
||||||
|
@ -599,7 +600,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
|
||||||
// Hanning
|
// Hanning
|
||||||
const double multiplier = 2 * M_PI / NumSamples;
|
const double multiplier = 2 * M_PI / NumSamples;
|
||||||
const double coeff1 = -0.5 * multiplier;
|
const double coeff1 = -0.5 * multiplier;
|
||||||
for (int ii = 0; ii < NumSamples; ++ii)
|
for (int ii = 0; ii < (int)NumSamples; ++ii)
|
||||||
in[ii] *= - coeff1 * sin(ii * multiplier);
|
in[ii] *= - coeff1 * sin(ii * multiplier);
|
||||||
if (extraSample)
|
if (extraSample)
|
||||||
in[NumSamples] = 0.0f;
|
in[NumSamples] = 0.0f;
|
||||||
|
@ -611,7 +612,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
|
||||||
const double multiplier = 2 * M_PI / NumSamples;
|
const double multiplier = 2 * M_PI / NumSamples;
|
||||||
const double multiplier2 = 2 * multiplier;
|
const double multiplier2 = 2 * multiplier;
|
||||||
const double coeff1 = -0.5 * multiplier, coeff2 = 0.08 * multiplier2;
|
const double coeff1 = -0.5 * multiplier, coeff2 = 0.08 * multiplier2;
|
||||||
for (int ii = 0; ii < NumSamples; ++ii)
|
for (int ii = 0; ii < (int)NumSamples; ++ii)
|
||||||
in[ii] *= - coeff1 * sin(ii * multiplier) - coeff2 * sin(ii * multiplier2);
|
in[ii] *= - coeff1 * sin(ii * multiplier) - coeff2 * sin(ii * multiplier2);
|
||||||
if (extraSample)
|
if (extraSample)
|
||||||
in[NumSamples] = 0.0f;
|
in[NumSamples] = 0.0f;
|
||||||
|
@ -625,7 +626,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
|
||||||
const double multiplier3 = 3 * multiplier;
|
const double multiplier3 = 3 * multiplier;
|
||||||
const double coeff1 = -0.48829 * multiplier,
|
const double coeff1 = -0.48829 * multiplier,
|
||||||
coeff2 = 0.14128 * multiplier2, coeff3 = -0.01168 * multiplier3;
|
coeff2 = 0.14128 * multiplier2, coeff3 = -0.01168 * multiplier3;
|
||||||
for (int ii = 0; ii < NumSamples; ++ii)
|
for (int ii = 0; ii < (int)NumSamples; ++ii)
|
||||||
in[ii] *= - coeff1 * sin(ii * multiplier) - coeff2 * sin(ii * multiplier2) - coeff3 * sin(ii * multiplier3);
|
in[ii] *= - coeff1 * sin(ii * multiplier) - coeff2 * sin(ii * multiplier2) - coeff3 * sin(ii * multiplier3);
|
||||||
if (extraSample)
|
if (extraSample)
|
||||||
in[NumSamples] = 0.0f;
|
in[NumSamples] = 0.0f;
|
||||||
|
@ -636,7 +637,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
|
||||||
// Welch
|
// Welch
|
||||||
const float N = NumSamples;
|
const float N = NumSamples;
|
||||||
const float NN = NumSamples * NumSamples;
|
const float NN = NumSamples * NumSamples;
|
||||||
for (int ii = 0; ii < NumSamples; ++ii) {
|
for (int ii = 0; ii < (int)NumSamples; ++ii) {
|
||||||
in[ii] *= 4 * (N - ii - ii) / NN;
|
in[ii] *= 4 * (N - ii - ii) / NN;
|
||||||
}
|
}
|
||||||
if (extraSample)
|
if (extraSample)
|
||||||
|
@ -668,7 +669,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
|
||||||
in[0] *= exp(A * 0.25) * (1 - invN);
|
in[0] *= exp(A * 0.25) * (1 - invN);
|
||||||
if (!extraSample)
|
if (!extraSample)
|
||||||
--NumSamples;
|
--NumSamples;
|
||||||
for (int ii = 1; ii < NumSamples; ++ii) {
|
for (int ii = 1; ii < (int)NumSamples; ++ii) {
|
||||||
const float iOverN = ii * invN;
|
const float iOverN = ii * invN;
|
||||||
in[ii] *= exp(A * (0.25 + (iOverN * iOverN) - iOverN)) * (2 * ii * invNN - invN);
|
in[ii] *= exp(A * (0.25 + (iOverN * iOverN) - iOverN)) * (2 * ii * invNN - invN);
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#if defined(USE_MIDI)
|
#if defined(USE_MIDI)
|
||||||
|
|
||||||
#include "allegro.h"
|
#include "../lib-src/header-substitutes/allegro.h"
|
||||||
|
|
||||||
// define this switch to play MIDI during redisplay to sonify run times
|
// define this switch to play MIDI during redisplay to sonify run times
|
||||||
// Note that if SONIFY is defined, the default MIDI device will be opened
|
// Note that if SONIFY is defined, the default MIDI device will be opened
|
||||||
|
|
|
@ -420,7 +420,7 @@ std::unique_ptr<Sequence> Sequence::Copy(sampleCount s0, sampleCount s1) const
|
||||||
// Nonnegative result is length of block0 or less:
|
// Nonnegative result is length of block0 or less:
|
||||||
blocklen =
|
blocklen =
|
||||||
( std::min(s1, block0.start + file->GetLength()) - s0 ).as_size_t();
|
( std::min(s1, block0.start + file->GetLength()) - s0 ).as_size_t();
|
||||||
wxASSERT(file->IsAlias() || (blocklen <= mMaxSamples)); // Vaughan, 2012-02-29
|
wxASSERT(file->IsAlias() || (blocklen <= (int)mMaxSamples)); // Vaughan, 2012-02-29
|
||||||
ensureSampleBufferSize(buffer, mSampleFormat, bufferSize, blocklen);
|
ensureSampleBufferSize(buffer, mSampleFormat, bufferSize, blocklen);
|
||||||
Get(b0, buffer.ptr(), mSampleFormat, s0, blocklen, true);
|
Get(b0, buffer.ptr(), mSampleFormat, s0, blocklen, true);
|
||||||
|
|
||||||
|
@ -440,7 +440,7 @@ std::unique_ptr<Sequence> Sequence::Copy(sampleCount s0, sampleCount s1) const
|
||||||
const auto &file = block.f;
|
const auto &file = block.f;
|
||||||
// s1 is within block:
|
// s1 is within block:
|
||||||
blocklen = (s1 - block.start).as_size_t();
|
blocklen = (s1 - block.start).as_size_t();
|
||||||
wxASSERT(file->IsAlias() || (blocklen <= mMaxSamples)); // Vaughan, 2012-02-29
|
wxASSERT(file->IsAlias() || (blocklen <= (int)mMaxSamples)); // Vaughan, 2012-02-29
|
||||||
if (blocklen < (int)file->GetLength()) {
|
if (blocklen < (int)file->GetLength()) {
|
||||||
ensureSampleBufferSize(buffer, mSampleFormat, bufferSize, blocklen);
|
ensureSampleBufferSize(buffer, mSampleFormat, bufferSize, blocklen);
|
||||||
Get(b1, buffer.ptr(), mSampleFormat, block.start, blocklen, true);
|
Get(b1, buffer.ptr(), mSampleFormat, block.start, blocklen, true);
|
||||||
|
|
|
@ -2581,7 +2581,7 @@ void TrackArtist::DrawClipSpectrum(WaveTrackCache &waveTrackCache,
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int specIndex = (xx - fisheyeLeft) * nBins;
|
int specIndex = (xx - fisheyeLeft) * nBins;
|
||||||
wxASSERT(specIndex >= 0 && specIndex < specCache.freq.size());
|
wxASSERT(specIndex >= 0 && specIndex < (int)specCache.freq.size());
|
||||||
uncached = &specCache.freq[specIndex];
|
uncached = &specCache.freq[specIndex];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,20 +21,17 @@ class wxDC;
|
||||||
|
|
||||||
// MSVC 2013 says this can't be instantiated - but in fact it can
|
// MSVC 2013 says this can't be instantiated - but in fact it can
|
||||||
// using {} syntax.
|
// using {} syntax.
|
||||||
|
// As it's a bogus warning caused by a bug in MSVC2013, it's Ok to disable it.
|
||||||
|
#pragma warning( push )
|
||||||
|
#pragma warning( disable : 4510)
|
||||||
|
#pragma warning( disable : 4610)
|
||||||
|
|
||||||
struct TrackPanelDrawingContext {
|
struct TrackPanelDrawingContext {
|
||||||
wxDC &dc;
|
wxDC &dc;
|
||||||
UIHandlePtr target;
|
UIHandlePtr target;
|
||||||
wxMouseState lastState;
|
wxMouseState lastState;
|
||||||
|
|
||||||
// MSVC 2013 has a bug and reports
|
|
||||||
// warning C4610: struct 'TrackPanelDrawingContext'
|
|
||||||
// can never be instantiated
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
// Add a default initialiser here to workaround that?
|
|
||||||
//TrackPanelDrawingContext();
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#pragma warning( pop )
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -126,19 +126,19 @@ public:
|
||||||
|
|
||||||
//if they are both off the cache boundary in the same direction, the cache is missed,
|
//if they are both off the cache boundary in the same direction, the cache is missed,
|
||||||
//so we are safe, and don't need to track this one.
|
//so we are safe, and don't need to track this one.
|
||||||
if((invalStart<0 && invalEnd <0) || (invalStart>=len && invalEnd >= len))
|
if((invalStart<0 && invalEnd <0) || (invalStart>=(long)len && invalEnd >= (long)len))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
//in all other cases, we need to clip the boundries so they make sense with the cache.
|
//in all other cases, we need to clip the boundries so they make sense with the cache.
|
||||||
//for some reason, the cache is set up to access up to array[len], not array[len-1]
|
//for some reason, the cache is set up to access up to array[len], not array[len-1]
|
||||||
if(invalStart <0)
|
if(invalStart <0)
|
||||||
invalStart =0;
|
invalStart =0;
|
||||||
else if(invalStart > len)
|
else if((size_t)invalStart > len)
|
||||||
invalStart = len;
|
invalStart = len;
|
||||||
|
|
||||||
if(invalEnd <0)
|
if(invalEnd <0)
|
||||||
invalEnd =0;
|
invalEnd =0;
|
||||||
else if(invalEnd > len)
|
else if((size_t)invalEnd > len)
|
||||||
invalEnd = len;
|
invalEnd = len;
|
||||||
|
|
||||||
|
|
||||||
|
@ -153,13 +153,13 @@ public:
|
||||||
{
|
{
|
||||||
//if the regions intersect OR are pixel adjacent
|
//if the regions intersect OR are pixel adjacent
|
||||||
InvalidRegion ®ion = mRegions[i];
|
InvalidRegion ®ion = mRegions[i];
|
||||||
if(region.start <= invalEnd+1
|
if(region.start <= (size_t)(invalEnd+1)
|
||||||
&& region.end + 1 >= invalStart)
|
&& (region.end + 1) >= (size_t)invalStart)
|
||||||
{
|
{
|
||||||
//take the union region
|
//take the union region
|
||||||
if(region.start > invalStart)
|
if(region.start > (size_t)invalStart)
|
||||||
region.start = invalStart;
|
region.start = invalStart;
|
||||||
if(region.end < invalEnd)
|
if((int)region.end < invalEnd)
|
||||||
region.end = invalEnd;
|
region.end = invalEnd;
|
||||||
added=true;
|
added=true;
|
||||||
break;
|
break;
|
||||||
|
@ -206,7 +206,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
//if we are past the end of the region we added, we are past the area of regions that might be oversecting.
|
//if we are past the end of the region we added, we are past the area of regions that might be oversecting.
|
||||||
if(region.start > invalEnd)
|
if(invalEnd < 0 || region.start > (size_t)invalEnd)
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -842,7 +842,7 @@ bool SpecCache::CalculateOneSpectrum
|
||||||
from = sampleCount(
|
from = sampleCount(
|
||||||
where[0].as_double() + xx * (rate / pixelsPerSecond)
|
where[0].as_double() + xx * (rate / pixelsPerSecond)
|
||||||
);
|
);
|
||||||
else if (xx > len)
|
else if ((size_t)xx > len)
|
||||||
from = sampleCount(
|
from = sampleCount(
|
||||||
where[len].as_double() + (xx - len) * (rate / pixelsPerSecond)
|
where[len].as_double() + (xx - len) * (rate / pixelsPerSecond)
|
||||||
);
|
);
|
||||||
|
@ -857,7 +857,7 @@ bool SpecCache::CalculateOneSpectrum
|
||||||
auto nBins = settings.NBins();
|
auto nBins = settings.NBins();
|
||||||
|
|
||||||
if (from < 0 || from >= numSamples) {
|
if (from < 0 || from >= numSamples) {
|
||||||
if (xx >= 0 && xx < len) {
|
if (xx >= 0 && xx < (int)len) {
|
||||||
// Pixel column is out of bounds of the clip! Should not happen.
|
// Pixel column is out of bounds of the clip! Should not happen.
|
||||||
float *const results = &out[nBins * xx];
|
float *const results = &out[nBins * xx];
|
||||||
std::fill(results, results + nBins, 0.0f);
|
std::fill(results, results + nBins, 0.0f);
|
||||||
|
@ -1276,8 +1276,8 @@ bool WaveClip::GetSpectrogram(WaveTrackCache &waveTrackCache,
|
||||||
// old cache doesn't match. It won't happen in resize, since the
|
// old cache doesn't match. It won't happen in resize, since the
|
||||||
// spectrum view is pinned to left side of window.
|
// spectrum view is pinned to left side of window.
|
||||||
wxASSERT(
|
wxASSERT(
|
||||||
(copyBegin >= 0 && copyEnd == numPixels) || // copied the end
|
(copyBegin >= 0 && copyEnd == (int)numPixels) || // copied the end
|
||||||
(copyBegin == 0 && copyEnd <= numPixels) // copied the beginning
|
(copyBegin == 0 && copyEnd <= (int)numPixels) // copied the beginning
|
||||||
);
|
);
|
||||||
|
|
||||||
int zeroBegin = copyBegin > 0 ? 0 : copyEnd-copyBegin;
|
int zeroBegin = copyBegin > 0 ? 0 : copyEnd-copyBegin;
|
||||||
|
|
|
@ -21,7 +21,6 @@ the pitch without changing the tempo.
|
||||||
#include "ChangePitch.h"
|
#include "ChangePitch.h"
|
||||||
|
|
||||||
#if USE_SBSMS
|
#if USE_SBSMS
|
||||||
#include "sbsms.h"
|
|
||||||
#include <wx/valgen.h>
|
#include <wx/valgen.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#if USE_SOUNDTOUCH
|
#if USE_SOUNDTOUCH
|
||||||
|
|
||||||
#if USE_SBSMS
|
#if USE_SBSMS
|
||||||
#include "sbsms.h"
|
#include "../../../lib-src/header-substitutes/sbsms.h"
|
||||||
#include <wx/valgen.h>
|
#include <wx/valgen.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -17,8 +17,8 @@
|
||||||
#define __AUDACITY_EFFECT_SBSMS__
|
#define __AUDACITY_EFFECT_SBSMS__
|
||||||
|
|
||||||
#include "Effect.h"
|
#include "Effect.h"
|
||||||
|
#include "../../../lib-src/header-substitutes/sbsms.h"
|
||||||
|
|
||||||
#include "sbsms.h"
|
|
||||||
using namespace _sbsms_;
|
using namespace _sbsms_;
|
||||||
|
|
||||||
class LabelTrack;
|
class LabelTrack;
|
||||||
|
|
|
@ -26,8 +26,6 @@
|
||||||
#include "../ShuttleGui.h"
|
#include "../ShuttleGui.h"
|
||||||
#include "../widgets/valnum.h"
|
#include "../widgets/valnum.h"
|
||||||
|
|
||||||
#include "sbsms.h"
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
ID_RatePercentChangeStart = 10000,
|
ID_RatePercentChangeStart = 10000,
|
||||||
|
|
|
@ -203,7 +203,7 @@ NoteTrackVRulerMenuTable &NoteTrackVRulerMenuTable::Instance()
|
||||||
return instance;
|
return instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
void NoteTrackVRulerMenuTable::InitMenu(Menu *pMenu, void *pUserData)
|
void NoteTrackVRulerMenuTable::InitMenu(Menu *WXUNUSED(pMenu), void *pUserData)
|
||||||
{
|
{
|
||||||
mpData = static_cast<InitMenuData*>(pUserData);
|
mpData = static_cast<InitMenuData*>(pUserData);
|
||||||
}
|
}
|
||||||
|
@ -247,7 +247,7 @@ UIHandle::Result NoteTrackVZoomHandle::Release
|
||||||
return RefreshNone;
|
return RefreshNone;
|
||||||
|
|
||||||
const wxMouseEvent &event = evt.event;
|
const wxMouseEvent &event = evt.event;
|
||||||
const bool shiftDown = event.ShiftDown();
|
//const bool shiftDown = event.ShiftDown();
|
||||||
const bool rightUp = event.RightUp();
|
const bool rightUp = event.RightUp();
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ public:
|
||||||
|
|
||||||
// Convenience wrapper for the above
|
// Convenience wrapper for the above
|
||||||
template<void (Scrubber::*pfn)(const CommandContext&)>
|
template<void (Scrubber::*pfn)(const CommandContext&)>
|
||||||
void Thunk(wxCommandEvent &dummy)
|
void Thunk(wxCommandEvent &)
|
||||||
{ (this->*pfn)(*GetActiveProject()); }
|
{ (this->*pfn)(*GetActiveProject()); }
|
||||||
|
|
||||||
// A string to put in the leftmost part of the status bar
|
// A string to put in the leftmost part of the status bar
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
void wxTabTraversalWrapperCharHook(wxKeyEvent &event);
|
void wxTabTraversalWrapperCharHook(wxKeyEvent &event);
|
||||||
|
|
||||||
template <typename Base>
|
template <typename Base>
|
||||||
class wxTabTraversalWrapper : public Base
|
class AUDACITY_DLL_API wxTabTraversalWrapper : public Base
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
template <typename... Args>
|
template <typename... Args>
|
||||||
|
@ -32,7 +32,7 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class wxPanelWrapper : public wxTabTraversalWrapper<wxPanel>
|
class AUDACITY_DLL_API wxPanelWrapper : public wxTabTraversalWrapper<wxPanel>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// Constructors
|
// Constructors
|
||||||
|
|
|
@ -121,7 +121,7 @@ bool XMLValueChecker::IsGoodIntForRange(const wxString & strInt, const wxString
|
||||||
|
|
||||||
if( lenStrInt < 1 )
|
if( lenStrInt < 1 )
|
||||||
return false;
|
return false;
|
||||||
int offset = (strInt[0] == '-') ?1:0;
|
size_t offset = (strInt[0] == '-') ?1:0;
|
||||||
if( lenStrInt <= offset )
|
if( lenStrInt <= offset )
|
||||||
return false;// string too short, no digits in it.
|
return false;// string too short, no digits in it.
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ bool XMLValueChecker::IsGoodIntForRange(const wxString & strInt, const wxString
|
||||||
return false; // not a digit
|
return false; // not a digit
|
||||||
|
|
||||||
// All chars were digits.
|
// All chars were digits.
|
||||||
if( (lenStrInt - offset) < lenMAXABS )
|
if( lenStrInt < (lenMAXABS + offset) )
|
||||||
return true; // too few digits to overflow.
|
return true; // too few digits to overflow.
|
||||||
|
|
||||||
// Numerical part is same length as strMAXABS
|
// Numerical part is same length as strMAXABS
|
||||||
|
|
Loading…
Reference in New Issue