oops, more fixes needed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp
index b8c77fa00674bffad77fa121f832fdcef37f1dd2..ca2e35113ed0cfc3087ec6bd2b2307400f6dad06 100644 (file)
--- a/src/unix/sound_sdl.cpp
+++ b/src/unix/sound_sdl.cpp
@@ -238,6 +238,8 @@ void wxSoundBackendSDL::CloseAudio()
 
 bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags)
 {
 
 bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags)
 {

+    Stop();
+    

     int format;
     if (data->m_bitsPerSample == 8)
         format = AUDIO_U8;
     int format;
     if (data->m_bitsPerSample == 8)
         format = AUDIO_U8;


@@ -245,8 +247,6 @@ bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags)
         format = AUDIO_S16LSB;
     else
         return false;
         format = AUDIO_S16LSB;
     else
         return false;

-    
-    SDL_LockAudio();

 
     bool needsOpen = true;
     if (m_audioOpen)
 
     bool needsOpen = true;
     if (m_audioOpen)


@@ -263,28 +263,24 @@ bool wxSoundBackendSDL::Play(wxSoundData *data, unsigned flags)
         }
     }
     
         }
     }
     

-    Stop();
-    

     if (needsOpen)
     {
         m_spec.format = format;
         m_spec.freq = data->m_samplingRate;
         m_spec.channels = data->m_channels;
         if (!OpenAudio())
     if (needsOpen)
     {
         m_spec.format = format;
         m_spec.freq = data->m_samplingRate;
         m_spec.channels = data->m_channels;
         if (!OpenAudio())

-        {
-            SDL_UnlockAudio();

             return false;
             return false;

-        }

     }
     }

-
+    
+    SDL_LockAudio();

     m_playing = true;
     m_pos = 0;
     m_loop = (flags & wxSOUND_LOOP);
     m_data = data;
     data->IncRef();
     m_playing = true;
     m_pos = 0;
     m_loop = (flags & wxSOUND_LOOP);
     m_data = data;
     data->IncRef();

+    SDL_UnlockAudio();

 
     SDL_PauseAudio(0);
 
     SDL_PauseAudio(0);

-    SDL_UnlockAudio();

 
     // wait until playback finishes if called in sync mode:
     if (!(flags & wxSOUND_ASYNC))
 
     // wait until playback finishes if called in sync mode:
     if (!(flags & wxSOUND_ASYNC))


@@ -314,6 +310,7 @@ void wxSoundBackendSDL::Stop()
 {
     SDL_LockAudio();
     SDL_PauseAudio(1);
 {
     SDL_LockAudio();
     SDL_PauseAudio(1);

+    m_playing = false;

     if (m_data)
     {
         m_data->DecRef();
     if (m_data)
     {
         m_data->DecRef();