Handle "compressed" songs

svn-id: r13066

3 files changed, 30 insertions, 68 deletions

diff --git a/queen/music.cpp b/queen/music.cpp
index d7142f2082..d60c89b6d2 100644
--- a/queen/music.cpp
+++ b/queen/music.cpp
@@ -205,10 +205,6 @@ static const byte mt32_to_gm[128] = {
 			return;
 		}
 	
-		//Don't play if the queue doesn't have any valid songs
-		if (!validSongs())
-			return;
-		
 		uint16 songNum = _songQueue[_queuePos];
 
 		//Special type
@@ -226,12 +222,38 @@ static const byte mt32_to_gm[128] = {
 			}
 		}
 
-		_currentSong = songNum = isBadSong(songNum) ? nextValidSong() : songNum;
+		byte *prevSong = _musicData + songOffset(_currentSong);
+		if (*prevSong == 0x43 || *prevSong == 0x63) {
+			if (_buf) {
+				delete[] _buf;
+				_buf = 0;
+			}
+		}
+		
+		_currentSong = songNum;
 		if (!songNum) {
 			stopMusic();
 			return;
 		}	
-		_parser->loadMusic(_musicData + songOffset(songNum), songLength(songNum));
+
+		byte *musicPtr = _musicData + songOffset(songNum);
+		uint32 size = songLength(songNum);
+
+		if (*musicPtr == 0x43 || *musicPtr == 0x63) {
+			uint32 packedSize = songLength(songNum) - 0x200;
+			_buf = new uint16[packedSize];
+
+			uint16 *data = (uint16 *)(musicPtr + 1);
+			byte *idx  = ((byte *)data) + 0x200;
+
+			for (uint i = 0; i < packedSize; i++)
+				_buf[i] = data[*(idx + i)];
+
+			musicPtr = ((byte *)_buf) + ((*musicPtr == 0x63) ? 1 : 0);
+			size = packedSize * 2;
+		}
+		
+		_parser->loadMusic(musicPtr, size);
 		_parser->setTrack(0);	
 		//debug(0, "Playing song %d [queue position: %d]", songNum, _queuePos);
 		_isPlaying = true;
@@ -262,61 +284,6 @@ static const byte mt32_to_gm[128] = {
 		return (uint8) _rnd.getRandomNumber(queueSize - 1) & 0xFF;
 	}
 	
-	bool MusicPlayer::isBadSong(uint16 songNum) const {
-		//Songs which are (apparently?) bogus
-		//Atleast they don't contain a valid MThd/MTrk
-		switch(songNum) {
-			case  50:
-			case  51:
-			case  53:
-			case  80:
-			case 176:
-				return true;
-				break;
-			default:
-				return false;
-				break;
-		}
-	}
-
-	uint8  MusicPlayer::validSongs() const {
-		uint8 valid = 0;
-		for (int i = 0; i < MUSIC_QUEUE_SIZE; i++)
-			if (_songQueue[i] && !isBadSong(_songQueue[i]))
-					valid++;
-
-		return valid;
-	}
-
-	uint16 MusicPlayer::nextValidSong() {
-		int i;
-
-		if (_randomLoop && validSongs() > 1) {
-			uint8 pos = randomQueuePos(); 
-			while(isBadSong(_songQueue[pos]))
-				pos = randomQueuePos(); 
-			_queuePos = pos;
-			return _songQueue[pos];
-		}
-	
-		if (!_looping && validSongs() < 2)
-			return 0;
-		
-		for (i = _queuePos + 1; i < MUSIC_QUEUE_SIZE; i++)  
-			if (_songQueue[i] && !isBadSong(_songQueue[i])) {
-				_queuePos = i;
-				return _songQueue[i];
-			}
-
-		for (i = 0; i < _queuePos; i++) 
-			if (_songQueue[i] && !isBadSong(_songQueue[i])) {
-				_queuePos = i;
-				return _songQueue[i];	
-			}
-		
-		return 0;
-	}
-
 	void MusicPlayer::stopMusic() {
 		_isPlaying = false;
 		_parser->unloadMusic();
diff --git a/queen/music.h b/queen/music.h
index c3bf135ddd..948efdb628 100644
--- a/queen/music.h
+++ b/queen/music.h
@@ -67,9 +67,6 @@ protected:
 	void queueUpdatePos();
 	uint8 randomQueuePos();
 	static void onTimer(void *data);
-	bool isBadSong(uint16 songNum) const;
-	uint8 validSongs() const;
-	uint16 nextValidSong();
 	uint32 songOffset(uint16 songNum) const;
 	uint32 songLength(uint16 songNum) const;
 
@@ -92,6 +89,7 @@ protected:
 	
 	uint16 _numSongs;
 	byte *_musicData;
+	uint16 *_buf;
 	uint32 _musicDataSize;
 };
 	
diff --git a/queen/musicdata.cpp b/queen/musicdata.cpp
index e767474cf0..287c1f1f0f 100644
--- a/queen/musicdata.cpp
+++ b/queen/musicdata.cpp
@@ -974,10 +974,7 @@ const tuneData Sound::_tune[] = {
 	{ { 67, 177, 0 }, { 0, 0 }, 2, 0 }, 
 
 	/* 40 - Airport */
-	//{ { 81, 0 }, { 0, 0 }, 1, 0 },	//This is the value from the original sources
-						//However it points to invalid music (atleast for
-						//Roland music data)...how odd. 
-	{ { 83, 0 }, { 0, 0 }, 1, 0 },
+	{ { 81, 0 }, { 0, 0 }, 1, 0 },
 	
 	/* 41 - Plane Leaves */
 	{ { 68, 1198, 0 }, { 0, 0 }, 2, 0 },