[Gnash-commit] [SCM] Gnash branch, master, updated. 2e57a690e316ef29cbabd44cce9021eb9d543a6e

[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  2e57a690e316ef29cbabd44cce9021eb9d543a6e (commit)
       via  4a820bbd6e339b4a2f4467c3c0420b91f076974e (commit)
       via  1ba571c1faa72cc318481264d37c1b70e68b1f2b (commit)
      from  146c5d78235f10cba0feec31f7fb5bf68edc6c41 (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=2e57a690e316ef29cbabd44cce9021eb9d543a6e


commit 2e57a690e316ef29cbabd44cce9021eb9d543a6e
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Sep 8 17:39:06 2010 +0200

    Const correctness.

diff --git a/libcore/Video.cpp b/libcore/Video.cpp
index 795a03e..8b34b7e 100644
--- a/libcore/Video.cpp
+++ b/libcore/Video.cpp
@@ -83,7 +83,7 @@ Video::Video(as_object* object,
     try {
            _decoder = mh->createVideoDecoder(*info);
        }
-       catch (MediaException &e) {
+       catch (const MediaException& e) {
            log_error("Could not create Video Decoder: %s", e.what());
        }
 }
diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 2cded2a..5770fd5 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -440,7 +440,7 @@ NetStream_as::initVideoDecoder(const media::VideoInfo& info)
                 "video consumer");
         _playHead.setVideoConsumerAvailable();
     }
-    catch (MediaException& e) {
+    catch (const MediaException& e) {
         log_error("NetStream: Could not create Video decoder: %s", e.what());
 
         // This is important enough to let the user know.
@@ -468,7 +468,7 @@ NetStream_as::initAudioDecoder(const media::AudioInfo& info)
                 "audio consumer");
         _playHead.setAudioConsumerAvailable();
     }
-    catch (MediaException& e) {
+    catch (const MediaException& e) {
         log_error("Could not create Audio decoder: %s", e.what());
 
         // This is important enough to let the user know.
diff --git a/libcore/asobj/Sound_as.cpp b/libcore/asobj/Sound_as.cpp
index 3f3ce4d..99ba475 100644
--- a/libcore/asobj/Sound_as.cpp
+++ b/libcore/asobj/Sound_as.cpp
@@ -377,7 +377,7 @@ Sound_as::probeAudio()
         try {
             _inputStream = attachAuxStreamerIfNeeded();
         } 
-        catch (MediaException& e) {
+        catch (const MediaException& e) {
             assert(!_inputStream);
             assert(!_audioDecoder.get());
             log_error(_("Could not create audio decoder: %s"), e.what());
diff --git a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp 
b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
index 0632c4b..fd42d5b 100644
--- a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
@@ -106,24 +106,20 @@ MediaHandlerFfmpeg::createAudioDecoder(const AudioInfo& 
info)
 
        std::auto_ptr<AudioDecoder> ret;
 
-    try
-    {
+    try {
         ret.reset(new AudioDecoderFfmpeg(info));
     }
-    catch (MediaException& ex)
-    {
-        if ( info.type != FLASH ) throw ex;
+    catch (const MediaException& ex) {
 
-        try
-        {
+        if (info.type != FLASH) throw;
+
+        try {
             ret = createFlashAudioDecoder(info);
         } 
-        catch (MediaException& ex2)
-        {
+        catch (const MediaException& ex2) {
             boost::format err = boost::format(
                 _("MediaHandlerFfmpeg::createAudioDecoder: %s "
-                  "-- %s")) %
-                ex.what() % ex2.what();
+                  "-- %s")) % ex.what() % ex2.what();
             throw MediaException(err.str());
         }
     }
diff --git a/libmedia/gst/MediaHandlerGst.cpp b/libmedia/gst/MediaHandlerGst.cpp
index 1472dee..eff720d 100644
--- a/libmedia/gst/MediaHandlerGst.cpp
+++ b/libmedia/gst/MediaHandlerGst.cpp
@@ -121,24 +121,20 @@ MediaHandlerGst::createAudioDecoder(const AudioInfo& info)
     } else
 #endif
     {
-        try
-        {
+        try {
             ret.reset(new AudioDecoderGst(info));
         }
-        catch (MediaException& ex)
-        {
-            if ( info.type != FLASH ) throw ex;
+        catch (const MediaException& ex) {
+
+            if (info.type != FLASH) throw;
 
-            try
-            {
+            try {
                 ret = createFlashAudioDecoder(info);
             } 
-            catch (MediaException& ex2)
-            {
+            catch (const MediaException& ex2) {
                 boost::format err = boost::format(
                     _("MediaHandlerGst::createAudioDecoder: %s "
-                      "-- %s")) %
-                    ex.what() % ex2.what();
+                      "-- %s")) % ex.what() % ex2.what();
                 throw MediaException(err.str());
             }
         }
diff --git a/libsound/EmbedSoundInst.cpp b/libsound/EmbedSoundInst.cpp
index 3bf4767..c21167c 100644
--- a/libsound/EmbedSoundInst.cpp
+++ b/libsound/EmbedSoundInst.cpp
@@ -97,12 +97,10 @@ EmbedSoundInst::createDecoder(media::MediaHandler& 
mediaHandler)
         0, // duration unknown, does it matter ?
         media::FLASH);
 
-    try
-    {
+    try {
         _decoder = mediaHandler.createAudioDecoder(info);
     }
-    catch (MediaException& e)
-    {
+    catch (const MediaException& e) {
         log_error("AudioDecoder initialization failed: %s", e.what());
     }
 }

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


commit 4a820bbd6e339b4a2f4467c3c0420b91f076974e
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Sep 8 17:09:31 2010 +0200

    Drop silly filter files.

diff --git a/libcore/BevelFilter.cpp b/libcore/BevelFilter.cpp
deleted file mode 100644
index e98d5ca..0000000
--- a/libcore/BevelFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "BevelFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool BevelFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/BlurFilter.cpp b/libcore/BlurFilter.cpp
deleted file mode 100644
index 94dcde2..0000000
--- a/libcore/BlurFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "BlurFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool BlurFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/ColorMatrixFilter.cpp b/libcore/ColorMatrixFilter.cpp
deleted file mode 100644
index 60ee2e8..0000000
--- a/libcore/ColorMatrixFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "ColorMatrixFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool ConvolutionFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/ConvolutionFilter.cpp b/libcore/ConvolutionFilter.cpp
deleted file mode 100644
index 22636b1..0000000
--- a/libcore/ConvolutionFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "ConvolutionFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool ConvolutionFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/DropShadowFilter.cpp b/libcore/DropShadowFilter.cpp
deleted file mode 100644
index 43a7b88..0000000
--- a/libcore/DropShadowFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "DropShadowFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool DropShadowFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/GlowFilter.cpp b/libcore/GlowFilter.cpp
deleted file mode 100644
index 9a8b3b8..0000000
--- a/libcore/GlowFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "GlowFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool DropShadowFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/GradientBevelFilter.cpp b/libcore/GradientBevelFilter.cpp
deleted file mode 100644
index 262c187..0000000
--- a/libcore/GradientBevelFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "GradientBevelFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool GradientBevelFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/GradientGlowFilter.cpp b/libcore/GradientGlowFilter.cpp
deleted file mode 100644
index 38a2173..0000000
--- a/libcore/GradientGlowFilter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-//   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#include "GradientGlowFilter.h"
-
-namespace gnash {
-
-// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool GradientGlowFilter::read(SWFStream* in);
-
-} // Namespace gnash
-
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index d292134..9670940 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -75,15 +75,7 @@ libgnashcore_la_SOURCES = \
        MorphShape.cpp \
        StaticText.cpp \
        TextField.cpp \
-        BlurFilter.cpp \
-        GlowFilter.cpp \
-        DropShadowFilter.cpp \
-        ConvolutionFilter.cpp \
-        ColorMatrixFilter.cpp \
-        GradientGlowFilter.cpp \
-        BevelFilter.cpp \
-        GradientBevelFilter.cpp \
-        parser/filter_factory.cpp \
+       parser/filter_factory.cpp \
        InteractiveObject.cpp \
        ExternalInterface.cpp \
        SWFMatrix.cpp \

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


commit 1ba571c1faa72cc318481264d37c1b70e68b1f2b
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Sep 8 10:41:48 2010 +0200

    Spacing.

diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 39ba327..2cded2a 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -406,7 +406,7 @@ NetStream_as::play(const std::string& c_url)
     // Reset any previously active playback
     close();
 
-    log_security( _("Connecting to movie: %s"), url );
+    log_security(_("Connecting to movie: %s"), url);
 
     _inputStream = _netCon->getStream(url); 
 

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

Summary of changes:
 libcore/BevelFilter.cpp                |   27 ---------------------------
 libcore/BlurFilter.cpp                 |   27 ---------------------------
 libcore/ColorMatrixFilter.cpp          |   27 ---------------------------
 libcore/ConvolutionFilter.cpp          |   27 ---------------------------
 libcore/DropShadowFilter.cpp           |   27 ---------------------------
 libcore/GlowFilter.cpp                 |   27 ---------------------------
 libcore/GradientBevelFilter.cpp        |   27 ---------------------------
 libcore/GradientGlowFilter.cpp         |   27 ---------------------------
 libcore/Makefile.am                    |   10 +---------
 libcore/Video.cpp                      |    2 +-
 libcore/asobj/NetStream_as.cpp         |    6 +++---
 libcore/asobj/Sound_as.cpp             |    2 +-
 libmedia/ffmpeg/MediaHandlerFfmpeg.cpp |   18 +++++++-----------
 libmedia/gst/MediaHandlerGst.cpp       |   18 +++++++-----------
 libsound/EmbedSoundInst.cpp            |    6 ++----
 15 files changed, 22 insertions(+), 256 deletions(-)
 delete mode 100644 libcore/BevelFilter.cpp
 delete mode 100644 libcore/BlurFilter.cpp
 delete mode 100644 libcore/ColorMatrixFilter.cpp
 delete mode 100644 libcore/ConvolutionFilter.cpp
 delete mode 100644 libcore/DropShadowFilter.cpp
 delete mode 100644 libcore/GlowFilter.cpp
 delete mode 100644 libcore/GradientBevelFilter.cpp
 delete mode 100644 libcore/GradientGlowFilter.cpp


hooks/post-receive
-- 
Gnash