CGE: Removed snddrv.h

4 files changed, 9 insertions, 65 deletions

diff --git a/engines/cge/general.cpp b/engines/cge/general.cpp
index 5e32aa63aa..3f4377a534 100644
--- a/engines/cge/general.cpp
+++ b/engines/cge/general.cpp
@@ -27,7 +27,6 @@
 
 #include "cge/cge.h"
 #include "cge/general.h"
-#include "cge/snddrv.h"
 
 namespace CGE {
 
diff --git a/engines/cge/general.h b/engines/cge/general.h
index 1793594d07..a02cfd0c37 100644
--- a/engines/cge/general.h
+++ b/engines/cge/general.h
@@ -53,6 +53,7 @@ uint16  chkSum(void *m, uint16 n);
 char   *mergeExt(char *buf, const char *name, const char *ext);
 char   *forceExt(char *buf, const char *name, const char *ext);
 int     newRandom(int range);
+void    sndSetVolume();
 
 } // End of namespace CGE
 
diff --git a/engines/cge/snddrv.h b/engines/cge/snddrv.h
deleted file mode 100644
index 93793de2fe..0000000000
--- a/engines/cge/snddrv.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * This code is based on original Soltys source code
- * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
- */
-
-#ifndef CGE_SNDDRV_H
-#define CGE_SNDDRV_H
-
-namespace CGE {
-
-// ******************************************************
-// *  Constants                                         *
-// ******************************************************
-
-// sample info
-struct SmpInfo {
-	const uint8  *_saddr;                              // address
-	uint16  _slen;                                     // length
-	uint16  _span;                                     // left/right pan (0-15)
-	int     _counter;                                  // number of time the sample should be played
-};
-
-// ******************************************************
-// *  Data                                              *
-// ******************************************************
-
-// midi player flag (1 means we are playing)
-extern uint16 _midiPlayFlag;
-
-// midi song end flag (1 means we have crossed end mark)
-extern uint16 _midiEndFlag;
-
-// ******************************************************
-// *  Driver Code                                       *
-// ******************************************************
-// Set Volume
-void sndSetVolume();
-
-} // End of namespace CGE
-
-#endif
diff --git a/engines/cge/sound.h b/engines/cge/sound.h
index 4441e24179..727ee78a5b 100644
--- a/engines/cge/sound.h
+++ b/engines/cge/sound.h
@@ -29,7 +29,6 @@
 #define CGE_SOUND_H
 
 #include "cge/fileio.h"
-#include "cge/snddrv.h"
 #include "audio/audiostream.h"
 #include "audio/decoders/wave.h"
 #include "audio/fmopl.h"
@@ -43,6 +42,14 @@ namespace CGE {
 
 class CGEEngine;
 
+// sample info
+struct SmpInfo {
+	const uint8  *_saddr;                              // address
+	uint16  _slen;                                     // length
+	uint16  _span;                                     // left/right pan (0-15)
+	int     _counter;                                  // number of time the sample should be played
+};
+
 class DataCk {
 	byte *_buf;
 	int _ckSize;