[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-379-geb85c80

[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  eb85c80269b7af2a4c9b5cb26d65c4b0bd6719bb (commit)
       via  7746a12273bf19945255cae90aa22f1d6971e5da (commit)
       via  44f8947c83353cb5d9c24c29ca3e5d4b8afa8531 (commit)
       via  5fd77ad83e8ced10761e386689ca0135a57790bb (commit)
      from  dad0b2a7d1609f62364d37af0229e3c27d99e107 (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=eb85c80269b7af2a4c9b5cb26d65c4b0bd6719bb


commit eb85c80269b7af2a4c9b5cb26d65c4b0bd6719bb
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Jun 29 16:36:01 2011 +0200

    Fix new unused variable warnings.

diff --git a/libcore/swf/DefineMorphShapeTag.cpp 
b/libcore/swf/DefineMorphShapeTag.cpp
index 2cba503..a8d5d8c 100644
--- a/libcore/swf/DefineMorphShapeTag.cpp
+++ b/libcore/swf/DefineMorphShapeTag.cpp
@@ -95,6 +95,9 @@ DefineMorphShapeTag::read(SWFStream& in, TagType tag, 
movie_definition& md,
         const SWFRect innerBound1 = readRect(in);
         const SWFRect innerBound2 = readRect(in);
 
+        UNUSED(innerBound1);
+        UNUSED(innerBound2);
+
         // This should be used -- first 6 bits reserved, then
         // 'non-scaling' stroke, then 'scaling' stroke -- these can be
         // used to optimize morphing.
diff --git a/libcore/swf/PlaceObject2Tag.cpp b/libcore/swf/PlaceObject2Tag.cpp
index 6b6091f..5b4fbba 100644
--- a/libcore/swf/PlaceObject2Tag.cpp
+++ b/libcore/swf/PlaceObject2Tag.cpp
@@ -35,6 +35,7 @@
 #include "filter_factory.h"
 #include "GnashAlgorithm.h"
 #include "action_buffer.h"
+#include "utility.h"
 
 namespace gnash {
 namespace SWF {
@@ -333,15 +334,13 @@ PlaceObject2Tag::readPlaceObject3(SWFStream& in)
     // PlaceObject3 speckfic flags, first 3 bits are unused
     m_has_flags3 = in.read_u8();
     
-    boost::uint8_t bitmask = 0;
-    std::string className;
-
     _depth = in.read_u16() + DisplayObject::staticDepthOffset;
 
     // This is documented to be here, but real instances of 
     // tags with either className or hasImage defined are rare to
     // non-existent. Alexis' SWF reference has neither of them,
     // instead specifying 5 reserved bits in the PlaceObject3 flags.
+    std::string className;
     if (hasClassName() || (hasImage() && hasCharacter())) {
         log_unimpl("PLACEOBJECT3 with associated class name");
         in.read_string(className);
@@ -390,6 +389,7 @@ PlaceObject2Tag::readPlaceObject3(SWFStream& in)
         LOG_ONCE(log_unimpl("Blend mode in PlaceObject tag"));
     }
 
+    boost::uint8_t bitmask = 0;
     if (hasBitmapCaching()) {
         // cacheAsBitmap is a boolean value, so the flag itself ought to be
         // enough. Alexis' SWF reference is unsure about this, but suggests
@@ -404,6 +404,7 @@ PlaceObject2Tag::readPlaceObject3(SWFStream& in)
         in.ensureBytes(1);
         bitmask = in.read_u8();
            LOG_ONCE(log_unimpl("Bitmap caching"));
+        UNUSED(bitmask);
     }
 
     if (hasClipActions()) {

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


commit 7746a12273bf19945255cae90aa22f1d6971e5da
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Jun 29 16:35:12 2011 +0200

    Fix includes and new compiler warnings.
    
    Make sure header is self-contained, mark unused variables.

diff --git a/libcore/swf/CSMTextSettingsTag.cpp 
b/libcore/swf/CSMTextSettingsTag.cpp
index b0fa3cf..4ddada0 100644
--- a/libcore/swf/CSMTextSettingsTag.cpp
+++ b/libcore/swf/CSMTextSettingsTag.cpp
@@ -17,11 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#include "CSMTextSettingsTag.h"
+
+#include <boost/cstdint.hpp>
+
+#include "utility.h"
 #include "RunResources.h"
 #include "log.h"
 #include "SWFStream.h"
 #include "movie_definition.h"
-#include "CSMTextSettingsTag.h"
 
 namespace gnash {
 namespace SWF {
@@ -59,6 +63,7 @@ CSMTextSettingsTag::loader(SWFStream& in, TagType tag, 
movie_definition& /*m*/,
 
     // Should be 0:
     boost::uint8_t reserved = in.read_uint(3);
+    UNUSED(reserved);
 
     float thickness = in.read_long_float();
     
diff --git a/libcore/swf/CSMTextSettingsTag.h b/libcore/swf/CSMTextSettingsTag.h
index 95538bb..417954d 100644
--- a/libcore/swf/CSMTextSettingsTag.h
+++ b/libcore/swf/CSMTextSettingsTag.h
@@ -20,6 +20,8 @@
 #ifndef GNASH_SWF_CSMTEXTSETTINGSTAG_H
 #define GNASH_SWF_CSMTEXTSETTINGSTAG_H
 
+#include "SWF.h"
+
 // Forward declarations
 namespace gnash {
        class movie_definition;
@@ -35,7 +37,8 @@ public:
 
        CSMTextSettingsTag(movie_definition& m, SWFStream& in);
 
-       static void loader(SWFStream& in, TagType tag, movie_definition& m, 
const RunResources& r);
+       static void loader(SWFStream& in, TagType tag, movie_definition& m,
+            const RunResources& r);
 
 private:
 

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


commit 44f8947c83353cb5d9c24c29ca3e5d4b8afa8531
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Jun 29 16:34:57 2011 +0200

    Remove unused stop_count.

diff --git a/utilities/processor.cpp b/utilities/processor.cpp
index ad08cff..40f2248 100644
--- a/utilities/processor.cpp
+++ b/utilities/processor.cpp
@@ -509,7 +509,6 @@ play_movie(const std::string& filename, const RunResources& 
runResources)
         
         resetLastAdvanceTimer();
         int    kick_count = 0;
-        int stop_count=0;
         size_t loop_back_count=0;
         size_t latest_frame=0;
         size_t end_hitcount=0;
@@ -556,7 +555,6 @@ play_movie(const std::string& filename, const RunResources& 
runResources)
                 // Max stop counts reached, kick it
                 if ( secondsSinceLastAdvance() > waitforadvance )
                 {
-                    stop_count=0;
 
                     // Kick the movie.
                     if ( last_frame + 1 > md->get_frame_count() -1 )
@@ -595,7 +593,6 @@ play_movie(const std::string& filename, const RunResources& 
runResources)
             else
             {
                 kick_count = 0;
-                stop_count = 0;
                 resetLastAdvanceTimer();
             }
 

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


commit 5fd77ad83e8ced10761e386689ca0135a57790bb
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Jun 29 16:28:36 2011 +0200

    Fix some new compiler warnings.

diff --git a/libcore/swf/DefineScalingGridTag.cpp 
b/libcore/swf/DefineScalingGridTag.cpp
index 384896f..aa21ec5 100644
--- a/libcore/swf/DefineScalingGridTag.cpp
+++ b/libcore/swf/DefineScalingGridTag.cpp
@@ -26,6 +26,7 @@
 #include "MovieClip.h"
 #include "GnashNumeric.h"
 #include "RunResources.h"
+#include "utility.h"
 
 namespace gnash {
 namespace SWF {
@@ -42,6 +43,7 @@ DefineScalingGridTag::loader(SWFStream& in, TagType /*tag*/,
     );
 
     const SWFRect inner = readRect(in);
+    UNUSED(inner);
 
     log_unimpl("DefineScalingGridTag");
 
diff --git a/libcore/swf/ShapeRecord.cpp b/libcore/swf/ShapeRecord.cpp
index 72ea8e0..745da33 100644
--- a/libcore/swf/ShapeRecord.cpp
+++ b/libcore/swf/ShapeRecord.cpp
@@ -19,7 +19,10 @@
 
 #include "ShapeRecord.h"
 
+#include <vector>
+
 #include "TypesParser.h"
+#include "utility.h"
 #include "SWF.h"
 #include "SWFStream.h"
 #include "movie_definition.h"
@@ -28,8 +31,6 @@
 #include "GnashNumeric.h"
 #include "log.h"
 
-#include <vector>
-
 namespace gnash {
 namespace SWF {
 
@@ -281,6 +282,7 @@ ShapeRecord::read(SWFStream& in, SWF::TagType tag, 
movie_definition& m,
         // TODO: Store and use these. Unfinished.
         if (tag == SWF::DEFINESHAPE4 || tag == SWF::DEFINESHAPE4_) {
             const SWFRect tbound = readRect(in);
+            UNUSED(tbound);
             in.ensureBytes(1);
             static_cast<void>(in.read_u8());
             LOG_ONCE(log_unimpl("DEFINESHAPE4 edge boundaries and scales"));
diff --git a/libmedia/gst/AudioInputGst.cpp b/libmedia/gst/AudioInputGst.cpp
index 938d5cc..4ce343d 100644
--- a/libmedia/gst/AudioInputGst.cpp
+++ b/libmedia/gst/AudioInputGst.cpp
@@ -199,8 +199,6 @@ AudioInputGst::getSelectedCaps(int devselect)
     GstMessage *message;
     
     GnashAudio *data_struct = _audioVect[devselect];
-    GstElement *element;
-    element = data_struct->getElementPtr();
     
     //create tester pipeline to enumerate properties
     command = g_strdup_printf ("%s name=src device=%s ! fakesink",
@@ -702,11 +700,10 @@ AudioInputGst::audioPlay(GnashAudioPrivate *audio)
 {
     GstStateChangeReturn state;
     GstBus *bus;
-    gint ret;
     
     //setup bus to watch pipeline for messages
     bus = gst_pipeline_get_bus (GST_PIPELINE (audio->_pipeline));
-    ret = gst_bus_add_watch (bus, audio_bus_call, audio);
+    gst_bus_add_watch (bus, audio_bus_call, audio);
     gst_object_unref (bus);
     
     state = gst_element_set_state (audio->_pipeline, GST_STATE_PLAYING);

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

Summary of changes:
 libcore/swf/CSMTextSettingsTag.cpp   |    7 ++++++-
 libcore/swf/CSMTextSettingsTag.h     |    5 ++++-
 libcore/swf/DefineMorphShapeTag.cpp  |    3 +++
 libcore/swf/DefineScalingGridTag.cpp |    2 ++
 libcore/swf/PlaceObject2Tag.cpp      |    7 ++++---
 libcore/swf/ShapeRecord.cpp          |    6 ++++--
 libmedia/gst/AudioInputGst.cpp       |    5 +----
 utilities/processor.cpp              |    3 ---
 8 files changed, 24 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash