Changeset 406 for trunk/src/sdl

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

Location:

trunk/src/sdl

Files:

• sdl_audio.cc (modified) (4 diffs)
• sdl_input.cc (modified) (2 diffs)
• sdl_window.cc (modified) (1 diff)

trunk/src/sdl/sdl_audio.cc

@@ -36 +36 @@
         if ( info )
         {
-                int channel = Mix_PlayChannel(-1, (Mix_Chunk*)( info->sdl_sound), 0);
+                int channel = Mix_PlayChannel(-1, static_cast<Mix_Chunk*>( info->sdl_sound ), 0);
                 if ( channel == -1 )
                 {
@@ -43 +43 @@
                 else
                 {
-                        Mix_Volume( channel, int( volume * 128.0f ) );
+                        Mix_Volume( channel, static_cast<int>( volume * 128.0f ) );
                         if ( pan != 0.0f) 
                         {
-                                uint8 right = (uint8)( (pan + 1.0f) * 127.0f ); 
+                                uint8 right = static_cast<uint8>( (pan + 1.0f) * 127.0f ); 
                                 Mix_SetPanning( channel, 254-right, right );
                         }
@@ -63 +63 @@
         if ( info )
         {
-                int channel = Mix_PlayChannel(-1, (Mix_Chunk*)( info->sdl_sound), 0);
+                int channel = Mix_PlayChannel(-1, static_cast<Mix_Chunk*>( info->sdl_sound ), 0);
                 if ( channel == -1 )
                 {
@@ -123 +123 @@
         if ( info )
         {
-                Mix_FreeChunk( (Mix_Chunk*)info->sdl_sound );
+                Mix_FreeChunk( static_cast<Mix_Chunk*>( info->sdl_sound ) );
                 m_sounds.destroy( a_sound );
         }

trunk/src/sdl/sdl_input.cc

@@ -25 +25 @@
         kevent.key.code    = KEY_NONE;
 
-        uint32 ucode = (uint32)ke.keysym.sym;
+        uint32 ucode = static_cast<uint32>( ke.keysym.sym );
 
         // if result is a typable char place it into the structure
@@ -36 +36 @@
                         int capslock = !!(ke.keysym.mod & KMOD_CAPS);
                         if ((shifted ^ capslock) != 0) {
-                                kevent.key.ascii = (uchar8)SDL_toupper((int)ucode);
+                                kevent.key.ascii = static_cast<uchar8>( SDL_toupper( static_cast<int>( ucode ) ) );
                         }
                 }

trunk/src/sdl/sdl_window.cc

@@ -64 +64 @@
 
         nv::load_gl_library();
-        NV_LOG_INFO( "OpenGL Vendor       : ", (const char*)glGetString(GL_VENDOR) );
-        NV_LOG_INFO( "OpenGL Renderer     : ", (const char*)glGetString( GL_RENDERER ) );
-        NV_LOG_INFO( "OpenGL Version      : ", (const char*)glGetString( GL_VERSION ) );
-        NV_LOG_INFO( "OpenGL GLSL Version : ", (const char*)glGetString( GL_SHADING_LANGUAGE_VERSION ) );
+        NV_LOG_INFO( "OpenGL Vendor       : ", reinterpret_cast<const char*>( glGetString(GL_VENDOR) ) );
+        NV_LOG_INFO( "OpenGL Renderer     : ", reinterpret_cast<const char*>( glGetString( GL_RENDERER ) ) );
+        NV_LOG_INFO( "OpenGL Version      : ", reinterpret_cast<const char*>( glGetString( GL_VERSION ) ) );
+        NV_LOG_INFO( "OpenGL GLSL Version : ", reinterpret_cast<const char*>( glGetString( GL_SHADING_LANGUAGE_VERSION ) ) );
         SDL_GL_SetSwapInterval(1);