From 84784add6811aa1b285b70e139d0bdf9738c858c Mon Sep 17 00:00:00 2001 From: Kamil Zbróg Date: Mon, 28 Oct 2013 00:06:21 +0000 Subject: PRINCE: midi music player added. mob and object lists added --- engines/prince/sound.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 engines/prince/sound.h (limited to 'engines/prince/sound.h') diff --git a/engines/prince/sound.h b/engines/prince/sound.h new file mode 100644 index 0000000000..779fe563f9 --- /dev/null +++ b/engines/prince/sound.h @@ -0,0 +1,73 @@ +/* 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 PRINCE_SOUND_H +#define PRINCE_SOUND_H + +#include "audio/audiostream.h" +#include "audio/decoders/wave.h" +#include "audio/fmopl.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" +#include "audio/midiplayer.h" +#include "audio/mixer.h" +#include "common/memstream.h" + +namespace Prince { + +class PrinceEngine; + +class MusicPlayer: public Audio::MidiPlayer { +private: + PrinceEngine *_vm; + byte *_data; + int _dataSize; + bool _isGM; + + // Start MIDI File + void sndMidiStart(); + + // Stop MIDI File + void sndMidiStop(); +public: + MusicPlayer(PrinceEngine *vm); + ~MusicPlayer(); + + void loadMidi(const char *); + void killMidi(); + + virtual void send(uint32 b); + virtual void sendToChannel(byte channel, uint32 b); + + static const char * _musTable[]; + static const uint8 _musRoomTable[]; +}; + +} // End of namespace Prince + +#endif + -- cgit v1.2.3 From 39265b7a4b3e39348165b126ae53c9d89ccf32a9 Mon Sep 17 00:00:00 2001 From: Kamil Zbróg Date: Mon, 28 Oct 2013 17:06:12 +0000 Subject: PRINCE: replace space with tabs in indent --- engines/prince/sound.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'engines/prince/sound.h') diff --git a/engines/prince/sound.h b/engines/prince/sound.h index 779fe563f9..f4ba9ba45f 100644 --- a/engines/prince/sound.h +++ b/engines/prince/sound.h @@ -43,25 +43,25 @@ class PrinceEngine; class MusicPlayer: public Audio::MidiPlayer { private: - PrinceEngine *_vm; - byte *_data; - int _dataSize; - bool _isGM; + PrinceEngine *_vm; + byte *_data; + int _dataSize; + bool _isGM; - // Start MIDI File - void sndMidiStart(); + // Start MIDI File + void sndMidiStart(); - // Stop MIDI File - void sndMidiStop(); + // Stop MIDI File + void sndMidiStop(); public: - MusicPlayer(PrinceEngine *vm); - ~MusicPlayer(); + MusicPlayer(PrinceEngine *vm); + ~MusicPlayer(); - void loadMidi(const char *); - void killMidi(); + void loadMidi(const char *); + void killMidi(); - virtual void send(uint32 b); - virtual void sendToChannel(byte channel, uint32 b); + virtual void send(uint32 b); + virtual void sendToChannel(byte channel, uint32 b); static const char * _musTable[]; static const uint8 _musRoomTable[]; -- cgit v1.2.3 From fcd2273d78d81bdd91d05ef28a0c349415a7317b Mon Sep 17 00:00:00 2001 From: Kamil Zbróg Date: Wed, 30 Oct 2013 02:28:07 +0000 Subject: PRINCE: spaces converted to tabs --- engines/prince/sound.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'engines/prince/sound.h') diff --git a/engines/prince/sound.h b/engines/prince/sound.h index f4ba9ba45f..7219411b36 100644 --- a/engines/prince/sound.h +++ b/engines/prince/sound.h @@ -43,28 +43,28 @@ class PrinceEngine; class MusicPlayer: public Audio::MidiPlayer { private: - PrinceEngine *_vm; - byte *_data; - int _dataSize; - bool _isGM; + PrinceEngine *_vm; + byte *_data; + int _dataSize; + bool _isGM; - // Start MIDI File - void sndMidiStart(); + // Start MIDI File + void sndMidiStart(); - // Stop MIDI File - void sndMidiStop(); + // Stop MIDI File + void sndMidiStop(); public: - MusicPlayer(PrinceEngine *vm); - ~MusicPlayer(); + MusicPlayer(PrinceEngine *vm); + ~MusicPlayer(); - void loadMidi(const char *); - void killMidi(); + void loadMidi(const char *); + void killMidi(); - virtual void send(uint32 b); - virtual void sendToChannel(byte channel, uint32 b); + virtual void send(uint32 b); + virtual void sendToChannel(byte channel, uint32 b); - static const char * _musTable[]; - static const uint8 _musRoomTable[]; + static const char * _musTable[]; + static const uint8 _musRoomTable[]; }; } // End of namespace Prince -- cgit v1.2.3