[Gnash-commit] /srv/bzr/gnash/trunk r9528: Embedded streaming sound fix

[Sandro Santilli]

------------------------------------------------------------
revno: 9528
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Wed 2008-07-23 19:52:46 +0200
message:
  Embedded streaming sound fix
modified:
  libcore/parser/SWFMovieDefinition.cpp
  libcore/parser/sprite_definition.cpp
  libcore/parser/sprite_definition.h
    ------------------------------------------------------------
    revno: 9527.1.1
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Wed 2008-07-23 19:50:23 +0200
    message:
      Allow different sprite definitions to maintain their own streaming sound.
      Fixes bug #23916.
      Take the chance to properly initialize the "loading sound id" to -1.
    modified:
      libcore/parser/SWFMovieDefinition.cpp
      libcore/parser/sprite_definition.cpp
      libcore/parser/sprite_definition.h

=== modified file 'libcore/parser/SWFMovieDefinition.cpp'
--- a/libcore/parser/SWFMovieDefinition.cpp     2008-07-22 17:15:52 +0000
+++ b/libcore/parser/SWFMovieDefinition.cpp     2008-07-23 17:50:23 +0000
@@ -206,6 +206,8 @@
        _frames_loaded_mutex(),
        _frame_reached_condition(),
        _waiting_for_frame(0),
+       m_loading_sound_stream(-1),
+       m_file_length(0),
        m_jpeg_in(0),
        _loader(*this),
        _loadingCanceled(false)

=== modified file 'libcore/parser/sprite_definition.cpp'
--- a/libcore/parser/sprite_definition.cpp      2008-06-09 17:12:54 +0000
+++ b/libcore/parser/sprite_definition.cpp      2008-07-23 17:50:23 +0000
@@ -193,7 +193,8 @@
        m_movie_def(m),
        m_frame_count(0),
        m_loading_frame(0),
-       registeredClass(0)
+       registeredClass(0),
+       _loadingSoundStream(-1)
 {
        assert(m_movie_def);
 

=== modified file 'libcore/parser/sprite_definition.h'
--- a/libcore/parser/sprite_definition.h        2008-06-29 15:00:40 +0000
+++ b/libcore/parser/sprite_definition.h        2008-07-23 17:50:23 +0000
@@ -176,17 +176,16 @@
                m_movie_def->add_sound_sample(id,sam);
        }
 
-       /// Delegate call to associated root movie
+       // See dox in movie_definition.h
        virtual void set_loading_sound_stream_id(int id)
        {
-               m_movie_def->set_loading_sound_stream_id(id);
-
+               _loadingSoundStream = id;
        }
 
-       /// Delegate call to associated root movie, or return -1
+       // See dox in movie_definition.h
        virtual int get_loading_sound_stream_id()
        {
-               return m_movie_def->get_loading_sound_stream_id();
+               return _loadingSoundStream;
        }
 
 
@@ -343,6 +342,8 @@
        ///
        boost::intrusive_ptr<as_function> registeredClass;
 
+       int     _loadingSoundStream;
+
 protected: