[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-368-ga442a62

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  a442a62560ad566e5916194f37be1f772b9faf76 (commit)
       via  02c55aefedafe6f5ef923ac6678b56cb304a1a65 (commit)
      from  c925c14e5e87b78e6c64227713cdc0e51c67b635 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=a442a62560ad566e5916194f37be1f772b9faf76


commit a442a62560ad566e5916194f37be1f772b9faf76
Author: Benjamin Wolsey <address@hidden>
Date:   Tue May 31 10:19:07 2011 +0200

    Remove obsolete comment.

diff --git a/libcore/swf/SoundStreamHeadTag.cpp 
b/libcore/swf/SoundStreamHeadTag.cpp
index 9673163..971fddc 100644
--- a/libcore/swf/SoundStreamHeadTag.cpp
+++ b/libcore/swf/SoundStreamHeadTag.cpp
@@ -45,12 +45,6 @@ SoundStreamHeadTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     // If we don't have a sound_handler registered stop here
     if (!handler) return;
 
-    // FIXME:
-    // no DisplayObject id for soundstreams... so we make one up...
-    // This only works if there is only one SWFStream in the movie...
-    // The right way to do it is to make seperate structures for streams
-    // in SWFMovieDefinition.
-
     // 1 byte for playback info, 1 for SWFStream info, 2 for sample count
     in.ensureBytes(4);
 
@@ -65,7 +59,7 @@ SoundStreamHeadTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
             log_swferror("SOUNDSTREAMHEAD: playback sound rate %d (expected "
                 "0 to %d)", +pbSoundRate, arraySize(samplerates));
         );
-        pbSoundRate=0;
+        pbSoundRate = 0;
     }
     const boost::uint32_t playbackSoundRate = samplerates[pbSoundRate];
     const bool playbackSound16bit = in.read_bit();

http://git.savannah.gnu.org/cgit//commit/?id=02c55aefedafe6f5ef923ac6678b56cb304a1a65


commit 02c55aefedafe6f5ef923ac6678b56cb304a1a65
Author: Benjamin Wolsey <address@hidden>
Date:   Tue May 31 10:17:27 2011 +0200

    Cleanup includes

diff --git a/libcore/swf/StreamSoundBlockTag.cpp 
b/libcore/swf/StreamSoundBlockTag.cpp
index b4dd7d0..32488f3 100644
--- a/libcore/swf/StreamSoundBlockTag.cpp
+++ b/libcore/swf/StreamSoundBlockTag.cpp
@@ -17,6 +17,11 @@
 //
 
 #include "StreamSoundBlockTag.h"
+
+#include <boost/intrusive_ptr.hpp>
+#include <boost/cstdint.hpp>
+
+#include "utility.h"
 #include "sound_handler.h" 
 #include "movie_root.h"
 #include "movie_definition.h"
diff --git a/libcore/swf/StreamSoundBlockTag.h 
b/libcore/swf/StreamSoundBlockTag.h
index 07014d6..c560ebb 100644
--- a/libcore/swf/StreamSoundBlockTag.h
+++ b/libcore/swf/StreamSoundBlockTag.h
@@ -18,13 +18,12 @@
 #ifndef GNASH_SWF_STREAMSOUNDBLOCK_TAG_H
 #define GNASH_SWF_STREAMSOUNDBLOCK_TAG_H
 
+#include <boost/cstdint.hpp> 
+
 #include "ControlTag.h" // for inheritance
 #include "SWF.h" // for TagType definition
 #include "sound_handler.h" // for StreamBlockId identifier
 
-#include <boost/cstdint.hpp> // for boost::uint16_t and friends
- 
-
 // Forward declarations
 namespace gnash {
     class SWFStream;

-----------------------------------------------------------------------

Summary of changes:
 libcore/swf/SoundStreamHeadTag.cpp  |    8 +-------
 libcore/swf/StreamSoundBlockTag.cpp |    5 +++++
 libcore/swf/StreamSoundBlockTag.h   |    5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash