Changeset 329 for trunk/src

Timestamp:

09/02/14 06:16:30 (11 years ago)

Author:

epyon

Message:

• audio now based on handles

Location:

trunk/src

Files:

• fmod/fmod_audio.cc (modified) (2 diffs)
• sdl/sdl_audio.cc (modified) (4 diffs)

trunk/src/fmod/fmod_audio.cc

@@ -37 +37 @@
 
 
-nv::channel* fmod::audio::play_sound( nv::sound* a_sound )
+nv::channel fmod::audio::play_sound( nv::sound a_sound )
 {
-        FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;
-        FMOD_SOUND* sample  = (FMOD_SOUND*)( down_cast< fmod::sound >( a_sound )->m_sound );
-        FMOD_RESULT result  = FMOD_System_PlaySound( system, FMOD_CHANNEL_FREE, sample, false, 0 );
-        if ( result != FMOD_OK )
+        sound_info* info = m_sounds.get( a_sound );
+        if ( info )
         {
-                NV_LOG( LOG_WARNING, "FMOD failed to play sound -- " << FMOD_ErrorString( result ) );
+                FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;
+                FMOD_SOUND* sample  = (FMOD_SOUND*)( info->fmod_sound );
+                FMOD_RESULT result  = FMOD_System_PlaySound( system, FMOD_CHANNEL_FREE, sample, false, 0 );
+                if ( result != FMOD_OK )
+                {
+                        NV_LOG( LOG_WARNING, "FMOD failed to play sound -- " << FMOD_ErrorString( result ) );
+                }
         }
-        return nullptr;
+        return channel();
 }
 
-nv::sound* fmod::audio::load_sound( const std::string& a_path )
+nv::sound fmod::audio::load_sound( const std::string& a_path )
 {
         FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;
         FMOD_SOUND* sample;
-        FMOD_RESULT result = FMOD_System_CreateSound( system, a_path.c_str(), FMOD_DEFAULT, 0, &sample );
-        if ( result != FMOD_OK )
+        FMOD_RESULT fm_result = FMOD_System_CreateSound( system, a_path.c_str(), FMOD_DEFAULT, 0, &sample );
+        if ( fm_result != FMOD_OK )
         {
-                NV_LOG( LOG_ERROR, "FMOD failed to load sample '" << a_path << "' -- " << FMOD_ErrorString( result ) );
-                return nullptr;
+                NV_LOG( LOG_ERROR, "FMOD failed to load sample '" << a_path << "' -- " << FMOD_ErrorString( fm_result ) );
+                return sound();
         }
-        return new fmod::sound( sample );
+        sound result = m_sounds.create();
+        sound_info* info = m_sounds.get( result );
+        info->fmod_sound = sample;
+        return result;
+}
+
+void nv::fmod::audio::release( sound a_sound )
+{
+        sound_info* info = m_sounds.get( a_sound );
+        if ( info )
+        {
+                FMOD_Sound_Release( (FMOD_SOUND*)info->fmod_sound );
+                m_sounds.destroy( a_sound );
+        }
 }
 
@@ -70 +87 @@
 fmod::audio::~audio()
 {
+        while ( m_sounds.size() > 0 )
+                release( m_sounds.get_handle(0) );
         FMOD_System_Release( (FMOD_SYSTEM*)m_system );
 }
 
-fmod::sound::~sound()
-{
-        FMOD_Sound_Release( (FMOD_SOUND*)m_sound );
-}

trunk/src/sdl/sdl_audio.cc

@@ -32 +32 @@
 
 
-nv::channel* sdl::audio::play_sound( nv::sound* a_sound )
+nv::channel sdl::audio::play_sound( sound a_sound )
 {
-        if ( Mix_PlayChannel(-1, (Mix_Chunk*)( down_cast< sdl::sound >( a_sound )->m_sound), 0) == -1 )
+        sound_info* info = m_sounds.get( a_sound );
+        if ( info )
         {
-                NV_LOG( LOG_WARNING, "SDL_mixer failed to play -- " << Mix_GetError() );
+                if ( Mix_PlayChannel(-1, (Mix_Chunk*)( info->sdl_sound), 0) == -1 )
+                {
+                        NV_LOG( LOG_WARNING, "SDL_mixer failed to play -- " << Mix_GetError() );
+                }
         }
-        return nullptr;
+        return channel();
 }
 
-nv::sound* nv::sdl::audio::load_sound( const std::string& a_path )
+nv::sound nv::sdl::audio::load_sound( const std::string& a_path )
 {
         // TODO: this is a really wierd error - if we remove this check, all hell gets loose
@@ -52 +56 @@
         {
                 NV_LOG( LOG_ERROR, "SDL_mixer failed to load sample '" << a_path << "' -- " << Mix_GetError() );
-                return nullptr;
+                return sound();
         }
-        return new sdl::sound( sample );
+        sound result = m_sounds.create();
+        sound_info* info = m_sounds.get( result );
+        info->sdl_sound = sample;
+        return result;
 }
 
@@ -64 +71 @@
 nv::sdl::audio::~audio()
 {
+        while ( m_sounds.size() > 0 )
+                release( m_sounds.get_handle(0) );
         Mix_CloseAudio();
         // TODO: should we do it here?
@@ -69 +78 @@
 }
 
-nv::sdl::sound::~sound()
+void nv::sdl::audio::release( sound a_sound )
 {
-        Mix_FreeChunk( (Mix_Chunk*)m_sound );
+        sound_info* info = m_sounds.get( a_sound );
+        if ( info )
+        {
+                Mix_FreeChunk( (Mix_Chunk*)info->sdl_sound );
+                m_sounds.destroy( a_sound );
+        }
 }
+