[Supertuxkart-commit] SF.net SVN: supertuxkart:[5516] main/trunk/src/audio

[<au...@us...>]

Revision: 5516
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=5516&view=rev
Author:   auria
Date:     2010-06-13 18:39:07 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Don't rely on OpenAL to know if a music is playing or not, it will say 'no' when the music is playing but couldn't be updated recently because of lagging

Modified Paths:
--------------
    main/trunk/src/audio/music_ogg.cpp
    main/trunk/src/audio/music_ogg.hpp

Modified: main/trunk/src/audio/music_ogg.cpp
===================================================================
--- main/trunk/src/audio/music_ogg.cpp	2010-06-13 18:31:55 UTC (rev 5515)
+++ main/trunk/src/audio/music_ogg.cpp	2010-06-13 18:39:07 UTC (rev 5516)
@@ -36,8 +36,9 @@
 {
     //m_oggStream= NULL;
     m_soundBuffers[0] = m_soundBuffers[1]= 0;
-    m_soundSource= -1;
-    m_pausedMusic= true;
+    m_soundSource     = -1;
+    m_pausedMusic     = true;
+    m_playing         = false;
 }   // MusicOggStream
 
 //-----------------------------------------------------------------------------
@@ -136,6 +137,7 @@
     if(!m_error) ov_clear(&m_oggStream);
 
     m_soundSource = -1;
+    m_playing = false;
     
     return true;
 }   // release
@@ -155,7 +157,8 @@
     alSourceQueueBuffers(m_soundSource, 2, m_soundBuffers);
 
     alSourcePlay(m_soundSource);
-    m_pausedMusic= false;
+    m_pausedMusic = false;
+    m_playing = true;
 
     return true;
 }   // playMusic
@@ -163,23 +166,29 @@
 //-----------------------------------------------------------------------------
 bool MusicOggStream::isPlaying()
 {
+    return m_playing;
+    
+    /*
     if (m_soundSource == -1) return false;
     
     ALenum state;
     alGetSourcei(m_soundSource, AL_SOURCE_STATE, &state);
 
     return (state == AL_PLAYING);
+     */
 }   // isPlaying
 
 //-----------------------------------------------------------------------------
 bool MusicOggStream::stopMusic()
 {
+    m_playing = false;
     return (release());
 }   // stopMusic
 
 //-----------------------------------------------------------------------------
 bool MusicOggStream::pauseMusic()
 {
+    m_playing = false;
     if (m_fileName == "")
     {
         // nothing is loaded
@@ -194,6 +203,8 @@
 //-----------------------------------------------------------------------------
 bool MusicOggStream::resumeMusic()
 {
+    m_playing = true;
+    
     if (m_fileName == "")
     {
         // nothing is loaded

Modified: main/trunk/src/audio/music_ogg.hpp
===================================================================
--- main/trunk/src/audio/music_ogg.hpp	2010-06-13 18:31:55 UTC (rev 5515)
+++ main/trunk/src/audio/music_ogg.hpp	2010-06-13 18:39:07 UTC (rev 5516)
@@ -77,6 +77,8 @@
     vorbis_info*    m_vorbisInfo;
     bool            m_error;
 
+    bool            m_playing;
+    
     ALuint m_soundBuffers[2];
     ALuint m_soundSource;
     ALenum nb_channels;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.