A lot of compiler L4 warnings fixed (some warnings disabled)

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1982 10f7b99b-c216-0410-bff0-8a66a9350fd8

4 files changed, 10 insertions, 10 deletions

diff --git a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/FIRFilter.cpp b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/FIRFilter.cpp
index 159df256d..f17d997ed 100644
--- a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/FIRFilter.cpp
+++ b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/FIRFilter.cpp
@@ -219,7 +219,7 @@ uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSample
 

 // Operator 'new' is overloaded so that it automatically creates a suitable instance 

 // depending on if we've a MMX-capable CPU available or not.

-void * FIRFilter::operator new(size_t s)

+void * FIRFilter::operator new(size_t /*s*/)

 {

     // Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead!

     throw std::runtime_error("Error in FIRFilter::new: Don't use 'new FIRFilter', use 'newInstance' member instead!");

diff --git a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/RateTransposer.cpp b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/RateTransposer.cpp
index 7e0b277d6..49d71ab9d 100644
--- a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/RateTransposer.cpp
+++ b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/RateTransposer.cpp
@@ -106,7 +106,7 @@ public:
 

 // Operator 'new' is overloaded so that it automatically creates a suitable instance 

 // depending on if we've a MMX/SSE/etc-capable CPU available or not.

-void * RateTransposer::operator new(size_t s)

+void * RateTransposer::operator new(size_t /*s*/)

 {

     throw runtime_error("Error in RateTransoser::new: don't use \"new TDStretch\" directly, use \"newInstance\" to create a new instance instead!");

     return NULL;

@@ -417,7 +417,7 @@ uint RateTransposerInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *sr
     // now always (iSlopeCount > SCALE)

     iSlopeCount -= SCALE;

 

-    while (1)

+    while (TRUE)

     {

         while (iSlopeCount > SCALE) 

         {

@@ -467,7 +467,7 @@ uint RateTransposerInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *
     // now always (iSlopeCount > SCALE)

     iSlopeCount -= SCALE;

 

-    while (1)

+    while (TRUE)

     {

         while (iSlopeCount > SCALE) 

         {

@@ -554,7 +554,7 @@ uint RateTransposerFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src,
 

     if (nSamples > 1)

     {

-        while (1)

+        while (TRUE)

         {

             while (fSlopeCount > 1.0f) 

             {

@@ -600,7 +600,7 @@ uint RateTransposerFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *sr
 

     if (nSamples > 1)

     {

-        while (1)

+        while (TRUE)

         {

             while (fSlopeCount > 1.0f) 

             {

diff --git a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/TDStretch.cpp b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/TDStretch.cpp
index 062524c84..6dea5f516 100644
--- a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/TDStretch.cpp
+++ b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/TDStretch.cpp
@@ -737,7 +737,7 @@ void TDStretch::acceptNewOverlapLength(int newOverlapLength)
 

 // Operator 'new' is overloaded so that it automatically creates a suitable instance 

 // depending on if we've a MMX/SSE/etc-capable CPU available or not.

-void * TDStretch::operator new(size_t s)

+void * TDStretch::operator new(size_t /*s*/)

 {

     // Notice! don't use "new TDStretch" directly, use "newInstance" to create a new instance instead!

     throw std::runtime_error("Error in TDStretch::new: Don't use 'new TDStretch' directly, use 'newInstance' member instead!");

@@ -849,8 +849,8 @@ void TDStretch::overlapStereo(short *poutput, const short *input) const
     {

         temp = (short)(overlapLength - i);

         cnt2 = 2 * i;

-        poutput[cnt2] = (input[cnt2] * i + pMidBuffer[cnt2] * temp )  / overlapLength;

-        poutput[cnt2 + 1] = (input[cnt2 + 1] * i + pMidBuffer[cnt2 + 1] * temp ) / overlapLength;

+        poutput[cnt2] = (short)((input[cnt2] * i + pMidBuffer[cnt2] * temp )  / overlapLength);

+        poutput[cnt2 + 1] = (short)((input[cnt2 + 1] * i + pMidBuffer[cnt2 + 1] * temp ) / overlapLength);

     }

 }

 

diff --git a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/mmx_optimized.cpp b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/mmx_optimized.cpp
index 539ee57c8..2740617a0 100644
--- a/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/mmx_optimized.cpp
+++ b/src/filters/renderer/MpcAudioRenderer/SoundTouch/source/mmx_optimized.cpp
@@ -162,7 +162,7 @@ void TDStretchMMX::overlapStereo(short *output, const short *input) const
     // mix1  = mixer values for 2nd stereo sample

     // adder = adder for updating mixer values after each round

     

-    mix1  = _mm_set_pi16(0, overlapLength,   0, overlapLength);

+    mix1  = _mm_set_pi16(0, (short)overlapLength,   0, (short)overlapLength);

     adder = _mm_set_pi16(1, -1, 1, -1);

     mix2  = _mm_add_pi16(mix1, adder);

     adder = _mm_add_pi16(adder, adder);