Use [Compact] attribute, patch by Phil Housley

2008-06-02  Jürg Billeter  <j@bitron.ch>

	* vapi/gmodule-2.0.vapi:
	* vapi/sdl-gfx.vapi:
	* vapi/sdl-mixer.vapi:
	* vapi/sdl-ttf.vapi:
	* vapi/sdl.vapi:

	Use [Compact] attribute, patch by Phil Housley

svn path=/trunk/; revision=1543

diff --git a/ChangeLog b/ChangeLog
index 962e00669e506a21ca43627ce1cb5683f24fea57..0fe5c13a50fa05404be7292ebd4cb864bf6cab11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-02  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/gmodule-2.0.vapi:
+       * vapi/sdl-gfx.vapi:
+       * vapi/sdl-mixer.vapi:
+       * vapi/sdl-ttf.vapi:
+       * vapi/sdl.vapi:
+
+       Use [Compact] attribute, patch by Phil Housley
+
 2008-06-02  Jürg Billeter  <j@bitron.ch>
 
        * vapi/glib-2.0.vapi:

diff --git a/vapi/gmodule-2.0.vapi b/vapi/gmodule-2.0.vapi
index 063b2c9a6f75b9fcf6898849c8480c9fc7f350fa..eabe9b14e44f399c1e2e679999fa48a3ca0ae859 100644 (file)
--- a/vapi/gmodule-2.0.vapi
+++ b/vapi/gmodule-2.0.vapi
@@ -24,6 +24,7 @@
 namespace GLib {
        /* Dynamic Loading of Modules */
        
+       [Compact]
        [CCode (free_function = "g_module_close", cheader_filename = "gmodule.h")]
        public class Module {
                public static bool supported ();

diff --git a/vapi/sdl-gfx.vapi b/vapi/sdl-gfx.vapi
index d8128d5ef30e3f6448938b9f5beefda4446b722d..82ba27a65a4742fe9b60135b901a24051f03bee1 100644 (file)
--- a/vapi/sdl-gfx.vapi
+++ b/vapi/sdl-gfx.vapi
@@ -3,6 +3,7 @@ using SDL;
 
 namespace SDLGraphics {
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Pixel {
                [CCode (cname="pixelColor")]
                public static int color(Surface dst, int16 x, int16 y, uint32 color);
@@ -13,6 +14,7 @@ namespace SDLGraphics {
        }// Pixel
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Line {
                [CCode (cname="hlineColor")]
                public static int color_h(Surface dst, int16 x1, int16 x2, 
@@ -48,6 +50,7 @@ namespace SDLGraphics {
        }// Line
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Rectangle {
                [CCode (cname="rectangleColor")]
                public static int outline_color(Surface dst, int16 x1, int16 y1, 
@@ -67,6 +70,7 @@ namespace SDLGraphics {
        }// Rectangle
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Circle {
                [CCode (cname="circleColor")]
                public static int outline_color(Surface dst, int16 x, int16 y, 
@@ -94,6 +98,7 @@ namespace SDLGraphics {
        }// Circle
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Ellipse {
                [CCode (cname="ellipseColor")]
                public static int outline_color(Surface dst, int16 xc, int16 yc, 
@@ -121,6 +126,7 @@ namespace SDLGraphics {
        }// Ellipse
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Arc {
                [CCode (cname="pieColor")]
                public static int outline_color(Surface dst, int16 x, int16 y, int16 radius, 
@@ -140,6 +146,7 @@ namespace SDLGraphics {
        }// Arc
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Trigon {
                [CCode (cname="trigonColor")]
                public static int outline_color(Surface dst, int16 x1, int16 y1, 
@@ -170,6 +177,7 @@ namespace SDLGraphics {
        }// Trigon
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Polygon {
                [CCode (cname="polygonColor")]
                [NoArrayLength]
@@ -203,6 +211,7 @@ namespace SDLGraphics {
        }// Polygon
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class BezierCurve {
                [CCode (cname="bezierColor")]
                [NoArrayLength]
@@ -216,6 +225,7 @@ namespace SDLGraphics {
        }// BezierCurve
 
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
+       [Compact]
        public class Text {
                [CCode (cname="stringColor")]
                public static int color(Surface dst, int16 x, int16 y, string s, uint32 color);
@@ -229,6 +239,7 @@ namespace SDLGraphics {
        }// Text
 
        [CCode (cheader_filename="SDL_rotozoom.h")]
+       [Compact]
        public class RotoZoom {
                [CCode (cname="rotozoomSurface")]
                public static Surface rotozoom(Surface src, double degrees, 
@@ -256,6 +267,7 @@ namespace SDLGraphics {
        }// RotoZoom
 
        [CCode (cheader_filename="SDL_framerate.h", cname="FPSmanager", free_function="g_free")]
+       [Compact]
        public class FramerateManager {
                [CCode (cname="SDL_initFramerate")]
                public void init();
@@ -271,6 +283,7 @@ namespace SDLGraphics {
        }// FramerateManager
 
        [CCode (cheader_filename="SDL_imageFilter.h")]
+       [Compact]
        public class Filter {
                [CCode (cname="SDL_imageFilterMMXdetect")]
                public static int have_mmx();

diff --git a/vapi/sdl-mixer.vapi b/vapi/sdl-mixer.vapi
index fdf46d999b5468acfe8dfafed18ca6a40104be5d..7201256cd8aa4fdace992aeaed5f53f52ef8101d 100644 (file)
--- a/vapi/sdl-mixer.vapi
+++ b/vapi/sdl-mixer.vapi
@@ -41,6 +41,7 @@ namespace SDLMixer {
        }// MusicType
 
        [CCode (cname="Mix_Chunk", free_function="Mix_FreeChunk")]
+       [Compact]
        public class Chunk {
                [CCode (cname="Mix_LoadWAV_RW")]
                public Chunk.WAV(RWops src, int freesrc=0);
@@ -57,6 +58,7 @@ namespace SDLMixer {
        }// Chunk
 
        [CCode (cname="Mix_Music", free_function="Mix_FreeMusic")]
+       [Compact]
        public class Music {
                [CCode (cname="Mix_GetMusicHookData")]
                public static void* get_hook_data();
@@ -116,6 +118,7 @@ namespace SDLMixer {
                public int fade_in(int loops, int ms, double position=0.0);
        }// Music
 
+       [Compact]
        public class Effect {
                [CCode (cname="Mix_RegisterEffect")]
                public static int register(int chan, EffectCallback f, 

diff --git a/vapi/sdl-ttf.vapi b/vapi/sdl-ttf.vapi
index e6ee15d037823983170d847c406b113fe01a8b9a..b4c55455277fe45aec584ba13a073f713c0e5d89 100644 (file)
--- a/vapi/sdl-ttf.vapi
+++ b/vapi/sdl-ttf.vapi
@@ -24,6 +24,7 @@ namespace SDLTTF {
        }// FontStyle
 
        [CCode (cname="TTF_Font", free_function="TTF_CloseFont")]
+       [Compact]
        public class Font {
                [CCode (cname="TTF_OpenFont")]
                public Font(string file, int ptsize);

diff --git a/vapi/sdl.vapi b/vapi/sdl.vapi
index 9f56fe444c6bed33b4817c3b129b6eadbd5ce9e7..fa57bafd7fe33490a44c865171268bd9e173cb2e 100644 (file)
--- a/vapi/sdl.vapi
+++ b/vapi/sdl.vapi
@@ -67,6 +67,7 @@ namespace SDL {
                OPAQUE, TRANSPARENT
        }// Opacity
 
+       [Compact]
        public class Video {
                [CCode (cname="SDL_VideoDriverName")]
                public static weak string? driver_name(string namebuf, int maxlen);
@@ -92,6 +93,7 @@ namespace SDL {
        }// SurfaceFlag
 
        [CCode (cname="SDL_Surface", free_function="SDL_FreeSurface", copy_function="SDL_DisplayFormat")]
+       [Compact]
        public class Surface {
                public uint32 flags;
                public PixelFormat format;
@@ -160,7 +162,8 @@ namespace SDL {
        }// Surface
 
        [CCode (cname="SDL_Surface")]
-       public class Screen: Surface {
+       [Compact]
+       public class Screen : Surface {
                [CCode (cname="SDL_GetVideoSurface")]
                public static weak Screen instance();
 
@@ -172,6 +175,7 @@ namespace SDL {
        }// Screen
 
        [CCode (cname="SDL_PixelFormat")]
+       [Compact]
        public class PixelFormat {
                public Palette palette;
                public uchar BitsPerPixel;
@@ -235,6 +239,7 @@ namespace SDL {
        }// Palette
 
        [CCode (cname="SDL_VideoInfo")]
+       [Compact]
        public class VideoInfo {
                public uint32 hw_available      ;
                public uint32 wm_available      ;
@@ -265,6 +270,7 @@ namespace SDL {
        }// OverlayFormat
 
        [CCode (cname="SDL_Overlay", free_function="SDL_FreeYUVOverlay")]
+       [Compact]
        public class Overlay {
                public uint32 format;
                public int w;
@@ -294,6 +300,7 @@ namespace SDL {
        /// RWops
        ///
        [CCode (cname="SDL_RWops", free_function="SDL_FreeRW")]
+       [Compact]
        public class RWops {
                [CCode (cname="SDL_RWFromFile")]
                public RWops.from_file(string file, string mode);
@@ -316,6 +323,7 @@ namespace SDL {
        }// GLattr
 
        [CCode (cprefix="SDL_GL_", cheader_filename="SDL.h")]
+       [Compact]
        public class GL {
                [CCode (cname="SDL_GL_LoadLibrary")]
                public static int load_library(string path);
@@ -343,6 +351,7 @@ namespace SDL {
        }// GrabMode
 
        [CCode (cprefix="SDL_WM_", cheader_filename="SDL.h")]
+       [Compact]
        public class WindowManager {
                [CCode (cname="SDL_WM_SetCaption")]
                public static void set_caption(string title, string icon);
@@ -866,6 +875,7 @@ namespace SDL {
        }// Buttons
 
        [CCode (cname="SDL_Cursor", free_function="SDL_FreeCursor")]
+       [Compact]
        public class Cursor {
                public Rect area;
                public int16 hot_x;
@@ -904,6 +914,7 @@ namespace SDL {
        }// HatValue
 
        [CCode (cname="SDL_Joystick", free_function="SDL_JoystickClose")]
+       [Compact]
        public class Joystick {
                [CCode (cname="SDL_JoystickName")]
                public static weak string get_name(int device_index);
@@ -967,6 +978,7 @@ namespace SDL {
        }// AudioStatus
 
        [CCode (cname="SDL_AudioSpec")]
+       [Compact]
        public class AudioSpec {
                public int freq;
                public AudioFormat format;
@@ -980,6 +992,7 @@ namespace SDL {
        }// AudioSpec
 
        [CCode (cname="SDL_AudioCVT")]
+       [Compact]
        public class AudioConverter {
                public int needed;
                public AudioFormat src_format;
@@ -1002,6 +1015,7 @@ namespace SDL {
                public int convert();
        }// AudioConverter
 
+       [Compact]
        public class Audio {
                [CCode (cname="SDL_AudioDriverName")]
                public static weak string driver_name(string namebuf, int maxlen);
@@ -1041,6 +1055,7 @@ namespace SDL {
        public delegate int ThreadFunc(void* data);
 
        [CCode (cname="SDL_Thread", free_function="SDL_WaitThread")]
+       [Compact]
        public class Thread {
                [CCode (cname="SDL_ThreadID")]
                public static uint32 id();
@@ -1050,6 +1065,7 @@ namespace SDL {
        }// Thread
 
        [CCode (cname="SDL_mutex", free_function="SDL_DestroyMutex")]
+       [Compact]
        public class Mutex {
                [CCode (cname="SDL_CreateMutex")]
                public Mutex();
@@ -1062,6 +1078,7 @@ namespace SDL {
        }// Mutex
 
        [CCode (cname="SDL_sem", free_function="SDL_DestroySemaphore")]
+       [Compact]
        public class Semaphore {
                [CCode (cname="SDL_CreateSemaphore")]
                public Semaphore(uint32 initial_value);
@@ -1083,6 +1100,7 @@ namespace SDL {
        }// Semaphore
 
        [CCode (cname="SDL_cond", free_function="SDL_DestroyCond")]
+       [Compact]
        public class Condition {
                [CCode (cname="SDL_CreateCond")]
                public Condition();
@@ -1107,6 +1125,7 @@ namespace SDL {
        public delegate uint32 TimerCallback(uint32 interval, void* param);
 
        [CCode (cname="struct _SDL_TimerID", free_function="SDL_RemoveTimer")]
+       [Compact]
        public class Timer {
                [CCode (cname="SDL_GetTicks")]
                public static uint32 get_ticks();