Now we can claim to implement the whole gestalt_Sound2 suite

diff --git a/libchimara/gestalt.c b/libchimara/gestalt.c
index 2b6c29c08a32ac8c3514757e3e516be94e638b5f..46e640dd9cc6592f2c12d908bf7f1e91d30d9ae5 100644 (file)
--- 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 b0a380042746e891876e7172513b00795485767a..5540624ad564da77b58481b81af23cbdb9cbe6a0 100644 (file)
--- 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;