Changeset 543 for trunk/src/sdl/sdl_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/sdl/sdl_audio.cc (modified) (2 diffs)

trunk/src/sdl/sdl_audio.cc

@@ -111 +111 @@
 nv::sdl::audio::~audio()
 {
-        while ( m_sounds.size() > 0 )
-                release( m_sounds.get_handle(0) );
+        for ( auto& s : m_sounds )
+                release( &s );
         Mix_CloseAudio();
         // TODO: should we do it here?
@@ -121 +121 @@
 {
         sound_info* info = m_sounds.get( a_sound );
+        release( info );
+        m_sounds.destroy( a_sound );
+}
+
+void nv::sdl::audio::release( sound_info* info )
+{
         if ( info )
-        {
                 Mix_FreeChunk( static_cast<Mix_Chunk*>( info->sdl_sound ) );
-                m_sounds.destroy( a_sound );
-        }
 }