Support for GStreamer 1.0

[projects/chimara/chimara.git] / libchimara / gestalt.c

diff --git a/libchimara/gestalt.c b/libchimara/gestalt.c
index 54fc700602ecc29f75c1f20b1eedc2d7943166a1..195733bd9c73d150168d7964b51cd2f8bc306215 100644 (file)
--- a/libchimara/gestalt.c
+++ b/libchimara/gestalt.c
@@ -1,11 +1,12 @@
 #include <stddef.h> /* Surprisingly, the only symbol needed is NULL */
 #include <config.h>
 #include "glk.h"
+#include "input.h"
 
 /* Version of the Glk specification implemented by this library */
 #define MAJOR_VERSION 0
 #define MINOR_VERSION 7
-#define SUB_VERSION   2
+#define SUB_VERSION   4
 
 /**
  * glk_gestalt:
@@ -96,18 +97,6 @@ glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
                                return gestalt_CharOutput_CannotPrint;
                        /* Can print all other characters */
                        return gestalt_CharOutput_ExactPrint;
-               
-               /* Unicode capabilities present */
-               case gestalt_Unicode:
-                       return 1;
-
-               /* Timer capabilities present */
-               case gestalt_Timer:
-                       return 1;
-
-               /* Hyperlink capabilities present */
-               case gestalt_Hyperlinks:
-                       return 1;
 
                /* Hyperlinks supported on textbuffers and textgrids */
                case gestalt_HyperlinkInput:
@@ -117,32 +106,41 @@ glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
                case gestalt_MouseInput:
                        return val == wintype_TextGrid;
 
-               case gestalt_Graphics:
-                       return 1;
-
                case gestalt_DrawImage:
                        return val == wintype_Graphics || val == wintype_TextBuffer;
 
+               /* Which keycodes can be used as line terminators */
+               case gestalt_LineTerminatorKey:
+                       return is_valid_line_terminator(val)? 1 : 0;
+
+               /* Capabilities that are simply supported */
+               case gestalt_Unicode:
+               case gestalt_Timer:
+               case gestalt_Hyperlinks:
+               case gestalt_Graphics:
                case gestalt_GraphicsTransparency:
+               case gestalt_DateTime:
+               case gestalt_UnicodeNorm:
+               case gestalt_LineInputEcho:
+               case gestalt_LineTerminators:
+               case gestalt_ResourceStream:
                        return 1;
 
-               /* Capabilities supported if compiled with GStreamer */
+               /* Capabilities supported if compiled with sound support */
                case gestalt_Sound:
                case gestalt_SoundVolume:
                case gestalt_SoundNotify:
                case gestalt_SoundMusic:
-#ifdef GSTREAMER_SOUND
+               case gestalt_Sound2:
+#ifdef HAVE_SOUND
                        return 1;
 #else
                        return 0;
 #endif
                        
                /* Unsupported capabilities */
-               case gestalt_DateTime:
-               case gestalt_LineInputEcho:
-               case gestalt_LineTerminatorKey:
-               case gestalt_LineTerminators:
-               case gestalt_UnicodeNorm:
+                       /* None! */
+
                /* Selector not supported */    
                default:
                        return 0;