[Scummvm-cvs-logs] SF.net SVN: scummvm:[54148] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Nov 9 00:07:42 CET 2010


Revision: 54148
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54148&view=rev
Author:   fingolfin
Date:     2010-11-08 23:07:42 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
COMMON: Push #include audiocd.h in system.h out to .cpp files

Modified Paths:
--------------
    scummvm/trunk/common/system.h
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/event.cpp
    scummvm/trunk/engines/agos/res_snd.cpp
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/sound.cpp
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/sound/cdrom.cpp
    scummvm/trunk/engines/groovie/groovie.cpp
    scummvm/trunk/engines/groovie/music.cpp
    scummvm/trunk/engines/kyra/sound_towns.cpp
    scummvm/trunk/engines/made/made.cpp
    scummvm/trunk/engines/made/scriptfuncs.cpp
    scummvm/trunk/engines/sci/sound/audio.cpp
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/sound.cpp
    scummvm/trunk/engines/teenagent/teenagent.cpp
    scummvm/trunk/engines/testbed/sound.cpp
    scummvm/trunk/engines/tinsel/music.cpp
    scummvm/trunk/engines/tinsel/tinsel.cpp
    scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp

Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/common/system.h	2010-11-08 23:07:42 UTC (rev 54148)
@@ -33,8 +33,6 @@
 
 #include "graphics/pixelformat.h"
 
-#include "backends/audiocd/audiocd.h"
-
 namespace Audio {
 	class Mixer;
 }
@@ -54,6 +52,7 @@
 	class HardwareKeySet;
 }
 
+class AudioCDManager;
 class FilesystemFactory;
 
 /**

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/agos/agos.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -37,6 +37,8 @@
 #include "agos/agos.h"
 #include "agos/vga.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "graphics/surface.h"
 
 #include "sound/mididrv.h"

Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/agos/event.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -32,6 +32,8 @@
 #include "common/events.h"
 #include "common/system.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "gui/about.h"
 
 #include "graphics/surface.h"

Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/agos/res_snd.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -30,6 +30,8 @@
 #include "agos/agos.h"
 #include "agos/vga.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "sound/audiostream.h"
 #include "sound/mididrv.h"
 #include "sound/mods/protracker.h"

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -30,6 +30,8 @@
 #include "common/savefile.h"
 #include "common/config-manager.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "base/plugins.h"
 #include "base/version.h"
 

Modified: scummvm/trunk/engines/drascula/sound.cpp
===================================================================
--- scummvm/trunk/engines/drascula/sound.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/drascula/sound.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -30,6 +30,8 @@
 
 #include "common/config-manager.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "drascula/drascula.h"
 
 namespace Drascula {

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/gob/gob.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -28,6 +28,7 @@
 #include "common/events.h"
 #include "common/EventRecorder.h"
 
+#include "backends/audiocd/audiocd.h"
 #include "base/plugins.h"
 #include "common/config-manager.h"
 #include "common/md5.h"

Modified: scummvm/trunk/engines/gob/sound/cdrom.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/cdrom.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/gob/sound/cdrom.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -27,6 +27,8 @@
 #include "common/str.h"
 #include "common/util.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "gob/gob.h"
 #include "gob/sound/cdrom.h"
 #include "gob/dataio.h"

Modified: scummvm/trunk/engines/groovie/groovie.cpp
===================================================================
--- scummvm/trunk/engines/groovie/groovie.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/groovie/groovie.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -37,6 +37,7 @@
 #include "common/events.h"
 #include "common/macresman.h"
 
+#include "backends/audiocd/audiocd.h"
 #include "engines/util.h"
 #include "graphics/fontman.h"
 #include "sound/mixer.h"

Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/groovie/music.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -27,6 +27,7 @@
 #include "groovie/groovie.h"
 #include "groovie/resource.h"
 
+#include "backends/audiocd/audiocd.h"
 #include "common/config-manager.h"
 #include "common/macresman.h"
 #include "sound/midiparser.h"

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -30,6 +30,8 @@
 #include "kyra/sound_intern.h"
 #include "kyra/screen.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "sound/audiostream.h"
 #include "sound/decoders/raw.h"
 

Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/made/made.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -35,6 +35,8 @@
 
 #include "engines/util.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "base/plugins.h"
 #include "base/version.h"
 

Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -26,6 +26,8 @@
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/events.h"
+
+#include "backends/audiocd/audiocd.h"
 #include "graphics/cursorman.h"
 #include "sound/softsynth/pcspk.h"
 

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -29,6 +29,8 @@
 #include "sci/engine/seg_manager.h"
 #include "sci/sound/audio.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "common/file.h"
 #include "common/system.h"
 

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -45,6 +45,8 @@
 
 #include "sound/mixer.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "graphics/thumbnail.h"
 
 namespace Scumm {

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -75,6 +75,8 @@
 #include "scumm/util.h"
 #include "scumm/verbs.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "sound/mixer.h"
 
 using Common::File;

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/scumm/sound.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -36,6 +36,8 @@
 #include "scumm/sound.h"
 #include "scumm/util.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "sound/decoders/adpcm.h"
 #include "sound/decoders/flac.h"
 #include "sound/mididrv.h"

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -28,6 +28,8 @@
 #include "common/savefile.h"
 #include "common/system.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "engines/advancedDetector.h"
 #include "engines/util.h"
 

Modified: scummvm/trunk/engines/testbed/sound.cpp
===================================================================
--- scummvm/trunk/engines/testbed/sound.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/testbed/sound.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -24,6 +24,8 @@
 
 #include "sound/softsynth/pcspk.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "testbed/sound.h"
 
 namespace Testbed {

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/tinsel/music.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -31,6 +31,9 @@
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
 #include "sound/decoders/adpcm.h"
+
+#include "backends/audiocd/audiocd.h"
+
 #include "common/config-manager.h"
 #include "common/file.h"
 

Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -36,6 +36,8 @@
 #include "common/serializer.h"
 #include "common/stream.h"
 
+#include "backends/audiocd/audiocd.h"
+
 #include "engines/util.h"
 
 #include "graphics/cursorman.h"

Modified: scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp	2010-11-08 22:53:36 UTC (rev 54147)
+++ scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp	2010-11-08 23:07:42 UTC (rev 54148)
@@ -25,6 +25,7 @@
 
 #include "sound/softsynth/fmtowns_pc98/towns_audio.h"
 #include "common/endian.h"
+#include "backends/audiocd/audiocd.h"
 
 
 class TownsAudio_PcmChannel {


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