Changeset 6502 for code/trunk/src/orxonox/sound

Timestamp:

Mar 11, 2010, 11:34:20 AM (14 years ago)

Author:

rgrieder

Message:

Removed a ton of msvc warnings revealed with OGRE v1.7 (they removed the warning suppressors in OgrePrerequisites.h).
All of them are conversions from one type to another that might be lossy (mostly double to float, please always use "3.7f" instead of "3.7" as constants when using floats).

Location:

code/trunk/src/orxonox/sound

Files:

• BaseSound.cc (modified) (1 diff)
• SoundBuffer.cc (modified) (1 diff)

code/trunk/src/orxonox/sound/BaseSound.cc

@@ -178 +178 @@
     void BaseSound::setPitch(float pitch)
     {
-        if (pitch > 2 || pitch < 0.5)
+        if (pitch > 2 || pitch < 0.5f)
         {
             COUT(2) << "Sound warning: pitch out of range, cropping value." << std::endl;
-            pitch = pitch > 2 ? 2 : pitch;
-            pitch = pitch < 0.5 ? 0.5 : pitch;
+            pitch = pitch > 2.0f ? 2.0f : pitch;
+            pitch = pitch < 0.5f ? 0.5f : pitch;
         }
         this->pitch_ = pitch;

code/trunk/src/orxonox/sound/SoundBuffer.cc

@@ -108 +108 @@
         {
         case SEEK_SET:
-            stream->seek(offset);
+            stream->seek((size_t)offset);
             break;
         case SEEK_CUR:
-            stream->skip(offset);
+            stream->skip((size_t)offset);
             break;
         case SEEK_END:
-            stream->seek(stream->size() + offset);
+            stream->seek(stream->size() + (size_t)offset);
             break;
         default: