From 06960d33e15bc80f9912fa92f11dd82388199bd6 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Aug 2010 09:28:20 +0000
Subject: HUGO: Adding engine to the main tree

svn-id: r52137
---
 engines/hugo/sound.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100755 engines/hugo/sound.h

(limited to 'engines/hugo/sound.h')

diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
new file mode 100755
index 0000000000..a9136b99e1
--- /dev/null
+++ b/engines/hugo/sound.h
@@ -0,0 +1,63 @@
+/* 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$
+ *
+ */
+
+/*
+ * This code is based on original Hugo Trilogy source code
+ *
+ * Copyright (c) 1989-1995 David P. Gray
+ *
+ */
+
+#ifndef HUGO_SOUND_H
+#define HUGO_SOUND_H
+
+#include "sound/mixer.h"
+
+namespace Hugo {
+
+class SoundHandler {
+public:
+	SoundHandler(HugoEngine &vm);
+
+	void toggleMusic();
+	void toggleSound();
+	void setMusicVolume();
+	void playMusic(short tune);
+	void playSound(short sound, stereo_t channel, byte priority);
+	void initSound(inst_t action);
+
+private:
+	HugoEngine &_vm;
+	Audio::SoundHandle _soundHandle;
+
+	void stopSound();
+	void stopMusic();
+	void playMIDI(sound_pt seq_p, uint16 size);
+	void pauseSound(bool activeFl, int hTask);
+
+};
+
+} // end of namespace Hugo
+#endif //HUGO_SOUND_H
-- 
cgit v1.2.3


From 54c1a1463f2eadb8bf48c234f2474d395b7d62a6 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Tue, 17 Aug 2010 23:55:31 +0000
Subject: HUGO: Fix file permissions

755->644

svn-id: r52177
---
 engines/hugo/sound.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 engines/hugo/sound.h

(limited to 'engines/hugo/sound.h')

diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 98400327c3d2e497bba04f22dd096fcca4eeb255 Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Thu, 26 Aug 2010 23:13:17 +0000
Subject: HUGO: Implemented basic MIDI support.

svn-id: r52403
---
 engines/hugo/sound.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines/hugo/sound.h')

diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
index a9136b99e1..89fcf463da 100644
--- a/engines/hugo/sound.h
+++ b/engines/hugo/sound.h
@@ -37,6 +37,8 @@
 
 namespace Hugo {
 
+class MidiPlayer;
+	
 class SoundHandler {
 public:
 	SoundHandler(HugoEngine &vm);
@@ -46,11 +48,12 @@ public:
 	void setMusicVolume();
 	void playMusic(short tune);
 	void playSound(short sound, stereo_t channel, byte priority);
-	void initSound(inst_t action);
+	void initSound();
 
 private:
 	HugoEngine &_vm;
 	Audio::SoundHandle _soundHandle;
+	MidiPlayer *_midiPlayer;
 
 	void stopSound();
 	void stopMusic();
-- 
cgit v1.2.3


From a7541810b4c4b991267ce7a63c6c4ad25e79e080 Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Thu, 26 Aug 2010 23:41:39 +0000
Subject: HUGO: Removed some dead code and redundant indirection

svn-id: r52404
---
 engines/hugo/sound.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'engines/hugo/sound.h')

diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
index 89fcf463da..ed2ee74be7 100644
--- a/engines/hugo/sound.h
+++ b/engines/hugo/sound.h
@@ -58,8 +58,6 @@ private:
 	void stopSound();
 	void stopMusic();
 	void playMIDI(sound_pt seq_p, uint16 size);
-	void pauseSound(bool activeFl, int hTask);
-
 };
 
 } // end of namespace Hugo
-- 
cgit v1.2.3


From ec9708694e886746af0d45d30bbf271c2061053f Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Fri, 27 Aug 2010 09:48:53 +0000
Subject: HUGO: Hopefully fix GCC_PRINTF issue in util

* Add a mask in each call of Warn(), Error() and Box() not using one
* cleanup: use the same wording for 'End of namespace Hugo' in all files

svn-id: r52406
---
 engines/hugo/sound.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/hugo/sound.h')

diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
index ed2ee74be7..53a5912a92 100644
--- a/engines/hugo/sound.h
+++ b/engines/hugo/sound.h
@@ -60,5 +60,6 @@ private:
 	void playMIDI(sound_pt seq_p, uint16 size);
 };
 
-} // end of namespace Hugo
+} // End of namespace Hugo
+
 #endif //HUGO_SOUND_H
-- 
cgit v1.2.3