Changeset 406 for trunk/src/fmod/fmod_audio.cc

Timestamp:

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

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/fmod/fmod_audio.cc (modified) (7 diffs)

trunk/src/fmod/fmod_audio.cc

@@ -41 +41 @@
         if ( info )
         {
-                FMOD_SYSTEM* system   = (FMOD_SYSTEM*)m_system;
-                FMOD_SOUND* sample    = (FMOD_SOUND*)( info->fmod_sound );
+                FMOD_SYSTEM* system   = static_cast<FMOD_SYSTEM*>( m_system );
+                FMOD_SOUND* sample    = static_cast<FMOD_SOUND*>( info->fmod_sound );
                 FMOD_CHANNEL* channel = nullptr;
                 FMOD_RESULT result    = FMOD_System_PlaySound( system, FMOD_CHANNEL_FREE, sample, true, &channel );
@@ -64 +64 @@
         if ( info )
         {
-                FMOD_SYSTEM* system   = (FMOD_SYSTEM*)m_system;
-                FMOD_SOUND* sample    = (FMOD_SOUND*)( info->fmod_sound );
+                FMOD_SYSTEM* system   = static_cast<FMOD_SYSTEM*>( m_system );
+                FMOD_SOUND* sample    = static_cast<FMOD_SOUND*>( info->fmod_sound );
                 FMOD_CHANNEL* channel = nullptr;
                 FMOD_RESULT result    = FMOD_System_PlaySound( system, FMOD_CHANNEL_FREE, sample, true, &channel );
@@ -90 +90 @@
 nv::sound fmod::audio::load_sound( const string_view& a_path )
 {
-        FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;
+        FMOD_SYSTEM* system = static_cast<FMOD_SYSTEM*>( m_system );
         FMOD_SOUND* sample;
         FMOD_RESULT fm_result = FMOD_System_CreateSound( system, a_path.data(), FMOD_3D, 0, &sample );
@@ -109 +109 @@
         if ( info )
         {
-                FMOD_Sound_Release( (FMOD_SOUND*)info->fmod_sound );
+                FMOD_Sound_Release( static_cast<FMOD_SOUND*>( info->fmod_sound ) );
                 m_sounds.destroy( a_sound );
         }
@@ -125 +125 @@
         fmod_up.z = up.z;
         // TODO: we also need to setup orientation!
-        FMOD_System_Set3DListenerAttributes( (FMOD_SYSTEM*)m_system, 0, 0, 0, &fmod_forward, &fmod_up );
+        FMOD_System_Set3DListenerAttributes( static_cast<FMOD_SYSTEM*>( m_system ), 0, 0, 0, &fmod_forward, &fmod_up );
 }
 
@@ -140 +140 @@
 //      fmod_up.z = 0.0f;
         // TODO: we also need to setup orientation!
-        FMOD_System_Set3DListenerAttributes( (FMOD_SYSTEM*)m_system, 0, &fmod_position, 0, 0, 0 );
-        FMOD_System_Update( (FMOD_SYSTEM*)m_system );
+        FMOD_System_Set3DListenerAttributes( static_cast<FMOD_SYSTEM*>( m_system ), 0, &fmod_position, 0, 0, 0 );
+        FMOD_System_Update( static_cast<FMOD_SYSTEM*>( m_system ) );
 }
 
@@ -148 +148 @@
         while ( m_sounds.size() > 0 )
                 release( m_sounds.get_handle(0) );
-        FMOD_System_Release( (FMOD_SYSTEM*)m_system );
+        FMOD_System_Release( static_cast<FMOD_SYSTEM*>( m_system ) );
 }