From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 16 Jul 2011 19:40:43 +0000 (+0200)
Subject: Now we can claim to implement the whole gestalt_Sound2 suite
X-Git-Tag: v0.9~47^2
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;ds=inline;h=6f7ca2daf591a9cc427e8174daf4a07f3e7728ab;hp=--cc;p=projects%2Fchimara%2Fchimara.git

Now we can claim to implement the whole gestalt_Sound2 suite
---

6f7ca2daf591a9cc427e8174daf4a07f3e7728ab
diff --git a/libchimara/gestalt.c b/libchimara/gestalt.c
index 2b6c29c..46e640d 100644
--- a/libchimara/gestalt.c
+++ b/libchimara/gestalt.c
@@ -130,6 +130,7 @@ glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
 		case gestalt_SoundVolume:
 		case gestalt_SoundNotify:
 		case gestalt_SoundMusic:
+		case gestalt_Sound2:
 #ifdef GSTREAMER_SOUND
 			return 1;
 #else
@@ -137,9 +138,7 @@ glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
 #endif
 			
 		/* Unsupported capabilities */
-		/* We do not support the entire new sound suite yet */
-		case gestalt_Sound2:
-			return 0;
+		/* none! */
 
 		/* Selector not supported */	
 		default:
diff --git a/tests/soundtest.c b/tests/soundtest.c
index b0a3800..5540624 100644
--- a/tests/soundtest.c
+++ b/tests/soundtest.c
@@ -8,18 +8,10 @@
 void
 glk_main(void)
 {
-	if(!glk_gestalt(gestalt_Sound, 0)) {
+	if(!glk_gestalt(gestalt_Sound2, 0)) {
 		fprintf(stderr, "Sound not supported.\n");
 		return;
 	}
-	if(!glk_gestalt(gestalt_SoundVolume, 0)) {
-		fprintf(stderr, "Sound volume not supported.\n");
-		return;
-	}
-	if(!glk_gestalt(gestalt_SoundNotify, 0)) {
-		fprintf(stderr, "Sound notification not supported.\n");
-		return;
-	}
 	
 	schanid_t sc[NUM_CHANNELS];
 	int count;