[#18260] FMOD Removal

from Jorg Muller (nexyon)

also removed references to CVS in install

3 files changed, 3 insertions, 58 deletions

diff --git a/source/blender/include/BIF_editsound.h b/source/blender/include/BIF_editsound.h
index 6561b3e6849..e04bd43307e 100644
--- a/source/blender/include/BIF_editsound.h
+++ b/source/blender/include/BIF_editsound.h
@@ -39,7 +39,6 @@ struct hdaudio;
 void sound_init_audio(void);
 void sound_initialize_sounds(void);
 void sound_exit_audio(void);
-int sound_get_mixrate(void);
 
 void* sound_get_audiodevice(void);
 void* sound_get_listener(void);
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index be988c5a68a..aa072285556 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -296,17 +296,11 @@ void do_soundbuts(unsigned short event)
 static void sound_panel_listener(void)
 {
 	uiBlock *block;
-	int xco= 100, yco=100, mixrate;
-	char mixrateinfo[256];
+	int xco= 100, yco=100;
 	
 	block= uiNewBlock(&curarea->uiblocks, "sound_panel_listener", UI_EMBOSS, UI_HELV, curarea->win);
 	if(uiNewPanel(curarea, block, "Listener", "Sound", 320, 0, 318, 204)==0) return;
 
-	mixrate = sound_get_mixrate();
-	sprintf(mixrateinfo, "Game Mixrate: %d Hz", mixrate);
-	uiDefBut(block, LABEL, 0, mixrateinfo, xco,yco,295,20, 0, 0, 0, 0, 0, "");
-
-	yco -= 30;
 	uiDefBut(block, LABEL, 0, "Game listener settings:",xco,yco,195,20, 0, 0, 0, 0, 0, "");
 
 	yco -= 30;
diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index 95b3a3d3021..71187f6bd8b 100644
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -530,38 +530,11 @@ static int sound_get_filetype_from_header(bSound *sound, PackedFile *pf)
 			filetype = SAMPLE_WAV;
 		}
 		else
-			/* only fmod supports compressed wav */
-#ifdef USE_FMOD
 		{
-			/* and only valid publishers may use compressed wav */
-			switch (shortbuf)
-			{
-			case SND_WAVE_FORMAT_ADPCM:
-			case SND_WAVE_FORMAT_ALAW:
-			case SND_WAVE_FORMAT_MULAW:
-			case SND_WAVE_FORMAT_DIALOGIC_OKI_ADPCM:
-			case SND_WAVE_FORMAT_CONTROL_RES_VQLPC:
-			case SND_WAVE_FORMAT_GSM_610:
-			case SND_WAVE_FORMAT_MPEG3:
-				filetype = SAMPLE_WAV;
-				break;
-			default:
-#endif
-				{
-					filetype = SAMPLE_INVALID;
-					if (G.f & G_DEBUG) printf("Unsupported wav compression\n");
-				}
-			}
-#ifdef USE_FMOD
+			filetype = SAMPLE_INVALID;
+			if (G.f & G_DEBUG) printf("Unsupported wav compression\n");
 		}
 	}
-	else if (!memcmp(buffer, "OggS", 4)) {
-		filetype = SAMPLE_OGG_VORBIS;
-	}
-	else if ((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "", 2))) {
-		filetype = SAMPLE_MP3;
-	}
-#endif
 	else {
 		filetype = SAMPLE_INVALID;
 		if (G.f & G_DEBUG) printf("Unsupported sound format: %s\n", sound->name);
@@ -583,21 +556,6 @@ static int check_filetype(bSound *sound, PackedFile *pf)
 	// a simple check to see what kind of sample we're dealing with
 	if (stricmp(pdest, ".wav") == 0)
 		sound->sample->type = SAMPLE_WAV;
-
-#ifdef USE_FMOD
-	if (stricmp(pdest, ".mp2") == 0)
-		sound->sample->type = SAMPLE_MP2;
-	if (stricmp(pdest, ".mp3") == 0)
-		sound->sample->type = SAMPLE_MP3;
-	if (stricmp(pdest, ".ogg") == 0)
-		sound->sample->type = SAMPLE_OGG_VORBIS;
-	if (stricmp(pdest, ".raw") == 0)
-		sound->sample->type = SAMPLE_RAW;
-	if (stricmp(pdest, ".wma") == 0)
-		sound->sample->type = SAMPLE_WMA;
-	if (stricmp(pdest, ".asf") == 0)
-		sound->sample->type = SAMPLE_ASF;
-#endif
 */
 	sound->sample->type = sound_get_filetype_from_header(sound, pf);
 
@@ -1061,12 +1019,6 @@ void sound_init_audio(void)
 }
 
 
-int sound_get_mixrate(void)
-{
-	return MIXRATE;
-}
-
-
 void sound_exit_audio(void)
 {
 	if(ghSoundScene) {