Removed useless dependencies from common/file.h in common code. When complete removal was not possibile, dependency has been pushed to the cpp files from the headers.

svn-id: r34343

7 files changed, 22 insertions, 20 deletions

diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp
index 343d5bc440..8fc9100926 100644
--- a/sound/audiocd.cpp
+++ b/sound/audiocd.cpp
@@ -29,7 +29,6 @@
 #include "sound/vorbis.h"
 #include "sound/flac.h"
 #include "engines/engine.h"
-#include "common/file.h"
 #include "common/util.h"
 #include "common/system.h"
 
diff --git a/sound/flac.cpp b/sound/flac.cpp
index 51b75237a4..bb1a6fb4be 100644
--- a/sound/flac.cpp
+++ b/sound/flac.cpp
@@ -27,7 +27,7 @@
 
 #ifdef USE_FLAC
 
-#include "common/file.h"
+#include "common/stream.h"
 #include "common/util.h"
 
 #include "sound/audiostream.h"
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 27e031f108..824143d829 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/file.h"
 #include "common/util.h"
 #include "common/system.h"
 
diff --git a/sound/mods/infogrames.cpp b/sound/mods/infogrames.cpp
index 97987b037a..d5b285576a 100644
--- a/sound/mods/infogrames.cpp
+++ b/sound/mods/infogrames.cpp
@@ -25,6 +25,7 @@
 
 #include "sound/mods/infogrames.h"
 #include "common/endian.h"
+#include "common/file.h"
 
 namespace Audio {
 
@@ -50,6 +51,14 @@ void Infogrames::Instruments::init() {
 	_sampleData = 0;
 }
 
+bool Infogrames::Instruments::load(const char *ins) {
+	Common::File f;
+
+	if (f.open(ins))
+		return load(f);
+	return false;
+}
+
 bool Infogrames::Instruments::load(Common::SeekableReadStream &ins) {
 	int i;
 	uint32 fsize;
@@ -191,6 +200,14 @@ void Infogrames::reset() {
 		_chn[i].cmdBlockIndices = 0;
 }
 
+bool Infogrames::load(const char *dum) {
+	Common::File f;
+
+	if (f.open(dum))
+		return load(f);
+	return false;
+}
+
 bool Infogrames::load(Common::SeekableReadStream &dum) {
 	int subSong = 0;
 	int i;
diff --git a/sound/mods/infogrames.h b/sound/mods/infogrames.h
index 572c5a6426..d44ea0475c 100644
--- a/sound/mods/infogrames.h
+++ b/sound/mods/infogrames.h
@@ -28,7 +28,6 @@
 
 #include "sound/mods/paula.h"
 #include "common/stream.h"
-#include "common/file.h"
 
 namespace Audio {
 
@@ -46,13 +45,7 @@ public:
 		~Instruments();
 
 		bool load(Common::SeekableReadStream &ins);
-		bool load(const char *ins) {
-			Common::File f;
-
-			if (f.open(ins))
-				return load(f);
-			return false;
-		}
+		bool load(const char *ins);
 		void unload(void);
 
 		uint8 getCount(void) const { return _count; }
@@ -82,13 +75,7 @@ public:
 	void setRepeating (int32 repCount) { _repCount = repCount; }
 
 	bool load(Common::SeekableReadStream &dum);
-	bool load(const char *dum) {
-		Common::File f;
-
-		if (f.open(dum))
-			return load(f);
-		return false;
-	}
+	bool load(const char *dum);
 	void unload(void);
 	void restart(void) {
 		if (_data) {
diff --git a/sound/mp3.cpp b/sound/mp3.cpp
index 70467bdb39..0249032e2f 100644
--- a/sound/mp3.cpp
+++ b/sound/mp3.cpp
@@ -27,7 +27,7 @@
 
 #ifdef USE_MAD
 
-#include "common/file.h"
+#include "common/stream.h"
 #include "common/util.h"
 
 #include "sound/audiocd.h"
diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp
index 64f67d2a13..da29b1b454 100644
--- a/sound/vorbis.cpp
+++ b/sound/vorbis.cpp
@@ -27,7 +27,7 @@
 
 #ifdef USE_VORBIS
 
-#include "common/file.h"
+#include "common/stream.h"
 #include "common/util.h"
 
 #include "sound/audiostream.h"