rubysdl 2.0.1 → 2.1.0

data/rubysdl_video.c

@@ -237,7 +237,7 @@ static VALUE Screen_s_open(VALUE klass,VALUE w,VALUE h,VALUE bpp,
   screen=SDL_SetVideoMode(NUM2INT(w),NUM2INT(h),NUM2INT(bpp),
 			  NUM2UINT(flags));
   if( screen==NULL ){
-    rb_raise(eSDLError,"Cound't set %dx%d %d bpp video mode: %s",
+    rb_raise(eSDLError,"Couldn't set %dx%d %d bpp video mode: %s",
 	     NUM2INT(w),NUM2INT(h),NUM2INT(bpp),SDL_GetError());
   }  
   return Screen_create(screen);
@@ -340,7 +340,7 @@ static VALUE Surface_s_createFrom(VALUE klass,VALUE pixels,VALUE w,
   SDL_Surface *surface;
   void* pixel_data;
   
-  StringValue(pixels);
+  SafeStringValue(pixels);
   pixel_data = ALLOC_N(char, RSTRING_LEN(pixels));
   memcpy(pixel_data,RSTRING_PTR(pixels),RSTRING_LEN(pixels));
   
@@ -359,7 +359,7 @@ static VALUE Surface_s_loadBMP(VALUE klass,VALUE filename)
 {
   SDL_Surface *image;
   rb_secure(4);
-  SafeStringValue(filename);
+  ExportFilenameStringValue(filename);
   
   image = SDL_LoadBMP(RSTRING_PTR(filename));
   if(image == NULL){
@@ -398,7 +398,7 @@ static VALUE Surface_s_loadBMPFromString(VALUE class, VALUE str)
 static VALUE Surface_saveBMP(VALUE self,VALUE filename)
 {
   rb_secure(4);
-  SafeStringValue(filename);
+  ExportFilenameStringValue(filename);
   if( SDL_SaveBMP(Get_SDL_Surface(self), RSTRING_PTR(filename))==-1 ){
     rb_raise(eSDLError,"cannot save %s: %s",RSTRING_PTR(filename),SDL_GetError());
   }
@@ -413,6 +413,11 @@ static VALUE Surface_destroy(VALUE self)
   sur->surface = NULL;
   return Qnil;
 }
+static VALUE Surface_destroyed(VALUE self)
+{
+  Surface* sur = GetSurface(self);
+  return INT2BOOL(sur->surface == NULL);
+}
 
 static VALUE Surface_format(VALUE self)
 {
@@ -823,6 +828,7 @@ VALUE rubysdl_init_video(VALUE mSDL)
   
   rb_define_method(cSurface,"saveBMP",Surface_saveBMP,1);
   rb_define_method(cSurface,"destroy",Surface_destroy,0);
+  rb_define_method(cSurface,"destroyed?",Surface_destroyed,0);
   rb_define_method(cSurface,"displayFormat",Surface_displayFormat,0);
   rb_define_method(cSurface,"displayFormatAlpha",Surface_displayFormatAlpha,0);
   rb_define_method(cSurface,"setColorKey",Surface_setColorKey,2);

data/rubysdl_wm.c

@@ -25,14 +25,19 @@ static VALUE WM_s_caption(VALUE mod)
   
   rb_secure(4);
   SDL_WM_GetCaption(&title, &icon);
+#ifdef ENABLE_M17N
+  return rb_ary_new3(2,
+                     ENC_STR_NEW2(title, utf8_enc),
+                     ENC_STR_NEW2(icon, utf8_enc));
+#else
   return rb_ary_new3(2, rb_str_new2(title), rb_str_new2(icon));
+#endif
 }
 static VALUE WM_s_setCaption(VALUE mod, VALUE title, VALUE icon)
 {
   rb_secure(4);
-  SafeStringValue(title);
-  SafeStringValue(icon);
-  
+  ExportStringValueToEnc(title, utf8_enc);
+  ExportStringValueToEnc(icon, utf8_enc);
   SDL_WM_SetCaption(RSTRING_PTR(title), RSTRING_PTR(icon));
   return Qnil;
 }
@@ -68,4 +73,5 @@ void rubysdl_init_WM(VALUE mSDL)
   rb_define_const(mWM, "GRAB_QUERY", INT2NUM(SDL_GRAB_QUERY));
   rb_define_const(mWM, "GRAB_OFF", INT2NUM(SDL_GRAB_OFF));
   rb_define_const(mWM, "GRAB_ON", INT2NUM(SDL_GRAB_ON));
+
 }

data/sample/font.rb

@@ -18,6 +18,7 @@ loop do
   while event = SDL::Event2.poll
     case event
     when SDL::Event2::KeyDown, SDL::Event2::Quit
+      font.close
       exit
     end
   end

data/sample/load_from_io.rb

@@ -16,9 +16,9 @@ SDL::WM::setCaption('from_str.rb','from_str.rb')
 
 str = File.read("icon.bmp")
 img = SDL::Surface.loadBMPFromIO(StringIO.new(str))
-img2 = File.open("icon.bmp"){|f| SDL::Surface.loadBMPFromIO(f) }
+img2 = File.open("icon.bmp", "rb"){|f| SDL::Surface.loadBMPFromIO(f) }
 img3 = Zlib::GzipReader.open("icon.bmp.gz"){|f| SDL::Surface.loadBMPFromIO(f) }
-img4 = File.open("icon.png"){|f| SDL::Surface.loadFromIO(f) }
+img4 = File.open("icon.png", "rb"){|f| SDL::Surface.loadFromIO(f) }
 
 mus = SDL::Mixer::Music.loadFromString(File.read("track01.ogg"))
 wav = File.open('sample.wav'){|f| SDL::Mixer::Wave.loadFromIO(f) }

data/sample/plaympeg.rb

@@ -33,15 +33,11 @@ loop do
       mpeg.play
     when SDL::Key::R
       mpeg.rewind
+      mpeg.play
     when SDL::Key::ESCAPE
       exit      
     end
   end
-
-  if mpeg.status != SDL::MPEG::PLAYING then
-    mpeg.stop
-    exit
-  end
       
   sleep 0.1
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubysdl
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ohbayashi Ippei
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-23 00:00:00 +09:00
+date: 2009-03-17 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: The simple ruby extension library to use SDL