Removed sfx/misc.h

svn-id: r45885

3 files changed, 9 insertions, 50 deletions

diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 3cd6e47ce5..82638a1af5 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -28,7 +28,6 @@
 #include "sci/sci.h"
 #include "sci/sfx/core.h"
 #include "sci/sfx/iterator.h"
-#include "sci/sfx/misc.h"
 #include "sci/sfx/sci_midi.h"
 
 #include "sci/sfx/softseq/pcjr.h"
diff --git a/engines/sci/sfx/iterator.h b/engines/sci/sfx/iterator.h
index b3fb115370..74a6b5ab84 100644
--- a/engines/sci/sfx/iterator.h
+++ b/engines/sci/sfx/iterator.h
@@ -306,7 +306,15 @@ int songit_handle_message(SongIterator **it_reg, SongIterator::Message msg);
 */
 SongIterator *new_fast_forward_iterator(SongIterator *it, int delta);
 
-
+/* Combines two song iterators into one
+** Parameters: (sfx_iterator_t *) it1: One of the two iterators, or NULL
+**             (sfx_iterator_t *) it2: The other iterator, or NULL
+** Returns   : (sfx_iterator_t *) A combined iterator
+** If a combined iterator is returned, it will be flagged to be allowed to
+** dispose of 'it1' and 'it2', where applicable. This means that this
+** call should be used by song players, but not by the core sound system
+*/
+SongIterator *sfx_iterator_combine(SongIterator *it1, SongIterator *it2);
 
 } // End of namespace Sci
 
diff --git a/engines/sci/sfx/misc.h b/engines/sci/sfx/misc.h
deleted file mode 100644
index ce2673a737..0000000000
--- a/engines/sci/sfx/misc.h
+++ /dev/null
@@ -1,48 +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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef SCI_SFX_MISC_H
-#define SCI_SFX_MISC_H
-
-namespace Sci {
-
-class SongIterator;
-
-
-
-SongIterator *sfx_iterator_combine(SongIterator *it1, SongIterator *it2);
-/* Combines two song iterators into one
-** Parameters: (sfx_iterator_t *) it1: One of the two iterators, or NULL
-**             (sfx_iterator_t *) it2: The other iterator, or NULL
-** Returns   : (sfx_iterator_t *) A combined iterator
-** If a combined iterator is returned, it will be flagged to be allowed to
-** dispose of 'it1' and 'it2', where applicable. This means that this
-** call should be used by song players, but not by the core sound system
-*/
-
-
-} // End of namespace Sci
-
-#endif // SCI_SFX_MISC_H