[Scummvm-cvs-logs] SF.net SVN: scummvm:[41632] scummvm/trunk/engines/gob/sound

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Thu Jun 18 15:27:15 CEST 2009


Revision: 41632
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41632&view=rev
Author:   drmccoy
Date:     2009-06-18 13:27:14 +0000 (Thu, 18 Jun 2009)

Log Message:
-----------
Replacing some #includes by forward declarations

Modified Paths:
--------------
    scummvm/trunk/engines/gob/sound/bgatmosphere.cpp
    scummvm/trunk/engines/gob/sound/bgatmosphere.h
    scummvm/trunk/engines/gob/sound/cdrom.cpp
    scummvm/trunk/engines/gob/sound/cdrom.h
    scummvm/trunk/engines/gob/sound/protracker.cpp
    scummvm/trunk/engines/gob/sound/protracker.h
    scummvm/trunk/engines/gob/sound/sound.cpp
    scummvm/trunk/engines/gob/sound/sound.h
    scummvm/trunk/engines/gob/sound/soundblaster.cpp
    scummvm/trunk/engines/gob/sound/soundblaster.h
    scummvm/trunk/engines/gob/sound/soundmixer.cpp
    scummvm/trunk/engines/gob/sound/soundmixer.h

Modified: scummvm/trunk/engines/gob/sound/bgatmosphere.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/bgatmosphere.cpp	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/bgatmosphere.cpp	2009-06-18 13:27:14 UTC (rev 41632)
@@ -27,6 +27,7 @@
 #include "common/events.h"
 
 #include "gob/sound/bgatmosphere.h"
+#include "gob/sound/sounddesc.h"
 
 namespace Gob {
 

Modified: scummvm/trunk/engines/gob/sound/bgatmosphere.h
===================================================================
--- scummvm/trunk/engines/gob/sound/bgatmosphere.h	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/bgatmosphere.h	2009-06-18 13:27:14 UTC (rev 41632)
@@ -29,11 +29,12 @@
 #include "sound/mixer.h"
 #include "common/mutex.h"
 
-#include "gob/sound/sounddesc.h"
 #include "gob/sound/soundmixer.h"
 
 namespace Gob {
 
+class SoundDesc;
+
 class BackgroundAtmosphere : private SoundMixer {
 public:
 	enum PlayMode {

Modified: scummvm/trunk/engines/gob/sound/cdrom.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/cdrom.cpp	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/cdrom.cpp	2009-06-18 13:27:14 UTC (rev 41632)
@@ -30,6 +30,7 @@
 #include "gob/gob.h"
 #include "gob/sound/cdrom.h"
 #include "gob/helper.h"
+#include "gob/dataio.h"
 
 namespace Gob {
 

Modified: scummvm/trunk/engines/gob/sound/cdrom.h
===================================================================
--- scummvm/trunk/engines/gob/sound/cdrom.h	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/cdrom.h	2009-06-18 13:27:14 UTC (rev 41632)
@@ -26,10 +26,10 @@
 #ifndef GOB_SOUND_CDROM_H
 #define GOB_SOUND_CDROM_H
 
-#include "gob/dataio.h"
-
 namespace Gob {
 
+class DataStream;
+
 class CDROM {
 public:
 	CDROM();

Modified: scummvm/trunk/engines/gob/sound/protracker.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/protracker.cpp	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/protracker.cpp	2009-06-18 13:27:14 UTC (rev 41632)
@@ -25,6 +25,8 @@
 
 #include "common/file.h"
 
+#include "sound/mods/protracker.h"
+
 #include "gob/sound/protracker.h"
 
 namespace Gob {

Modified: scummvm/trunk/engines/gob/sound/protracker.h
===================================================================
--- scummvm/trunk/engines/gob/sound/protracker.h	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/protracker.h	2009-06-18 13:27:14 UTC (rev 41632)
@@ -28,7 +28,6 @@
 
 #include "sound/mixer.h"
 #include "sound/audiostream.h"
-#include "sound/mods/protracker.h"
 
 namespace Gob {
 

Modified: scummvm/trunk/engines/gob/sound/sound.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/sound.cpp	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/sound.cpp	2009-06-18 13:27:14 UTC (rev 41632)
@@ -31,6 +31,13 @@
 #include "gob/game.h"
 #include "gob/inter.h"
 
+#include "gob/sound/pcspeaker.h"
+#include "gob/sound/soundblaster.h"
+#include "gob/sound/adlib.h"
+#include "gob/sound/infogrames.h"
+#include "gob/sound/protracker.h"
+#include "gob/sound/cdrom.h"
+
 namespace Gob {
 
 Sound::Sound(GobEngine *vm) : _vm(vm) {

Modified: scummvm/trunk/engines/gob/sound/sound.h
===================================================================
--- scummvm/trunk/engines/gob/sound/sound.h	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/sound.h	2009-06-18 13:27:14 UTC (rev 41632)
@@ -27,16 +27,18 @@
 #define GOB_SOUND_SOUND_H
 
 #include "gob/sound/sounddesc.h"
-#include "gob/sound/pcspeaker.h"
-#include "gob/sound/soundblaster.h"
-#include "gob/sound/adlib.h"
-#include "gob/sound/infogrames.h"
-#include "gob/sound/protracker.h"
-#include "gob/sound/cdrom.h"
 #include "gob/sound/bgatmosphere.h"
 
 namespace Gob {
 
+class GobEngine;
+class PCSpeaker;
+class SoundBlaster;
+class AdLib;
+class Infogrames;
+class Protracker;
+class CDROM;
+
 class Sound {
 public:
 	static const int kSoundsCount = 60;

Modified: scummvm/trunk/engines/gob/sound/soundblaster.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/soundblaster.cpp	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/soundblaster.cpp	2009-06-18 13:27:14 UTC (rev 41632)
@@ -24,6 +24,7 @@
  */
 
 #include "gob/sound/soundblaster.h"
+#include "gob/sound/sounddesc.h"
 
 namespace Gob {
 

Modified: scummvm/trunk/engines/gob/sound/soundblaster.h
===================================================================
--- scummvm/trunk/engines/gob/sound/soundblaster.h	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/soundblaster.h	2009-06-18 13:27:14 UTC (rev 41632)
@@ -29,11 +29,12 @@
 #include "common/mutex.h"
 #include "sound/mixer.h"
 
-#include "gob/sound/sounddesc.h"
 #include "gob/sound/soundmixer.h"
 
 namespace Gob {
 
+class SoundDesc;
+
 class SoundBlaster : public SoundMixer {
 public:
 	SoundBlaster(Audio::Mixer &mixer);

Modified: scummvm/trunk/engines/gob/sound/soundmixer.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.cpp	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/soundmixer.cpp	2009-06-18 13:27:14 UTC (rev 41632)
@@ -24,6 +24,7 @@
  */
 
 #include "gob/sound/soundmixer.h"
+#include "gob/sound/sounddesc.h"
 
 namespace Gob {
 

Modified: scummvm/trunk/engines/gob/sound/soundmixer.h
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.h	2009-06-18 12:32:10 UTC (rev 41631)
+++ scummvm/trunk/engines/gob/sound/soundmixer.h	2009-06-18 13:27:14 UTC (rev 41632)
@@ -31,10 +31,10 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
-#include "gob/sound/sounddesc.h"
-
 namespace Gob {
 
+class SoundDesc;
+
 class SoundMixer : public Audio::AudioStream {
 public:
 	SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list