5 files changed, 34 insertions, 59 deletions
diff --git a/engines/cryo/clhnm.cpp b/engines/cryo/clhnm.cpp
deleted file mode 100644
index 53e778c3d1..0000000000
--- a/engines/cryo/clhnm.cpp
+++ /dev/null
@@ -1,46 +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.
- *
- */
-
-#include "common/debug.h"
-
-#include "cryo/cryolib.h"
-
-namespace Cryo {
-
-static bool use_mono = false;
-
-void CLHNM_Done() {
-}
-
-void CLHNM_Dispose(hnm_t *hnm) {
-	free(hnm);
-}
-
-void CLHNM_CanLoop(hnm_t *hnm, bool canLoop) {
-	hnm->_canLoop = canLoop;
-}
-
-void CLHNM_SoundMono(bool isMono) {
-	use_mono = isMono;
-}
-
-} // End of namespace Cryo
diff --git a/engines/cryo/cryolib.h b/engines/cryo/cryolib.h
index b2d1b7a5e0..5470d2871d 100644
--- a/engines/cryo/cryolib.h
+++ b/engines/cryo/cryolib.h
@@ -248,12 +248,6 @@ void CLScreenView_CenterIn(View *view);
 void CRYOLib_ManagersInit();
 void CRYOLib_ManagersDone();
 
-void CLHNM_Done();
-void CLHNM_Dispose(hnm_t *hnm);
-void CLHNM_CanLoop(hnm_t *hnm, bool canLoop);
-void CLHNM_SoundMono(int16 is_mono);
-
-
 } // End of namespace Cryo
 
 #endif
diff --git a/engines/cryo/module.mk b/engines/cryo/module.mk
index bc47aea777..825432f285 100644
--- a/engines/cryo/module.mk
+++ b/engines/cryo/module.mk
@@ -1,7 +1,6 @@
 MODULE := engines/cryo
 
 MODULE_OBJS = \
-	clhnm.o \
 	clsoundgroup.o \
 	clsoundraw.o \
 	cryolib.o \
diff --git a/engines/cryo/video.cpp b/engines/cryo/video.cpp
index 521efa274e..fc9ed4afcc 100644
--- a/engines/cryo/video.cpp
+++ b/engines/cryo/video.cpp
@@ -40,6 +40,7 @@ HnmPlayer::HnmPlayer(CryoEngine *vm) : _vm(vm) {
 	_soundGroupAdpcm = nullptr;
 	_prevRight = _prevLeft = 0;
 	_useAdpcm = false;
+	_useMono = false;
 	_customChunkHandler = nullptr;
 	_preserveColor0 = false;
 	_safePalette = false;
@@ -138,11 +139,6 @@ void HnmPlayer::setupSoundADPCM(int16 numSounds, int16 length, int16 sampleSize,
 	_soundGroupAdpcm = CLSoundGroup_New(numSounds, length, sampleSize, rate, mode);
 }
 
-// Original name: CLHNM_SoundInADPCM
-void HnmPlayer::soundInADPCM(bool isAdpcm) {
-	_useAdpcm = isAdpcm;
-}
-
 // Original name: CLHNM_CloseSound
 void HnmPlayer::closeSound() {
 	if (_soundChannel) {
@@ -657,5 +653,29 @@ void HnmPlayer::selectBuffers(hnm_t *hnm) {
 	}
 }
 
+// Original name: CLHNM_Done
+void HnmPlayer::done() {
+}
+
+// Original name: CLHNM_Dispose
+void HnmPlayer::dispose(hnm_t *hnm) {
+	free(hnm);
+}
+
+// Original name: CLHNM_CanLoop
+void HnmPlayer::canLoop(hnm_t *hnm, bool canLoop) {
+	hnm->_canLoop = canLoop;
+}
+
+// Original name: CLHNM_SoundInADPCM
+void HnmPlayer::soundInADPCM(bool isAdpcm) {
+	_useAdpcm = isAdpcm;
+}
+
+// Original name: CLHNM_SoundMono
+void HnmPlayer::soundMono(bool isMono) {
+	_useMono = isMono;
+}
+
 }   // namespace Cryo
 
diff --git a/engines/cryo/video.h b/engines/cryo/video.h
index e86d5066b8..ea41905479 100644
--- a/engines/cryo/video.h
+++ b/engines/cryo/video.h
@@ -35,7 +35,6 @@ private:
 	void wantsSound(bool sound);
 	void decompADPCM(byte *buffer, int16 *output, int size);
 	void loadDecompTable(int16 *buffer);
-	void soundInADPCM(bool is_adpcm); // Unused
 	bool loadFrame(hnm_t *hnm);
 	void tryRead(hnm_t *hnm, int size);
 	void changePalette(hnm_t *hnm);
@@ -45,6 +44,14 @@ private:
 	void desentrelace(hnm_t *hnm);
 	void decompUBA(byte *output, byte *curr_buffer, byte *prev_buffer, byte *input, int width, char flags);
 
+	// Unused
+	void done();
+	void dispose(hnm_t *hnm);
+	void canLoop(hnm_t *hnm, bool canLoop);
+	void soundInADPCM(bool is_adpcm);
+	void soundMono(bool is_mono);
+	//
+
 	bool _soundStarted;
 	int16 _pendingSounds;
 	float _timeDrift;
@@ -56,6 +63,7 @@ private:
 	int16 _prevRight;
 	int16 _prevLeft;
 	bool _useAdpcm;
+	bool _useMono;
 	bool _preserveColor0;
 	int16 decompTable[256];
 	bool _safePalette;