diff options
author | Travis Howell | 2003-09-24 06:56:30 +0000 |
---|---|---|
committer | Travis Howell | 2003-09-24 06:56:30 +0000 |
commit | 4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd (patch) | |
tree | fcd1210b4b896122ade69adf498a7054e23cd8d4 /scumm/player_v2a.h | |
parent | 09a01e4cbeada86167d83608cd0dcd77d7a0168f (diff) | |
download | scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.tar.gz scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.tar.bz2 scummvm-rg350-4a62eb3e3b75944bca5af3bbab9e05dfecd77dcd.zip |
More Amiga V2/V3 sound updates from _Q_:
1. A Player_MOD class, basically acts as a simplified mixer that mixes at 60Hz intervals (or whatever interval you specify), this gives smooth music playback in player_v3a
2. Some changes to player_v3a as a result of #1, including reduced music volume
3. player_v2a, and the necessary additions to scummvm.cpp/scumm.h
svn-id: r10392
Diffstat (limited to 'scumm/player_v2a.h')
-rw-r--r-- | scumm/player_v2a.h | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/scumm/player_v2a.h b/scumm/player_v2a.h new file mode 100644 index 0000000000..128899683b --- /dev/null +++ b/scumm/player_v2a.h @@ -0,0 +1,66 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2001 Ludvig Strigeus + * Copyright (C) 2001-2003 The ScummVM project + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header$ + * + */ + +#ifndef PLAYER_V2A_H +#define PLAYER_V2A_H + +#include "common/scummsys.h" +#include "common/system.h" +#include "scumm/music.h" +#include "scumm/player_mod.h" + +#define V2A_MAXSLOTS 8 + +class Scumm; +class SoundMixer; + +class V2A_Sound; + +class Player_V2A : public MusicEngine { +public: + Player_V2A(Scumm *scumm); + virtual ~Player_V2A(); + + virtual void setMasterVolume(int vol); + virtual void startSound(int nr); + virtual void stopSound(int nr); + virtual void stopAllSounds(); + virtual int getMusicTimer() const; + virtual int getSoundStatus(int nr) const; + +private: + OSystem *_system; + Scumm *_scumm; + Player_MOD *_mod; + + struct soundSlot + { + int id; + V2A_Sound *sound; + } _slot[V2A_MAXSLOTS]; + int getSoundSlot (int id = 0) const; + + static void update_proc(void *param); + void updateSound(); +}; + +#endif |