GNOME.org
 

vala r1250 - in trunk: . vapi

Author: juergbi
Date: Wed Apr 16 22:27:11 2008
New Revision: 1250
URL: http://svn.gnome.org/viewvc/vala?rev=1250&view=rev

Log:
2008-04-16  Juerg Billeter  <j bitron ch>

	* vapi/sdl-gfx.vapi, vapi/sdl-image.vapi, vapi/sdl-mixer.vapi,
	  vapi/sdl.vapi: replace `pointer' by void*, patch by Levi Bard


Modified:
   trunk/ChangeLog
   trunk/vapi/sdl-gfx.vapi
   trunk/vapi/sdl-image.vapi
   trunk/vapi/sdl-mixer.vapi
   trunk/vapi/sdl.vapi

Modified: trunk/vapi/sdl-gfx.vapi
==============================================================================
--- trunk/vapi/sdl-gfx.vapi	(original)
+++ trunk/vapi/sdl-gfx.vapi	Wed Apr 16 22:27:11 2008
@@ -225,7 +225,7 @@
 			uchar r, uchar g, uchar b, uchar a);
 
 		[CCode (cname="gfxPrimitivesSetFont")]
-		public static int set_font(pointer fontdata, int cw, int ch);
+		public static int set_font(void* fontdata, int cw, int ch);
 	}// Text
 
 	[CCode (cheader_filename="SDL_rotozoom.h")]

Modified: trunk/vapi/sdl-image.vapi
==============================================================================
--- trunk/vapi/sdl-image.vapi	(original)
+++ trunk/vapi/sdl-image.vapi	Wed Apr 16 22:27:11 2008
@@ -80,7 +80,7 @@
 	public static Surface load_xpm(RWops src);
 
 	[CCode (cname="IMG_ReadXPMFromArray")]
-	public static Surface read_xpm(pointer xpmdata);
+	public static Surface read_xpm(char** xpmdata);
 
 	[CCode (cname="IMG_LoadXV_RW")]
 	public static Surface load_xv(RWops src);

Modified: trunk/vapi/sdl-mixer.vapi
==============================================================================
--- trunk/vapi/sdl-mixer.vapi	(original)
+++ trunk/vapi/sdl-mixer.vapi	Wed Apr 16 22:27:11 2008
@@ -16,7 +16,7 @@
 	public static int query(ref int frequency, ref uint16 format, ref int channels);
 
 	[CCode (cname="Mix_SetPostMix")]
-	public static void set_post_mixer(MixFunction f, pointer arg);
+	public static void set_post_mixer(MixFunction f, void* arg);
 
 	[CCode (cname="Mix_SetSynchroValue")]
 	public static int set_synchro_value(int value);
@@ -24,11 +24,11 @@
 	[CCode (cname="Mix_GetSynchroValue")]
 	public static int get_synchro_value();
 
-	public delegate void MixFunction(pointer udata, uchar[] stream);
+	public delegate void MixFunction(void* udata, uchar[] stream);
 	public delegate void MusicFinishedCallback();
 	public delegate void ChannelFinishedCallback(int channel);
-	public delegate void EffectCallback(int chan, pointer stream, int len, pointer udata);
-	public delegate void EffectDoneCallback(int chan, pointer udata);
+	public delegate void EffectCallback(int chan, void* stream, int len, void* udata);
+	public delegate void EffectDoneCallback(int chan, void* udata);
 
 	[CCode (cprefix="MIX_")]
 	public enum FadeStatus {
@@ -59,10 +59,10 @@
 	[CCode (cname="Mix_Music", free_function="Mix_FreeMusic")]
 	public class Music {
 		[CCode (cname="Mix_GetMusicHookData")]
-		public static pointer get_hook_data();
+		public static void* get_hook_data();
 
 		[CCode (cname="Mix_HookMusic")]
-		public static void hook_mixer(MixFunction? f, pointer arg);
+		public static void hook_mixer(MixFunction? f, void* arg);
 
 		[CCode (cname="Mix_HookMusicFinished")]
 		public static void hook_finished(MusicFinishedCallback cb);
@@ -119,7 +119,7 @@
 	public class Effect {
 		[CCode (cname="Mix_RegisterEffect")]
 		public static int register(int chan, EffectCallback f, 
-			EffectDoneCallback? d, pointer arg);
+			EffectDoneCallback? d, void* arg);
 
 		[CCode (cname="Mix_UnregisterEffect")]
 		public static int unregister(int chan, EffectCallback f);

Modified: trunk/vapi/sdl.vapi
==============================================================================
--- trunk/vapi/sdl.vapi	(original)
+++ trunk/vapi/sdl.vapi	Wed Apr 16 22:27:11 2008
@@ -75,16 +75,13 @@
 		public static int set_gamma(float red, float green, float blue);
 
 		[CCode (cname="SDL_SetGammaRamp")]
-		[NoArrayLength]
-		public static int set_gamma_ramp(weak uint16[]? red, weak uint16[]? green, weak uint16[]? blue);
+		public static int set_gamma_ramp(uint16* red, uint16* green, uint16* blue);
 
 		[CCode (cname="SDL_GetGammaRamp")]
-		[NoArrayLength]
-		public static int get_gamma_ramp(ref uint16[]? red, ref uint16[]? green, ref uint16[]? blue);
+		public static int get_gamma_ramp(uint16* red, uint16* green, uint16* blue);
 
 		[CCode (cname="SDL_ListModes")]
-		[NoArrayLength]
-		public static pointer list_modes(PixelFormat? format, uint32 flags);
+		public static void* list_modes(PixelFormat? format, uint32 flags);
 	}// Video
 
 	[CCode (cprefix="SDL_")]
@@ -101,7 +98,7 @@
 		public int w;
 		public int h;
 		public uint16 pitch;
-		public pointer pixels;
+		public void* pixels;
 		public int ref_count;
 
 		[CCode (cname="SDL_CreateRGBSurface")]
@@ -109,7 +106,7 @@
 			uint32 rmask, uint32 gmask, uint32 bmask, uint32 amask);
 
 		[CCode (cname="SDL_CreateRGBSurfaceFrom")]
-		public Surface.from_RGB(pointer pixels, int width, int height, int depth, 
+		public Surface.from_RGB(void* pixels, int width, int height, int depth, 
 			int pitch, uint32 rmask, uint32 gmask, uint32 bmask, uint32 amask);
 
 		[CCode (cname="SDL_LoadBMP_RW")]
@@ -117,8 +114,7 @@
 
 		// Instance methods
 		[CCode (cname="SDL_UpdateRects")]
-		[NoArrayLength]
-		public void update_rects(int numrects, Rect[] rects);
+		public void update_rects(int numrects, Rect* rects);
 
 		[CCode (cname="SDL_UpdateRect")]
 		public void update_rect(int32 x, int32 y, uint32 w, uint32 h);
@@ -127,12 +123,10 @@
 		public int flip();
 
 		[CCode (cname="SDL_SetColors")]
-		[NoArrayLength]
-		public int set_colors(Color[] colors, int firstcolor, int ncolors);
+		public int set_colors(Color* colors, int firstcolor, int ncolors);
 
 		[CCode (cname="SDL_SetPalette")]
-		[NoArrayLength]
-		public int set_palette(int flags, Color[] colors, int firstcolor, int ncolors);
+		public int set_palette(int flags, Color* colors, int firstcolor, int ncolors);
 
 		[CCode (cname="SDL_LockSurface")]
 		public int do_lock();
@@ -237,8 +231,7 @@
 	public class Palette {
 		public int ncolors;
 
-		[NoArrayLength]
-		public Color[] colors;
+		public Color* colors;
 	}// Palette
 
 	[CCode (cname="SDL_VideoInfo")]
@@ -277,8 +270,8 @@
 		public int w;
 		public int h;
 		public int planes;
-		uint16[] pitches;
-		pointer pixels;
+		uint16* pitches;
+		uchar** pixels;
 
 		uint32 hw_overlay;
 		uint32 UnusedBits;
@@ -306,7 +299,7 @@
 		public RWops.from_file(string file, string mode);
 
 		[CCode (cname="SDL_RWFromMem")]
-		public RWops.from_mem(pointer mem, int size);
+		public RWops.from_mem(void* mem, int size);
 	}// RWops
 
 
@@ -328,7 +321,7 @@
 		public static int load_library(string path);
 
 		[CCode (cname="SDL_GL_GetProcAddress")]
-		public static pointer get_proc_address(string proc);
+		public static void* get_proc_address(string proc);
 
 		[CCode (cname="SDL_GL_SetAttribute")]
 		public static int set_attribute(GLattr attr, int val);
@@ -358,8 +351,7 @@
 		public static void get_caption(ref string title, ref string icon);
 
 		[CCode (cname="SDL_WM_SetIcon")]
-		[NoArrayLength]
-		public static void set_icon(Surface icon, uchar[]? mask);
+		public static void set_icon(Surface icon, uchar* mask);
 
 		[CCode (cname="SDL_WM_IconifyWindow")]
 		public static int iconify();
@@ -484,8 +476,8 @@
 	public struct UserEvent {
 		public uchar type;
 		public int code;
-		public pointer data1;
-		public pointer data2;
+		public void* data1;
+		public void* data2;
 	}// UserEvent
 
 	[CCode (cname="SDL_SysWMEvent", type_id = "G_TYPE_POINTER", marshaller_type_name = "POINTER")]
@@ -519,8 +511,7 @@
 		public static void pump();
 
 		[CCode (cname="SDL_PeepEvents")]
-		[NoArrayLength]
-		public static void peep(weak Event[] events, int numevents, 
+		public static void peep(weak Event* events, int numevents, 
 			EventAction action, EventMask mask);
 
 		[CCode (cname="SDL_PollEvent")]
@@ -872,9 +863,9 @@
 		public Rect area;
 		public int16 hot_x;
 		public int16 hot_y;
-		public pointer data;
-		public pointer mask;
-		public pointer save;
+		public uchar* data;
+		public uchar* mask;
+		public uchar** save;
 
 		[CCode (cname="SDL_GetMouseState")]
 		public static uchar get_state(ref int x, ref int y);
@@ -886,7 +877,7 @@
 		public static void warp(uint16 x, uint16 y);
 
 		[CCode (cname="SDL_CreateCursor")]
-		public Cursor(pointer data, pointer mask, int w, int h, 
+		public Cursor(uchar* data, uchar* mask, int w, int h, 
 			int hot_x, int hot_y);
 
 		[CCode (cname="SDL_GetCursor")]
@@ -978,7 +969,7 @@
 		public uint16 padding;
 		public uint32 size;
 
-		public pointer userdata;
+		public void* userdata;
 	}// AudioSpec
 
 	[CCode (cname="SDL_AudioCVT")]
@@ -988,8 +979,7 @@
 		public AudioFormat dst_format;
 		public double rate_incr;
 
-		[NoArrayLength]
-		public uchar[] buf;
+		public uchar* buf;
 		public int len;
 		public int len_cvt;
 		public int len_mult;
@@ -1019,10 +1009,10 @@
 		public static void pause(int pause_on);
 
 		[CCode (cname="SDL_LoadWAV_RW")]
-		public static AudioSpec load(RWops src, int freesrc=0, AudioSpec spec, ref pointer audio_buf, ref uint32 audio_len);
+		public static AudioSpec load(RWops src, int freesrc=0, AudioSpec spec, uchar** audio_buf, ref uint32 audio_len);
 
 		[CCode (cname="SDL_FreeWAV")]
-		public static void free(pointer audio_buf);
+		public static void free(uchar* audio_buf);
 
 		[CCode (cname="SDL_MixAudio")]
 		public static void mix(uchar[] dst, uchar[] src, uint32 len, int volume);
@@ -1041,7 +1031,7 @@
 	///
 	/// Threading
 	///
-	public delegate int ThreadFunc(pointer data);
+	public delegate int ThreadFunc(void* data);
 
 	[CCode (cname="SDL_Thread", free_function="SDL_WaitThread")]
 	public class Thread {
@@ -1049,7 +1039,7 @@
 		public static uint32 id();
 
 		[CCode (cname="SDL_CreateThread")]
-		public Thread(ThreadFunc f, pointer data);
+		public Thread(ThreadFunc f, void* data);
 	}// Thread
 
 	[CCode (cname="SDL_mutex", free_function="SDL_DestroyMutex")]
@@ -1107,7 +1097,7 @@
 	///
 	/// Timers
 	///
-	public delegate uint32 TimerCallback(uint32 interval, pointer param);
+	public delegate uint32 TimerCallback(uint32 interval, void* param);
 
 	[CCode (cname="struct _SDL_TimerID", free_function="SDL_RemoveTimer")]
 	public class Timer {
@@ -1118,6 +1108,6 @@
 		public static void delay(uint32 ms);
 
 		[CCode (cname="SDL_AddTimer")]
-		public Timer(uint32 interval, TimerCallback callback, pointer param);
+		public Timer(uint32 interval, TimerCallback callback, void* param);
 	}// Timer
 }// SDL
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]