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

Timestamp:

02/06/17 21:13:58 (8 years ago)

Author:

epyon

Message:

• fixes in handle store
• removal of get_handle
• indices instead of handles
• efficient handle store clears

File:

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

trunk/src/fmod/fmod_audio.cc

@@ -107 +107 @@
 {
         sound_info* info = m_sounds.get( a_sound );
+        release( info );
+        m_sounds.destroy( a_sound );
+}
+
+void nv::fmod::audio::release( sound_info* info )
+{
         if ( info )
-        {
                 FMOD_Sound_Release( static_cast<FMOD_SOUND*>( info->fmod_sound ) );
-                m_sounds.destroy( a_sound );
-        }
 }
 
@@ -146 +149 @@
 fmod::audio::~audio()
 {
-        while ( m_sounds.size() > 0 )
-                release( m_sounds.get_handle(0) );
+        for ( auto& s : m_sounds )
+                release( &s );
+        m_sounds.clear();
         FMOD_System_Release( static_cast<FMOD_SYSTEM*>( m_system ) );
 }