rays-video 0.2.0 → 0.3.0

data/ext/rays-video/video.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_VALUE_FROM_TO(RAYS_VIDEO_EXPORT, Rays::Video)
 
 #define THIS  to<Rays::Video*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Video, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Video, self)
 
 
 static
@@ -22,7 +22,7 @@ RUCY_END
 static
 RUCY_DEF4(initialize, width, height, fps, pixel_density)
 {
-	RUCY_CHECK_OBJ(Rays::Video, self);
+	RUCY_CHECK_PTR(Rays::Video, self);
 
 	float fps_ = to<float>(fps);
 	*THIS = Rays::Video(
@@ -36,35 +36,35 @@ RUCY_END
 static
 RUCY_DEF1(initialize_copy, obj)
 {
-	RUCY_CHECK_OBJ(Rays::Video, self);
+	RUCY_CHECK_PTR(Rays::Video, self);
 
 	*THIS = to<Rays::Video&>(obj).dup();
 }
 RUCY_END
 
 static
-RUCY_DEF2(insert, index, image)
+RUCY_DEF0(play)
 {
 	CHECK;
-	THIS->insert(to<size_t>(index), to<const Rays::Image&>(image));
+	THIS->play();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF1(append, image)
+RUCY_DEF0(pause)
 {
 	CHECK;
-	THIS->append(to<const Rays::Image&>(image));
+	THIS->pause();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF1(remove, index)
+RUCY_DEF0(stop)
 {
 	CHECK;
-	THIS->remove(to<size_t>(index));
+	THIS->stop();
 	return self;
 }
 RUCY_END
@@ -94,6 +94,14 @@ RUCY_DEF0(height)
 }
 RUCY_END
 
+static
+RUCY_DEF0(pixel_density)
+{
+	CHECK;
+	return value(THIS->pixel_density());
+}
+RUCY_END
+
 static
 RUCY_DEF0(fps)
 {
@@ -103,114 +111,115 @@ RUCY_DEF0(fps)
 RUCY_END
 
 static
-RUCY_DEF0(pixel_density)
+RUCY_DEF1(set_position, position)
 {
 	CHECK;
-	return value(THIS->pixel_density());
+	THIS->set_position(to<size_t>(position));
+	return position;
 }
 RUCY_END
 
 static
-RUCY_DEF0(size)
+RUCY_DEF0(get_position)
 {
 	CHECK;
-	return value(THIS->size());
+	return value(THIS->position());
 }
 RUCY_END
 
 static
-RUCY_DEF0(empty)
+RUCY_DEF1(set_time_scale, scale)
 {
 	CHECK;
-	return value(THIS->empty());
+	THIS->set_time_scale(to<float>(scale));
+	return scale;
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_position, position)
+RUCY_DEF0(get_time_scale)
 {
 	CHECK;
-	THIS->set_position(to<size_t>(position));
-	return position;
+	return value(THIS->time_scale());
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_position)
+RUCY_DEF2(insert, index, image)
 {
 	CHECK;
-	return value(THIS->position());
+	THIS->insert(to<size_t>(index), to<const Rays::Image&>(image));
+	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(each)
+RUCY_DEF1(append, image)
 {
 	CHECK;
-	Value ret;
-	for (auto it = THIS->begin(), end = THIS->end(); it != end; ++it)
-		ret = yield(value(*it));
-	return ret;
+	THIS->append(to<const Rays::Image&>(image));
+	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(to_image)
+RUCY_DEF1(remove, index)
 {
 	CHECK;
-	return value((Rays::Image) *THIS);
+	THIS->remove(to<size_t>(index));
+	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF1(at, index)
+RUCY_DEF2(set_at, index, image)
 {
 	CHECK;
-	return value((*THIS)[(size_t) to<int>(index)]);
+	THIS->set(to<size_t>(index), to<const Rays::Image&>(image));
+	return image;
 }
 RUCY_END
 
 static
-RUCY_DEF0(play)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
-	THIS->play();
-	return self;
+	return value(THIS->get(to<size_t>(index)));
 }
 RUCY_END
 
 static
-RUCY_DEF0(pause)
+RUCY_DEF0(size)
 {
 	CHECK;
-	THIS->pause();
-	return self;
+	return value(THIS->size());
 }
 RUCY_END
 
 static
-RUCY_DEF0(stop)
+RUCY_DEF0(empty)
 {
 	CHECK;
-	THIS->stop();
-	return self;
+	return value(THIS->empty());
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_time_scale, scale)
+RUCY_DEF0(each)
 {
 	CHECK;
-	THIS->set_time_scale(to<float>(scale));
-	return scale;
+	Value ret;
+	for (auto it = THIS->begin(), end = THIS->end(); it != end; ++it)
+		ret = yield(value(*it));
+	return ret;
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_time_scale)
+RUCY_DEF0(to_image)
 {
 	CHECK;
-	return value(THIS->time_scale());
+	return value((Rays::Image) *THIS);
 }
 RUCY_END
 
@@ -224,10 +233,12 @@ RUCY_END
 static
 RUCY_DEF0(exts)
 {
-	std::vector<Value> list;
-	for (const auto& ext : Rays::get_video_exts())
-		list.emplace_back(ext.c_str());
-	return array(list.data(), list.size());
+	const auto& exts = Rays::get_video_exts();
+
+	Value list = array(NULL, exts.size());
+	for (const auto& ext : exts)
+		list.push(ext.c_str());
+	return list;
 }
 RUCY_END
 
@@ -243,26 +254,27 @@ Init_rays_video ()
 	cVideo.define_alloc_func(alloc);
 	cVideo.define_private_method("initialize!",     initialize);
 	cVideo.define_private_method("initialize_copy", initialize_copy);
-	cVideo.define_method("insert!", insert);
-	cVideo.define_method("append!", append);
-	cVideo.define_method("remove!", remove);
-	cVideo.define_method("save", save);
-	cVideo.define_method("width",         width);
-	cVideo.define_method("height",        height);
-	cVideo.define_method("fps",           fps);
-	cVideo.define_method("pixel_density", pixel_density);
-	cVideo.define_method("size",          size);
-	cVideo.define_method("empty?",        empty);
-	cVideo.define_method("position=", set_position);
-	cVideo.define_method("position",  get_position);
 	cVideo.define_method("play",  play);
 	cVideo.define_method("pause", pause);
 	cVideo.define_method("stop",  stop);
+	cVideo.define_method("save",  save);
+	cVideo.define_method("width",         width);
+	cVideo.define_method("height",        height);
+	cVideo.define_method("pixel_density", pixel_density);
+	cVideo.define_method("fps",           fps);
+	cVideo.define_method("position=",   set_position);
+	cVideo.define_method("position",    get_position);
 	cVideo.define_method("time_scale=", set_time_scale);
 	cVideo.define_method("time_scale",  get_time_scale);
+	cVideo.define_method("insert!", insert);
+	cVideo.define_method("append!", append);
+	cVideo.define_method("remove!", remove);
+	cVideo.define_method("[]=",     set_at);
+	cVideo.define_method("[]",      get_at);
+	cVideo.define_method("size",    size);
+	cVideo.define_method("empty?",  empty);
 	cVideo.define_method("each!", each);
 	cVideo.define_method("to_image", to_image);
-	cVideo.define_method("[]", at);
 	cVideo.define_module_function("load", load);
 	cVideo.define_module_function("exts", exts);
 }

data/include/rays/video.h

@@ -38,40 +38,44 @@ namespace Rays
 
 			This dup () const;
 
-			void insert (size_t index, const Image& image);
-
-			void append (const Image& image);
-
-			void remove (size_t index);
-
 			void play ();
 
 			void pause ();
 
 			void stop ();
 
-			void set_time_scale (float scale);
-
-			float    time_scale () const;
-
 			void save (const char* path);
 
 			coord width () const;
 
 			coord height () const;
 
-			float fps () const;
-
 			float pixel_density () const;
 
-			size_t size () const;
-
-			bool empty () const;
+			float fps () const;
 
 			void set_position (size_t index);
 
 			size_t   position () const;
 
+			void set_time_scale (float scale);
+
+			float    time_scale () const;
+
+			void insert (size_t index, const Image& image);
+
+			void append (const Image& image);
+
+			void remove (size_t index);
+
+			void  set   (size_t index, const Image& image);
+
+			Image get   (size_t index) const;
+
+			size_t size () const;
+
+			bool empty () const;
+
 			const_iterator begin () const;
 
 			const_iterator end () const;

data/lib/rays/video.rb

@@ -22,8 +22,12 @@ module Rays
 
     def append(*images)
       images.each {|image| append! image}
+      self
     end
 
+    alias push append
+    alias <<   append
+
     def remove(index_or_range)
       case index_or_range
       when Range then raise NotImplementedError

data/rays-video.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   ext   = RaysVideo::Extension
   name  = ext.name true
-  rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
+  rdocs = glob.call(*%w[README .doc/ext/**/*.cpp])
 
   s.name        = name
   s.version     = ext.version
@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',   '~> 0.4.0'
-  s.add_dependency 'rucy',  '~> 0.4.0'
-  s.add_dependency 'beeps', '~> 0.4.0'
-  s.add_dependency 'rays',  '~> 0.4.0'
+  s.add_dependency 'xot',   '~> 0.5.0'
+  s.add_dependency 'rucy',  '~> 0.5.0'
+  s.add_dependency 'beeps', '~> 0.5.0'
+  s.add_dependency 'rays',  '~> 0.5.0'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}