[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/sound_handler_s...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/19 21:53:50

Modified files:
        .              : ChangeLog 
        libmedia/ffmpeg: sound_handler_sdl.cpp 

Log message:
                * libmedia/ffmpeg/sound_handler_sdl.cpp: fix mute() and 
unmute().
                  Have fun with the gtk menu control of it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6988&r2=1.6989
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6988
retrieving revision 1.6989
diff -u -b -r1.6988 -r1.6989
--- ChangeLog   19 Jun 2008 21:33:22 -0000      1.6988
+++ ChangeLog   19 Jun 2008 21:53:49 -0000      1.6989
@@ -1,5 +1,10 @@
 2008-06-19 Sandro Santilli <address@hidden>
 
+       * libmedia/ffmpeg/sound_handler_sdl.cpp: fix mute() and unmute().
+         Have fun with the gtk menu control of it.
+
+2008-06-19 Sandro Santilli <address@hidden>
+
        * testsuite/swfdec/PASSING: sound-target-reference-5.swf pass.
 
 2008-06-19 Sandro Santilli <address@hidden>

Index: libmedia/ffmpeg/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libmedia/ffmpeg/sound_handler_sdl.cpp       17 Jun 2008 13:04:19 -0000      
1.16
+++ libmedia/ffmpeg/sound_handler_sdl.cpp       19 Jun 2008 21:53:50 -0000      
1.17
@@ -455,18 +455,25 @@
 }
 
 // gnash calls this to mute audio
-void SDL_sound_handler::mute() {
-       stop_all_sounds();
+void
+SDL_sound_handler::mute()
+{
+       //stop_all_sounds();
+       boost::mutex::scoped_lock lock(_mutex);
        muted = true;
 }
 
 // gnash calls this to unmute audio
-void SDL_sound_handler::unmute() {
+void
+SDL_sound_handler::unmute()
+{
+       boost::mutex::scoped_lock lock(_mutex);
        muted = false;
 }
 
 bool SDL_sound_handler::is_muted()
 {
+       boost::mutex::scoped_lock lock(_mutex);
        return muted;
 }
 
@@ -821,6 +828,13 @@
             memset ((void*) stream, 0, buffer_length_in);
        }
 
+       // Now, after having "consumed" all sounds, blank out
+       // the buffer if muted..
+       if ( handler->muted )
+       {
+               memset ((void*) stream, 0, buffer_length_in);
+       }
+
 
 
 }