[Gnash-commit] gnash ChangeLog server/asobj/SoundFfmpeg.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/19 23:24:04

Modified files:
        .              : ChangeLog 
        server/asobj   : SoundFfmpeg.cpp 

Log message:
        any new loadSound call replaces the streaming sound (tested).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6990&r2=1.6991
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6990
retrieving revision 1.6991
diff -u -b -r1.6990 -r1.6991
--- ChangeLog   19 Jun 2008 23:07:15 -0000      1.6990
+++ ChangeLog   19 Jun 2008 23:24:02 -0000      1.6991
@@ -1,5 +1,10 @@
 2008-06-19 Sandro Santilli <address@hidden>
 
+       * server/asobj/SoundFfmpeg.cpp: any new loadSound call replaces
+         the streaming sound (tested).
+
+2008-06-19 Sandro Santilli <address@hidden>
+
        * server/asobj/SoundFfmpeg.cpp: attach aux streamer on loadSound,
          don't wait for .start() to be called..
 

Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/SoundFfmpeg.cpp        19 Jun 2008 23:07:16 -0000      1.28
+++ server/asobj/SoundFfmpeg.cpp        19 Jun 2008 23:24:04 -0000      1.29
@@ -72,7 +72,7 @@
                                // (should really honour loopings if any)
                                //if ( remainingLoops.. )
                                //log_debug("Parsing complete and no more audio 
frames in input, detaching");
-                               return false; // will detach us
+                               return false; // will detach us (we should 
change isAttached, but need thread safety!)
                        }
 
                        // if we've been asked to start at a specific time, skip
@@ -136,13 +136,21 @@
                return;
        }
 
-       if (_mediaParser)
+       /// If we are already streaming stop doing so as we'll replace
+       /// the media parser
+       if ( isAttached )
        {
-               // TODO: check what to do in these cases
-               log_error("FIXME: Sound.loadSound() called while already 
streaming");
-               return;
+               _soundHandler->detach_aux_streamer(this);
+               isAttached = false;
        }
 
+       /// Delete any media parser being used (make sure we have detached!)
+       _mediaParser.reset();
+
+       /// Start at offset 0, in case a previous ::start() call
+       /// changed that.
+       _startTime=0;
+
        URL url(file, get_base_url());
        externalURL = url.str(); // what for ? bah!