[Scummvm-git-logs] scummvm master -> 286c5d6f1ea5b1495141cbe2f37073b864c4dab1

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
286c5d6f1e AUDIO: Fix Compiler Warnings in MIDI / XMIDI Parser


Commit: 286c5d6f1ea5b1495141cbe2f37073b864c4dab1
    https://github.com/scummvm/scummvm/commit/286c5d6f1ea5b1495141cbe2f37073b864c4dab1
Author: D G Turner (digitall at scummvm.org)
Date: 2020-06-13T18:31:32+01:00

Commit Message:
AUDIO: Fix Compiler Warnings in MIDI / XMIDI Parser

The _activeTrack variable is of type byte which is defined in
common/scummsys.h as unsigned char so this variable can never
be negative and thus the checks removed here were causing compiler
warnings.

Changed paths:
    audio/midiparser.cpp
    audio/midiparser_xmidi.cpp


diff --git a/audio/midiparser.cpp b/audio/midiparser.cpp
index 9e8a0105d0..89c564d279 100644
--- a/audio/midiparser.cpp
+++ b/audio/midiparser.cpp
@@ -367,7 +367,7 @@ void MidiParser::stopPlaying() {
 }
 
 bool MidiParser::startPlaying() {
-	if (_activeTrack < 0 || _activeTrack >= _numTracks)
+	if (_activeTrack >= _numTracks)
 		return false;
 	if (!_position._playPos) {
 		_position._playPos = _tracks[_activeTrack];
diff --git a/audio/midiparser_xmidi.cpp b/audio/midiparser_xmidi.cpp
index ad4ced3769..865582cc69 100644
--- a/audio/midiparser_xmidi.cpp
+++ b/audio/midiparser_xmidi.cpp
@@ -133,14 +133,14 @@ uint32 MidiParser_XMIDI::read4low(byte *&data) {
 }
 
 bool MidiParser_XMIDI::hasJumpIndex(uint8 index) {
-	if (_activeTrack < 0 || _activeTrack >= _numTracks)
+	if (_activeTrack >= _numTracks)
 		return false;
 
 	return index < MAXIMUM_TRACK_BRANCHES && _trackBranches[_activeTrack][index] != 0;
 }
 
 bool MidiParser_XMIDI::jumpToIndex(uint8 index, bool stopNotes) {
-	if (_activeTrack < 0 || _activeTrack >= _numTracks)
+	if (_activeTrack >= _numTracks)
 		return false;
 
 	if (index >= MAXIMUM_TRACK_BRANCHES || _trackBranches[_activeTrack][index] == 0) {