[Gnash-commit] gnash/server/asobj NetStreamFfmpeg.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/12 14:00:56

Modified files:
        server/asobj   : NetStreamFfmpeg.cpp 

Log message:
        (pausePlayback): detach aux streamer so sound doesn't come out while
        in pause mode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.124&r2=1.125

Patches:
Index: NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- NetStreamFfmpeg.cpp 12 May 2008 13:10:10 -0000      1.124
+++ NetStreamFfmpeg.cpp 12 May 2008 14:00:55 -0000      1.125
@@ -89,7 +89,9 @@
 NetStreamFfmpeg::~NetStreamFfmpeg()
 {
        if ( _decoderBuffer ) delete [] _decoderBuffer;
-       close();
+
+       close(); // close will also detach from sound handler
+
        delete m_imageframe;
 }
 
@@ -1401,6 +1403,9 @@
 
        // Save the current time so we later can tell how long the pause lasted
        m_time_of_pause = clocktime::getTicks();
+
+       // Disconnect the soundhandler so we don't play while paused
+       if ( _soundHandler ) _soundHandler->detach_aux_streamer((void*)this);
 }
 
 void NetStreamFfmpeg::unpausePlayback()
@@ -1424,7 +1429,7 @@
        }
 
        // Re-connect to the soundhandler.
-       // It was disconnected to avoid to keep playing sound while paused
+       // It was disconnected in ::pausePlayback to avoid to keep playing 
sound while paused
        if ( _soundHandler ) _soundHandler->attach_aux_streamer(audio_streamer, 
(void*) this);
 }