aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMax Horn2003-05-19 09:04:50 +0000
committerMax Horn2003-05-19 09:04:50 +0000
commit3d14e5305e7b87c3394dbd9ffee80186adbe70bb (patch)
tree5a680619108e1419ca56ff8c8c5797a3c5de406a /sound
parent12ff6c4f992034c1a59f935d8882c9d41e37d0b4 (diff)
downloadscummvm-rg350-3d14e5305e7b87c3394dbd9ffee80186adbe70bb.tar.gz
scummvm-rg350-3d14e5305e7b87c3394dbd9ffee80186adbe70bb.tar.bz2
scummvm-rg350-3d14e5305e7b87c3394dbd9ffee80186adbe70bb.zip
fix shadow warning; removed unused var
svn-id: r7677
Diffstat (limited to 'sound')
-rw-r--r--sound/midiparser_smf.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/midiparser_smf.cpp b/sound/midiparser_smf.cpp
index 845f935da8..69123c7d6f 100644
--- a/sound/midiparser_smf.cpp
+++ b/sound/midiparser_smf.cpp
@@ -102,8 +102,8 @@ MidiParser_SMF::~MidiParser_SMF() {
free (_buffer);
}
-void MidiParser_SMF::property (int property, int value) {
- switch (property) {
+void MidiParser_SMF::property (int prop, int value) {
+ switch (prop) {
case mpMalformedPitchBends:
_malformedPitchBends = (value > 0);
}
@@ -533,7 +533,6 @@ void MidiParser_SMF::jumpToTick (uint32 tick) {
} while (_malformedPitchBends && (event & 0xF0) == 0xE0 && _play_pos++);
_running_status = event;
- byte bytes_to_skip = 0;
if (command_lengths[(event >> 4) - 8] > 0) {
_play_pos += command_lengths[(event >> 4) - 8];
} else if (special_lengths[event & 0xF] > 0) {