[Gnash-commit] [SCM] Gnash branch, master, updated. 3222174d3368ccb2b78149586df76da72ef1d254

[Sandro Santilli]

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  3222174d3368ccb2b78149586df76da72ef1d254 (commit)
       via  b0710604c9de59a5181f36a46a9dcc97b1293ec1 (commit)
       via  6efc3626f27f198beb3401a74f9bcdd5cc6cca67 (commit)
       via  b442ee24b2d377e55087e6a599369d2e5d951f8d (commit)
       via  18233e474257ca1b5f597a1305f4466c6cb04a3e (commit)
      from  0eaf1672515f7027166faae4bc60565ec9190515 (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=3222174d3368ccb2b78149586df76da72ef1d254


commit 3222174d3368ccb2b78149586df76da72ef1d254
Author: Sandro Santilli <address@hidden>
Date:   Tue Oct 19 17:36:30 2010 +0200

    indent-tabs-mode: nil (not using myself, but hoping to do a favor to emacs 
users)

diff --git a/libcore/swf/StreamSoundBlockTag.cpp 
b/libcore/swf/StreamSoundBlockTag.cpp
index 34386d7..4ea5dab 100644
--- a/libcore/swf/StreamSoundBlockTag.cpp
+++ b/libcore/swf/StreamSoundBlockTag.cpp
@@ -128,5 +128,5 @@ StreamSoundBlockTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
 
 // Local Variables:
 // mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
 // End:
diff --git a/libcore/swf/StreamSoundBlockTag.h 
b/libcore/swf/StreamSoundBlockTag.h
index d560f74..670554a 100644
--- a/libcore/swf/StreamSoundBlockTag.h
+++ b/libcore/swf/StreamSoundBlockTag.h
@@ -103,5 +103,5 @@ private:
 
 // Local Variables:
 // mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
 // End:

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


commit b0710604c9de59a5181f36a46a9dcc97b1293ec1
Author: Sandro Santilli <address@hidden>
Date:   Tue Oct 19 17:35:34 2010 +0200

    tab to spaces

diff --git a/libcore/swf/StreamSoundBlockTag.cpp 
b/libcore/swf/StreamSoundBlockTag.cpp
index 538104a..34386d7 100644
--- a/libcore/swf/StreamSoundBlockTag.cpp
+++ b/libcore/swf/StreamSoundBlockTag.cpp
@@ -34,14 +34,14 @@ void
 StreamSoundBlockTag::executeActions(MovieClip* m, DisplayList& /*dlist*/) const
 {
 
-       sound::sound_handler* handler = 
getRunResources(*getObject(m)).soundHandler(); 
-       if (handler)
-       {
-               // This makes it possible to stop only the stream when 
framejumping.
-               m->setStreamSoundId(m_handler_id);
-
-               handler->playStream(m_handler_id, _blockId);
-       }
+    sound::sound_handler* handler = 
getRunResources(*getObject(m)).soundHandler(); 
+    if (handler)
+    {
+        // This makes it possible to stop only the stream when framejumping.
+        m->setStreamSoundId(m_handler_id);
+
+        handler->playStream(m_handler_id, _blockId);
+    }
 }
 
 /* public static */
@@ -56,7 +56,7 @@ StreamSoundBlockTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     // If we don't have a sound_handler registered stop here
     if (!handler)
     {
-           // log_debug ?
+        // log_debug ?
         return;
     }
 
@@ -84,10 +84,10 @@ StreamSoundBlockTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     if (format == media::AUDIO_CODEC_MP3)
     {
         in.ensureBytes(4);
-           // FIXME: use these values !
+        // FIXME: use these values !
         unsigned int samplesCount = in.read_u16(); UNUSED(samplesCount);
         unsigned int seekSamples = in.read_u16();
-           if (seekSamples) LOG_ONCE(log_unimpl(_("MP3 soundblock seek 
samples")));
+        if (seekSamples) LOG_ONCE(log_unimpl(_("MP3 soundblock seek 
samples")));
     }
 
     const unsigned int dataLength = in.get_tag_end_position() - in.tell();

http://git.savannah.gnu.org/cgit//commit/?id=6efc3626f27f198beb3401a74f9bcdd5cc6cca67


commit 6efc3626f27f198beb3401a74f9bcdd5cc6cca67
Author: Sandro Santilli <address@hidden>
Date:   Tue Oct 19 17:33:40 2010 +0200

    tabs to spaces

diff --git a/libcore/swf/StreamSoundBlockTag.h 
b/libcore/swf/StreamSoundBlockTag.h
index 8b6d3a5..d560f74 100644
--- a/libcore/swf/StreamSoundBlockTag.h
+++ b/libcore/swf/StreamSoundBlockTag.h
@@ -27,9 +27,9 @@
 
 // Forward declarations
 namespace gnash {
-       class SWFStream;
-       class movie_definition;
-       class RunResources;
+    class SWFStream;
+    class movie_definition;
+    class RunResources;
 }
 
 namespace gnash {
@@ -50,13 +50,13 @@ namespace SWF {
 class StreamSoundBlockTag : public ControlTag
 {
 
-       /// Id of the stream this tag should play
-       boost::uint16_t m_handler_id;
+    /// Id of the stream this tag should play
+    boost::uint16_t m_handler_id;
 
-       /// Offset in the stream buffer to play
-       sound::sound_handler::StreamBlockId _blockId;
+    /// Offset in the stream buffer to play
+    sound::sound_handler::StreamBlockId _blockId;
 
-       //int           latency;
+    //int       latency;
 
 public:
 
@@ -67,30 +67,30 @@ public:
     ///
     boost::uint16_t getStreamId() const { return m_handler_id; }
 
-       /// Start the associated block of sound
-       void executeActions(MovieClip* m, DisplayList& dlist) const;
+    /// Start the associated block of sound
+    void executeActions(MovieClip* m, DisplayList& dlist) const;
 
-       /// Load an SWF::SOUNDSTREAMBLOCK (19) tag.
-       static void loader(SWFStream& in, TagType tag, movie_definition& m,
+    /// Load an SWF::SOUNDSTREAMBLOCK (19) tag.
+    static void loader(SWFStream& in, TagType tag, movie_definition& m,
             const RunResources& r);
 
 private:
 
-       /// Create a ControlTag playing the given sample when executed.
-       //
-       /// @param streamId
-       ///     Identifier of the stream to play.
-       ///
-       /// @param blockId
-       ///     Identifier of the stream block to play.
-       ///
+    /// Create a ControlTag playing the given sample when executed.
+    //
+    /// @param streamId
+    /// Identifier of the stream to play.
+    ///
+    /// @param blockId
+    /// Identifier of the stream block to play.
+    ///
     /// This should only be constructed using the loader() function.
-       StreamSoundBlockTag(int streamId,
-                           sound::sound_handler::StreamBlockId blockId)
-               :
-               m_handler_id(streamId),
-               _blockId(blockId)
-       {}
+    StreamSoundBlockTag(int streamId,
+                        sound::sound_handler::StreamBlockId blockId)
+        :
+        m_handler_id(streamId),
+        _blockId(blockId)
+    {}
 };
 
 

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


commit b442ee24b2d377e55087e6a599369d2e5d951f8d
Author: Sandro Santilli <address@hidden>
Date:   Tue Oct 19 17:31:00 2010 +0200

    Signal playSound is a private (luckly)

diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index bb42182..9d39adf 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -365,6 +365,7 @@ sound_handler::swfToOutSamples(const media::SoundInfo& 
sinfo,
 
 
 
+/* private */
 void
 sound_handler::playSound(int sound_handle,
         int loopCount, unsigned int inPoint, unsigned int outPoint,

http://git.savannah.gnu.org/cgit//commit/?id=18233e474257ca1b5f597a1305f4466c6cb04a3e


commit 18233e474257ca1b5f597a1305f4466c6cb04a3e
Author: Sandro Santilli <address@hidden>
Date:   Tue Oct 19 17:06:55 2010 +0200

    Split long lines

diff --git a/libsound/EmbedSound.h b/libsound/EmbedSound.h
index 7fd34f6..1a25726 100644
--- a/libsound/EmbedSound.h
+++ b/libsound/EmbedSound.h
@@ -58,7 +58,8 @@ public:
 
     /// Construct a sound with given data, info and volume.
     //
-    /// @param data The encoded sound data. May be the NULL pointer for 
streaming sounds,
+    /// @param data The encoded sound data.
+    ///     May be the NULL pointer for streaming sounds,
     ///     in which case data will be appended later using ::append()
     ///
     /// @param info encoding info

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

Summary of changes:
 libcore/swf/StreamSoundBlockTag.cpp |   24 ++++++++--------
 libcore/swf/StreamSoundBlockTag.h   |   54 +++++++++++++++++-----------------
 libsound/EmbedSound.h               |    3 +-
 libsound/sound_handler.cpp          |    1 +
 4 files changed, 42 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
Gnash