LAB: Remove dead code

5 files changed, 0 insertions, 42 deletions

diff --git a/engines/lab/audioi.cpp b/engines/lab/audioi.cpp
index e2c5af819d..ed1e32cd70 100644
--- a/engines/lab/audioi.cpp
+++ b/engines/lab/audioi.cpp
@@ -87,20 +87,6 @@ bool initAudio(void) {
 }
 
 
-void initSampleRate(uint16 SampleSpeed) {
-	flushAudio();
-
-	if (SampleSpeed < 4000)
-		SampleSpeed = 4000;
-
-	//firstblock.sample_rate = SampleSpeed;
-	//firstblock.pack_type = AUDIO_S16; // SOUND_MONO | SOUND_16BIT;  // 16-bit mono sample
-	// TODO: 8-bit mono sample for DOS
-}
-
-
-
-
 bool musicBufferEmpty(uint16 i) {
 	// TODO: Multiple streams
 	return !g_lab->_mixer->isSoundHandleActive(g_musicHandle);
@@ -115,10 +101,6 @@ void playMusicBlock(void *Ptr, uint32 Size, uint16 BufferNum, uint16 SampleSpeed
 	if (SampleSpeed < 4000)
 		SampleSpeed = 4000;
 
-	firstblock.sample_rate = SampleSpeed;
-	firstblock.pack_type = SOUND_MONO | SOUND_16BIT;  // 16-bit mono sample
-	// TODO: 8-bit mono sample for DOS
-
 	tempblock = firstblock;
 	tempblock.sel_data = Ptr;
 	tempblock.len      = Size;
@@ -207,8 +189,6 @@ void playMusic(uint16 SampleSpeed, uint16 Volume, uint32 Length, bool flush, voi
 	if (SampleSpeed < 4000)
 		SampleSpeed = 4000;
 
-	//firstblock.sample_rate = SampleSpeed;
-	//firstblock.pack_type = SOUND_MONO | SOUND_16BIT;  // 16-bit mono sample
 	// TODO: 8-bit mono sample for DOS
 	//firstblock.len = Length;
 	bufnum = 0;
diff --git a/engines/lab/diff.h b/engines/lab/diff.h
index e1644d49ab..b0725e5625 100644
--- a/engines/lab/diff.h
+++ b/engines/lab/diff.h
@@ -81,8 +81,6 @@ bool readDiff(bool playonce);
 
 void diffNextFrame(void);
 
-void playCntMusic(void);
-
 void readSound(void);
 
 void stopDiff(void);
@@ -91,8 +89,6 @@ void stopDiffEnd(void);
 
 void stopSound(void);
 
-void diffSetMusic(void);
-
 } // End of namespace Lab
 
 #endif /* LAB_DIFF_H */
diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h
index 4d1854f057..ea454971fc 100644
--- a/engines/lab/labfun.h
+++ b/engines/lab/labfun.h
@@ -65,8 +65,6 @@ bool initAudio(void);
 
 void freeAudio(void);
 
-void initSampleRate(uint16 SampleSpeed);
-
 bool musicBufferEmpty(uint16 i);
 
 void playMusicBlock(void *Ptr, uint32 Size, uint16 BufferNum, uint16 SampleSpeed);
diff --git a/engines/lab/labmusic.cpp b/engines/lab/labmusic.cpp
index 2998b6230d..8e61c63c5e 100644
--- a/engines/lab/labmusic.cpp
+++ b/engines/lab/labmusic.cpp
@@ -219,8 +219,6 @@ void Music::startMusic(bool startatbegin) {
 		_leftinfile  = _filelength;
 	}
 
-	initSampleRate(SAMPLESPEED);
-
 	_musicPlaying  = 0;
 	_musicOnBuffer = 0;
 	_musicFilledTo = _manyBuffers - 1;
diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp
index b270f3b8d5..71707dc55a 100644
--- a/engines/lab/readdiff.cpp
+++ b/engines/lab/readdiff.cpp
@@ -487,20 +487,6 @@ void stopSound(void) {
 
 
 /*****************************************************************************/
-/* Checks the music while a diff is playing.                                 */
-/*****************************************************************************/
-void diffSetMusic(void) {
-	return;
-
-	while (IsPlaying) {
-		waitTOF();
-		g_music->newCheckMusic();
-	}
-}
-
-
-
-/*****************************************************************************/
 /* Reads in a DIFF file.                                                     */
 /*****************************************************************************/
 bool readDiff(bool playonce) {