[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1772-gfe92ee6

[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  fe92ee64a68e88f2a0cc3996b1278ad5f9e20aff (commit)
      from  15d9381b4c0d5003e3111727132bc310c738f774 (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=fe92ee64a68e88f2a0cc3996b1278ad5f9e20aff


commit fe92ee64a68e88f2a0cc3996b1278ad5f9e20aff
Author: Bastiaan Jacques <address@hidden>
Date:   Fri Aug 30 19:07:44 2013 +0200

    Some more header file include directive cleanup.

diff --git a/gui/Player.cpp b/gui/Player.cpp
index 59149b7..38d445f 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -56,6 +56,7 @@
 #include "GnashSystemIOHeaders.h" // for write() 
 #include "log.h"
 #include "HostInterface.h"
+#include "RunResources.h"
 
 using namespace gnash;
 
diff --git a/gui/Player.h b/gui/Player.h
index 039a8b8..d11f0f1 100644
--- a/gui/Player.h
+++ b/gui/Player.h
@@ -24,22 +24,27 @@
 #include "gnashconfig.h"
 #endif
 
+#include "HostInterface.h"              // for HostInterface, FsCallback, etc
+#include "StringPredicates.h"           // for StringNoCaseLessThan
+#include "movie_definition.h"
+
 #include <boost/intrusive_ptr.hpp>
 #include <string>
 #include <boost/shared_ptr.hpp>
 #include <map>
 #include <memory>
 
-#include "sound_handler.h"
-#include "MediaHandler.h" 
-#include "gui.h"
-#include "movie_definition.h" 
-#include "movie_root.h"
-#include "RunResources.h"
-
 // Forward declarations
 namespace gnash {
     class MovieClip;
+    class RunResources;
+    class Gui;
+    namespace media {
+        class MediaHandler;
+    }
+    namespace sound {
+        class sound_handler;
+    }
 }
 
 namespace gnash {
diff --git a/gui/dump/dump.h b/gui/dump/dump.h
index be0795f..29abea9 100644
--- a/gui/dump/dump.h
+++ b/gui/dump/dump.h
@@ -25,7 +25,6 @@
 
 #include "dsodefs.h" // for DSOEXPORT
 #include "gui.h" // for inheritance
-#include "sound_handler.h" // for dtor visibility
 #include "ManualClock.h"
 
 #include <string>
@@ -34,6 +33,12 @@
 #include <boost/shared_ptr.hpp>
 
 namespace gnash {
+    namespace sound {
+        class sound_handler;
+    }
+}
+
+namespace gnash {
 
 class Renderer_agg_base;
 
diff --git a/gui/gui.h b/gui/gui.h
index 2c2c54c..69ec79e 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -25,16 +25,12 @@
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/function.hpp>
 #include <string>
 #include <map>
 #include <utility>
 
-#include "SWFRect.h"  // for composition
 #include "snappingrange.h"  // for InvalidatedRanges
-#include "ScreenShotter.h"
 #include "GnashKey.h"
-#include "Renderer.h" 
 #include "VirtualClock.h"
 #include "SystemClock.h"
 #include "GnashEnums.h" 
@@ -71,6 +67,11 @@ namespace gnash {
     class RunResources;
     class movie_root;
     class movie_definition;
+    class Renderer;
+    class SWFRect;
+}
+namespace boost {
+    template <typename Signature> class function;
 }
 
 namespace gnash {
diff --git a/libsound/EmbedSound.h b/libsound/EmbedSound.h
index 69c202f..61a0890 100644
--- a/libsound/EmbedSound.h
+++ b/libsound/EmbedSound.h
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <memory> // for auto_ptr (composition)
-#include <set> // for composition (_soundInstances)
 #include <cassert>
 #include <boost/thread/mutex.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/libsound/EmbedSoundInst.h b/libsound/EmbedSoundInst.h
index 91bf854..6e1cb81 100644
--- a/libsound/EmbedSoundInst.h
+++ b/libsound/EmbedSoundInst.h
@@ -25,10 +25,8 @@
 #include <boost/cstdint.hpp> // For C99 int types
 
 #include "LiveSound.h"
-#include "AudioDecoder.h" 
 #include "SoundEnvelope.h" 
 #include "EmbedSound.h" 
-#include "sound_handler.h" 
 
 // Forward declarations
 namespace gnash {
diff --git a/libsound/LiveSound.h b/libsound/LiveSound.h
index 113aa55..8da4719 100644
--- a/libsound/LiveSound.h
+++ b/libsound/LiveSound.h
@@ -27,12 +27,12 @@
 #include "InputStream.h" 
 #include "AudioDecoder.h" 
 #include "SimpleBuffer.h" 
-#include "SoundInfo.h"
 
 // Forward declarations
 namespace gnash {
     namespace media {
         class MediaHandler;
+        class SoundInfo;
     }
 }
 
diff --git a/libsound/StreamingSound.h b/libsound/StreamingSound.h
index a8e9938..45cfb40 100644
--- a/libsound/StreamingSound.h
+++ b/libsound/StreamingSound.h
@@ -25,9 +25,6 @@
 #include <boost/cstdint.hpp> // For C99 int types
 
 #include "LiveSound.h" 
-#include "AudioDecoder.h" 
-#include "SoundEnvelope.h"
-#include "SimpleBuffer.h" 
 #include "StreamingSoundData.h" 
 #include "sound_handler.h" 
 
diff --git a/libsound/StreamingSoundData.h b/libsound/StreamingSoundData.h
index e6f6186..6da7326 100644
--- a/libsound/StreamingSoundData.h
+++ b/libsound/StreamingSoundData.h
@@ -21,19 +21,17 @@
 #define SOUND_STREAMING_SOUND_DATA_H
 
 #include <vector>
-#include <map> 
 #include <memory> 
-#include <set> 
 #include <cassert>
 #include <boost/thread/mutex.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
-#include "SimpleBuffer.h" 
 #include "SoundInfo.h" 
 
 // Forward declarations
 namespace gnash {
+    class SimpleBuffer;
     namespace sound {
         class InputStream;
         class StreamingSound;
diff --git a/libsound/sdl/sound_handler_sdl.h b/libsound/sdl/sound_handler_sdl.h
index b9809e8..9d3c830 100644
--- a/libsound/sdl/sound_handler_sdl.h
+++ b/libsound/sdl/sound_handler_sdl.h
@@ -24,7 +24,6 @@
 
 #include "sound_handler.h" // for inheritance
 
-#include <set> // for composition (InputStreams)
 #include <SDL_audio.h>
 #include <boost/thread/mutex.hpp>
 
diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index ed35c1f..3c0ae52 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -31,6 +31,7 @@
 #include "StreamingSound.h"
 #include "StreamingSoundData.h"
 #include "SimpleBuffer.h"
+#include "MediaHandler.h"
 
 // Debug create_sound/delete_sound/playSound/stop_sound, loops
 //#define GNASH_DEBUG_SOUNDS_MANAGEMENT
diff --git a/libsound/sound_handler.h b/libsound/sound_handler.h
index 01cd64a..ddc6385 100644
--- a/libsound/sound_handler.h
+++ b/libsound/sound_handler.h
@@ -31,13 +31,13 @@
 #include <boost/scoped_ptr.hpp>
 
 #include "dsodefs.h" // for DSOEXPORT
-#include "MediaHandler.h" // for inlined ctor
 #include "SoundEnvelope.h" // for SoundEnvelopes typedef
 #include "AuxStream.h" // for aux_streamer_ptr typedef
-#include "WAVWriter.h" // for dtor visibility 
+#include "WAVWriter.h"
 
 namespace gnash {
     namespace media {
+        class MediaHandler;
         class SoundInfo;
     }
     namespace sound {

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

Summary of changes:
 gui/Player.cpp                   |    1 +
 gui/Player.h                     |   19 ++++++++++++-------
 gui/dump/dump.h                  |    7 ++++++-
 gui/gui.h                        |    9 +++++----
 libsound/EmbedSound.h            |    1 -
 libsound/EmbedSoundInst.h        |    2 --
 libsound/LiveSound.h             |    2 +-
 libsound/StreamingSound.h        |    3 ---
 libsound/StreamingSoundData.h    |    4 +---
 libsound/sdl/sound_handler_sdl.h |    1 -
 libsound/sound_handler.cpp       |    1 +
 libsound/sound_handler.h         |    4 ++--
 12 files changed, 29 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Gnash