From 5e4980090198a334b136bcdce16ea6addbe708a2 Mon Sep 17 00:00:00 2001 From: Ori Avtalion Date: Thu, 14 Apr 2016 16:48:02 +0300 Subject: AGOS: Reduce audio header dependencies --- engines/agos/agos.cpp | 1 + engines/agos/agos.h | 6 +++++- engines/agos/cursor.cpp | 1 + engines/agos/debugger.cpp | 1 + engines/agos/drivers/accolade/adlib.cpp | 5 +---- engines/agos/drivers/accolade/driverfile.cpp | 1 - engines/agos/drivers/accolade/mt32.cpp | 1 - engines/agos/event.cpp | 1 + engines/agos/icons.cpp | 1 + engines/agos/input.cpp | 1 + engines/agos/res.cpp | 1 - engines/agos/res_snd.cpp | 1 + engines/agos/script.cpp | 2 +- engines/agos/script_e1.cpp | 1 + engines/agos/script_e2.cpp | 1 + engines/agos/script_ff.cpp | 2 ++ engines/agos/script_pn.cpp | 1 + engines/agos/script_s1.cpp | 2 ++ engines/agos/script_s2.cpp | 1 + engines/agos/script_ww.cpp | 1 + engines/agos/subroutine.cpp | 1 + engines/agos/vga.cpp | 1 + engines/agos/vga_e2.cpp | 1 + engines/agos/vga_ff.cpp | 1 + engines/agos/vga_s1.cpp | 1 + engines/agos/vga_s2.cpp | 1 + 26 files changed, 29 insertions(+), 9 deletions(-) (limited to 'engines') diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 8952e649fd..48b170da75 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -32,6 +32,7 @@ #include "agos/intern.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/agos/agos.h b/engines/agos/agos.h index b6b5e427e1..551df6e19b 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -32,8 +32,8 @@ #include "common/rect.h" #include "common/stack.h" #include "common/util.h" +#include "audio/mixer.h" -#include "agos/sound.h" #include "agos/vga.h" /** @@ -77,10 +77,14 @@ uint fileReadItemID(Common::SeekableReadStream *in); class MoviePlayer; #endif +class Sound; class MidiPlayer; struct Child; struct SubObject; +struct RoomState; +struct SubRoom; +struct SubSuperRoom; struct Item; struct WindowBlock; diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 65fdc9ec99..19a38116cf 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -26,6 +26,7 @@ #include "graphics/cursorman.h" #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp index 7ad742c928..365d84dd3f 100644 --- a/engines/agos/debugger.cpp +++ b/engines/agos/debugger.cpp @@ -25,6 +25,7 @@ #include "agos/debugger.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/drivers/accolade/adlib.cpp b/engines/agos/drivers/accolade/adlib.cpp index 294be2b8a7..3a95d8f1c1 100644 --- a/engines/agos/drivers/accolade/adlib.cpp +++ b/engines/agos/drivers/accolade/adlib.cpp @@ -20,16 +20,13 @@ * */ -#include "agos/agos.h" #include "agos/drivers/accolade/mididriver.h" -#include "common/file.h" -#include "common/mutex.h" #include "common/system.h" #include "common/textconsole.h" #include "audio/fmopl.h" -#include "audio/softsynth/emumidi.h" +#include "audio/mididrv.h" namespace AGOS { diff --git a/engines/agos/drivers/accolade/driverfile.cpp b/engines/agos/drivers/accolade/driverfile.cpp index 4ff2fd550f..1e7fd442df 100644 --- a/engines/agos/drivers/accolade/driverfile.cpp +++ b/engines/agos/drivers/accolade/driverfile.cpp @@ -20,7 +20,6 @@ * */ -#include "agos/agos.h" #include "audio/mididrv.h" #include "common/error.h" #include "common/file.h" diff --git a/engines/agos/drivers/accolade/mt32.cpp b/engines/agos/drivers/accolade/mt32.cpp index 319e0ebf56..321b95f4ca 100644 --- a/engines/agos/drivers/accolade/mt32.cpp +++ b/engines/agos/drivers/accolade/mt32.cpp @@ -20,7 +20,6 @@ * */ -#include "agos/agos.h" #include "agos/drivers/accolade/mididriver.h" #include "audio/mididrv.h" diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 5240cdd771..b70ec674dd 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" #include "agos/animation.h" #include "agos/debugger.h" +#include "agos/sound.h" #include "agos/intern.h" #include "common/events.h" diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index 2db2a52cbc..364fbf5f15 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -27,6 +27,7 @@ #include "graphics/surface.h" #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index 686b1c35b2..3b57369f1e 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -26,6 +26,7 @@ #include "agos/intern.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" #include "agos/vga.h" namespace AGOS { diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index 2631f7998e..76d23905b7 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -31,7 +31,6 @@ #include "agos/agos.h" #include "agos/intern.h" -#include "agos/sound.h" #include "common/zlib.h" diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 3a092e652c..81d89cc4d3 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -28,6 +28,7 @@ #include "agos/intern.h" #include "agos/agos.h" #include "agos/midi.h" +#include "agos/sound.h" #include "agos/vga.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index 1dbb9c255a..5f4ff4e773 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -27,8 +27,8 @@ #include "common/system.h" #include "common/textconsole.h" -#include "agos/animation.h" #include "agos/agos.h" +#include "agos/intern.h" #ifdef _WIN32_WCE extern bool isSmartphone(); diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index a022335ebc..38b29d475e 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -22,6 +22,7 @@ #include "agos/agos.h" +#include "agos/intern.h" #include "agos/vga.h" namespace AGOS { diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp index 21b651ec12..d0cd015ce9 100644 --- a/engines/agos/script_e2.cpp +++ b/engines/agos/script_e2.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp index e4fadcf360..10c9e995d4 100644 --- a/engines/agos/script_ff.cpp +++ b/engines/agos/script_ff.cpp @@ -28,6 +28,8 @@ #include "agos/animation.h" #include "agos/agos.h" +#include "agos/intern.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index 60948db35a..653a162904 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -21,6 +21,7 @@ */ #include "agos/agos.h" +#include "agos/intern.h" #include "agos/vga.h" #include "common/endian.h" diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index ec3de9bf94..e7828609d9 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -26,6 +26,8 @@ #include "graphics/palette.h" #include "agos/agos.h" +#include "agos/intern.h" +#include "agos/sound.h" #ifdef _WIN32_WCE extern bool isSmartphone(); diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp index 44552ecd8a..7b1f369d68 100644 --- a/engines/agos/script_s2.cpp +++ b/engines/agos/script_s2.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" +#include "agos/intern.h" #include "agos/midi.h" #include "common/textconsole.h" diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp index aff3229f8e..9394311001 100644 --- a/engines/agos/script_ww.cpp +++ b/engines/agos/script_ww.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" +#include "agos/intern.h" namespace AGOS { diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index 1e6ecaa829..0f6c767300 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -26,6 +26,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index f761c3fc3f..2a675bf6e8 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -25,6 +25,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" #include "agos/vga.h" #include "common/debug-channels.h" diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp index bc26058640..a26f189c43 100644 --- a/engines/agos/vga_e2.cpp +++ b/engines/agos/vga_e2.cpp @@ -25,6 +25,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" #include "common/endian.h" #include "common/system.h" diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp index 52e30699b0..c350c37413 100644 --- a/engines/agos/vga_ff.cpp +++ b/engines/agos/vga_ff.cpp @@ -26,6 +26,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" namespace AGOS { diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp index c5f0f7874d..9b7e529e4b 100644 --- a/engines/agos/vga_s1.cpp +++ b/engines/agos/vga_s1.cpp @@ -24,6 +24,7 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "agos/sound.h" #include "agos/vga.h" namespace AGOS { diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp index 0c716d06c4..5326e0250f 100644 --- a/engines/agos/vga_s2.cpp +++ b/engines/agos/vga_s2.cpp @@ -23,6 +23,7 @@ #include "agos/agos.h" #include "agos/intern.h" #include "agos/midi.h" +#include "agos/sound.h" #include "graphics/surface.h" -- cgit v1.2.3