hornetseye-v4l2 0.3.4 → 0.3.5

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-v4l2'
-PKG_VERSION = '0.3.4'
+PKG_VERSION = '0.3.5'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]

data/ext/v4l2input.cc

@@ -30,7 +30,8 @@ using namespace std;
 
 VALUE V4L2Input::cRubyClass = Qnil;
 
-V4L2Input::V4L2Input( const std::string &device, V4L2SelectPtr select ) throw (Error):
+V4L2Input::V4L2Input( const std::string &device, int channel,
+                      V4L2SelectPtr select ) throw (Error):
   m_device(device), m_fd(-1), m_io(IO_READ), m_frameUsed(false)
 {
   m_map[ 0 ] = MAP_FAILED;
@@ -57,6 +58,9 @@ V4L2Input::V4L2Input( const std::string &device, V4L2SelectPtr select ) throw (E
 #endif
     ERRORMACRO( capability.capabilities & V4L2_CAP_VIDEO_CAPTURE != 0,
                 Error, , m_device << " is no video capture device" );
+    ERRORMACRO( xioctl( VIDIOC_S_INPUT, &channel ) == 0, Error, ,
+                "Error selecting channel " << channel << " for device \""
+                << m_device << "\"" );
     unsigned int formatIndex = 0;
     while ( true ) {
       struct v4l2_fmtdesc format;
@@ -670,7 +674,7 @@ VALUE V4L2Input::registerRubyClass( VALUE module )
                    INT2NUM(V4L2_CID_VCENTER) );
   rb_define_const( cRubyClass, "FEATURE_LASTP1",
                    INT2NUM(V4L2_CID_LASTP1) );
-  rb_define_singleton_method( cRubyClass, "new", RUBY_METHOD_FUNC( wrapNew ), 1 );
+  rb_define_singleton_method( cRubyClass, "new", RUBY_METHOD_FUNC( wrapNew ), 2 );
   rb_define_method( cRubyClass, "close",
                     RUBY_METHOD_FUNC( wrapClose ), 0 );
   rb_define_method( cRubyClass, "read",
@@ -707,13 +711,13 @@ void V4L2Input::deleteRubyObject( void *ptr )
   delete (V4L2InputPtr *)ptr;
 }
 
-VALUE V4L2Input::wrapNew( VALUE rbClass, VALUE rbDevice )
+VALUE V4L2Input::wrapNew( VALUE rbClass, VALUE rbDevice, VALUE rbChannel )
 {
   VALUE retVal = Qnil;
   try {
     rb_check_type( rbDevice, T_STRING );
     V4L2SelectPtr select( new V4L2Select );
-    V4L2InputPtr ptr( new V4L2Input( StringValuePtr( rbDevice ), select ) );
+    V4L2InputPtr ptr(new V4L2Input(StringValuePtr(rbDevice), NUM2INT(rbChannel), select));
     retVal = Data_Wrap_Struct( rbClass, 0, deleteRubyObject,
                                new V4L2InputPtr( ptr ) );
   } catch ( std::exception &e ) {

data/ext/v4l2input.hh

@@ -29,7 +29,7 @@
 class V4L2Input
 {
 public:
-  V4L2Input( const std::string &device, V4L2SelectPtr select ) throw (Error);
+  V4L2Input( const std::string &device, int channel, V4L2SelectPtr select ) throw (Error);
   virtual ~V4L2Input(void);
   void close(void);
   FramePtr read(void) throw (Error);
@@ -49,7 +49,7 @@ public:
   static VALUE cRubyClass;
   static VALUE registerRubyClass( VALUE module );
   static void deleteRubyObject( void *ptr );
-  static VALUE wrapNew( VALUE rbClass, VALUE rbDevice );
+  static VALUE wrapNew( VALUE rbClass, VALUE rbDevice, VALUE rbChannel );
   static VALUE wrapClose( VALUE rbSelf );
   static VALUE wrapRead( VALUE rbSelf );
   static VALUE wrapStatus( VALUE rbSelf );

data/lib/hornetseye-v4l2/v4l2input.rb

@@ -39,10 +39,11 @@ module Hornetseye
       #   camera = V4L2Input.new { |modes| modes.last }
       #
       # @param [String] device The device file name.
+      # @param [Integer] channel Number of the input channel to use.
       # @param [Proc] action An optional block for selecting the desired video mode.
       # @return [V4L2Input] An object for accessing the camera.
-      def new( device = '/dev/video0', &action )
-        orig_new device do |modes|
+      def new( device = '/dev/video0', channel = 0, &action )
+        orig_new device, channel do |modes|
           map = { MODE_UYVY   => UYVY,
                   MODE_YUYV   => YUY2,
                   MODE_YUV420 => I420,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 +01:00
+date: 2011-06-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency