[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.12,1.13 midi.h,1.4,1.5 simon.cpp,1.82,1.83 simon.h,1.15,1.16
Oliver Kiehl
olki at users.sourceforge.net
Sun Nov 17 09:16:02 CET 2002
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv3523
Modified Files:
midi.cpp midi.h simon.cpp simon.h
Log Message:
added structures for midi pause/volume
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- midi.cpp 13 Nov 2002 16:37:05 -0000 1.12
+++ midi.cpp 17 Nov 2002 17:15:29 -0000 1.13
@@ -417,6 +417,21 @@
_midiDriver->pause(false);
}
+void MidiPlayer::pause(bool b)
+{
+ _midiDriver->pause(b);
+}
+
+uint MidiPlayer::get_volume()
+{
+ // TODO: implement me
+ return 0;
+}
+
+void MidiPlayer::set_volume(uint volume)
+{
+ // TODO: implement me
+}
void MidiPlayer::set_driver(MidiDriver *md)
{
Index: midi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- midi.h 13 Nov 2002 04:34:45 -0000 1.4
+++ midi.h 17 Nov 2002 17:15:29 -0000 1.5
@@ -33,6 +33,9 @@
void initialize();
void shutdown();
void play();
+ void pause(bool b);
+ uint get_volume();
+ void set_volume(uint volume);
void set_driver(MidiDriver *md);
private:
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- simon.cpp 16 Nov 2002 16:49:39 -0000 1.82
+++ simon.cpp 17 Nov 2002 17:15:29 -0000 1.83
@@ -153,6 +153,8 @@
_effects_sound = 0;
_voice_sound = 0;
_ambient_sound = 0;
+
+ _music_playing = false;
}
SimonState::~SimonState()
@@ -4608,6 +4610,12 @@
case OSystem::EVENT_KEYDOWN:
if (event.kbd.keycode == 't') {
_vk_t_toggle ^= 1;
+ } else if (event.kbd.keycode == '+') {
+ midi.set_volume(midi.get_volume() + 10);
+ } else if (event.kbd.keycode == '-') {
+ midi.set_volume(midi.get_volume() - 10);
+ } else if (event.kbd.keycode == 'm') {
+ midi.pause(_music_playing ^= 1);
} else if (event.kbd.flags == OSystem::KBD_CTRL) {
if (event.kbd.keycode == 'f') {
_fast_mode ^= 1;
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- simon.h 17 Nov 2002 15:42:05 -0000 1.15
+++ simon.h 17 Nov 2002 17:15:29 -0000 1.16
@@ -341,6 +341,8 @@
int _ambient_index;
uint _ambient_playing;
+ bool _music_playing;
+
int _timer_id;
FILE *_dump_file;
More information about the Scummvm-git-logs
mailing list