クラス名変更

[scala-sdl/scalasdl-1.0.git.git] / src / SDL.c

diff --git a/src/SDL.c b/src/SDL.c
index 7eea45c..c023f47 100644 (file)
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -16,27 +16,27 @@
 jobject g_surface = NULL;
 
 jclass getSDL_Surface(JNIEnv *env){
-  return (*env)->FindClass(env, "Lsdl/Surface;");
+  return (*env)->FindClass(env, "Lsdl/SDL_Surface;");
 }
 
 jclass getSDL_PixelFormat(JNIEnv* env){
-  return (*env)->FindClass(env, "Lsdl/PixelFormat;");
+  return (*env)->FindClass(env, "Lsdl/SDL_PixelFormat;");
 }
 
 jclass getSDL_Rect(JNIEnv *env){
-  return (*env)->FindClass(env, "Lsdl/Rect;");
+  return (*env)->FindClass(env, "Lsdl/SDL_Rect;");
 }
 
 jclass getSDL_Palette(JNIEnv *env){
-  return (*env)->FindClass(env, "Lsdl/Palette;");
+  return (*env)->FindClass(env, "Lsdl/SDL_Palette;");
 }
 
 jclass getSDL_Color(JNIEnv *env){
-  return (*env)->FindClass(env, "Lsdl/Color;");
+  return (*env)->FindClass(env, "Lsdl/SDL_Color;");
 }
 
 jclass getSDL_VideoInfo(JNIEnv *env){
-  return (*env)->FindClass(env, "Lsdl/VideoInfo;");
+  return (*env)->FindClass(env, "Lsdl/SDL_VideoInfo;");
 }
 
 SDL_Surface* getSDL_SurfacePointer(JNIEnv *env, jobject surface){
@@ -87,7 +87,7 @@ jobject createObjectFromSDL_Palette(JNIEnv *env, jclass sdl_palette, SDL_Palette
 
   jfieldID fld_pointer = (*env)->GetFieldID(env, sdl_palette, "pointer", "I");
   jfieldID fld_ncolors = (*env)->GetFieldID(env, sdl_palette, "ncolors","I");
-  jfieldID fld_colors = (*env)->GetFieldID(env, sdl_palette, "colors","Lsdl/Color;");
+  jfieldID fld_colors = (*env)->GetFieldID(env, sdl_palette, "colors","Lsdl/SDL_Color;");
   jclass sdl_color = getSDL_Color(env);
 
   jobject sdl_color_obj = createObjectFromSDL_Color(env, sdl_color, palette->colors);
@@ -102,7 +102,7 @@ jobject createObjectFromSDL_PixelFormat(JNIEnv *env, jclass sdl_pixel_format, SD
   jobject sdl_pixel_format_obj = (*env)->NewObject(env, sdl_pixel_format, cns);
   
   jfieldID fld_pointer = (*env)->GetFieldID(env, sdl_pixel_format, "pointer", "I");
-  jfieldID fld_palette = (*env)->GetFieldID(env, sdl_pixel_format, "palette", "Lsdl/Palette;");
+  jfieldID fld_palette = (*env)->GetFieldID(env, sdl_pixel_format, "palette", "Lsdl/SDL_Palette;");
   jfieldID fld_bitsperpixel = (*env)->GetFieldID(env, sdl_pixel_format, "BitsPerPixel","I");
   jfieldID fld_bytesperpixel = (*env)->GetFieldID(env, sdl_pixel_format, "BytesPerPixel","I");
   jfieldID fld_rloss = (*env)->GetFieldID(env, sdl_pixel_format, "Rloss","I");
@@ -160,14 +160,14 @@ jobject createObjectFromSDL_Surface(JNIEnv* env, jclass sdl_surface, SDL_Surface
   jfieldID fld_refcount = (*env)->GetFieldID(env, sdl_surface, "refcount", "I");
   //SDL_Rectの作成とセット
   //L完全なパッケージ名;で指定しなければならない。
-  jfieldID fld_clip_rect = (*env)->GetFieldID(env, sdl_surface, "clip_rect", "Lsdl/Rect;");
+  jfieldID fld_clip_rect = (*env)->GetFieldID(env, sdl_surface, "clip_rect", "Lsdl/SDL_Rect;");
   SDL_Rect* rect = &(surface->clip_rect);
   jclass sdl_rect = getSDL_Rect(env);
   jobject sdl_rect_obj = createObjectFromSDL_Rect(env, sdl_rect, rect);
   (*env)->SetObjectField(env, sdl_surface_obj, fld_clip_rect, sdl_rect_obj);
 
   //SDL_PixelFormatの生成とセット
-  jfieldID fld_format = (*env)->GetFieldID(env, sdl_surface, "format", "Lsdl/PixelFormat;");
+  jfieldID fld_format = (*env)->GetFieldID(env, sdl_surface, "format", "Lsdl/SDL_PixelFormat;");
   SDL_PixelFormat* format = surface->format;
   jclass sdl_format = getSDL_PixelFormat(env);
   jobject sdl_pixel_format_obj = createObjectFromSDL_PixelFormat(env, sdl_format, format);
@@ -206,7 +206,7 @@ jobject createObjectFromSDL_VideoInfo(JNIEnv* env, jclass sdl_videoinfo, const S
   jfieldID fld_blit_sw_A = (*env)->GetFieldID(env, sdl_videoinfo, "blit_sw_A", "J");
   jfieldID fld_blit_fill = (*env)->GetFieldID(env, sdl_videoinfo, "blit_fill", "J");
   jfieldID fld_video_mem = (*env)->GetFieldID(env, sdl_videoinfo, "video_mem", "J");
-  jfieldID fld_vfmt = (*env)->GetFieldID(env, sdl_videoinfo, "vfmt", "Lsdl/PixelFormat;");
+  jfieldID fld_vfmt = (*env)->GetFieldID(env, sdl_videoinfo, "vfmt", "Lsdl/SDL_PixelFormat;");
   jfieldID fld_current_w = (*env)->GetFieldID(env, sdl_videoinfo, "current_w", "I");
   jfieldID fld_current_h = (*env)->GetFieldID(env, sdl_videoinfo, "current_h", "I");