[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2070-g558fe08

[Bastiaan Jacques]

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  558fe08913bdb45502dd18e771c2cc96ab72d3cd (commit)
      from  0d10397941b88ce0731b0caa3dc23594b93c36df (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=558fe08913bdb45502dd18e771c2cc96ab72d3cd


commit 558fe08913bdb45502dd18e771c2cc96ab72d3cd
Author: Bastiaan Jacques <address@hidden>
Date:   Tue May 27 22:19:48 2014 +0200

    Forward declare GnashFactory.

diff --git a/gui/Player.cpp b/gui/Player.cpp
index 49a6336..8a29eb5 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -58,6 +58,7 @@
 #include "HostInterface.h"
 #include "RunResources.h"
 #include "IOChannel.h"
+#include "GnashFactory.h"
 
 using namespace gnash;
 
diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index d4674fa..7fccecd 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -47,6 +47,7 @@
 #include "GnashException.h"
 #include "revno.h"
 #include "MediaHandler.h"
+#include "GnashFactory.h"
 #include "utility.h"
 #include "accumulator.h"
 #include "GnashFileUtilities.h"
diff --git a/libbase/GnashFactory.h b/libbase/GnashFactory.h
index 0f783e3..ed8aa81 100644
--- a/libbase/GnashFactory.h
+++ b/libbase/GnashFactory.h
@@ -51,7 +51,7 @@ namespace gnash {
 ///                 are registered. This helps avoid problems with
 ///                 unpredictable static initialization.
 /// @tparam Key     The type to be used as a key.
-template<typename T, typename Init = void, typename Key = std::string>
+template<typename T, typename Init, typename Key>
 class DSOEXPORT GnashFactory
 {
 public:
diff --git a/libcore/swf/tag_loaders.cpp b/libcore/swf/tag_loaders.cpp
index 0979d31..c0da0ce 100644
--- a/libcore/swf/tag_loaders.cpp
+++ b/libcore/swf/tag_loaders.cpp
@@ -35,6 +35,7 @@
 #include "swf/TagLoadersTable.h"
 #include "URL.h"
 #include "GnashException.h"
+#include "GnashAlgorithm.h"
 #include "sound_definition.h"
 #include "SoundInfo.h"
 #include "MediaHandler.h"
diff --git a/libmedia/MediaHandler.cpp b/libmedia/MediaHandler.cpp
index c95db4e..aecf39c 100644
--- a/libmedia/MediaHandler.cpp
+++ b/libmedia/MediaHandler.cpp
@@ -28,6 +28,7 @@
 #include "IOChannel.h"
 #include "AudioDecoderSimple.h"
 #include "log.h"
+#include "GnashFactory.h"
 
 #ifdef DECODING_SPEEX
 # include "AudioDecoderSpeex.h"
diff --git a/libmedia/MediaHandler.h b/libmedia/MediaHandler.h
index f9df8e6..d8dc34f 100644
--- a/libmedia/MediaHandler.h
+++ b/libmedia/MediaHandler.h
@@ -23,7 +23,6 @@
 
 #include "dsodefs.h" // DSOEXPORT
 #include "VideoConverter.h"
-#include "GnashFactory.h"
 
 #include <vector>
 #include <memory>
@@ -32,6 +31,7 @@
 // Forward declarations
 namespace gnash {
     class IOChannel;
+    template<typename T, typename Init, typename Key> class GnashFactory;
     namespace media {
         class VideoDecoder;
         class AudioDecoder;
@@ -62,7 +62,7 @@ struct DSOEXPORT RegisterAllHandlers
     RegisterAllHandlers();
 };
 
-typedef GnashFactory<MediaHandler, RegisterAllHandlers> MediaFactory;
+using MediaFactory = GnashFactory<MediaHandler, RegisterAllHandlers, 
std::string>;
 
 /// The MediaHandler class acts as a factory to provide parser and decoders
 class DSOEXPORT MediaHandler
diff --git a/libmedia/gst/MediaHandlerGst.cpp b/libmedia/gst/MediaHandlerGst.cpp
index 046f2a4..60e43c8 100644
--- a/libmedia/gst/MediaHandlerGst.cpp
+++ b/libmedia/gst/MediaHandlerGst.cpp
@@ -29,6 +29,7 @@
 #include "AudioInputGst.h"
 #include "FLVParser.h"
 #include "MediaParser.h"
+#include "GnashFactory.h"
 
 #ifdef DECODING_SPEEX
 #include "AudioDecoderSpeex.h"
diff --git a/testsuite/MovieTester.cpp b/testsuite/MovieTester.cpp
index 5baec1f..8108680 100644
--- a/testsuite/MovieTester.cpp
+++ b/testsuite/MovieTester.cpp
@@ -38,6 +38,7 @@
 #include "IOChannel.h"
 #include "swf/TagLoadersTable.h"
 #include "swf/DefaultTagLoaders.h"
+#include "GnashFactory.h"
 
 #ifdef RENDERER_CAIRO
 # include "Renderer_cairo.h"
diff --git a/utilities/processor.cpp b/utilities/processor.cpp
index 47b3dc5..611e8ed 100644
--- a/utilities/processor.cpp
+++ b/utilities/processor.cpp
@@ -51,6 +51,7 @@
 #include "StringPredicates.h"
 #include "IOChannel.h" // for proper dtor call
 #include "GnashSleep.h" // for usleep compatibility.
+#include "GnashFactory.h"
 #include "StreamProvider.h"
 #include "RunResources.h"
 #include "HostInterface.h"

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

Summary of changes:
 gui/Player.cpp                   |    1 +
 gui/gnash.cpp                    |    1 +
 libbase/GnashFactory.h           |    2 +-
 libcore/swf/tag_loaders.cpp      |    1 +
 libmedia/MediaHandler.cpp        |    1 +
 libmedia/MediaHandler.h          |    4 ++--
 libmedia/gst/MediaHandlerGst.cpp |    1 +
 testsuite/MovieTester.cpp        |    1 +
 utilities/processor.cpp          |    1 +
 9 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash